Merge branch 'next' into fix/generator-issues-1

webpack · Mar 31, 2020 · 0ac4069 · 0ac4069
2 parents 11d751c + 594447b
commit 0ac4069
Show file tree

Hide file tree

Showing 7 changed files with 403 additions and 376 deletions.
diff --git a/package.json b/package.json
@@ -149,7 +149,7 @@
     "execa": "^4.0.0",
     "git-cz": "^4.3.1",
     "husky": "^4.2.3",
-    "jest": "^25.1.0",
+    "jest": "^25.2.3",
     "jest-junit": "^10.0.0",
     "jest-serializer-ansi": "^1.0.3",
     "jest-watch-typeahead": "^0.4.2",

diff --git a/packages/generators/__tests__/init-generator.test.ts b/packages/generators/__tests__/init-generator.test.ts
@@ -36,7 +36,7 @@ describe('init generator', () => {
     });
 
     it('generates a webpack config with custom entry and output', async () => {
-        const outputDir = await run(join(__dirname, '../src/init-generator')).withPrompts({
+        const outputDir = await run(join(__dirname, '../src/init-generator.ts')).withPrompts({
             multiEntries: false,
             singularEntry: 'src/index2',
             outputDir: 'dist2',

diff --git a/packages/generators/__tests__/loader-generator.test.ts b/packages/generators/__tests__/loader-generator.test.ts
@@ -7,7 +7,7 @@ import { makeLoaderName } from '../src/loader-generator';
 describe('loader generator', () => {
     it('generates a default loader', async () => {
         const loaderName = 'my-test-loader';
-        const outputDir = await run(join(__dirname, '../src/loader-generator')).withPrompts({
+        const outputDir = await run(join(__dirname, '../src/loader-generator.ts')).withPrompts({
             name: loaderName,
         });
         const loaderDir = join(outputDir, loaderName);

diff --git a/packages/generators/__tests__/plugin-generator.test.ts b/packages/generators/__tests__/plugin-generator.test.ts
@@ -7,7 +7,7 @@ import { generatePluginName } from '../src/utils';
 describe('plugin generator', () => {
     it('generates a default plugin', async () => {
         const pluginName = 'my-test-plugin';
-        const outputDir = await run(join(__dirname, '../src/plugin-generator')).withPrompts({
+        const outputDir = await run(join(__dirname, '../src/plugin-generator.ts')).withPrompts({
             name: pluginName,
         });
         const pluginDir = join(outputDir, pluginName);

diff --git a/packages/generators/package.json b/packages/generators/package.json
@@ -25,7 +25,6 @@
   },
   "devDependencies": {
     "@types/lodash": "4.14.149",
-    "@types/log-symbols": "3.0.0",
     "@types/mkdirp": "1.0.0",
     "@types/yeoman-assert": "^3.1.1",
     "@types/yeoman-generator": "3.1.4",

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -23,8 +23,7 @@
   "devDependencies": {
     "@types/got": "9.6.9",
     "@types/prettier": "1.19.0",
-    "@types/yeoman-generator": "3.1.4",
-    "jest": "25.1.0"
+    "@types/yeoman-generator": "3.1.4"
   },
   "scripts": {
     "build": "tsc",