From 93d4914f46ef1342117e7a13240187b33d727d8e Mon Sep 17 00:00:00 2001 From: Daniel Stoian Date: Thu, 9 Jan 2025 11:45:30 +0200 Subject: [PATCH 1/6] updated eslint in travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e9e315a..40a450c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ install: - npm install - npm link - popd - - npm install -g eslint@8.57.0 + - npm install -g eslint - npm install - cd ./packages/theme/template - npm install From 660a949404ce5d2802de4876a075432086e01f7a Mon Sep 17 00:00:00 2001 From: Daniel Stoian Date: Thu, 9 Jan 2025 11:53:41 +0200 Subject: [PATCH 2/6] updated lint command in travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 40a450c..31a0e7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,10 +15,10 @@ install: - npm install script: - echo -e "\x1b\x5b35;1m*** Starting lint and tests from theme template...\x1b\x5b0m" - - npm run lint -- --report-unused-disable-directives --max-warnings 0 + - npm run lint -- -no-config-lookup --report-unused-disable-directives --max-warnings 0 - npm run test - echo -e "\x1b\x5b35;1m*** Tests complete\x1b\x5b0m" - cd ../../.. - echo -e "\x1b\x5b35;1m*** Starting eslint...\x1b\x5b0m" - - npm run lint -- --report-unused-disable-directives --max-warnings 0 + - npm run lint -- -no-config-lookup --report-unused-disable-directives --max-warnings 0 - echo -e "\x1b\x5b35;1m*** eslint complete\x1b\x5b0m" From ffc5c3b7633df59044e5206a43da4ff5828a84a7 Mon Sep 17 00:00:00 2001 From: Daniel Stoian Date: Thu, 9 Jan 2025 11:54:21 +0200 Subject: [PATCH 3/6] minor fix --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31a0e7b..6493a14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,10 +15,10 @@ install: - npm install script: - echo -e "\x1b\x5b35;1m*** Starting lint and tests from theme template...\x1b\x5b0m" - - npm run lint -- -no-config-lookup --report-unused-disable-directives --max-warnings 0 + - npm run lint -- --no-config-lookup --report-unused-disable-directives --max-warnings 0 - npm run test - echo -e "\x1b\x5b35;1m*** Tests complete\x1b\x5b0m" - cd ../../.. - echo -e "\x1b\x5b35;1m*** Starting eslint...\x1b\x5b0m" - - npm run lint -- -no-config-lookup --report-unused-disable-directives --max-warnings 0 + - npm run lint -- --no-config-lookup --report-unused-disable-directives --max-warnings 0 - echo -e "\x1b\x5b35;1m*** eslint complete\x1b\x5b0m" From 91db6017840fd3e52a469effdd4ca18c3f18bc19 Mon Sep 17 00:00:00 2001 From: Daniel Stoian Date: Fri, 10 Jan 2025 11:40:34 +0200 Subject: [PATCH 4/6] updated eslint config --- .travis.yml | 4 +- eslint.config.js | 16 +++++ package-lock.json | 170 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 8 +-- 4 files changed, 189 insertions(+), 9 deletions(-) create mode 100644 eslint.config.js diff --git a/.travis.yml b/.travis.yml index 6493a14..40a450c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,10 +15,10 @@ install: - npm install script: - echo -e "\x1b\x5b35;1m*** Starting lint and tests from theme template...\x1b\x5b0m" - - npm run lint -- --no-config-lookup --report-unused-disable-directives --max-warnings 0 + - npm run lint -- --report-unused-disable-directives --max-warnings 0 - npm run test - echo -e "\x1b\x5b35;1m*** Tests complete\x1b\x5b0m" - cd ../../.. - echo -e "\x1b\x5b35;1m*** Starting eslint...\x1b\x5b0m" - - npm run lint -- --no-config-lookup --report-unused-disable-directives --max-warnings 0 + - npm run lint -- --report-unused-disable-directives --max-warnings 0 - echo -e "\x1b\x5b35;1m*** eslint complete\x1b\x5b0m" diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 0000000..a31e631 --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,16 @@ +const eslintEnactProxy = require('eslint-config-enact-proxy/strict'); +const { FlatCompat } = require("@eslint/eslintrc"); + +const compat = new FlatCompat({}); + +console.log(eslintEnactProxy) +module.exports = [ + ...compat.extends(eslintEnactProxy), + //...compat.extends("enact-proxy/strict"), + { + ignores: [ + "node_modules", + "packages/theme" + ] + } +]; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 4b115a5..5e755a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,11 @@ "name": "@enact/templates", "version": "5.0.0-alpha.2", "license": "Apache-2.0", + "dependencies": { + "-": "^0.0.1" + }, "devDependencies": { + "@eslint/eslintrc": "^3.2.0", "eslint-config-enact-proxy": "^1.0.8", "lerna": "^8.1.9" }, @@ -16,6 +20,11 @@ "node": ">=18.0.0" } }, + "node_modules/-": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/-/-/--0.0.1.tgz", + "integrity": "sha512-3HfneK3DGAm05fpyj20sT3apkNcvPpCuccOThOPdzz8sY7GgQGe0l93XH9bt+YzibcTIgUAIMoyVJI740RtgyQ==" + }, "node_modules/@babel/code-frame": { "version": "7.26.2", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", @@ -72,6 +81,41 @@ "tslib": "^2.4.0" } }, + "node_modules/@eslint/eslintrc": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", + "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^10.0.1", + "globals": "^14.0.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/@hutson/parse-repository-url": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz", @@ -1306,6 +1350,27 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/acorn": { + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, "node_modules/add-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", @@ -1340,6 +1405,22 @@ "node": ">=8" } }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, "node_modules/ansi-colors": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", @@ -2565,6 +2646,35 @@ "node": ">=10" } }, + "node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "dev": true, + "dependencies": { + "acorn": "^8.14.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^4.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -2645,6 +2755,12 @@ "node": ">=0.6.0" } }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, "node_modules/fast-glob": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", @@ -2675,6 +2791,12 @@ "node": ">= 6" } }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, "node_modules/fastq": { "version": "1.17.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", @@ -3220,6 +3342,18 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/globals": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/globby": { "version": "11.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", @@ -3955,6 +4089,12 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, "node_modules/json-stringify-nice": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz", @@ -5755,6 +5895,15 @@ "dev": true, "license": "MIT" }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -6631,6 +6780,18 @@ "node": ">=8" } }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/strong-log-transformer": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", @@ -7016,6 +7177,15 @@ "yarn": "*" } }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/package.json b/package.json index 20735c8..6d7b3b7 100644 --- a/package.json +++ b/package.json @@ -20,14 +20,8 @@ "lerna": "lerna", "lint": "eslint ." }, - "eslintConfig": { - "extends": "enact-proxy" - }, - "eslintIgnore": [ - "node_modules", - "packages/theme" - ], "devDependencies": { + "@eslint/eslintrc": "^3.2.0", "eslint-config-enact-proxy": "^1.0.8", "lerna": "^8.1.9" } From 47330dfcaa20824b03c6f72c98ee56ab51550776 Mon Sep 17 00:00:00 2001 From: Daniel Stoian Date: Fri, 10 Jan 2025 13:54:05 +0200 Subject: [PATCH 5/6] fix --- eslint.config.js | 2 -- package-lock.json | 8 -------- 2 files changed, 10 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index a31e631..20b6be0 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -3,10 +3,8 @@ const { FlatCompat } = require("@eslint/eslintrc"); const compat = new FlatCompat({}); -console.log(eslintEnactProxy) module.exports = [ ...compat.extends(eslintEnactProxy), - //...compat.extends("enact-proxy/strict"), { ignores: [ "node_modules", diff --git a/package-lock.json b/package-lock.json index 5e755a3..203bd4e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,9 +8,6 @@ "name": "@enact/templates", "version": "5.0.0-alpha.2", "license": "Apache-2.0", - "dependencies": { - "-": "^0.0.1" - }, "devDependencies": { "@eslint/eslintrc": "^3.2.0", "eslint-config-enact-proxy": "^1.0.8", @@ -20,11 +17,6 @@ "node": ">=18.0.0" } }, - "node_modules/-": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/-/-/--0.0.1.tgz", - "integrity": "sha512-3HfneK3DGAm05fpyj20sT3apkNcvPpCuccOThOPdzz8sY7GgQGe0l93XH9bt+YzibcTIgUAIMoyVJI740RtgyQ==" - }, "node_modules/@babel/code-frame": { "version": "7.26.2", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", From 48e794be98705ef102896bd9bd94104b56cb3b24 Mon Sep 17 00:00:00 2001 From: Daniel Stoian Date: Tue, 14 Jan 2025 11:47:13 +0200 Subject: [PATCH 6/6] small revert --- eslint.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eslint.config.js b/eslint.config.js index 20b6be0..a2e7306 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,4 +1,4 @@ -const eslintEnactProxy = require('eslint-config-enact-proxy/strict'); +const eslintEnactProxy = require('eslint-config-enact-proxy'); const { FlatCompat } = require("@eslint/eslintrc"); const compat = new FlatCompat({});