[pull] master from tailwindlabs:master

.github/CONTRIBUTING.md

@@ -0,0 +1,18 @@
+# Contributing
+
+Thanks for your interest in contributing to Tailwind CSS IntelliSense! Please take a moment to review this document **before submitting a pull request**.
+
+## Pull requests
+
+**Please ask first before starting work on any significant new features.**
+
+It's never a fun experience to have your pull request declined after investing a lot of time and effort into a new feature. To avoid this from happening, we request that contributors create [a feature request](https://github.com/tailwindlabs/tailwindcss/discussions/new?category=ideas) to first discuss any significant new ideas.
+
+## Building the Extension
+
+You can build the VSIX package by running these commands in the project root.
+
+```bash
+pnpm install
+pnpx run package --workspace=packages/vscode-tailwindcss
+```

.github/workflows/bump-version.mjs

@@ -0,0 +1,49 @@
+import PackageJson from '@npmcli/package-json'
+import assert from 'node:assert'
+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()
+
+/** @type {string[]} */
+let versions = results[0].extensions[0].versions.map(({ version }) => version)
+
+// Determine the latest version of the extension
+let latest = versions
+  .map((v) => semver.parse(v, { includePrerelease: true, loose: false }))
+  .filter((v) => v !== null)
+  .filter((v) => v.prerelease.length === 0)
+  .sort((a, b) => b.compare(a) || b.compareBuild(a))
+  .at(0)
+
+// Require the minor version to be odd. This is done because
+// the VSCode Marketplace suggests using odd numbers for
+// pre-release builds and even ones for release builds
+assert(latest && latest.minor % 2 === 1)
+
+// Bump the patch version in `package.json`
+let nextVersion = latest.inc('patch').format()
+let pkg = await PackageJson.load('packages/vscode-tailwindcss')
+await pkg.update({ version: nextVersion }).save()

.github/workflows/manual-release.yml

@@ -0,0 +1,32 @@
+name: Publish Release
+concurrency: publish
+on:
+  workflow_dispatch: {}
+
+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'
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install
+      - name: Run tests
+        run: >
+          cd packages/tailwindcss-language-server &&
+          pnpm run build &&
+          pnpm run test:prepare &&
+          pnpm test
+      - name: Publish IntelliSense
+        env:
+          VSCODE_TOKEN: ${{ secrets.VSCODE_TOKEN }}
+        run: >
+          cd packages/vscode-tailwindcss &&
+          pnpm run publish -p $VSCODE_TOKEN

.github/workflows/pre-release.yml

@@ -0,0 +1,51 @@
+name: Publish pre-release
+concurrency: publish
+on:
+  push:
+    branches: [master]
+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'
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install
+      - name: Run tests
+        run: >
+          cd packages/tailwindcss-language-server &&
+          pnpm run build &&
+          pnpm run test:prepare &&
+          pnpm 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 &&
+          pnpm run publish --pre-release -p $VSCODE_TOKEN
+      - name: Build LSP
+        run: pnpm 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 &&
+          pnpm version 0.0.0-insiders.${{ env.SHA_SHORT }} --force --no-git-tag-version
+      - name: Publish LSP
+        run: >
+          cd packages/tailwindcss-language-server &&
+          pnpm publish --tag insiders --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.prettierignore

@@ -0,0 +1,2 @@
+packages/*/dist
+packages/*/bin

.vscode/launch.json

