Merge branch 'main' into fix/mts-and-cts-config-file-detection

Author: thecrypticace

.github/CONTRIBUTING.md

@@ -13,6 +13,6 @@ It's never a fun experience to have your pull request declined after investing a
 You can build the VSIX package by running these commands in the project root.
 
 ```bash
-npm install
-npx run package --workspace=packages/vscode-tailwindcss
+pnpm install
+pnpx run package --workspace=packages/vscode-tailwindcss
 ```

.github/workflows/bump-version.mjs

@@ -1,34 +1,29 @@
 import PackageJson from '@npmcli/package-json'
 import assert from 'node:assert'
+import * as path from 'node:path'
+import { spawnSync } from 'node:child_process'
+import { fileURLToPath } from 'node:url'
 import semver from 'semver'
 
-let res = await fetch('https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery', {
-  method: 'POST',
-  headers: {
-    accept: 'application/json;api-version=7.2-preview.1;excludeUrls=true',
-    'content-type': 'application/json',
-  },
-  body: JSON.stringify({
-    assetTypes: null,
-    flags: 2151,
-    filters: [
-      {
-        criteria: [{ filterType: 7, value: 'bradlc.vscode-tailwindcss' }],
-        direction: 2,
-        pageSize: 100,
-        pageNumber: 1,
-        sortBy: 0,
-        sortOrder: 0,
-        pagingToken: null,
-      },
-    ],
-  }),
-})
-
-let { results } = await res.json()
+const __dirname = fileURLToPath(new URL('.', import.meta.url))
+
+// Let `vsce` get the metadata for the extension
+// Querying the marketplace API directly is not supported or recommended
+let result = spawnSync(
+  path.resolve(__dirname, '../../packages/vscode-tailwindcss/node_modules/.bin/vsce'),
+  ['show', 'bradlc.vscode-tailwindcss', '--json'],
+  { encoding: 'utf8' },
+)
+
+let metadata = JSON.parse(result.stdout)
+
+if (!metadata) {
+  console.error(result.error)
+  throw new Error('Failed to get extension metadata')
+}
 
 /** @type {string[]} */
-let versions = results[0].extensions[0].versions.map(({ version }) => version)
+let versions = metadata.versions.map(({ version }) => version)
 
 // Determine the latest version of the extension
 let latest = versions

.github/workflows/manual-release.yml

@@ -8,26 +8,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v3
+        with:
+          version: ^9.6.0
       - uses: actions/setup-node@v3
         with:
           node-version: 18
           registry-url: 'https://registry.npmjs.org'
-      - name: Cache node_modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-${{ env.NODE_VERSION }}-node_modules-${{ hashFiles('**/package-lock.json') }}
+          cache: 'pnpm'
       - name: Install dependencies
-        run: npm install
+        run: pnpm install
       - name: Run tests
         run: >
           cd packages/tailwindcss-language-server &&
-          npm run build &&
-          npm run test:prepare &&
-          npm test
+          pnpm run build &&
+          pnpm run test
       - name: Publish IntelliSense
         env:
           VSCODE_TOKEN: ${{ secrets.VSCODE_TOKEN }}
         run: >
           cd packages/vscode-tailwindcss &&
-          npm run publish -- -p $VSCODE_TOKEN
+          pnpm run publish -p $VSCODE_TOKEN

.github/workflows/pre-release.yml

@@ -2,51 +2,46 @@ name: Publish pre-release
 concurrency: publish
 on:
   push:
-    branches: [master]
+    branches: [main]
 jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v3
+        with:
+          version: ^9.6.0
       - uses: actions/setup-node@v3
         with:
           node-version: 18
           registry-url: 'https://registry.npmjs.org'
-      - name: Cache node_modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-${{ env.NODE_VERSION }}-node_modules-${{ hashFiles('**/package-lock.json') }}
+          cache: 'pnpm'
       - name: Install dependencies
-        run: npm install
+        run: pnpm install
+      - name: Build everything
+        run: pnpm -r run build
       - name: Run tests
-        run: >
-          cd packages/tailwindcss-language-server &&
-          npm run build &&
-          npm run test:prepare &&
-          npm test
+        run: pnpm --filter ./packages/tailwindcss-language-server run test
       - name: Bump IntelliSense version
         run: >
           node .github/workflows/bump-version.mjs &&
           cat packages/vscode-tailwindcss/package.json
-      - name: Publish IntelliSense
-        env:
-          VSCODE_TOKEN: ${{ secrets.VSCODE_TOKEN }}
-        run: >
-          cd packages/vscode-tailwindcss &&
-          npm run publish -- --pre-release -p $VSCODE_TOKEN
-      - name: Build LSP
-        run: npm run build --workspace=packages/tailwindcss-language-server
       - name: Resolve LSP version
         run: |
           echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
       - name: 'Version LSP based on commit: 0.0.0-insiders.${{ env.SHA_SHORT }}'
         run: >
           cd packages/tailwindcss-language-server &&
-          npm version 0.0.0-insiders.${{ env.SHA_SHORT }} --force --no-git-tag-version
+          pnpm version 0.0.0-insiders.${{ env.SHA_SHORT }} --force --no-git-tag-version
+      - name: Publish IntelliSense
+        env:
+          VSCODE_TOKEN: ${{ secrets.VSCODE_TOKEN }}
+        run: >
+          cd packages/vscode-tailwindcss &&
+          pnpm run publish --pre-release -p $VSCODE_TOKEN
       - name: Publish LSP
         run: >
           cd packages/tailwindcss-language-server &&
-          npm publish --tag insiders --access public
+          pnpm publish --tag insiders --access public --no-git-checks
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.vscode/launch.json

@@ -10,8 +10,8 @@
       "args": ["--extensionDevelopmentPath=${workspaceRoot}/packages/vscode-tailwindcss"],
       "stopOnEntry": false,
       "sourceMaps": true,
-      "outFiles": ["${workspaceRoot}/packages/vscode-tailwindcss/dist/**/*.js"]
-      // "preLaunchTask": "npm: dev"
+      "outFiles": ["${workspaceRoot}/packages/vscode-tailwindcss/dist/**/*.js"],
+      "preLaunchTask": "npm: dev"
     },
     {
       "type": "node",