Skip to content

Commit 4bc4d00

Browse files
targosevanlucas
authored andcommitted
tools: move eslint from tools to tools/node_modules
This is required because we need to add the babel-eslint dependency and it has to be able to resolve "eslint". babel-eslint is required to support future ES features such as async iterators and import.meta. Refs: #17755 PR-URL: #17820 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
1 parent 969c89b commit 4bc4d00

File tree

2,582 files changed

+72
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,582 files changed

+72
-71
lines changed

β€Ž.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ end_of_line = ignore
3636
trim_trailing_whitespace = ignore
3737
charset = ignore
3838

39-
[{test/fixtures,deps,tools/eslint,tools/gyp,tools/icu,tools/msvs}/**]
39+
[{test/fixtures,deps,tools/node_modules,tools/gyp,tools/icu,tools/msvs}/**]
4040
insert_final_newline = false

β€Ž.eslintignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ lib/punycode.js
33
test/addons/??_*
44
test/fixtures
55
test/message/esm_display_syntax_error.mjs
6-
tools/eslint
6+
tools/node_modules
77
tools/icu
88
tools/remark-*
99
node_modules

β€Ž.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.*
33
!deps/**/.*
44
!test/fixtures/**/.*
5-
!tools/eslint/**/.*
5+
!tools/node_modules/**/.*
66
!tools/doc/node_modules/**/.*
77
!.editorconfig
88
!.eslintignore

β€ŽLICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ The externally maintained libraries used by Node.js are:
10381038
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10391039
"""
10401040

1041-
- ESLint, located at tools/eslint, is licensed as follows:
1041+
- ESLint, located at tools/node_modules/eslint, is licensed as follows:
10421042
"""
10431043
Copyright JS Foundation and other contributors, https://js.foundation
10441044

β€ŽMakefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ $(TARBALL): release-only $(NODE_EXE) doc
914914
$(RM) -r $(TARNAME)/deps/openssl/openssl/{doc,demos,test}
915915
$(RM) -r $(TARNAME)/deps/zlib/contrib # too big, unused
916916
$(RM) -r $(TARNAME)/.{editorconfig,git*,mailmap}
917-
$(RM) -r $(TARNAME)/tools/{eslint,eslint-rules,osx-pkg.pmdoc,pkgsrc,remark-cli,remark-preset-lint-node}
917+
$(RM) -r $(TARNAME)/tools/{eslint-rules,node_modules,osx-pkg.pmdoc,pkgsrc,remark-cli,remark-preset-lint-node}
918918
$(RM) -r $(TARNAME)/tools/{osx-*,license-builder.sh,cpplint.py}
919919
$(RM) -r $(TARNAME)/test*.tap
920920
find $(TARNAME)/ -name ".eslint*" -maxdepth 2 | xargs $(RM)
@@ -1116,7 +1116,7 @@ lint-md:
11161116
endif
11171117

11181118
LINT_JS_TARGETS = benchmark doc lib test tools
1119-
LINT_JS_CMD = tools/eslint/bin/eslint.js --cache \
1119+
LINT_JS_CMD = tools/node_modules/eslint/bin/eslint.js --cache \
11201120
--rulesdir=tools/eslint-rules --ext=.js,.mjs,.md \
11211121
$(LINT_JS_TARGETS)
11221122

@@ -1207,7 +1207,7 @@ cpplint: lint-cpp
12071207

12081208
.PHONY: lint
12091209
.PHONY: lint-ci
1210-
ifneq ("","$(wildcard tools/eslint/)")
1210+
ifneq ("","$(wildcard tools/node_modules/eslint/)")
12111211
lint: ## Run JS, C++, MD and doc linters.
12121212
@EXIT_STATUS=0 ; \
12131213
$(MAKE) lint-js || EXIT_STATUS=$$? ; \

β€Ždoc/onboarding-extras.md

+39-39

β€Žtest/doctool/test-doctool-html.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict';
22

33
const common = require('../common');
4-
// The doctool currently uses js-yaml from the tool/eslint/ tree.
4+
// The doctool currently uses js-yaml from the tool/node_modules/eslint/ tree.
55
try {
6-
require('../../tools/eslint/node_modules/js-yaml');
6+
require('../../tools/node_modules/eslint/node_modules/js-yaml');
77
} catch (e) {
88
common.skip('missing js-yaml (eslint not present)');
99
}

β€Žtest/parallel/test-eslint-alphabetize-errors.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/alphabetize-errors');
77

88
new RuleTester().run('alphabetize-errors', rule, {

β€Žtest/parallel/test-eslint-buffer-constructor.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/buffer-constructor');
77

88
const message = 'Use of the Buffer() constructor has been deprecated. ' +

β€Žtest/parallel/test-eslint-crypto-check.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/crypto-check');
77

88
const message = 'Please add a hasCrypto check to allow this test to be ' +

β€Žtest/parallel/test-eslint-documented-errors.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/documented-errors');
77

88
const invalidCode = 'UNDOCUMENTED ERROR CODE';

β€Žtest/parallel/test-eslint-inspector-check.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/inspector-check');
77

88
const message = 'Please add a skipIfInspectorDisabled() call to allow this ' +

β€Žtest/parallel/test-eslint-lowercase-name-for-primitive.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/lowercase-name-for-primitive');
77

88
const valid = [

β€Žtest/parallel/test-eslint-no-let-in-for-declaration.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/no-let-in-for-declaration');
77

88
const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } });

β€Žtest/parallel/test-eslint-no-unescaped-regexp-dot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/no-unescaped-regexp-dot');
77

88
new RuleTester().run('no-unescaped-regexp-dot', rule, {

β€Žtest/parallel/test-eslint-number-isnan.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/number-isnan');
77

88
const message = 'Please use Number.isNaN instead of the global isNaN function';

β€Žtest/parallel/test-eslint-prefer-assert-iferror.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/prefer-assert-iferror');
77

88
new RuleTester().run('prefer-assert-iferror', rule, {

β€Žtest/parallel/test-eslint-prefer-assert-methods.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/prefer-assert-methods');
77

88
new RuleTester().run('prefer-assert-methods', rule, {

β€Žtest/parallel/test-eslint-prefer-common-expectserror.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/prefer-common-expectserror');
77

88
const message = 'Please use common.expectsError(fn, err) instead of ' +

β€Žtest/parallel/test-eslint-prefer-common-mustnotcall.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/prefer-common-mustnotcall');
77

88
const message = 'Please use common.mustNotCall(msg) instead of ' +

β€Žtest/parallel/test-eslint-prefer-util-format-errors.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
require('../common');
66

7-
const RuleTester = require('../../tools/eslint').RuleTester;
7+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
88
const rule = require('../../tools/eslint-rules/prefer-util-format-errors');
99

1010
new RuleTester({ parserOptions: { ecmaVersion: 6 } })

β€Žtest/parallel/test-eslint-require-buffer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/require-buffer');
77
const ruleTester = new RuleTester({
88
parserOptions: { ecmaVersion: 6 },

β€Žtest/parallel/test-eslint-required-modules.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require('../common');
44

5-
const RuleTester = require('../../tools/eslint').RuleTester;
5+
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
66
const rule = require('../../tools/eslint-rules/required-modules');
77

88
new RuleTester().run('required-modules', rule, {

β€Žtools/doc/node_modules/js-yaml/index.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žtools/license-builder.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ addlicense "marked" "tools/doc/node_modules/marked" \
7676
# Testing tools
7777
addlicense "cpplint.py" "tools/cpplint.py" \
7878
"$(sed -e '/^$/,$d' -e 's/^#$//' -e 's/^# //' ${rootdir}/tools/cpplint.py | tail -n +3)"
79-
addlicense "ESLint" "tools/eslint" "$(cat ${rootdir}/tools/eslint/LICENSE)"
79+
addlicense "ESLint" "tools/node_modules/eslint" "$(cat ${rootdir}/tools/node_modules/eslint/LICENSE)"
8080
addlicense "gtest" "deps/gtest" "$(cat ${rootdir}/deps/gtest/LICENSE)"
8181

8282
# nghttp2

β€Žtools/lint-js.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ const path = require('path');
1010
const fs = require('fs');
1111
const totalCPUs = require('os').cpus().length;
1212

13-
const CLIEngine = require('./eslint').CLIEngine;
14-
const glob = require('./eslint/node_modules/glob');
13+
const CLIEngine = require('eslint').CLIEngine;
14+
const glob = require('eslint/node_modules/glob');
1515

1616
const cliOptions = {
1717
rulePaths: rulesDirs,
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
Β (0)