@umijs/lint 4.0.0-rc.11 → 4.0.0-rc.14

package/compiled/@rushstack/eslint-patch/LICENSE

@@ -0,0 +1,24 @@
+@rushstack/eslint-patch
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/compiled/@rushstack/eslint-patch/lib/modern-module-resolution.js

@@ -0,0 +1,216 @@
+"use strict";
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
+// This is a workaround for https://github.com/eslint/eslint/issues/3458
+//
+// To correct how ESLint searches for plugin packages, add this line to the top of your project's .eslintrc.js file:
+//
+//    require("@rushstack/eslint-patch/modern-module-resolution");
+//
+const path = require('path');
+const fs = require('fs');
+const isModuleResolutionError = (ex) => typeof ex === 'object' && !!ex && 'code' in ex && ex.code === 'MODULE_NOT_FOUND';
+// ==== @umijs/lint fork start ====
+const getBuiltinPluginResolvePath = (pkg) => (
+  require('@umijs/lint/package.json').dependencies[pkg] &&
+  require.resolve('@umijs/lint/package.json')
+);
+// ==== @umijs/lint fork end ====
+// Module path for eslintrc.cjs
+// Example: ".../@eslint/eslintrc/dist/eslintrc.cjs"
+let eslintrcBundlePath = undefined;
+// Module path for config-array-factory.js
+// Example: ".../@eslint/eslintrc/lib/config-array-factory"
+let configArrayFactoryPath = undefined;
+// Module path for relative-module-resolver.js
+// Example: ".../@eslint/eslintrc/lib/shared/relative-module-resolver"
+let moduleResolverPath = undefined;
+// Folder path where ESLint's package.json can be found
+// Example: ".../node_modules/eslint"
+let eslintFolder = undefined;
+// Probe for the ESLint >=8.0.0 layout:
+for (let currentModule = module;;) {
+    if (!eslintrcBundlePath) {
+        // For ESLint >=8.0.0, all @eslint/eslintrc code is bundled at this path:
+        //   .../@eslint/eslintrc/dist/eslintrc.cjs
+        try {
+            const eslintrcFolder = path.dirname(require.resolve('@eslint/eslintrc/package.json', { paths: [currentModule.path] }));
+            // Make sure we actually resolved the module in our call path
+            // and not some other spurious dependency.
+            if (path.join(eslintrcFolder, 'dist/eslintrc.cjs') === currentModule.filename) {
+                eslintrcBundlePath = path.join(eslintrcFolder, 'dist/eslintrc.cjs');
+            }
+        }
+        catch (ex) {
+            // Module resolution failures are expected, as we're walking
+            // up our require stack to look for eslint. All other errors
+            // are rethrown.
+            if (!isModuleResolutionError(ex)) {
+                throw ex;
+            }
+        }
+    }
+    else {
+        // Next look for a file in ESLint's folder
+        //   .../eslint/lib/cli-engine/cli-engine.js
+        try {
+            const eslintCandidateFolder = path.dirname(require.resolve('eslint/package.json', {
+                paths: [currentModule.path]
+            }));
+            // Make sure we actually resolved the module in our call path
+            // and not some other spurious dependency.
+            if (path.join(eslintCandidateFolder, 'lib/cli-engine/cli-engine.js') === currentModule.filename) {
+                eslintFolder = eslintCandidateFolder;
+                break;
+            }
+        }
+        catch (ex) {
+            // Module resolution failures are expected, as we're walking
+            // up our require stack to look for eslint. All other errors
+            // are rethrown.
+            if (!isModuleResolutionError(ex)) {
+                throw ex;
+            }
+        }
+    }
+    if (!currentModule.parent) {
+        break;
+    }
+    currentModule = currentModule.parent;
+}
+if (!eslintFolder) {
+    // Probe for the ESLint >=7.8.0 layout:
+    for (let currentModule = module;;) {
+        if (!configArrayFactoryPath) {
+            // For ESLint >=7.8.0, config-array-factory.js is at this path:
+            //   .../@eslint/eslintrc/lib/config-array-factory.js
+            try {
+                const eslintrcFolder = path.dirname(require.resolve('@eslint/eslintrc/package.json', {
+                    paths: [currentModule.path]
+                }));
+                if (path.join(eslintrcFolder, '/lib/config-array-factory.js') == currentModule.filename) {
+                    configArrayFactoryPath = path.join(eslintrcFolder, 'lib/config-array-factory.js');
+                    moduleResolverPath = path.join(eslintrcFolder, 'lib/shared/relative-module-resolver');
+                }
+            }
+            catch (ex) {
+                // Module resolution failures are expected, as we're walking
+                // up our require stack to look for eslint. All other errors
+                // are rethrown.
+                if (!isModuleResolutionError(ex)) {
+                    throw ex;
+                }
+            }
+        }
+        else {
+            // Next look for a file in ESLint's folder
+            //   .../eslint/lib/cli-engine/cli-engine.js
+            try {
+                const eslintCandidateFolder = path.dirname(require.resolve('eslint/package.json', {
+                    paths: [currentModule.path]
+                }));
+                if (path.join(eslintCandidateFolder, 'lib/cli-engine/cli-engine.js') == currentModule.filename) {
+                    eslintFolder = eslintCandidateFolder;
+                    break;
+                }
+            }
+            catch (ex) {
+                // Module resolution failures are expected, as we're walking
+                // up our require stack to look for eslint. All other errors
+                // are rethrown.
+                if (!isModuleResolutionError(ex)) {
+                    throw ex;
+                }
+            }
+        }
+        if (!currentModule.parent) {
+            break;
+        }
+        currentModule = currentModule.parent;
+    }
+}
+if (!eslintFolder) {
+    // Probe for the <7.8.0 layout:
+    for (let currentModule = module;;) {
+        // For ESLint <7.8.0, config-array-factory.js was at this path:
+        //   .../eslint/lib/cli-engine/config-array-factory.js
+        if (/[\\/]eslint[\\/]lib[\\/]cli-engine[\\/]config-array-factory\.js$/i.test(currentModule.filename)) {
+            eslintFolder = path.join(path.dirname(currentModule.filename), '../..');
+            configArrayFactoryPath = path.join(eslintFolder, 'lib/cli-engine/config-array-factory');
+            moduleResolverPath = path.join(eslintFolder, 'lib/shared/relative-module-resolver');
+            break;
+        }
+        if (!currentModule.parent) {
+            // This was tested with ESLint 6.1.0 .. 7.12.1.
+            throw new Error('Failed to patch ESLint because the calling module was not recognized.\n' +
+                'If you are using a newer ESLint version that may be unsupported, please create a GitHub issue:\n' +
+                'https://github.com/microsoft/rushstack/issues');
+        }
+        currentModule = currentModule.parent;
+    }
+}
+// Detect the ESLint package version
+const eslintPackageJson = fs.readFileSync(path.join(eslintFolder, 'package.json')).toString();
+const eslintPackageObject = JSON.parse(eslintPackageJson);
+const eslintPackageVersion = eslintPackageObject.version;
+const versionMatch = /^([0-9]+)\./.exec(eslintPackageVersion); // parse the SemVer MAJOR part
+if (!versionMatch) {
+    throw new Error('Unable to parse ESLint version: ' + eslintPackageVersion);
+}
+const eslintMajorVersion = Number(versionMatch[1]);
+if (!(eslintMajorVersion >= 6 && eslintMajorVersion <= 8)) {
+    throw new Error('The patch-eslint.js script has only been tested with ESLint version 6.x, 7.x, and 8.x.' +
+        ` (Your version: ${eslintPackageVersion})\n` +
+        'Consider reporting a GitHub issue:\n' +
+        'https://github.com/microsoft/rushstack/issues');
+}
+let ConfigArrayFactory;
+if (eslintMajorVersion === 8) {
+    ConfigArrayFactory = require(eslintrcBundlePath).Legacy.ConfigArrayFactory;
+}
+else {
+    ConfigArrayFactory = require(configArrayFactoryPath).ConfigArrayFactory;
+}
+if (!ConfigArrayFactory.__patched) {
+    ConfigArrayFactory.__patched = true;
+    let ModuleResolver;
+    if (eslintMajorVersion === 8) {
+        ModuleResolver = require(eslintrcBundlePath).Legacy.ModuleResolver;
+    }
+    else {
+        ModuleResolver = require(moduleResolverPath);
+    }
+    const originalLoadPlugin = ConfigArrayFactory.prototype._loadPlugin;
+    if (eslintMajorVersion === 6) {
+        // ESLint 6.x
+        ConfigArrayFactory.prototype._loadPlugin = function (name, importerPath, importerName) {
+            const originalResolve = ModuleResolver.resolve;
+            try {
+                ModuleResolver.resolve = function (moduleName, relativeToPath) {
+                    // resolve using importerPath instead of relativeToPath
+                    return originalResolve.call(this, moduleName, getBuiltinPluginResolvePath(moduleName) || importerPath);
+                };
+                return originalLoadPlugin.apply(this, arguments);
+            }
+            finally {
+                ModuleResolver.resolve = originalResolve;
+            }
+        };
+    }
+    else {
+        // ESLint 7.x || 8.x
+        ConfigArrayFactory.prototype._loadPlugin = function (name, ctx) {
+            const originalResolve = ModuleResolver.resolve;
+            try {
+                ModuleResolver.resolve = function (moduleName, relativeToPath) {
+                    // resolve using ctx.filePath instead of relativeToPath
+                    return originalResolve.call(this, moduleName, getBuiltinPluginResolvePath(moduleName) || ctx.filePath);
+                };
+                return originalLoadPlugin.apply(this, arguments);
+            }
+            finally {
+                ModuleResolver.resolve = originalResolve;
+            }
+        };
+    }
+}

