From 060d4f46e206cde6c27c076c70df385e2e8fb383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Goetz?= Date: Tue, 31 Aug 2021 22:43:11 +0200 Subject: [PATCH] Fix many tests, add hot-patching to get the ball rolling --- package.json | 3 - packages/crafty-preset-babel/package.json | 2 +- packages/crafty-preset-babel/src/gulp.js | 8 +- packages/crafty-preset-eslint/package.json | 2 +- .../src/commands/jsLint.js | 2 +- packages/crafty-preset-eslint/src/index.js | 3 +- packages/crafty-preset-eslint/src/resolver.js | 2 +- packages/crafty-preset-swc/package.json | 2 +- packages/crafty-preset-swc/src/gulp.js | 8 +- .../crafty-preset-typescript/package.json | 2 +- packages/crafty-preset-typescript/src/gulp.js | 8 +- .../eslint-plugin-swissquote/package.json | 2 +- .../__snapshots__/crafty-preset-babel.js.snap | 3 - .../__snapshots__/crafty-preset-swc.js.snap | 3 - packages/rollup-plugin-eslint/package.json | 2 +- yarn.lock | 158 ++++++++++-------- 16 files changed, 113 insertions(+), 97 deletions(-) diff --git a/package.json b/package.json index 101360205..66ce2a889 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,5 @@ }, "engines": { "node": ">=12" - }, - "resolutions": { - "**/eslint": "8.0.0-beta.1" } } diff --git a/packages/crafty-preset-babel/package.json b/packages/crafty-preset-babel/package.json index 53f6c1fff..0a3d703bc 100644 --- a/packages/crafty-preset-babel/package.json +++ b/packages/crafty-preset-babel/package.json @@ -21,7 +21,7 @@ "babel-loader": "8.2.2", "gulp-babel": "8.0.0", "gulp-concat": "2.6.1", - "gulp-eslint7": "0.3.2", + "gulp-eslint-new": "0.4.0", "gulp-newer": "1.4.0", "gulp-sourcemaps": "3.0.0", "gulp-terser": "2.1.0" diff --git a/packages/crafty-preset-babel/src/gulp.js b/packages/crafty-preset-babel/src/gulp.js index ead7f81d6..cd9c8073c 100644 --- a/packages/crafty-preset-babel/src/gulp.js +++ b/packages/crafty-preset-babel/src/gulp.js @@ -18,8 +18,12 @@ module.exports = function createTask(crafty, bundle, StreamHandler) { const { toTempFile } = require("@swissquote/crafty-preset-eslint/src/eslintConfigurator"); - const eslint = require("gulp-eslint7"); - stream.add(eslint(toTempFile(crafty.config.eslint))).add(eslint.format()); + const eslint = require("gulp-eslint-new"); + stream.add(eslint( + { + overrideConfigFile: toTempFile(crafty.config.eslint) + } + )).add(eslint.format()); // Fail the build if we have linting // errors and we build directly diff --git a/packages/crafty-preset-eslint/package.json b/packages/crafty-preset-eslint/package.json index 938e05949..b3f345fc1 100644 --- a/packages/crafty-preset-eslint/package.json +++ b/packages/crafty-preset-eslint/package.json @@ -17,7 +17,7 @@ "@swissquote/rollup-plugin-eslint": "1.16.3", "copy-anything": "2.0.3", "debug": "^4.1.0", - "eslint": "8.0.0-beta.1", + "eslint": "8.0.1", "eslint-webpack-plugin": "3.0.1", "merge-anything": "4.0.1", "resolve-from": "5.0.0", diff --git a/packages/crafty-preset-eslint/src/commands/jsLint.js b/packages/crafty-preset-eslint/src/commands/jsLint.js index f27e33434..01a6e457a 100755 --- a/packages/crafty-preset-eslint/src/commands/jsLint.js +++ b/packages/crafty-preset-eslint/src/commands/jsLint.js @@ -20,4 +20,4 @@ process.argv.push(require.resolve("../resolver.js")) process.argv.push("--config"); process.argv.push(tmpfile); -require("eslint/bin/eslint"); +require(".bin/eslint"); diff --git a/packages/crafty-preset-eslint/src/index.js b/packages/crafty-preset-eslint/src/index.js index 81ba683ec..e03139775 100644 --- a/packages/crafty-preset-eslint/src/index.js +++ b/packages/crafty-preset-eslint/src/index.js @@ -97,8 +97,7 @@ module.exports = { chain.plugin("lint-js").use(require.resolve("eslint-webpack-plugin"), [ { extensions: crafty.config.eslintExtensions, - overrideConfigFile: toTempFile(crafty.config.eslint), - resolver: require.resolve("@swissquote/crafty-preset-eslint/src/resolver.js") + overrideConfigFile: toTempFile(crafty.config.eslint) } ]); } diff --git a/packages/crafty-preset-eslint/src/resolver.js b/packages/crafty-preset-eslint/src/resolver.js index 4096536bb..08f593a49 100644 --- a/packages/crafty-preset-eslint/src/resolver.js +++ b/packages/crafty-preset-eslint/src/resolver.js @@ -3,7 +3,7 @@ const { } = require("@eslint/eslintrc"); function resolve(moduleName, relativeToPath) { - console.log("resolving", { moduleName, relativeToPath }); + //console.log({moduleName, relativeToPath}); try { // First check for the module relative to the current location return ModuleResolver.resolve(moduleName, __filename); diff --git a/packages/crafty-preset-swc/package.json b/packages/crafty-preset-swc/package.json index b25c79111..a5e065605 100644 --- a/packages/crafty-preset-swc/package.json +++ b/packages/crafty-preset-swc/package.json @@ -20,7 +20,7 @@ "debug": "^4.1.0", "find-up": "5.0.0", "gulp-concat": "2.6.1", - "gulp-eslint7": "0.3.2", + "gulp-eslint-new": "0.4.0", "gulp-newer": "1.4.0", "gulp-sourcemaps": "3.0.0", "gulp-swc": "1.1.1", diff --git a/packages/crafty-preset-swc/src/gulp.js b/packages/crafty-preset-swc/src/gulp.js index 1f8b238ba..1658ff3ef 100644 --- a/packages/crafty-preset-swc/src/gulp.js +++ b/packages/crafty-preset-swc/src/gulp.js @@ -18,8 +18,12 @@ module.exports = function createTask(crafty, bundle, StreamHandler) { const { toTempFile } = require("@swissquote/crafty-preset-eslint/src/eslintConfigurator"); - const eslint = require("gulp-eslint7"); - stream.add(eslint(toTempFile(crafty.config.eslint))).add(eslint.format()); + const eslint = require("gulp-eslint-new"); + stream.add(eslint( + { + overrideConfigFile: toTempFile(crafty.config.eslint) + } + )).add(eslint.format()); // Fail the build if we have linting // errors and we build directly diff --git a/packages/crafty-preset-typescript/package.json b/packages/crafty-preset-typescript/package.json index 2600029cb..2b7424ddc 100644 --- a/packages/crafty-preset-typescript/package.json +++ b/packages/crafty-preset-typescript/package.json @@ -21,7 +21,7 @@ "find-up": "5.0.0", "fork-ts-checker-webpack-plugin": "6.3.4", "gulp-babel": "8.0.0", - "gulp-eslint7": "0.3.2", + "gulp-eslint-new": "0.4.0", "gulp-sourcemaps": "3.0.0", "gulp-typescript": "5.0.1", "tmp": "0.2.1", diff --git a/packages/crafty-preset-typescript/src/gulp.js b/packages/crafty-preset-typescript/src/gulp.js index a813789aa..03552bce1 100644 --- a/packages/crafty-preset-typescript/src/gulp.js +++ b/packages/crafty-preset-typescript/src/gulp.js @@ -18,9 +18,13 @@ module.exports = function createTask(crafty, bundle, StreamHandler) { const { toTempFile } = require("@swissquote/crafty-preset-eslint/src/eslintConfigurator"); - const eslint = require("gulp-eslint7"); + const eslint = require("gulp-eslint-new"); stream - .add(eslint({ configFile: toTempFile(crafty.config.eslint) })) + .add(eslint( + { + overrideConfigFile: toTempFile(crafty.config.eslint) + } + )) .add(eslint.format()); // Fail the build if we have linting diff --git a/packages/eslint-plugin-swissquote/package.json b/packages/eslint-plugin-swissquote/package.json index bf064ae98..4073c3c3b 100644 --- a/packages/eslint-plugin-swissquote/package.json +++ b/packages/eslint-plugin-swissquote/package.json @@ -37,7 +37,7 @@ "eslint": "^6.0.0 | ^7.0.0 | ^8.0.0" }, "devDependencies": { - "eslint": "8.0.0-beta.1", + "eslint": "8.0.1", "jest": "27.2.5" }, "engines": { diff --git a/packages/integration/__tests__/__snapshots__/crafty-preset-babel.js.snap b/packages/integration/__tests__/__snapshots__/crafty-preset-babel.js.snap index 83513e187..9186d913a 100644 --- a/packages/integration/__tests__/__snapshots__/crafty-preset-babel.js.snap +++ b/packages/integration/__tests__/__snapshots__/crafty-preset-babel.js.snap @@ -17,9 +17,6 @@ exports[`Generates IDE Helper 2`] = ` // This file is generated to improve IDE Integration // You don't need to commit this file, nor need it to run \`crafty build\` -// Fix module resolution -require(\\"__PATH__/packages/crafty-preset-eslint/src/patchModuleResolver.js\\"); - module.exports = { \\"plugins\\": [ \\"@swissquote/swissquote\\" diff --git a/packages/integration/__tests__/__snapshots__/crafty-preset-swc.js.snap b/packages/integration/__tests__/__snapshots__/crafty-preset-swc.js.snap index 7b8451fbd..05c3dc89d 100644 --- a/packages/integration/__tests__/__snapshots__/crafty-preset-swc.js.snap +++ b/packages/integration/__tests__/__snapshots__/crafty-preset-swc.js.snap @@ -17,9 +17,6 @@ exports[`Generates IDE Helper 2`] = ` // This file is generated to improve IDE Integration // You don't need to commit this file, nor need it to run \`crafty build\` -// Fix module resolution -require(\\"__PATH__/packages/crafty-preset-eslint/src/patchModuleResolver.js\\"); - module.exports = { \\"plugins\\": [ \\"@swissquote/swissquote\\" diff --git a/packages/rollup-plugin-eslint/package.json b/packages/rollup-plugin-eslint/package.json index 3165b99fa..ce9baf1a6 100644 --- a/packages/rollup-plugin-eslint/package.json +++ b/packages/rollup-plugin-eslint/package.json @@ -35,6 +35,6 @@ }, "dependencies": { "@rollup/pluginutils": "4.1.1", - "eslint": "8.0.0-beta.1" + "eslint": "8.0.1" } } diff --git a/yarn.lock b/yarn.lock index 9837155e4..44cd07dc3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,14 +2,7 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.8.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" - integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== - dependencies: - "@babel/highlight" "^7.14.5" - -"@babel/code-frame@^7.15.8": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8", "@babel/code-frame@^7.8.3": version "7.15.8" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503" integrity sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg== @@ -984,14 +977,14 @@ resolved "https://registry.yarnpkg.com/@csstools/sass-import-resolve/-/sass-import-resolve-1.0.0.tgz#32c3cdb2f7af3cd8f0dca357b592e7271f3831b5" integrity sha512-pH4KCsbtBLLe7eqUrw8brcuFO8IZlN36JjdKlOublibVdAIPHCzEnpBWOVUXK5sCf+DpBi8ZtuWtjF0srybdeA== -"@eslint/eslintrc@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.0.tgz#08309b915051dbfcfea8c3cdfc832375303396c9" - integrity sha512-FPnE4y+crrKBF0c9PckDHFuPDQl+wRX6S9jeSw2WwM2YNmrdRch3gx3DOTWpqpQu0G9yoJaeSSrJLiV/29tGyQ== +"@eslint/eslintrc@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.3.tgz#41f08c597025605f672251dcc4e8be66b5ed7366" + integrity sha512-DHI1wDPoKCBPoLZA3qDR91+3te/wDSc1YhKg3jR8NxKKRJq2hwHwcWv31cSwSYvIBrmbENoYMWcenW8uproQqg== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^8.0.0" + espree "^9.0.0" globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" @@ -1585,9 +1578,9 @@ integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== "@types/node@*": - version "16.7.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.8.tgz#2448be5f24fe6b77114632b6350fcd219334651e" - integrity sha512-8upnoQU0OPzbIkm+ZMM0zCeFCkw2s3mS0IWdx0+AAaWqm4fkBb0UJp8Edl7FVKRamYbpJC/aVsHpKWBIbiC7Zg== + version "16.11.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.0.tgz#4b95f2327bacd1ef8f08d8ceda193039c5d7f52e" + integrity sha512-8MLkBIYQMuhRBQzGN9875bYsOhPnf/0rgXGo66S2FemHkhbn9qtsz9ywV1iCG+vbjigE4WUNVvw37Dx+L0qsPg== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -1610,9 +1603,9 @@ integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== "@types/react@^17.0.3": - version "17.0.29" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.29.tgz#9535f3fc01a4981ce9cadcf0daa2593c0c2f2251" - integrity sha512-HSenIfBEBZ70BLrrVhtEtHpqaP79waauPtA8XKlczTxL3hXrW/ElGNLTpD1TmqkykgGlOAK55+D3SmUHEirpFw== + version "17.0.30" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.30.tgz#2f8e6f5ab6415c091cc5e571942ee9064b17609e" + integrity sha512-3Dt/A8gd3TCXi2aRe84y7cK1K8G+N9CZRDG8kDGguOKa0kf/ZkSwTmVIDPsm/KbQOVMaDJXwhBtuOXxqwdpWVg== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -1924,10 +1917,10 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4, acorn@^8.2.4, acorn@^8.4.1: - version "8.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" - integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== +acorn@^8.0.4, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" + integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== adverb-where@^0.2.2: version "0.2.5" @@ -2608,7 +2601,7 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== -browserslist@4.17.3, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.16.6, browserslist@^4.17.3, browserslist@^4.3.6: +browserslist@4.17.3: version "4.17.3" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.3.tgz#2844cd6eebe14d12384b0122d217550160d2d624" integrity sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ== @@ -2619,6 +2612,17 @@ browserslist@4.17.3, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4. node-releases "^1.1.77" picocolors "^0.2.1" +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.16.6, browserslist@^4.17.3, browserslist@^4.3.6: + version "4.17.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.4.tgz#72e2508af2a403aec0a49847ef31bd823c57ead4" + integrity sha512-Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ== + dependencies: + caniuse-lite "^1.0.30001265" + electron-to-chromium "^1.3.867" + escalade "^3.1.1" + node-releases "^2.0.0" + picocolors "^1.0.0" + bs-logger@0.x: version "0.2.6" resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" @@ -2799,10 +2803,10 @@ caniuse-api@3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000655, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001179, caniuse-lite@^1.0.30001264: - version "1.0.30001265" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz#0613c9e6c922e422792e6fcefdf9a3afeee4f8c3" - integrity sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000655, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001179, caniuse-lite@^1.0.30001264, caniuse-lite@^1.0.30001265: + version "1.0.30001267" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001267.tgz#b1cf2937175afc0570e4615fc2d2f9069fa0ed30" + integrity sha512-r1mjTzAuJ9W8cPBGbbus8E0SKcUP7gn03R14Wk8FlAlqhH9hroy9nLqmpuXlfKEw/oILW+FGz47ipXV2O7x8lg== case-sensitive-paths-webpack-plugin@2.4.0: version "2.4.0" @@ -3772,10 +3776,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.857: - version "1.3.866" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.866.tgz#d446338f5ad6948b27a50739760e7b0b5cc5032f" - integrity sha512-iYze6TpDXWxk+sfcpUUdTs6Pv/3kG45Pnjer2DxEeFw0N08bZeNLuz97s2lMgy8yObon48o0WHY2Bkg3xuAPOA== +electron-to-chromium@^1.3.857, electron-to-chromium@^1.3.867: + version "1.3.868" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.868.tgz#ed835023b57ecf0ba63dfe7d50e16b53758ab1da" + integrity sha512-kZYCHqwJ1ctGrYDlOcWQH+/AftAm/KD4lEnLDNwS0kKwx1x6dU4zv+GuDjsPPOGn/2TjnKBaZjDyjXaoix0q/A== emittery@^0.8.1: version "0.8.1" @@ -3974,9 +3978,9 @@ eslint-import-resolver-typescript@2.5.0: tsconfig-paths "^3.9.0" eslint-module-utils@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.0.tgz#9e97c12688113401259b39d960e6a1f09f966435" - integrity sha512-hqSE88MmHl3ru9SYvDyGrlo0JwROlf9fiEMplEV7j/EAuq9iSlIlyCFbBT6pdULQBSnBYtYKiMLps+hKkyP7Gg== + version "2.7.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c" + integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ== dependencies: debug "^3.2.7" find-up "^2.1.0" @@ -4082,12 +4086,12 @@ eslint-webpack-plugin@3.0.1: normalize-path "^3.0.0" schema-utils "^3.1.0" -eslint@8.0.0-beta.1, eslint@^7.32.0: - version "8.0.0-beta.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.0.0-beta.1.tgz#5cd74684dbcfd8abee08cc10de578294124539b5" - integrity sha512-+3EHhCIJHUXuksq6dUSe1Nv9+sdFaLfct6ZiWdFYrHU8u9tX6QQWGdKJQuQXUlUdhMMh6cchRFIQ7OqSAcyq7A== +eslint@8.0.1, eslint@^8.0.0: + version "8.0.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.0.1.tgz#3610e7fe4a05c2154669515ca60835a76a19f700" + integrity sha512-LsgcwZgQ72vZ+SMp4K6pAnk2yFDWL7Ti4pJaRvsZ0Hsw2h8ZjUIW38a9AFn2cZXdBMlScMFYYgsSp4ttFI/0bA== dependencies: - "@eslint/eslintrc" "^1.0.0" + "@eslint/eslintrc" "^1.0.3" "@humanwhocodes/config-array" "^0.6.0" ajv "^6.10.0" chalk "^4.0.0" @@ -4099,7 +4103,7 @@ eslint@8.0.0-beta.1, eslint@^7.32.0: eslint-scope "^6.0.0" eslint-utils "^3.0.0" eslint-visitor-keys "^3.0.0" - espree "^8.0.0" + espree "^9.0.0" esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -4126,12 +4130,12 @@ eslint@8.0.0-beta.1, eslint@^7.32.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-8.0.0.tgz#08c92c31814c96c96c54d3a35cc80f1cdb420275" - integrity sha512-y/+i23dwTjIDJrYCcjcAMr3c3UGbPIjC6THMQKjWmhP97fW0FPiI89kmpKfmgV/5jrkIi6toQP+CMm3qBE1Hig== +espree@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.0.0.tgz#e90a2965698228502e771c7a58489b1a9d107090" + integrity sha512-r5EQJcYZ2oaGbeR0jR0fFVijGOcwai07/690YRXLINuhmVeRY4UKSAsQPe/0BNuDgwP7Ophoc1PRsr2E3tkbdQ== dependencies: - acorn "^8.4.1" + acorn "^8.5.0" acorn-jsx "^5.3.1" eslint-visitor-keys "^3.0.0" @@ -4625,9 +4629,9 @@ forwarded@0.2.0: integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== fp-ts@^2.6.1: - version "2.11.4" - resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.11.4.tgz#ad78a0d8eafb0dcfc835a0fb200f6da6422c27f0" - integrity sha512-lhV7tGEbs2qoVw4vmqOovChS7CAoIYU0gdiPEF8Vc4bLZct+PAMMeXrCqRyBNEo33XOvwvAmFDEDIrHPWH2/fg== + version "2.11.5" + resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.11.5.tgz#97cceb26655b1452d7088d6fb0864f84cceffbe4" + integrity sha512-OqlwJq1BdpB83BZXTqI+dNcA6uYk6qk4u9Cgnt64Y+XS7dwdbp/mobx8S2KXf2AXH+scNmA/UVK3SEFHR3vHZA== fresh@0.5.2: version "0.5.2" @@ -4770,11 +4774,11 @@ glob-parent@^5.1.2, glob-parent@~5.1.2: is-glob "^4.0.1" glob-parent@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.1.tgz#42054f685eb6a44e7a7d189a96efa40a54971aa7" - integrity sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog== + version "6.0.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== dependencies: - is-glob "^4.0.1" + is-glob "^4.0.3" glob-stream@^6.1.0: version "6.1.0" @@ -4904,12 +4908,12 @@ gulp-concat@2.6.1: through2 "^2.0.0" vinyl "^2.0.0" -gulp-eslint7@0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/gulp-eslint7/-/gulp-eslint7-0.3.2.tgz#713617567a920b25ac6a5a240be73ca36ad49cd6" - integrity sha512-zDb/sz8sXmP2jv6BTM9mH1DhoOX7nq5Q3ESHelqw+Fqd7lbU0GoOUVte3NvpqP+oWaGn2+t0AKEs0kXEQRMUIw== +gulp-eslint-new@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/gulp-eslint-new/-/gulp-eslint-new-0.4.0.tgz#fae4befebf2b62691a8148619c1d48b4e4996f19" + integrity sha512-WZPoj58nyrLT+xjrvO/ZK41Y/KAQrzw5xlSyL7JtGc8GtrIC2fLHzdOoKZ8/Zk3hm8cIhsPv/mqxBoZ+DXNZDQ== dependencies: - eslint "^7.32.0" + eslint "^8.0.0" fancy-log "^1.3.3" plugin-error "^1.0.1" @@ -5539,9 +5543,9 @@ is-ci@^3.0.0: ci-info "^3.1.1" is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3" - integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ== + version "2.8.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== dependencies: has "^1.0.3" @@ -5884,9 +5888,9 @@ istanbul-lib-source-maps@^4.0.0: source-map "^0.6.1" istanbul-reports@^3.0.2: - version "3.0.4" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.4.tgz#5c38ce8136edf484c0fcfbf7514aafb0363ed1db" - integrity sha512-bFjUnc95rHjdCR63WMHUS7yfJJh8T9IPSWavvR02hhjVwezWALZ5axF9EqjmwZHpXqkzbgAMP8DmAtiyNxrdrQ== + version "3.0.5" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.5.tgz#a2580107e71279ea6d661ddede929ffc6d693384" + integrity sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" @@ -7037,9 +7041,9 @@ nanocolors@^0.1.12: integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ== nanoid@^3.1.28: - version "3.1.29" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.29.tgz#214fb2d7a33e1a5bef4757b779dfaeb6a4e5aeb4" - integrity sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg== + version "3.1.30" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" + integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== native-promise-only@~0.8.1: version "0.8.1" @@ -7111,6 +7115,11 @@ node-releases@^1.1.77: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.77.tgz#50b0cfede855dd374e7585bf228ff34e57c1c32e" integrity sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ== +node-releases@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.0.tgz#67dc74903100a7deb044037b8a2e5f453bb05400" + integrity sha512-aA87l0flFYMzCHpTM3DERFSYxc6lv/BltdbRTOMZuxZ0cwZCD3mejE5n9vLhSJCN++/eOqr77G1IO5uXxlQYWA== + normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -7643,6 +7652,11 @@ picocolors@^0.2.1: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== + picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3: version "2.3.0" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" @@ -9779,16 +9793,16 @@ symbol-tree@^3.2.4: integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== table@^6.6.0: - version "6.7.1" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" - integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== + version "6.7.2" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0" + integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g== dependencies: ajv "^8.0.1" lodash.clonedeep "^4.5.0" lodash.truncate "^4.4.2" slice-ansi "^4.0.0" - string-width "^4.2.0" - strip-ansi "^6.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" tapable@^1.0.0: version "1.1.3"