From 24e15cc86e67506c1e307154da3bff476cfa689a Mon Sep 17 00:00:00 2001 From: Rishabh Chawla Date: Wed, 19 Aug 2020 13:00:36 +0530 Subject: [PATCH 1/3] chore: update generator deps --- packages/generators/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/generators/package.json b/packages/generators/package.json index c13a129f9dd..6845ebff61e 100644 --- a/packages/generators/package.json +++ b/packages/generators/package.json @@ -10,7 +10,6 @@ "access": "public" }, "dependencies": { - "@webpack-cli/package-utils": "^1.0.1-alpha.4", "@webpack-cli/utils": "^1.0.1-alpha.5", "@webpack-cli/webpack-scaffold": "^1.0.1-alpha.4", "lodash": "4.17.19", From c7c9769b9f4c34505596b32e22564aafdc0ffa87 Mon Sep 17 00:00:00 2001 From: Rishabh Chawla Date: Wed, 19 Aug 2020 13:23:54 +0530 Subject: [PATCH 2/3] chore: fix lint --- packages/generators/__tests__/addon-generator.test.ts | 1 + packages/generators/src/addon-generator.ts | 1 + packages/generators/src/init-generator.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/generators/__tests__/addon-generator.test.ts b/packages/generators/__tests__/addon-generator.test.ts index 2a17159d94a..eb158aa2c9c 100644 --- a/packages/generators/__tests__/addon-generator.test.ts +++ b/packages/generators/__tests__/addon-generator.test.ts @@ -6,6 +6,7 @@ import fs from 'fs'; import path from 'path'; import mkdirp from 'mkdirp'; import rimraf from 'rimraf'; +// eslint-disable-next-line node/no-extraneous-import import { getPackageManager } from '@webpack-cli/package-utils'; import addonGenerator from '../src/addon-generator'; diff --git a/packages/generators/src/addon-generator.ts b/packages/generators/src/addon-generator.ts index ec4c4ddd5ca..5bce59124a6 100644 --- a/packages/generators/src/addon-generator.ts +++ b/packages/generators/src/addon-generator.ts @@ -1,6 +1,7 @@ import mkdirp from 'mkdirp'; import path from 'path'; import Generator from 'yeoman-generator'; +// eslint-disable-next-line node/no-extraneous-import import { getPackageManager } from '@webpack-cli/package-utils'; import { generatorCopy, generatorCopyTpl } from '@webpack-cli/utils'; diff --git a/packages/generators/src/init-generator.ts b/packages/generators/src/init-generator.ts index c952eb648a2..ddfd50f43c7 100644 --- a/packages/generators/src/init-generator.ts +++ b/packages/generators/src/init-generator.ts @@ -1,6 +1,7 @@ import { blue, green, bold } from 'colorette'; import logSymbols from 'log-symbols'; import path from 'path'; +// eslint-disable-next-line node/no-extraneous-import import { getPackageManager } from '@webpack-cli/package-utils'; import { Confirm, Input, List } from '@webpack-cli/webpack-scaffold'; From 5aa0bc08108a5408da7925a1e3c79095d6a844bd Mon Sep 17 00:00:00 2001 From: Rishabh Chawla Date: Sun, 23 Aug 2020 09:25:30 +0530 Subject: [PATCH 3/3] chore: add package-utils as peer --- packages/generators/package.json | 3 ++- packages/generators/src/addon-generator.ts | 1 - packages/generators/src/init-generator.ts | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/generators/package.json b/packages/generators/package.json index 6845ebff61e..7e60a80e840 100644 --- a/packages/generators/package.json +++ b/packages/generators/package.json @@ -19,7 +19,8 @@ "yeoman-generator": "4.7.2" }, "peerDependencies": { - "webpack-cli": "3.x.x || 4.x.x" + "webpack-cli": "3.x.x || 4.x.x", + "@webpack-cli/package-utils": "^1.0.1-alpha-4" }, "devDependencies": { "@types/lodash": "4.14.149", diff --git a/packages/generators/src/addon-generator.ts b/packages/generators/src/addon-generator.ts index 5bce59124a6..ec4c4ddd5ca 100644 --- a/packages/generators/src/addon-generator.ts +++ b/packages/generators/src/addon-generator.ts @@ -1,7 +1,6 @@ import mkdirp from 'mkdirp'; import path from 'path'; import Generator from 'yeoman-generator'; -// eslint-disable-next-line node/no-extraneous-import import { getPackageManager } from '@webpack-cli/package-utils'; import { generatorCopy, generatorCopyTpl } from '@webpack-cli/utils'; diff --git a/packages/generators/src/init-generator.ts b/packages/generators/src/init-generator.ts index ddfd50f43c7..c952eb648a2 100644 --- a/packages/generators/src/init-generator.ts +++ b/packages/generators/src/init-generator.ts @@ -1,7 +1,6 @@ import { blue, green, bold } from 'colorette'; import logSymbols from 'log-symbols'; import path from 'path'; -// eslint-disable-next-line node/no-extraneous-import import { getPackageManager } from '@webpack-cli/package-utils'; import { Confirm, Input, List } from '@webpack-cli/webpack-scaffold';