module: move modules/cjs/helpers.js to modules/helpers.js · nodejs/node@a3b0f4c · GitHub

nodejs / node Public

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

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

Additional navigation options

Commit a3b0f4c

Browse filesBrowse the repository at this point in the historyBrowse files

joyeecheung

authored and

targos

committed

module: move modules/cjs/helpers.js to modules/helpers.js

The helpers are actually shared by the two loaders, so move them under modules/ directly. PR-URL: #45849 Backport-PR-URL: #46425 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>

1 parent 5f37dec commit a3b0f4c
Copy full SHA for a3b0f4c

9 files changed

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

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • internal
    • main
      • eval_string.js
    • modules
      • cjs
        • loader.js
      • esm
        • translators.js
      • helpers.js
    • source_map
      • source_map_cache.js
    • util
      • inspector.js
  • repl.js
• test/parallel
  • test-bootstrap-modules.js
  • test-util-inspect.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/internal/main/eval_string.js‎

Copy file name to clipboardExpand all lines: lib/internal/main/eval_string.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -12,7 +12,7 @@ const {
12	12	markBootstrapComplete,
13	13	} = require('internal/process/pre_execution');
14	14	const { evalModule, evalScript } = require('internal/process/execution');
15		- const { addBuiltinLibsToObject } = require('internal/modules/cjs/helpers');
	15	+ const { addBuiltinLibsToObject } = require('internal/modules/helpers');
16	16
17	17	const { getOptionValue } = require('internal/options');
18	18

Collapse file

‎lib/internal/modules/cjs/loader.js‎

Copy file name to clipboardExpand all lines: lib/internal/modules/cjs/loader.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -108,7 +108,7 @@ const {
108	108	makeRequireFunction,
109	109	normalizeReferrerURL,
110	110	stripBOM,
111		- } = require('internal/modules/cjs/helpers');
	111	+ } = require('internal/modules/helpers');
112	112	const { getOptionValue } = require('internal/options');
113	113	const preserveSymlinks = getOptionValue('--preserve-symlinks');
114	114	const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');

Collapse file

‎lib/internal/modules/esm/translators.js‎

Copy file name to clipboardExpand all lines: lib/internal/modules/esm/translators.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -30,7 +30,7 @@ const {
30	30	hasEsmSyntax,
31	31	loadBuiltinModule,
32	32	stripBOM,
33		- } = require('internal/modules/cjs/helpers');
	33	+ } = require('internal/modules/helpers');
34	34	const {
35	35	Module: CJSModule,
36	36	cjsParseCache,

Collapse file

‎lib/internal/modules/cjs/helpers.js‎ ‎lib/internal/modules/helpers.js‎lib/internal/modules/cjs/helpers.js renamed to lib/internal/modules/helpers.js

Copy file name to clipboard

File renamed without changes.

Collapse file

‎lib/internal/source_map/source_map_cache.js‎

Copy file name to clipboardExpand all lines: lib/internal/source_map/source_map_cache.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -27,7 +27,7 @@ const { getOptionValue } = require('internal/options');
27	27	const { IterableWeakMap } = require('internal/util/iterable_weak_map');
28	28	const {
29	29	normalizeReferrerURL,
30		- } = require('internal/modules/cjs/helpers');
	30	+ } = require('internal/modules/helpers');
31	31	const { validateBoolean } = require('internal/validators');
32	32	const { setMaybeCacheGeneratedSourceMap } = internalBinding('errors');
33	33

Collapse file

‎lib/internal/util/inspector.js‎

Copy file name to clipboardExpand all lines: lib/internal/util/inspector.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -66,7 +66,7 @@ function installConsoleExtensions(commandLineApi) {
66	66	if (commandLineApi.require) { return; }
67	67	const { tryGetCwd } = require('internal/process/execution');
68	68	const CJSModule = require('internal/modules/cjs/loader').Module;
69		- const { makeRequireFunction } = require('internal/modules/cjs/helpers');
	69	+ const { makeRequireFunction } = require('internal/modules/helpers');
70	70	const consoleAPIModule = new CJSModule('<inspector console>');
71	71	const cwd = tryGetCwd();
72	72	consoleAPIModule.paths = [];

Collapse file

‎lib/repl.js‎

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

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -101,7 +101,7 @@ const { BuiltinModule } = require('internal/bootstrap/loaders');
101	101	const {
102	102	makeRequireFunction,
103	103	addBuiltinLibsToObject,
104		- } = require('internal/modules/cjs/helpers');
	104	+ } = require('internal/modules/helpers');
105	105	const {
106	106	isIdentifierStart,
107	107	isIdentifierChar,

Collapse file

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

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

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -51,7 +51,7 @@ const expectedModules = new Set([
51	51	'NativeModule internal/fs/utils',
52	52	'NativeModule internal/idna',
53	53	'NativeModule internal/linkedlist',
54		- 'NativeModule internal/modules/cjs/helpers',
	54	+ 'NativeModule internal/modules/helpers',
55	55	'NativeModule internal/modules/cjs/loader',
56	56	'NativeModule internal/modules/esm/assert',
57	57	'NativeModule internal/modules/esm/formats',

Collapse file

‎test/parallel/test-util-inspect.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-util-inspect.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -2829,7 +2829,7 @@ assert.strictEqual(
2829	2829	' at Function.Module._load (node:internal/modules/cjs/loader:621:3)',
2830	2830	// This file is not an actual Node.js core file.
2831	2831	' at Module.require [as weird/name] (node:internal/aaaaa/loader:735:19)',
2832		- ' at require (node:internal/modules/cjs/helpers:14:16)',
	2832	+ ' at require (node:internal/modules/helpers:14:16)',
2833	2833	' at Array.forEach (<anonymous>)',
2834	2834	` at ${process.cwd()}/test/parallel/test-util-inspect.js:2760:12`,
2835	2835	` at Object.<anonymous> (${process.cwd()}/node_modules/hyper_module/folder/file.js:2753:10)`,

0 commit comments

Comments

0 (0)