package/compiled/@rushstack/eslint-patch/package.json

@@ -0,0 +1 @@
+{"name":"@rushstack/eslint-patch","license":"MIT"}

package/dist/config/eslint/index.js

@@ -27,7 +27,7 @@ const recommended_1 = __importStar(require("./rules/recommended"));
 require("./setup");
 module.exports = {
     parser: '@babel/eslint-parser',
-    plugins: ['react', 'react-hooks', 'jest'],
+    plugins: ['react', 'react-hooks'],
     settings: {
         react: {
             version: 'detect',
@@ -47,6 +47,16 @@ module.exports = {
             files: ['**/*.{ts,tsx}'],
             rules: recommended_1.typescript,
         },
+        {
+            settings: {
+                jest: {
+                    version: 26,
+                },
+            },
+            files: ['**/*.{test,spec,unit,e2e}.{ts,tsx,js,jsx}'],
+            plugins: ['jest'],
+            rules: recommended_1.jest,
+        },
     ],
     parserOptions: {
         ecmaFeatures: {

package/dist/config/eslint/rules/recommended.d.ts

@@ -47,6 +47,17 @@ declare const _default: {
     'react/no-unescaped-entities': number;
     'react/no-unknown-property': number;
     'react/require-render-return': number;
+    'react-hooks/rules-of-hooks': number;
+};
+/**
+ * recommended enabled/disabled rules for umi project
+ * @note  base on recommended rule set from loaded eslint plugins
+ */
+export default _default;
+/**
+ * config-plugin-jest rules
+ */
+export declare const jest: {
     'jest/no-conditional-expect': number;
     'jest/no-deprecated-functions': number;
     'jest/no-export': number;
@@ -61,13 +72,7 @@ declare const _default: {
     'jest/valid-expect-in-promise': number;
     'jest/valid-expect': number;
     'jest/valid-title': number;
-    'react-hooks/rules-of-hooks': number;
 };
-/**
- * recommended enabled/disabled rules for umi project
- * @note  base on recommended rule set from loaded eslint plugins
- */
-export default _default;
 /**
  * recommended enabled/disabled rules for typescript umi project
  * @note  base on recommended rule set from loaded eslint plugins

package/dist/config/eslint/rules/recommended.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typescript = void 0;
+exports.typescript = exports.jest = void 0;
 /**
  * recommended enabled/disabled rules for umi project
  * @note  base on recommended rule set from loaded eslint plugins
@@ -64,7 +64,13 @@ exports.default = {
     'react/no-unescaped-entities': 2,
     'react/no-unknown-property': 2,
     'react/require-render-return': 2,
-    // config-plugin-jest rules
+    // config-plugin-react-hooks rules
+    'react-hooks/rules-of-hooks': 2,
+};
+/**
+ * config-plugin-jest rules
+ */
+exports.jest = {
     'jest/no-conditional-expect': 2,
     'jest/no-deprecated-functions': 2,
     'jest/no-export': 2,
@@ -79,8 +85,6 @@ exports.default = {
     'jest/valid-expect-in-promise': 2,
     'jest/valid-expect': 2,
     'jest/valid-title': 2,
-    // config-plugin-react-hooks rules
-    'react-hooks/rules-of-hooks': 2,
 };
 /**
  * recommended enabled/disabled rules for typescript umi project

package/dist/config/eslint/setup.js

@@ -1,3 +1,3 @@
 "use strict";
 // patch eslint plugin resolve logic
-require('@rushstack/eslint-patch/modern-module-resolution');
+require('../../../compiled/@rushstack/eslint-patch/lib/modern-module-resolution.js');

package/dist/index.js

@@ -12,18 +12,20 @@ const STYLE_EXTS = [
 exports.default = (opts, args) => {
     if (!args.eslintOnly) {
         const stylelint = new linter_1.StyleLinter(opts);
-        if (!args.cssinjs) {
+        const styleArgs = Object.assign(Object.assign({}, args), { _: [...args._] });
+        if (!styleArgs.cssinjs) {
             for (const suffix of ES_EXTS) {
-                args._.unshift('--ignore-pattern', suffix);
+                styleArgs._.unshift('--ignore-pattern', suffix);
             }
         }
-        stylelint.run(args);
+        stylelint.run(styleArgs);
     }
     if (!args.stylelintOnly) {
         const eslint = new linter_1.EsLinter(opts);
+        const esArgs = Object.assign(Object.assign({}, args), { _: [...args._] });
         for (const suffix of STYLE_EXTS) {
-            args._.unshift('--ignore-pattern', suffix);
+            esArgs._.unshift('--ignore-pattern', suffix);
         }
-        eslint.run(args);
+        eslint.run(esArgs);
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/lint",
-  "version": "4.0.0-rc.11",
+  "version": "4.0.0-rc.14",
   "description": "@umijs/lint",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/lint#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -17,25 +17,25 @@
   ],
   "scripts": {
     "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
+    "build:deps": "umi-scripts bundleDeps",
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@babel/core": "7.17.7",
+    "@babel/core": "7.17.9",
     "@babel/eslint-parser": "7.17.0",
-    "@rushstack/eslint-patch": "1.1.1",
     "@stylelint/postcss-css-in-js": "^0.37.2",
-    "@typescript-eslint/eslint-plugin": "5.16.0",
-    "@typescript-eslint/parser": "5.16.0",
-    "@umijs/babel-preset-umi": "4.0.0-rc.11",
-    "eslint-plugin-jest": "26.1.2",
+    "@typescript-eslint/eslint-plugin": "5.20.0",
+    "@typescript-eslint/parser": "5.20.0",
+    "@umijs/babel-preset-umi": "4.0.0-rc.14",
+    "eslint-plugin-jest": "26.1.4",
     "eslint-plugin-react": "7.29.4",
-    "eslint-plugin-react-hooks": "4.3.0",
+    "eslint-plugin-react-hooks": "4.4.0",
     "postcss": "^8.4.12",
     "postcss-syntax": "0.36.2",
     "stylelint-config-standard": "25.0.0"
   },
   "devDependencies": {
+    "@rushstack/eslint-patch": "1.1.2",
     "postcss-less": "6.0.0",
     "stylelint-config-css-modules": "4.1.0",
     "stylelint-config-prettier": "9.0.3",