Merge branch 'next' into info

.eslintignore

@@ -1,24 +1,19 @@
-**/__testfixtures__/*
+__testfixtures__
 coverage
 docs
 node_modules
-test/binCases/errors/parse/index.js
-test/**/bundle.js
-test/**/*.bundle.js
-test/**/null.js
-test/**/main.js
-test/**/cliEntry.js
-test/**/foo.js
-test/**/**/**/bin/
-test/**/**/**/binary/
+packages/generate-loader/lib
+packages/generate-plugin/lib
+packages/generators/lib
+packages/info/lib
+packages/init/lib
+packages/migrate/lib
+packages/package-utils/lib
+packages/serve/lib
+packages/utils/lib
+packages/webpack-scaffold/lib
 test/**/dist/
-test/**/**/dist/
-test/**/**/**/dist/
-test/**/**/index.js
-test/binCases/config-location/webpack-babel-config/bin/es6.js
-packages/**/lib
-packages/utils/validate-identifier.ts
-
-
-lib/utils/interactive.js
+test/**/bin/
+test/**/binary/
+test/**/index.js
 test/typescript/webpack.config.ts

.eslintrc.js

@@ -1,62 +1,39 @@
 module.exports = {
-    extends: ['eslint:recommended', 'plugin:node/recommended', 'plugin:prettier/recommended'],
+    root: true,
+    extends: ['eslint:recommended', 'plugin:node/recommended', 'plugin:prettier/recommended', 'prettier'],
+    parserOptions: { ecmaVersion: 2018, sourceType: 'script' },
+    plugins: ['node'],
     env: {
         node: true,
         es6: true,
         jest: true,
     },
-    root: true,
-    plugins: ['node', 'prettier'],
-    parserOptions: { ecmaVersion: 2020, sourceType: 'module' },
-
     rules: {
-        'no-useless-escape': 'off',
-        'quote-props': ['error', 'as-needed'],
-        'no-dupe-keys': 'error',
-        'no-undef': 'error',
-        'no-extra-semi': 'error',
-        quotes: ['error', 'single'],
-        'prettier/prettier': ['error', { singleQuote: true }],
-        semi: 'error',
+        quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: false }],
+        'no-process-exit': 'off',
         'no-template-curly-in-string': 'error',
         'no-caller': 'error',
-        'global-require': 'off',
-        'brace-style': 'error',
-        'key-spacing': 'error',
-        'space-in-parens': ['error', 'never'],
-        'space-infix-ops': 'error',
-        'no-extra-bind': 'warn',
-        'no-empty': 'off',
-        'no-multiple-empty-lines': 'error',
-        'no-multi-spaces': 'error',
-        'no-process-exit': 'off',
-        'no-trailing-spaces': 'error',
-        'no-use-before-define': 'off',
-        'no-unused-vars': ['error', { args: 'none' }],
-        'no-unsafe-negation': 'error',
-        'no-loop-func': 'warn',
-        'object-curly-spacing': ['error', 'always'],
-        'object-curly-newline': ['error', { consistent: true }],
-        '@typescript-eslint/no-var-requires': 'off',
-        '@typescript-eslint/ban-ts-ignore': 'off',
-        'keyword-spacing': [
-            'error',
-            {
-                after: true,
-                overrides: {
-                    const: { after: true },
-                    try: { after: true },
-                    throw: { after: true },
-                    case: { after: true },
-                    return: { after: true },
-                    finally: { after: true },
-                    do: { after: true },
+        'no-extra-bind': 'error',
+        'no-loop-func': 'error',
+    },
+    overrides: [
+        {
+            settings: {
+                node: {
+                    tryExtensions: ['.ts', '.tsx', '.js', '.jsx', '.json'],
                 },
             },
-        ],
-        'no-console': 'off',
-        'valid-jsdoc': 'error',
-        'eol-last': ['error', 'always'],
-        'newline-per-chained-call': 'off',
-    },
+            files: ['**/*.ts'],
+            extends: [
+                'plugin:@typescript-eslint/eslint-recommended',
+                'plugin:@typescript-eslint/recommended',
+                'prettier/@typescript-eslint',
+            ],
+            parser: '@typescript-eslint/parser',
+            plugins: ['@typescript-eslint'],
+            rules: {
+                'node/no-unsupported-features/es-syntax': 'off',
+            },
+        },
+    ],
 };

.github/workflows/nodejs.yml

@@ -12,14 +12,15 @@ on:
 
 jobs:
   lint:
-    name: Lint - ${{ matrix.os }} - Node v${{ matrix.node }}
+    name: Lint - ${{ matrix.os }} - Node v${{ matrix.node-version }}
 
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
-        node: [12]
         os: [ubuntu-latest]
+        node-version: [12.x]
+        webpack-version: [latest]
 
     steps:
       - uses: actions/checkout@v2
@@ -28,11 +29,18 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
+
       - name: Install dependencies
         run: |
           yarn
           yarn bootstrap
 
+      - name: Install webpack ${{ matrix.webpack-version }}
+        run: yarn add -W webpack@${{ matrix.webpack-version }}
+
+      - name: Build
+        run: yarn build
+
       - name: Lint
         run: yarn lint
 
@@ -60,10 +68,14 @@ jobs:
           yarn
           yarn bootstrap
 
