From 8ef136c6803f43886842fc66248589910cabe739 Mon Sep 17 00:00:00 2001
From: unclebill <billbill290@gmail.com>
Date: Wed, 16 Feb 2022 19:48:17 +0800
Subject: [PATCH 1/2] chore: list workspace packages with glob patterns

---
 packages/scripts/src/commands/new-package.ts |  2 -
 pnpm-workspace.yaml                          | 42 ++------------------
 2 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/packages/scripts/src/commands/new-package.ts b/packages/scripts/src/commands/new-package.ts
index a4d55f2843d8..4e52a98be061 100644
--- a/packages/scripts/src/commands/new-package.ts
+++ b/packages/scripts/src/commands/new-package.ts
@@ -68,8 +68,6 @@ task(createPackageInteractive, 'new-pkg', 'Create a new package interactively')
 
 const INSERT_HERE = '// @masknet/scripts: insert-here'
 async function createNewPackage({ path, npmName, type, pluginID }: PackageOptions) {
-    await changeFile(resolve(ROOT_PATH, 'pnpm-workspace.yaml'), (content) => content + `  - '${path}'\n`)
-
     const packagePath = resolve(ROOT_PATH, path)
     await ensureDir(packagePath)
 
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index b06877b8aa12..910ec99823e6 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,41 +1,7 @@
 # If you need to speedup webpack build, please also add the new package builds into
 # webpack config.resolve.alias
 packages:
-  - 'packages/test-serializer'
-  - 'packages/empty'
-  - 'packages/polyfills'
-  - 'packages/polyfills/types'
-  - 'packages/scripts'
-  - 'packages/dashboard'
-  - 'packages/mask'
-  - 'packages/injected-script'
-  - 'packages/gun-utils'
-  - 'packages/mask-sdk'
-  - 'packages/public-api'
-  - 'packages/shared-base'
-  - 'packages/shared'
-  - 'packages/web3-kit'
-  - 'packages/web3-providers'
-  - 'packages/web3-constants'
-  - 'packages/web3-contracts'
-  - 'packages/web3-shared/base'
-  - 'packages/web3-shared/evm'
-  - 'packages/web3-shared/flow'
-  - 'packages/web3-shared/solana'
-  - 'packages/storybook-shared'
-  - 'packages/icons'
-  - 'packages/theme'
-  - 'packages/plugin-infra'
-  - 'packages/plugins/template'
-  - 'packages/plugins/example'
-  - 'packages/plugins/Debugger'
-  - 'packages/plugins/Wallet'
-  - 'packages/plugins/Flow'
-  - 'packages/plugins/FileService'
-  - 'packages/plugins/DAO'
-  - 'packages/plugins/RSS3'
-  - 'packages/plugins/Solana'
-  - 'packages/external-plugin-previewer'
-  - 'packages/backup-format'
-  - 'packages/encryption'
-  - 'packages/provider-proxy'
+  - 'packages/*'
+  - 'packages/polyfills/*'
+  - 'packages/web3-shared/*'
+  - 'packages/plugins/*'

From 08d178808f6060e0b5f66ba0807e846f5d671756 Mon Sep 17 00:00:00 2001
From: unclebill <billbill290@gmail.com>
Date: Wed, 16 Feb 2022 20:25:37 +0800
Subject: [PATCH 2/2] fixup! chore: list workspace packages with glob patterns

---
 pnpm-workspace.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 910ec99823e6..093702d03f25 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -2,6 +2,9 @@
 # webpack config.resolve.alias
 packages:
   - 'packages/*'
-  - 'packages/polyfills/*'
-  - 'packages/web3-shared/*'
+  - 'packages/polyfills/types'
+  - 'packages/web3-shared/base'
+  - 'packages/web3-shared/evm'
+  - 'packages/web3-shared/flow'
+  - 'packages/web3-shared/solana'
   - 'packages/plugins/*'