feat: use config schema from core

webpack · Jul 1, 2020 · 0eaecac · 0eaecac
1 parent f4e51e3
commit 0eaecac
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -20,6 +20,9 @@
     "yeoman-environment": "2.8.1",
     "yeoman-generator": "4.7.2"
   },
+  "peerDependencies": {
+    "webpack": "4.x.x || 5.x.x"
+  },
   "devDependencies": {
     "@types/got": "9.6.9",
     "@types/prettier": "1.19.0",

diff --git a/packages/utils/src/isWebpack5.ts b/packages/utils/src/isWebpack5.ts
@@ -0,0 +1,3 @@
+import { version } from 'webpack';
+
+export const isWebpack5 = (): boolean => version.startsWith('5');
diff --git a/packages/utils/src/prop-types.ts b/packages/utils/src/prop-types.ts
@@ -1,6 +1,42 @@
-// eslint-disable-next-line node/no-extraneous-import
+import { isWebpack5 } from './isWebpack5';
 import { config } from 'webpack';
-const configKeys = Object.keys(config.getNormalizedWebpackOptions({}));
+
+let configKeys;
+if (isWebpack5()) {
+    configKeys = Object.keys(config.getNormalizedWebpackOptions({}));
+} else {
+    configKeys = [
+        'amd',
+        'bail',
+        'cache',
+        'context',
+        'devServer',
+        'devtool',
+        'entry',
+        'externals',
+        'merge',
+        'mode',
+        'module',
+        'node',
+        'optimization',
+        'output',
+        'parallelism',
+        'performance',
+        'plugins',
+        'profile',
+        'recordsInputPath',
+        'recordsOutputPath',
+        'recordsPath',
+        'resolve',
+        'resolveLoader',
+        'splitChunks',
+        'stats',
+        'target',
+        'topScope',
+        'watch',
+        'watchOptions',
+    ];
+}
 
 /**
  *