@@ -1,37 +1,37 @@
-{
-  "version": "0.2.0",
-  // List of configurations. Add new configurations or edit existing ones.
-  "configurations": [
-    {
-      "type": "extensionHost",
-      "request": "launch",
-      "name": "Launch Client",
-      "runtimeExecutable": "${execPath}",
-      "args": ["--extensionDevelopmentPath=${workspaceRoot}/packages/vscode-tailwindcss"],
-      "stopOnEntry": false,
-      "sourceMaps": true,
-      "outFiles": ["${workspaceRoot}/packages/vscode-tailwindcss/dist/**/*.js"]
-      // "preLaunchTask": "npm: dev"
-    },
-    {
-      "type": "node",
-      "request": "attach",
-      "name": "Attach to Server 6011",
-      "address": "localhost",
-      "protocol": "inspector",
-      "port": 6011,
-      "sourceMaps": true,
-      "outFiles": ["${workspaceRoot}/packages/vscode-tailwindcss/dist/**/*.js"]
-    },
-    {
-      "type": "node",
-      "request": "attach",
-      "name": "Attach to Server 6012",
-      "address": "localhost",
-      "protocol": "inspector",
-      "port": 6012,
-      "sourceMaps": true,
-      "outFiles": ["${workspaceRoot}/packages/vscode-tailwindcss/dist/**/*.js"]
-    }
-  ]
-}
+{
+  "version": "0.2.0",
+  // List of configurations. Add new configurations or edit existing ones.
+  "configurations": [
+    {
+      "type": "extensionHost",
+      "request": "launch",
+      "name": "Launch Client",
+      "runtimeExecutable": "${execPath}",
+      "args": ["--extensionDevelopmentPath=${workspaceRoot}/packages/vscode-tailwindcss"],
+      "stopOnEntry": false,
+      "sourceMaps": true,
+      "outFiles": ["${workspaceRoot}/packages/vscode-tailwindcss/dist/**/*.js"],
+      "preLaunchTask": "npm: dev"
+    },
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Attach to Server 6011",
+      "address": "localhost",
+      "protocol": "inspector",
+      "port": 6011,
+      "sourceMaps": true,
+      "outFiles": ["${workspaceRoot}/packages/vscode-tailwindcss/dist/**/*.js"]
+    },
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Attach to Server 6012",
+      "address": "localhost",
+      "protocol": "inspector",
+      "port": 6012,
+      "sourceMaps": true,
+      "outFiles": ["${workspaceRoot}/packages/vscode-tailwindcss/dist/**/*.js"]
+    }
+  ]
+}

.vscode/tasks.json

@@ -1,29 +1,29 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "type": "npm",
-      "script": "build",
-      "group": "build",
-      "presentation": {
-        "panel": "dedicated",
-        "reveal": "never"
-      },
-      "problemMatcher": ["$tsc"]
-    },
-    {
-      "type": "npm",
-      "script": "dev",
-      "isBackground": true,
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "presentation": {
-        "panel": "dedicated",
-        "reveal": "never"
-      },
-      "problemMatcher": ["$tsc-watch"]
-    }
-  ]
-}
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "npm",
+      "script": "build",
+      "group": "build",
+      "presentation": {
+        "panel": "dedicated",
+        "reveal": "never"
+      },
+      "problemMatcher": ["$tsc"]
+    },
+    {
+      "type": "npm",
+      "script": "dev",
+      "isBackground": true,
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "presentation": {
+        "panel": "dedicated",
+        "reveal": "never"
+      },
+      "problemMatcher": ["$tsc-watch"]
+    }
+  ]
+}

esbuild.js → esbuild.mjs

@@ -1,24 +1,24 @@
-const esbuild = require('esbuild')
-const path = require('path')
-const fs = require('fs')
-const mri = require('mri')
+import esbuild from 'esbuild'
+import fs from 'fs'
+import { createRequire } from 'module'
+import minimist from 'minimist'
 
-const resolve = (...args) => path.resolve(__dirname, ...args)
+const require = createRequire(import.meta.url)
 
-const args = mri(process.argv.slice(2), {
+const args = minimist(process.argv.slice(2), {
   boolean: ['watch', 'minify'],
-  string: ['outfile', 'outdir', 'external'],
+  string: ['outfile', 'outdir'],
 })
 
-esbuild.build({
+console.log('- Preparing')
+let ctx = await esbuild.context({
   entryPoints: args._,
   bundle: true,
   platform: 'node',
-  external: [].concat(args.external),
+  external: ['pnpapi', 'vscode', 'lightningcss', '@tailwindcss/oxide'],
   format: 'cjs',
   outdir: args.outdir,
   outfile: args.outfile,
-  watch: args.watch,
   minify: args.minify,
   plugins: [
     {
@@ -74,3 +74,14 @@ esbuild.build({
     },
   ],
 })
+
+console.log('- Building')
+await ctx.rebuild()
+
+if (args.watch) {
+  console.log('- Watching')
+  await ctx.watch()
+} else {
+  console.log('- Cleaning up')
+  await ctx.dispose()
+}