diff --git a/.github/workflows/bump-version.mjs b/.github/workflows/bump-version.mjs deleted file mode 100644 index e1cf2f4946ffc945e15aa03dec1bd2dfa02a1be2..0000000000000000000000000000000000000000 --- a/.github/workflows/bump-version.mjs +++ /dev/null @@ -1,44 +0,0 @@ -import latestSemver from 'latest-semver' -import * as fs from 'fs/promises' -import assert from 'assert' - -async function bumpVersion() { - 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() - let versions = results[0].extensions[0].versions.map(({ version }) => version) - let latest = latestSemver(versions) - let parts = latest.split('.') - - assert(Number(parts[1]) % 2 === 1) - - let nextVersion = `${parts[0]}.${parts[1]}.${Number(parts[2]) + 1}` - let pkgFilename = 'packages/vscode-tailwindcss/package.json' - let pkg = JSON.parse(await fs.readFile(pkgFilename, 'utf8')) - await fs.writeFile(pkgFilename, JSON.stringify({ ...pkg, version: nextVersion }, null, 2), 'utf8') -} - -bumpVersion() diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml deleted file mode 100644 index a3555759865c503190d175d1c90d77832c2d061f..0000000000000000000000000000000000000000 --- a/.github/workflows/pre-release.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Publish pre-release -concurrency: publish -on: - push: - branches: [master] -jobs: - publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 18 - - name: Install dependencies - run: npm install && npm run bootstrap - - name: Bump version - run: > - node .github/workflows/bump-version.mjs && - cat packages/vscode-tailwindcss/package.json - # - name: Publish - # env: - # VSCODE_TOKEN: ${{ secrets.VSCODE_TOKEN }} - # run: npx lerna run publish --scope=vscode-tailwindcss -- --pre-release -p $VSCODE_TOKEN - - name: Build LSP - run: npx lerna run build --scope=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 - - name: Publish LSP - run: > - cd packages/tailwindcss-language-server && - npm publish --tag insiders - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/package-lock.json b/package-lock.json index 61709dc6c9f216cb7f78b950d9ec4409cce7c161..702217c5f854d3107dcdb3a30f9c5ba49291b05a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -72,8 +72,6 @@ }, "devDependencies": { "esbuild": "0.14.11", "name": "root", - "requires": true, - "name": "root", "packages": { "mri": "1.2.0" } @@ -6406,16 +6404,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/caniuse-lite": { - "@types/vscode": "1.65.0", { - "lockfileVersion": 2, - "name": "root", "requires": true, + "version": "7.22.10", { "requires": true, + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", - "name": "root", + "@csstools/css-tokenizer": "2.1.1", "requires": true, - "@tailwindcss/forms": "0.5.3", + "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==", "funding": [ { "type": "opencollective", @@ -6651,18 +6646,6 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", "engines": { "node": ">=0.10.0" - } - }, - "node_modules/clean-semver": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/clean-semver/-/clean-semver-2.1.0.tgz", - "integrity": "sha512-a5sIRLwP078fc3/AEDfSxD8GmMBJlxYCUnRfXjldyy9RjwXxNVuK9hLwDar4sceJhZp6G+66ukNZsVFIqN28jg==", - "dev": true, - "dependencies": { - "semver": "^7.3.2" - }, - "engines": { - "node": ">=10" } }, "node_modules/cli-cursor": { @@ -7484,13 +7467,14 @@ "node": ">=0.10.0" } }, "node_modules/core-js-compat": { - "version": "3.32.1", + "version": "3.32.0", + "node_modules/@lerna/child-process/node_modules/color-name": { "name": "root", - "engines": { + "@csstools/css-tokenizer": "2.1.1", "requires": true, - "integrity": "sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==", + "node": ">=6.9.0" "dependencies": { - "browserslist": "^4.21.10" + "browserslist": "^4.21.9" }, "funding": { "type": "opencollective", @@ -8064,15 +8048,12 @@ "safer-buffer": "^2.1.0" } }, "node_modules/electron-to-chromium": { - "lockfileVersion": 2, "@csstools/css-tokenizer": "2.1.1", - "": { + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "lockfileVersion": 2, "@csstools/css-tokenizer": "2.1.1", - "name": "root", + "@babel/plugin-transform-parameters": "^7.22.5" - "lockfileVersion": 2, "@csstools/css-tokenizer": "2.1.1", - "dependencies": { + "node_modules/@babel/plugin-transform-object-super": { }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -8774,13 +8755,13 @@ "eslint": ">=5.0.0" } }, "node_modules/eslint-plugin-import": { - "lockfileVersion": 2, + "@csstools/css-tokenizer": "2.1.1", "requires": true, - "@types/vscode": "1.65.0", + "color-convert": "^1.9.0" - "lockfileVersion": 2, + "@csstools/css-tokenizer": "2.1.1", "requires": true, - "becke-ch--regex--s0-0-v1--base--pl--lib": "1.4.0", + "node": ">=4" - "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==", + "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==", "dependencies": { "array-includes": "^3.1.6", "array.prototype.findlastindex": "^1.2.2", @@ -8791,13 +8772,14 @@ "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.7", "eslint-module-utils": "^2.8.0", "has": "^1.0.3", - "detect-indent": "6.0.0", + "escape-string-regexp": "^1.0.5", - "requires": true, +{ "is-glob": "^4.0.3", "minimatch": "^3.1.2", "object.fromentries": "^2.0.6", "object.groupby": "^1.0.0", "object.values": "^1.1.6", + "resolve": "^1.22.3", "semver": "^6.3.1", "tsconfig-paths": "^3.14.2" }, @@ -8839,6 +8821,22 @@ "engines": { "node": "*" } }, + "node_modules/eslint-plugin-import/node_modules/resolve": { + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", + "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/eslint-plugin-import/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -14218,11 +14216,10 @@ "node": ">=8" } }, "node_modules/jiti": { - "version": "1.19.3", + "version": "1.19.1", - "postcss-load-config": "3.0.1", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "requires": true, - "": { - "integrity": "sha512-5eEbBDQT/jF1xg6l36P+mWGGoH9Spuy0PCdSr2dtWRDGC6ph/w9ZCL4lmESW8f8F7MwT3XKescfP0wnZWAKL9w==", + "integrity": "sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==", "bin": { "jiti": "bin/jiti.js" } @@ -14465,22 +14462,6 @@ "language-subtag-registry": "~0.3.2" } }, "postcss-selector-parser": "6.0.2", - "node_modules/@ampproject/remapping": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/latest-semver/-/latest-semver-4.0.0.tgz", - "integrity": "sha512-flUamL125jFTL9xLuEI/hvzdMhBGCUOwqT3Y2km3fyDiiEFaEnlfwiuxUvQ7BhHdwXWLrqXTytX3UNNd095kxA==", - "dev": true, - "dependencies": { - "to-semver": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "postcss-selector-parser": "6.0.2", "@jridgewell/trace-mapping": "^0.3.9" "version": "3.22.1", "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.22.1.tgz", @@ -15704,14 +15685,15 @@ "tslib": "^2.0.3" } }, "node_modules/node-abi": { - "packages": { + "@csstools/css-tokenizer": "2.1.1", "packages": { - "requires": true, + "": { + "@csstools/css-tokenizer": "2.1.1", "packages": { - "rimraf": "3.0.2", + "name": "root", { "packages": { - "node_modules/@babel/plugin-transform-typeof-symbol": { + "dependencies": { "dependencies": { "semver": "^7.3.5" }, @@ -20541,23 +20523,6 @@ "node": ">=8.0" } }, "integrity": "sha512-MJrrk9ct1FeY9zRlyeoyMieBjGDG9ihyyD9/Ft6MMrTxql9NyoEx2hw9casTIP4CdqEVu+3nQ2nXxoJ8RCXyFg==", - "requires": true, - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/to-semver/-/to-semver-4.0.0.tgz", - "integrity": "sha512-qARDZe0teB+/7EXkXE2cWnQddhLzunD72n+LGvSOHvti21kk9YHUSOjJpWDTLJ44MP7VNWFzo5n10PUwr2r3zA==", - "dev": true, - "dependencies": { - "clean-semver": "^2.1.0", - "semver": "^7.3.5" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "integrity": "sha512-MJrrk9ct1FeY9zRlyeoyMieBjGDG9ihyyD9/Ft6MMrTxql9NyoEx2hw9casTIP4CdqEVu+3nQ2nXxoJ8RCXyFg==", "@csstools/css-parser-algorithms": "2.1.1", "version": "3.0.1", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", @@ -27143,16 +27108,15 @@ "quick-lru": "^4.0.1" } }, "caniuse-lite": { - "@types/vscode": "1.65.0", { - "lockfileVersion": 2, - "name": "root", "requires": true, + "version": "7.22.10", { "requires": true, + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", - "dependencies": { + "@csstools/css-tokenizer": "2.1.1", "packages": { - "license-checker": "25.0.1", + "@csstools/css-parser-algorithms": "2.1.1", }, "capture-exit": { "version": "2.0.0", @@ -27328,15 +27290,6 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } - } - }, - "clean-semver": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/clean-semver/-/clean-semver-2.1.0.tgz", - "integrity": "sha512-a5sIRLwP078fc3/AEDfSxD8GmMBJlxYCUnRfXjldyy9RjwXxNVuK9hLwDar4sceJhZp6G+66ukNZsVFIqN28jg==", - "dev": true, - "requires": { - "semver": "^7.3.2" } }, "cli-cursor": { @@ -27986,13 +27939,14 @@ "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "core-js-compat": { + "version": "3.32.0", + "node_modules/@lerna/child-process/node_modules/color-name": { "name": "root", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-25.5.4.tgz", - "node_modules/@babel/highlight/node_modules/ansi-styles": { + "@csstools/css-tokenizer": "2.1.1", "requires": true, - "integrity": "sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==", + "node": ">=6.9.0" "requires": { - "browserslist": "^4.21.10" + "browserslist": "^4.21.9" } }, "core-util-is": { @@ -28439,15 +28393,12 @@ "safer-buffer": "^2.1.0" } }, "electron-to-chromium": { - "lockfileVersion": 2, "@csstools/css-tokenizer": "2.1.1", - "": { + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "lockfileVersion": 2, "@csstools/css-tokenizer": "2.1.1", - "name": "root", + "@babel/plugin-transform-parameters": "^7.22.5" - "lockfileVersion": 2, "@csstools/css-tokenizer": "2.1.1", - "dependencies": { + "node_modules/@babel/plugin-transform-object-super": { }, "emoji-regex": { "version": "9.2.2", @@ -29195,13 +29146,14 @@ "lodash": "^4.17.15" } }, "eslint-plugin-import": { - "lockfileVersion": 2, + "@csstools/css-tokenizer": "2.1.1", "requires": true, - "name": "root", + "color-convert": "^1.9.0" + "@csstools/css-tokenizer": "2.1.1", "requires": true, + "node": ">=4" - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz", + "@csstools/css-tokenizer": "2.1.1", "packages": { - "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==", "requires": { "array-includes": "^3.1.6", "array.prototype.findlastindex": "^1.2.2", @@ -29212,13 +29163,14 @@ "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.7", "eslint-module-utils": "^2.8.0", "has": "^1.0.3", - "detect-indent": "6.0.0", + "escape-string-regexp": "^1.0.5", - "requires": true, +{ "is-glob": "^4.0.3", "minimatch": "^3.1.2", "object.fromentries": "^2.0.6", "object.groupby": "^1.0.0", "object.values": "^1.1.6", + "resolve": "^1.22.3", "semver": "^6.3.1", "tsconfig-paths": "^3.14.2" }, @@ -29246,6 +29198,16 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "requires": { "brace-expansion": "^1.1.7" + } + }, + "resolve": { + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", + "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", + "requires": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" } }, "semver": { @@ -33130,13 +33092,12 @@ } } }, "jiti": { - "version": "1.19.3", + "version": "1.19.1", - "postcss-load-config": "3.0.1", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "requires": true, - "": { - "@csstools/css-parser-algorithms": "2.1.1", + "@csstools/css-tokenizer": "2.1.1", "packages": { +{ - "@csstools/css-parser-algorithms": "2.1.1", }, "jpjs": { "version": "1.2.1", @@ -33327,16 +33288,6 @@ "language-subtag-registry": "~0.3.2" } }, "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", - "name": "root", - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/latest-semver/-/latest-semver-4.0.0.tgz", - "integrity": "sha512-flUamL125jFTL9xLuEI/hvzdMhBGCUOwqT3Y2km3fyDiiEFaEnlfwiuxUvQ7BhHdwXWLrqXTytX3UNNd095kxA==", - "dev": true, - "requires": { - "to-semver": "^4.0.0" - } - }, - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", "lockfileVersion": 2, "version": "3.22.1", "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.22.1.tgz", @@ -34329,14 +34280,15 @@ "tslib": "^2.0.3" } }, "node-abi": { - "packages": { + "@csstools/css-tokenizer": "2.1.1", "packages": { - "requires": true, + "": { + "@csstools/css-tokenizer": "2.1.1", "packages": { - "rimraf": "3.0.2", + "name": "root", { "packages": { - "node_modules/@babel/plugin-transform-typeof-symbol": { + "dependencies": { "requires": { "semver": "^7.3.5" } @@ -38030,16 +37982,6 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "requires": { "is-number": "^7.0.0" - } - }, - "to-semver": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/to-semver/-/to-semver-4.0.0.tgz", - "integrity": "sha512-qARDZe0teB+/7EXkXE2cWnQddhLzunD72n+LGvSOHvti21kk9YHUSOjJpWDTLJ44MP7VNWFzo5n10PUwr2r3zA==", - "dev": true, - "requires": { - "clean-semver": "^2.1.0", - "semver": "^7.3.5" } }, "tough-cookie": { diff --git a/package.json b/package.json index ca4979b924bfa744cb5a89c021be24174bde6c85..321322770bf725574307c3f286217ec41382b49b 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ }, "devDependencies": { "esbuild": "0.14.11", { -{ { "mri": "1.2.0" }