From 67da737fa791d0f639a7ba8e51990df979c71ac8 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Sun, 15 Mar 2020 11:37:32 +0100 Subject: [PATCH 01/11] Lint typescript files. --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 70b55cabbe3f..c444ac93b076 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "eslintConfig": { "extends": "@redwoodjs/eslint-config" }, + "eslintIgnore": ["dist", "packages/api/importAll.macro.js"], "scripts": { "build": "lerna run build", "test": "lerna run test --stream -- --colors", - "lint": "yarn eslint 'packages/*/src/**/*.js'", - "lint:fix": "yarn eslint --fix 'packages/*/src/**/*.js'" + "lint": "yarn eslint './packages/'", + "lint:fix": "yarn eslint --fix './packages/'" } } \ No newline at end of file From 7db8b5d190e6a9e27d93098c7418e73246a14d61 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Sun, 15 Mar 2020 11:37:46 +0100 Subject: [PATCH 02/11] Fix linting errors. --- packages/api/__mocks__/@prisma/client.js | 2 +- packages/cli/jest.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/api/__mocks__/@prisma/client.js b/packages/api/__mocks__/@prisma/client.js index c866bc2983af..a75b01bde84e 100644 --- a/packages/api/__mocks__/@prisma/client.js +++ b/packages/api/__mocks__/@prisma/client.js @@ -1 +1 @@ -export const PrismaClient = class MockPrismaClient { } \ No newline at end of file +export const PrismaClient = class MockPrismaClient {} diff --git a/packages/cli/jest.config.js b/packages/cli/jest.config.js index 5a2dafc63230..420651a55619 100644 --- a/packages/cli/jest.config.js +++ b/packages/cli/jest.config.js @@ -1,3 +1,3 @@ module.exports = { - testMatch: [ "**/__tests__/**/*.[jt]s?(x)", "**/*.test.[jt]s?(x)" ] + testMatch: ['**/__tests__/**/*.[jt]s?(x)', '**/*.test.[jt]s?(x)'], } From b7ffe4bb391936245cde032fc6559169c5a70bcd Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Sun, 15 Mar 2020 13:36:51 +0100 Subject: [PATCH 03/11] Add webpack import resolver. --- packages/eslint-config/index.js | 12 ++++++++---- packages/eslint-config/package.json | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js index 2ead7feda1ec..27568c2cae9f 100644 --- a/packages/eslint-config/index.js +++ b/packages/eslint-config/index.js @@ -21,7 +21,7 @@ module.exports = { 'react-hooks', '@redwoodjs/redwood', ], - ignorePatterns: ['node_modules'], + ignorePatterns: ['node_modules', 'dist'], extends: [ 'eslint:recommended', 'plugin:react/recommended', @@ -53,8 +53,12 @@ module.exports = { }, ], settings: { + // This is used to support our `import/order` configuration. 'import/resolver': { - 'babel-module': {}, + 'eslint-import-resolver-babel-module': {}, + 'eslint-import-resolver-webpack': { + config: '@redwoodjs/core/config/webpack.development.js', + }, }, react: { version: 'detect', @@ -91,7 +95,7 @@ module.exports = { { varsIgnorePattern: '^_', argsIgnorePattern: '^_' }, ], 'import/order': [ - 'error', + 'warn', { groups: [ 'builtin', @@ -106,7 +110,7 @@ module.exports = { ], // React rules 'react/prop-types': [ - 'error', + 'warn', { skipUndeclared: true, ignore: ['style', 'children', 'className', 'theme'], diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index f4a5cd3b10eb..914985cb8cc8 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -11,11 +11,12 @@ "eslint": "6.8.0", "eslint-config-prettier": "^6.10.0", "eslint-import-resolver-babel-module": "^5.1.2", + "eslint-import-resolver-webpack": "^0.12.1", "eslint-plugin-babel": "^5.3.0", "eslint-plugin-import": "^2.20.1", "eslint-plugin-jsx-a11y": "^6.2.3", "eslint-plugin-prettier": "^3.1.2", - "eslint-plugin-react": "^7.18.3", + "eslint-plugin-react": "^7.19.0", "eslint-plugin-react-hooks": "^2.5.0", "prettier": "^1.19.1" }, From 00c37bd26401ce6885d05d050ce923784c469438 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Sun, 15 Mar 2020 13:37:39 +0100 Subject: [PATCH 04/11] Do not lint test files, we do not transpile them. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c444ac93b076..9259d14d4844 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "eslintConfig": { "extends": "@redwoodjs/eslint-config" }, - "eslintIgnore": ["dist", "packages/api/importAll.macro.js"], + "eslintIgnore": ["dist", "packages/api/importAll.macro.js", "__test__", "__mocks__", "test.js"], "scripts": { "build": "lerna run build", "test": "lerna run test --stream -- --colors", From 218cac574f8fa0850ed08c24e0d8c2510498551d Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Sun, 15 Mar 2020 13:47:25 +0100 Subject: [PATCH 05/11] Add webpack config for web-side. --- packages/eslint-config/index.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js index 27568c2cae9f..d97d91c14bc9 100644 --- a/packages/eslint-config/index.js +++ b/packages/eslint-config/index.js @@ -45,20 +45,25 @@ module.exports = { }, }, { - files: ['api/src/**/*.js'], + files: ['api/src/**'], globals: { db: 'readonly', context: 'readonly', }, }, + { + files: 'web/src/**', + settings: { + 'eslint-import-resolver-webpack': { + config: 'node_modules/@redwoodjs/core/config/webpack.development.js', + }, + }, + }, ], settings: { // This is used to support our `import/order` configuration. 'import/resolver': { 'eslint-import-resolver-babel-module': {}, - 'eslint-import-resolver-webpack': { - config: '@redwoodjs/core/config/webpack.development.js', - }, }, react: { version: 'detect', From 2e88c246d15bc3e6b84e6b0eea5f4ab9d89a983f Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Sun, 15 Mar 2020 13:47:42 +0100 Subject: [PATCH 06/11] Fix eslint ignores. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9259d14d4844..d5ec249d8334 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "eslintConfig": { "extends": "@redwoodjs/eslint-config" }, - "eslintIgnore": ["dist", "packages/api/importAll.macro.js", "__test__", "__mocks__", "test.js"], + "eslintIgnore": ["dist", "packages/api/importAll.macro.js", "__tests__/", "__mocks__", "*.test.js"], "scripts": { "build": "lerna run build", "test": "lerna run test --stream -- --colors", From 5fca141b81879eb1946ce491a5e1266aec0d1984 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Sun, 15 Mar 2020 13:48:00 +0100 Subject: [PATCH 07/11] Update yarn lock file. --- yarn.lock | 72 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 63 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2c301ac505e5..e509cbc2b76b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1066,7 +1066,7 @@ pirates "^4.0.0" source-map-support "^0.5.16" -"@babel/runtime-corejs3@^7.7.4": +"@babel/runtime-corejs3@^7.7.4", "@babel/runtime-corejs3@^7.8.3": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz#8209d9dff2f33aa2616cb319c83fe159ffb07b8c" integrity sha512-sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q== @@ -3666,6 +3666,11 @@ array-find-index@^1.0.1: resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= +array-find@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-find/-/array-find-1.0.0.tgz#6c8e286d11ed768327f8e62ecee87353ca3e78b8" + integrity sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg= + array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -5951,6 +5956,15 @@ enhanced-resolve@4.1.0: memory-fs "^0.4.0" tapable "^1.0.0" +enhanced-resolve@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e" + integrity sha1-TW5omzcl+GCQknzMhs2fFjW4ni4= + dependencies: + graceful-fs "^4.1.2" + memory-fs "^0.2.0" + tapable "^0.1.8" + enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66" @@ -6082,6 +6096,22 @@ eslint-import-resolver-node@^0.3.2: debug "^2.6.9" resolve "^1.13.1" +eslint-import-resolver-webpack@^0.12.1: + version "0.12.1" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.1.tgz#771ae561e887ca4e53ee87605fbb36c5e290b0f5" + integrity sha512-O/sUAXk6GWrICiN8JUkkjdt9uZpqZHP+FVnTxtEILL6EZMaPSrnP4lGPSFwcKsv7O211maqq4Nz60+dh236hVg== + dependencies: + array-find "^1.0.0" + debug "^2.6.9" + enhanced-resolve "^0.9.1" + find-root "^1.1.0" + has "^1.0.3" + interpret "^1.2.0" + lodash "^4.17.15" + node-libs-browser "^1.0.0 || ^2.0.0" + resolve "^1.13.1" + semver "^5.7.1" + eslint-module-utils@^2.4.1: version "2.5.2" resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708" @@ -6142,10 +6172,10 @@ eslint-plugin-react-hooks@^2.5.0: resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.0.tgz#c50ab7ca5945ce6d1cf8248d9e185c80b54171b6" integrity sha512-bzvdX47Jx847bgAYf0FPX3u1oxU+mKU8tqrpj4UX9A96SbAmj/HVEefEy6rJUog5u8QIlOPTKZcBpGn5kkKfAQ== -eslint-plugin-react@^7.18.3: - version "7.18.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz#8be671b7f6be095098e79d27ac32f9580f599bc8" - integrity sha512-Bt56LNHAQCoou88s8ViKRjMB2+36XRejCQ1VoLj716KI1MoE99HpTVvIThJ0rvFmG4E4Gsq+UgToEjn+j044Bg== +eslint-plugin-react@^7.19.0: + version "7.19.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666" + integrity sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ== dependencies: array-includes "^3.1.1" doctrine "^2.1.0" @@ -6155,8 +6185,10 @@ eslint-plugin-react@^7.18.3: object.fromentries "^2.0.2" object.values "^1.1.1" prop-types "^15.7.2" - resolve "^1.14.2" + resolve "^1.15.1" + semver "^6.3.0" string.prototype.matchall "^4.0.2" + xregexp "^4.3.0" eslint-rule-composer@^0.3.0: version "0.3.0" @@ -6693,6 +6725,11 @@ find-cache-dir@^3.2.0: make-dir "^3.0.2" pkg-dir "^4.1.0" +find-root@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" + integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== + find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -7849,7 +7886,7 @@ internal-slot@^1.0.2: has "^1.0.3" side-channel "^1.0.2" -interpret@1.2.0: +interpret@1.2.0, interpret@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== @@ -9414,6 +9451,11 @@ mem@^4.0.0: mimic-fn "^2.0.0" p-is-promise "^2.0.0" +memory-fs@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290" + integrity sha1-8rslNovBIeORwlIN6Slpyu4KApA= + memory-fs@^0.4.0, memory-fs@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" @@ -9892,7 +9934,7 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= -node-libs-browser@^2.2.1: +"node-libs-browser@^1.0.0 || ^2.0.0", node-libs-browser@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== @@ -11662,7 +11704,7 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.8.1, resolve@^1.9.0: +resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.8.1, resolve@^1.9.0: version "1.15.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== @@ -12660,6 +12702,11 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" +tapable@^0.1.8: + version "0.1.10" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4" + integrity sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q= + tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" @@ -13872,6 +13919,13 @@ xmlchars@^2.1.1: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== +xregexp@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50" + integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g== + dependencies: + "@babel/runtime-corejs3" "^7.8.3" + xtend@^4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" From 31135eaef56ef205760f46672445b32335244261 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Sun, 15 Mar 2020 13:52:22 +0100 Subject: [PATCH 08/11] Make import order an error again. --- packages/eslint-config/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js index d97d91c14bc9..faa269c243bc 100644 --- a/packages/eslint-config/index.js +++ b/packages/eslint-config/index.js @@ -100,7 +100,7 @@ module.exports = { { varsIgnorePattern: '^_', argsIgnorePattern: '^_' }, ], 'import/order': [ - 'warn', + 'error', { groups: [ 'builtin', From f54defb21e39f91fe78a54b2d3493aca3f05b2c8 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Sun, 15 Mar 2020 13:57:04 +0100 Subject: [PATCH 09/11] I like linting my tests and mocks. --- babel.config.js | 8 ++++---- package.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/babel.config.js b/babel.config.js index 20deaf387249..aeef1f7d98f6 100644 --- a/babel.config.js +++ b/babel.config.js @@ -67,9 +67,9 @@ module.exports = { ], }, ], - // Only build test files when testing + // Do not build tests or mocks in production. ignore: - process.env.NODE_ENV === 'test' - ? [] - : [/\.test\.(js|ts)/, '**/__tests__', '**/__mocks__'], + process.env.NODE_ENV === 'production' + ? [/\.test\.(js|ts)/, '**/__tests__', '**/__mocks__'] + : [], } diff --git a/package.json b/package.json index d5ec249d8334..1a635f14df4c 100644 --- a/package.json +++ b/package.json @@ -23,9 +23,9 @@ "eslintConfig": { "extends": "@redwoodjs/eslint-config" }, - "eslintIgnore": ["dist", "packages/api/importAll.macro.js", "__tests__/", "__mocks__", "*.test.js"], + "eslintIgnore": ["dist", "packages/api/importAll.macro.js"], "scripts": { - "build": "lerna run build", + "build": "NODE_ENV=production lerna run build", "test": "lerna run test --stream -- --colors", "lint": "yarn eslint './packages/'", "lint:fix": "yarn eslint --fix './packages/'" From 233c48306963df42711264b32485eef1285384f3 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Sun, 15 Mar 2020 14:14:20 +0100 Subject: [PATCH 10/11] Remove eslint webpack resolver. --- packages/eslint-config/index.js | 8 ----- packages/eslint-config/package.json | 1 - yarn.lock | 49 ++--------------------------- 3 files changed, 2 insertions(+), 56 deletions(-) diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js index faa269c243bc..e9624f368b0d 100644 --- a/packages/eslint-config/index.js +++ b/packages/eslint-config/index.js @@ -51,14 +51,6 @@ module.exports = { context: 'readonly', }, }, - { - files: 'web/src/**', - settings: { - 'eslint-import-resolver-webpack': { - config: 'node_modules/@redwoodjs/core/config/webpack.development.js', - }, - }, - }, ], settings: { // This is used to support our `import/order` configuration. diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 914985cb8cc8..1ca37177c5a7 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -11,7 +11,6 @@ "eslint": "6.8.0", "eslint-config-prettier": "^6.10.0", "eslint-import-resolver-babel-module": "^5.1.2", - "eslint-import-resolver-webpack": "^0.12.1", "eslint-plugin-babel": "^5.3.0", "eslint-plugin-import": "^2.20.1", "eslint-plugin-jsx-a11y": "^6.2.3", diff --git a/yarn.lock b/yarn.lock index e509cbc2b76b..2819dc4af3a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3666,11 +3666,6 @@ array-find-index@^1.0.1: resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= -array-find@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-find/-/array-find-1.0.0.tgz#6c8e286d11ed768327f8e62ecee87353ca3e78b8" - integrity sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg= - array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -5956,15 +5951,6 @@ enhanced-resolve@4.1.0: memory-fs "^0.4.0" tapable "^1.0.0" -enhanced-resolve@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e" - integrity sha1-TW5omzcl+GCQknzMhs2fFjW4ni4= - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.2.0" - tapable "^0.1.8" - enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66" @@ -6096,22 +6082,6 @@ eslint-import-resolver-node@^0.3.2: debug "^2.6.9" resolve "^1.13.1" -eslint-import-resolver-webpack@^0.12.1: - version "0.12.1" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.1.tgz#771ae561e887ca4e53ee87605fbb36c5e290b0f5" - integrity sha512-O/sUAXk6GWrICiN8JUkkjdt9uZpqZHP+FVnTxtEILL6EZMaPSrnP4lGPSFwcKsv7O211maqq4Nz60+dh236hVg== - dependencies: - array-find "^1.0.0" - debug "^2.6.9" - enhanced-resolve "^0.9.1" - find-root "^1.1.0" - has "^1.0.3" - interpret "^1.2.0" - lodash "^4.17.15" - node-libs-browser "^1.0.0 || ^2.0.0" - resolve "^1.13.1" - semver "^5.7.1" - eslint-module-utils@^2.4.1: version "2.5.2" resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708" @@ -6725,11 +6695,6 @@ find-cache-dir@^3.2.0: make-dir "^3.0.2" pkg-dir "^4.1.0" -find-root@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" - integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== - find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -7886,7 +7851,7 @@ internal-slot@^1.0.2: has "^1.0.3" side-channel "^1.0.2" -interpret@1.2.0, interpret@^1.2.0: +interpret@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== @@ -9451,11 +9416,6 @@ mem@^4.0.0: mimic-fn "^2.0.0" p-is-promise "^2.0.0" -memory-fs@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290" - integrity sha1-8rslNovBIeORwlIN6Slpyu4KApA= - memory-fs@^0.4.0, memory-fs@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" @@ -9934,7 +9894,7 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= -"node-libs-browser@^1.0.0 || ^2.0.0", node-libs-browser@^2.2.1: +node-libs-browser@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== @@ -12702,11 +12662,6 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -tapable@^0.1.8: - version "0.1.10" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4" - integrity sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q= - tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" From d2d8314aa02ea466b0c7bc69380cbf7e687af8e2 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Sun, 15 Mar 2020 14:14:39 +0100 Subject: [PATCH 11/11] Change eslint paths. --- packages/cli/src/commands/lint.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/cli/src/commands/lint.js b/packages/cli/src/commands/lint.js index f6f66280a52a..e79423d5bcf6 100644 --- a/packages/cli/src/commands/lint.js +++ b/packages/cli/src/commands/lint.js @@ -9,13 +9,9 @@ export const builder = { } export const handler = ({ fix }) => { - execa( - 'yarn eslint', - [fix && '--fix', 'web/src/**/*.js', 'api/src/**/*.js'].filter(Boolean), - { - cwd: getPaths().base, - shell: true, - stdio: 'inherit', - } - ) + execa('yarn eslint', [fix && '--fix', 'web/src', 'api/src'].filter(Boolean), { + cwd: getPaths().base, + shell: true, + stdio: 'inherit', + }) }