Switch to yarn & enable untrusted workspaces

Luraph · Jan 31, 2024 · d63a3e1 · d63a3e1
1 parent fd6d108
commit d63a3e1
Show file tree

Hide file tree

Showing 5 changed files with 2,196 additions and 2,266 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,31 +16,14 @@ jobs:
       - name: Setup node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: latest
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> "$GITHUB_OUTPUT"
-
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+          node-version: ">=18"
+          cache: "yarn"
 
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+        run: yarn install --immutable --immutable-cache --check-cache
 
       - name: Package VSIX
-        run: pnpm run package
+        run: yarn run package
 
       - name: Upload VSIX to GitHub Release
         uses: softprops/action-gh-release@v1
@@ -50,6 +33,6 @@ jobs:
               *.vsix
 
       - name: Publish to VS marketplace
-        run: pnpm run deploy
+        run: yarn run deploy
         env:
             VSCE_PAT: ${{ secrets.VSCE_PAT }}
diff --git a/.vscodeignore b/.vscodeignore
@@ -4,7 +4,8 @@
 
 # Include only what's needed
 !out/**/extension.js
-!LICENSE
+!node_modules
 !logo.png
-!package.json
-!README.md
+!LICENSE
+!README.md
+!package.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "displayName": "Luraph (vscode)",
   "publisher": "luraph",
   "description": "Obfuscate scripts via the Luraph API from the comfort of your editor.",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "author": "memcorrupt",
   "license": "MIT",
   "engines": {
@@ -30,6 +30,12 @@
   "files": [
     "out/**/*"
   ],
+  "capabilities": {
+    "untrustedWorkspaces": {
+      "supported": true
+    },
+    "virtualWorkspaces": true
+  },
   "contributes": {
     "commands": [
       {
@@ -52,15 +58,15 @@
     }
   },
   "scripts": {
-    "vscode:prepublish": "pnpm run compile",
+    "vscode:prepublish": "yarn run compile",
     "compile": "tsc -p ./ || echo WARNING: tsc exited with errors",
     "watch": "tsc -watch -p ./",
-    "pretest": "pnpm run compile && pnpm run lint",
+    "pretest": "yarn run compile && yarn run lint",
     "lint": "eslint src --ext ts",
     "test": "vscode-test",
-    "preinstall": "npx only-allow pnpm",
-    "deploy": "vsce publish --no-dependencies",
-    "package": "vsce package --no-dependencies"
+    "preinstall": "npx only-allow yarn",
+    "deploy": "npx vsce publish",
+    "package": "npx vsce package"
   },
   "dependencies": {
     "luraph": "^2.0.3"