chore: switch yarn to pnpm linker (zwave-js#3748)

Masterz69 · Nov 18, 2021 · 9a56c5d · 9a56c5d
1 parent 7e2ca72
commit 9a56c5d
Show file tree

Hide file tree

Showing 38 changed files with 60 additions and 660 deletions.
diff --git a/.github/actions/generateTypedDocs/main.js b/.github/actions/generateTypedDocs/main.js
@@ -1,6 +1,3 @@
-// Enable Yarn PnP
-require("../../../.pnp.cjs").setup();
-
 const exec = require("@actions/exec");
 const github = require("@actions/github");
 const core = require("@actions/core");

diff --git a/.github/actions/gh-cc-table/main.js b/.github/actions/gh-cc-table/main.js
@@ -1,6 +1,3 @@
-// Enable Yarn PnP
-require("../../../.pnp.cjs").setup();
-
 const c = require("ansi-colors");
 const exec = require("@actions/exec");
 const github = require("@actions/github");

diff --git a/.github/actions/toLogEntry/main.js b/.github/actions/toLogEntry/main.js
@@ -1,6 +1,3 @@
-// Enable Yarn PnP
-require("../../../.pnp.cjs").setup();
-
 const c = require("ansi-colors");
 const exec = require("@actions/exec");
 const github = require("@actions/github");

diff --git a/.github/actions/zwave-js-bot/main.js b/.github/actions/zwave-js-bot/main.js
@@ -1,9 +1,5 @@
 // @ts-check
 
-// Enable Yarn PnP
-// @ts-expect-error 🤷🏻‍♂️
-require("../../../.pnp.cjs").setup();
-
 const exec = require("@actions/exec");
 const github = require("@actions/github");
 const core = require("@actions/core");
@@ -55,15 +51,14 @@ async function publishPr() {
 
 		// Bump versions
 		await exec.exec(
-			"yarn",
-			`lerna version ${newVersion} --exact --allow-branch * --ignore-scripts --no-commit-hooks --no-push --yes`.split(
+			"lerna",
+			`version ${newVersion} --exact --allow-branch * --ignore-scripts --no-commit-hooks --no-push --yes`.split(
 				" ",
 			),
 		);
 
 		// and release
-		await exec.exec("yarn", [
-			"lerna",
+		await exec.exec("lerna", [
 			"publish",
 			"from-package",
 			"--yes",

diff --git a/.github/bot-scripts/addCompatFlag.js b/.github/bot-scripts/addCompatFlag.js
@@ -2,10 +2,6 @@
 
 /// <reference path="types.d.ts" />
 
-// To require non-local modules, we need to setup Yarn PnP
-// @ts-ignore
-require("../../.pnp.cjs").setup();
-
 const { ConfigManager } = require("@zwave-js/config");
 const JSONC = require("comment-json");
 const fs = require("fs-extra");

diff --git a/.github/bot-scripts/addFingerprint.js b/.github/bot-scripts/addFingerprint.js
@@ -2,10 +2,6 @@
 
 /// <reference path="types.d.ts" />
 
-// To require non-local modules, we need to setup Yarn PnP
-// @ts-ignore
-require("../../.pnp.cjs").setup();
-
 const { ConfigManager } = require("@zwave-js/config");
 const { formatId } = require("@zwave-js/shared");
 const JSONC = require("comment-json");

diff --git a/.github/bot-scripts/approveWorkflows.js b/.github/bot-scripts/approveWorkflows.js
@@ -1,13 +1,9 @@
 // @ts-check
 
-// To require non-local modules, we need to setup Yarn PnP
-// @ts-ignore
-require("../../.pnp.cjs").setup();
+/// <reference path="./types.d.ts" />
 
 const { makeRe } = require("minimatch");
 
-/// <reference path="./types.d.ts" />
-
 /**
  * @param {{github: Github, context: Context, whitelist: string[], workflows: string[]}} param
  */

diff --git a/.github/bot-scripts/checkAuthorized.js b/.github/bot-scripts/checkAuthorized.js
@@ -1,4 +1,5 @@
 // @ts-check
+
 /// <reference path="types.d.ts" />
 
 const { authorizedUsers } = require("./users");

diff --git a/.github/bot-scripts/fixLintFeedback.js b/.github/bot-scripts/fixLintFeedback.js
@@ -1,4 +1,5 @@
 // @ts-check
+
 /// <reference path="types.d.ts" />
 
 /**

diff --git a/.github/bot-scripts/getFixLintInfo.js b/.github/bot-scripts/getFixLintInfo.js
@@ -1,4 +1,5 @@
 // @ts-check
+
 /// <reference path="types.d.ts" />
 
 /**

diff --git a/.github/bot-scripts/importConfigCreatePR.js b/.github/bot-scripts/importConfigCreatePR.js
@@ -1,4 +1,5 @@
 // @ts-check
+
 /// <reference path="types.d.ts" />
 
 const { reviewers } = require("./users");

diff --git a/.github/bot-scripts/rebaseFeedback.js b/.github/bot-scripts/rebaseFeedback.js
@@ -1,4 +1,5 @@
 // @ts-check
+
 /// <reference path="types.d.ts" />
 
 /**

diff --git a/.github/bot-scripts/renameCommitCheck.js b/.github/bot-scripts/renameCommitCheck.js
@@ -1,4 +1,5 @@
 // @ts-check
+
 /// <reference path="types.d.ts" />
 
 /**

diff --git a/.github/bot-scripts/renameCommitFeedback.js b/.github/bot-scripts/renameCommitFeedback.js
@@ -1,4 +1,5 @@
 // @ts-check
+
 /// <reference path="types.d.ts" />
 
 /**

diff --git a/.github/bot-scripts/renameCommitGetPRInfo.js b/.github/bot-scripts/renameCommitGetPRInfo.js
@@ -1,4 +1,5 @@
 // @ts-check
+
 /// <reference path="types.d.ts" />
 
 /**

diff --git a/.github/workflows/nightly-config-publish.yml b/.github/workflows/nightly-config-publish.yml
@@ -64,7 +64,7 @@ jobs:
         # ===============================
 
         # Verify that only @zwave-js/config and zwave-js are changed
-        LERNA_CHANGED=$(yarn lerna changed)
+        LERNA_CHANGED=$(lerna changed)
         if [[ $(echo -e "@zwave-js/config\nzwave-js") != "$LERNA_CHANGED" ]]; then
           echo "❌ Lerna detected unexpected package changes, aborting..."
           echo "These packages are changed:"
@@ -77,7 +77,7 @@ jobs:
         # ===============================
 
         # Create a clean build
-        yarn lerna run build
+        lerna run build
 
         # Lint config files
         yarn run lint:config
@@ -110,7 +110,7 @@ jobs:
         console.log(v);
         EOF
 
-        VERSION=$(yarn node script.js)
+        VERSION=$(node script.js)
         echo "Next version is $VERSION"
         npm version "$VERSION" --ignore-scripts --no-git-tag-version
         npm publish --tag nightly
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
@@ -42,7 +42,7 @@ jobs:
       run: yarn install --immutable
 
     - name: Compile TypeScript code
-      run: yarn lerna run build
+      run: lerna run build
 
     - name: Run linters
       run: yarn run lint
@@ -101,7 +101,7 @@ jobs:
       run: yarn install --immutable
 
     - name: Compile TypeScript code
-      run: yarn lerna run build
+      run: lerna run build
 
     - name: Lint config files
       run: yarn run lint:config
@@ -139,7 +139,7 @@ jobs:
 
     # Test that the generated packages are ok
     - name: Import main entry point
-      run: yarn node -e 'require("zwave-js")'
+      run: node -e 'require("zwave-js")'
 
     - name: Run component tests
       run: yarn run test:ci
@@ -244,7 +244,7 @@ jobs:
       run: |
         npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
         npm whoami
-        yarn lerna publish from-package --yes $TAG
+        lerna publish from-package --yes $TAG
 
     - name: Create Github Release
       uses: actions/create-release@v1

diff --git a/.github/workflows/to-log-entry-overview.yml b/.github/workflows/to-log-entry-overview.yml
@@ -29,7 +29,7 @@ jobs:
       run: yarn install --immutable
 
     - name: Compile TypeScript code
-      run: yarn lerna run build
+      run: lerna run build
 
     - name: Update overview
       uses: ./.github/actions/toLogEntry

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -29,7 +29,6 @@ vscode:
     - dbaeumer.vscode-eslint
     - esbenp.prettier-vscode
     - EditorConfig.EditorConfig
-    - arcanis.vscode-zipfs
 
 # Configure prebuilds
 github:

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -3,7 +3,6 @@
 		"dbaeumer.vscode-eslint",
 		"esbenp.prettier-vscode",
 		"EditorConfig.EditorConfig",
-		"amodio.toggle-excluded-files",
-		"arcanis.vscode-zipfs"
+		"amodio.toggle-excluded-files"
 	]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -12,40 +12,40 @@
 		"typescriptreact"
 	],
 	"files.exclude": {
-		"node_modules/": true,
-		"coverage/": true,
+		"node_modules/": false,
+		"coverage/": false,
 		".*": false,
-		"**/node_modules/": true,
-		".nyc_output": true,
-		"**/coverage/": true,
-		"**/*.map": true,
-		"**/zwave-js-*.tgz": true,
-		"build": true,
-		"*.d.ts": true,
-		"*.map": true,
-		"**/build": true,
-		"**/*.tsbuildinfo": true,
-		"packages/zwave-js/**/fingerprint.txt": true,
-		"node_modules/zwave-js/**/fingerprint.txt": true,
-		".husky/_/**/*": true,
-		"packages/config/config/devices/index.json": true,
-		"packages/*/package-lock.json": true,
-		".yarn/*": true,
+		"**/node_modules/": false,
+		".nyc_output": false,
+		"**/coverage/": false,
+		"**/*.map": false,
+		"**/zwave-js-*.tgz": false,
+		"build": false,
+		"*.d.ts": false,
+		"*.map": false,
+		"**/build": false,
+		"**/*.tsbuildinfo": false,
+		"packages/zwave-js/**/fingerprint.txt": false,
+		"node_modules/zwave-js/**/fingerprint.txt": false,
+		".husky/_/**/*": false,
+		"packages/config/config/devices/index.json": false,
+		"packages/*/package-lock.json": false,
+		".yarn/*": false,
 		".yarn/patches": false,
 		".yarn/releases": false,
 		".yarn/plugins": false,
 		".yarn/sdks": false,
 		".yarn/versions": false,
-		"**/.pnp.*": true,
-		"**/*.test.js": true,
-		"packages/*/cache": true,
-		"**/.tmp": true,
-		"**/.tmpoh/": true,
-		"**/.tmpozw/": true,
-		"**/.tmpzwa/": true,
-		"**/.secrets": true,
-		"**/.test-payloads": true,
-		"(!test)/cache": true
+		"**/.pnp.*": false,
+		"**/*.test.js": false,
+		"packages/*/cache": false,
+		"**/.tmp": false,
+		"**/.tmpoh/": false,
+		"**/.tmpozw/": false,
+		"**/.tmpzwa/": false,
+		"**/.secrets": false,
+		"**/.test-payloads": false,
+		"(!test)/cache": false
 	},
 	"files.associations": {
 		"**/config/**/*.json": "jsonc"

diff --git a/.yarn-patches/ts-morph.diff b/.yarn-patches/ts-morph.diff
diff --git a/.yarn/sdks/eslint/bin/eslint.js b/.yarn/sdks/eslint/bin/eslint.js
diff --git a/.yarn/sdks/eslint/lib/api.js b/.yarn/sdks/eslint/lib/api.js
diff --git a/.yarn/sdks/eslint/package.json b/.yarn/sdks/eslint/package.json
diff --git a/.yarn/sdks/integrations.yml b/.yarn/sdks/integrations.yml