lib: load internal/fs/watchers and internal/fs/read_file_context early · nodejs/node@5d9442a · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 632
• Pull requests 755
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 5d9442a

Browse filesBrowse the repository at this point in the historyBrowse files

joyeecheung

authored and

danielleadams

committed

lib: load internal/fs/watchers and internal/fs/read_file_context early

So that they are included in the builtin snapshot PR-URL: #38737 Refs: #35711 Reviewed-By: Anna Henningsen <anna@addaleax.net>

1 parent a1b0e64 commit 5d9442a
Copy full SHA for 5d9442a

2 files changed

+4-8Lines changed: 4 additions & 8 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • fs.js
• test/parallel
  • test-bootstrap-modules.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/fs.js‎

Copy file name to clipboardExpand all lines: lib/fs.js

+3-8Lines changed: 3 additions & 8 deletions

Original file line number	Diff line number	Diff line change
@@ -138,13 +138,14 @@ const {
138	138	validateInteger,
139	139	} = require('internal/validators');
140	140
	141	+ const watchers = require('internal/fs/watchers');
	142	+ const ReadFileContext = require('internal/fs/read_file_context');
	143	+
141	144	let truncateWarn = true;
142	145	let fs;
143	146
144	147	// Lazy loaded
145	148	let promises = null;
146		- let watchers;
147		- let ReadFileContext;
148	149	let ReadStream;
149	150	let WriteStream;
150	151	let rimraf;
@@ -369,8 +370,6 @@ function checkAborted(signal, callback) {
369	370	function readFile(path, options, callback) {
370	371	callback = maybeCallback(callback || options);
371	372	options = getOptions(options, { flag: 'r' });
372		- if (!ReadFileContext)
373		- ReadFileContext = require('internal/fs/read_file_context');
374	373	const context = new ReadFileContext(callback, options.encoding);
375	374	context.isUserFd = isFd(path); // File descriptor ownership
376	375
@@ -2234,8 +2233,6 @@ function watch(filename, options, listener) {
2234	2233	if (options.recursive === undefined) options.recursive = false;
2235	2234	if (options.recursive && !(isOSX || isWindows))
2236	2235	throw new ERR_FEATURE_UNAVAILABLE_ON_PLATFORM('watch recursively');
2237		- if (!watchers)
2238		- watchers = require('internal/fs/watchers');
2239	2236	const watcher = new watchers.FSWatcher();
2240	2237	watcher[watchers.kFSWatchStart](filename,
2241	2238	options.persistent,
@@ -2301,8 +2298,6 @@ function watchFile(filename, options, listener) {
2301	2298	stat = statWatchers.get(filename);
2302	2299
2303	2300	if (stat === undefined) {
2304		- if (!watchers)
2305		- watchers = require('internal/fs/watchers');
2306	2301	stat = new watchers.StatWatcher(options.bigint);
2307	2302	stat[watchers.kFSStatWatcherStart](filename,
2308	2303	options.persistent, options.interval);

Collapse file

‎test/parallel/test-bootstrap-modules.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-bootstrap-modules.js

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -56,6 +56,7 @@ const expectedModules = new Set([
56	56	'NativeModule internal/fs/dir',
57	57	'NativeModule internal/fs/utils',
58	58	'NativeModule internal/fs/promises',
	59	+ 'NativeModule internal/fs/read_file_context',
59	60	'NativeModule internal/fs/rimraf',
60	61	'NativeModule internal/fs/watchers',
61	62	'NativeModule internal/heap_utils',

0 commit comments

Comments

0 (0)