refactor: generators (#2328)

webpack · Jan 9, 2021 · 7506f07 · 7506f07
1 parent b6884fa
commit 7506f07
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 9 deletions.
diff --git a/packages/configtest/src/index.ts b/packages/configtest/src/index.ts
@@ -27,7 +27,8 @@ class ConfigTestCommand {
                         throw new webpack.WebpackOptionsValidationError(error);
                     }
                 } catch (error) {
-                    const isValidationError = (error) => {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    const isValidationError = (error: any): boolean => {
                         // https://github.com/webpack/webpack/blob/master/lib/index.js#L267
                         // https://github.com/webpack/webpack/blob/v4.44.2/lib/webpack.js#L90
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any

diff --git a/...enerators/templates/addon-package.json.js → ...generators/addon-template/package.json.js b/...enerators/templates/addon-package.json.js → ...generators/addon-template/package.json.js
diff --git a/packages/generators/templates/.babelrc → packages/generators/init-template/.babelrc b/packages/generators/templates/.babelrc → packages/generators/init-template/.babelrc
diff --git a/packages/generators/templates/README.md → packages/generators/init-template/README.md b/packages/generators/templates/README.md → packages/generators/init-template/README.md
diff --git a/packages/generators/templates/index.js → packages/generators/init-template/index.js b/packages/generators/templates/index.js → packages/generators/init-template/index.js
diff --git a/...ages/generators/templates/package.json.js → .../generators/init-template/package.json.js b/...ages/generators/templates/package.json.js → .../generators/init-template/package.json.js
diff --git a/packages/generators/templates/sw.js → packages/generators/init-template/sw.js b/packages/generators/templates/sw.js → packages/generators/init-template/sw.js
diff --git a/packages/generators/templates/template.html → ...es/generators/init-template/template.html b/packages/generators/templates/template.html → ...es/generators/init-template/template.html
diff --git a/...ges/generators/templates/tsconfig.json.js → ...generators/init-template/tsconfig.json.js b/...ges/generators/templates/tsconfig.json.js → ...generators/init-template/tsconfig.json.js
diff --git a/packages/generators/package.json b/packages/generators/package.json
@@ -11,7 +11,10 @@
   },
   "files": [
     "lib",
-    "templates"
+    "addon-template",
+    "init-template",
+    "loader-template",
+    "plugin-template"
   ],
   "dependencies": {
     "@webpack-cli/utils": "^1.2.1",

diff --git a/packages/generators/src/addon-generator.ts b/packages/generators/src/addon-generator.ts
@@ -65,7 +65,7 @@ const addonGenerator = (
         }
 
         public writing(): void {
-            const packageJsonTemplatePath = '../templates/addon-package.json.js';
+            const packageJsonTemplatePath = '../addon-template/package.json.js';
             // eslint-disable-next-line @typescript-eslint/no-var-requires
             this.fs.extendJSON(this.destinationPath('package.json'), require(packageJsonTemplatePath)(this.props.name));
 

diff --git a/packages/generators/src/init-generator.ts b/packages/generators/src/init-generator.ts
@@ -244,13 +244,13 @@ export default class InitGenerator extends CustomGenerator {
     public writing(): void {
         this.config.set('configuration', this.configuration);
 
-        const packageJsonTemplatePath = '../templates/package.json.js';
+        const packageJsonTemplatePath = '../init-template/package.json.js';
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         this.fs.extendJSON(this.destinationPath('package.json'), require(packageJsonTemplatePath)(this.autoGenerateConfig));
 
         const generateEntryFile = (entryPath: string, name: string): void => {
             entryPath = entryPath.replace(/'/g, '');
-            this.fs.copyTpl(path.resolve(__dirname, '../templates/index.js'), this.destinationPath(entryPath), { name });
+            this.fs.copyTpl(path.resolve(__dirname, '../init-template/index.js'), this.destinationPath(entryPath), { name });
         };
 
         // Generate entry file/files
@@ -262,16 +262,16 @@ export default class InitGenerator extends CustomGenerator {
         }
 
         // Generate README
-        this.fs.copyTpl(path.resolve(__dirname, '../templates/README.md'), this.destinationPath('README.md'), {});
+        this.fs.copyTpl(path.resolve(__dirname, '../init-template/README.md'), this.destinationPath('README.md'), {});
 
         // Generate HTML template file, copy the default service worker
-        this.fs.copyTpl(path.resolve(__dirname, '../templates/template.html'), this.destinationPath('index.html'), {});
+        this.fs.copyTpl(path.resolve(__dirname, '../init-template/template.html'), this.destinationPath('index.html'), {});
 
         if (this.langType === LangType.ES6) {
-            this.fs.copyTpl(path.resolve(__dirname, '../templates/.babelrc'), this.destinationPath('.babelrc'), {});
+            this.fs.copyTpl(path.resolve(__dirname, '../init-template/.babelrc'), this.destinationPath('.babelrc'), {});
         } else if (this.langType === LangType.Typescript) {
             // Generate tsconfig
-            const tsConfigTemplatePath = '../templates/tsconfig.json.js';
+            const tsConfigTemplatePath = '../init-template/tsconfig.json.js';
             // eslint-disable-next-line @typescript-eslint/no-var-requires
             this.fs.extendJSON(this.destinationPath('tsconfig.json'), require(tsConfigTemplatePath));
         }

diff --git a/packages/generators/src/types/index.ts b/packages/generators/src/types/index.ts
@@ -247,4 +247,5 @@ export class CustomGenerator extends Generator {
     };
     public isProd: boolean;
     public dependencies: string[];
+    public getTemplatePath: (template: string) => string;
 }