+      - name: Install webpack ${{ matrix.webpack-version }}
+        run: yarn add -W webpack@${{ matrix.webpack-version }}
+
+      - name: Build
+        run: yarn build
+
       - name: Run tests for webpack version ${{ matrix.webpack-version }}
         run: |
-          yarn add -W webpack@${{ matrix.webpack-version }}
-          yarn build
           yarn prepsuite
           yarn test:ci
         env:

.gitignore

@@ -45,9 +45,12 @@ package-lock.json
 docs/**/*.map
 junit.xml
 
-#typescript source maps
+# typescript source maps
 packages/**/*.map
 *.tsbuildinfo
 
+# cache
+.eslintcache
+
 # temporary test files
 test-assets/

husky.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+    hooks: {
+        'pre-commit': 'lint-staged',
+        'commit-msg': 'commitlint -E HUSKY_GIT_PARAMS',
+    },
+};

jest.config.js

@@ -10,4 +10,5 @@ module.exports = {
     testRegex: ['/__tests__/.*\\.(test.js|test.ts)$', '/test/.*\\.(test.js|test.ts)$'],
     moduleFileExtensions: ['ts', 'js', 'json'],
     watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
+    setupFilesAfterEnv: ['<rootDir>/setupTest.js'],
 };

lint-staged.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '*.{json,md,yml,css}': ['prettier --write'],
+    '*.{js,ts}': ['eslint --fix'],
+};

package.json

@@ -30,9 +30,8 @@
     "watch": "tsc --build --watch",
     "prepsuite": "node scripts/prepareSuite.js",
     "commit": "git-cz",
-    "format": "eslint --fix . --ext .js,.ts",
-    "lint": "eslint . --ext .js,.ts",
-    "lint:fix": "eslint . --ext .js,.ts --fix",
+    "lint": "eslint --cache --ext .js --ext .ts .",
+    "fix": "eslint --ext .js --ext --fix .",
     "pretest": "yarn build && yarn lint && yarn prepsuite",
     "test": "jest --reporters=default --reporters=jest-junit",
     "test:cli": "jest test/ --reporters=default --reporters=jest-junit --forceExit",
@@ -42,30 +41,6 @@
     "test:smoke": "smoketests/smoketests.sh",
     "publish:monorepo": "yarn format && yarn test && yarn build && lerna publish -m \"chore: monorepo version update\""
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged",
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
-    }
-  },
-  "lint-staged": {
-    "*.md": [
-      "prettier --parser markdown --write",
-      "git add"
-    ],
-    "{packages,lib}/**/!(__testfixtures__)/**.js": [
-      "eslint --fix",
-      "git add"
-    ],
-    "*.ts": [
-      "yarn format",
-      "git add"
-    ],
-    "*.js": [
-      "yarn format",
-      "git add"
-    ]
-  },
   "standard-version": {
     "types": [
       {
@@ -123,7 +98,7 @@
     "@types/jest": "^25.1.4",
     "@types/node": "13.9.8",
     "@typescript-eslint/eslint-plugin": "^2.24.0",
-    "@typescript-eslint/parser": "^2.24.0",
+    "@typescript-eslint/parser": "^2.26.0",
     "chalk": "^3.0.0",
     "commitlint": "^8.3.5",
     "commitlint-config-cz": "^0.13.0",
@@ -146,7 +121,7 @@
     "prettier": "1.19.1",
     "readable-stream": "^3.6.0",
     "rimraf": "^3.0.2",
-    "ts-jest": "^25.2.1",
+    "ts-jest": "^25.3.0",
     "typescript": "^3.8.3",
     "webpack": "^4.42.0",
     "yeoman-test": "^2.3.0"

packages/generate-loader/src/index.ts

@@ -1,16 +1,16 @@
-import { loaderGenerator } from "@webpack-cli/generators";
-import yeoman from "yeoman-environment";
+import { loaderGenerator } from '@webpack-cli/generators';
+import yeoman from 'yeoman-environment';
 
 /**
  * Runs a yeoman generator to create a new webpack loader project
  * @returns {void}
  */
 
 export default function loaderCreator(): void {
-	const env = yeoman.createEnv();
-	const generatorName = "webpack-loader-generator";
+    const env = yeoman.createEnv();
+    const generatorName = 'webpack-loader-generator';
 
-	env.registerStub(loaderGenerator, generatorName);
+    env.registerStub(loaderGenerator, generatorName);
 
-	env.run(generatorName);
+    env.run(generatorName);
 }

packages/generate-plugin/src/index.ts

@@ -1,16 +1,16 @@
-import { pluginGenerator } from "@webpack-cli/generators";
-import yeoman from "yeoman-environment";
+import { pluginGenerator } from '@webpack-cli/generators';
+import yeoman from 'yeoman-environment';
 
 /**
  * Runs a yeoman generator to create a new webpack plugin project
  * @returns {void}
  */
 
 export default function pluginCreator(): void {
-	const env = yeoman.createEnv();
-	const generatorName = "webpack-plugin-generator";
+    const env = yeoman.createEnv();
+    const generatorName = 'webpack-plugin-generator';
 
-	env.registerStub(pluginGenerator, generatorName);
+    env.registerStub(pluginGenerator, generatorName);
 
-	env.run(generatorName);
+    env.run(generatorName);
 }