vite-plugin-qingkuai 1.0.22 → 1.0.24

package/.github/workflows/release.yml

@@ -0,0 +1,106 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+    inputs:
+      tag:
+        type: string
+        required: false
+        description: "Optional tag to release (for example: v1.0.66). Leave empty to auto-create from package version."
+
+permissions:
+  contents: write
+  id-token: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Resolve release tag
+        id: tag
+        env:
+          INPUT_TAG: ${{ inputs.tag }}
+          REF_NAME: ${{ github.ref_name }}
+          EVENT_NAME: ${{ github.event_name }}
+        run: |
+          if [[ "$EVENT_NAME" == "push" ]]; then
+            echo "value=$REF_NAME" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          if [[ -n "$INPUT_TAG" ]]; then
+            echo "value=$INPUT_TAG" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          package_version="$(node -p 'require("./package.json").version')"
+          echo "value=v$package_version" >> "$GITHUB_OUTPUT"
+
+      - name: Ensure tag exists on workflow dispatch
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        env:
+          TAG: ${{ steps.tag.outputs.value }}
+        run: |
+          git fetch origin --tags --prune
+
+          if git rev-parse --verify --quiet "refs/tags/$TAG" >/dev/null; then
+            echo "Tag already exists: $TAG"
+          else
+            git config user.name "github-actions[bot]"
+            git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+            git tag "$TAG"
+            git push origin "$TAG"
+            echo "Created and pushed tag: $TAG"
+          fi
+
+      - name: Checkout resolved tag
+        env:
+          TAG: ${{ steps.tag.outputs.value }}
+        run: |
+          git fetch origin --tags --prune
+          git checkout "refs/tags/$TAG"
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v6
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+          cache: pnpm
+          registry-url: https://registry.npmjs.org
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile --ignore-scripts
+
+      - name: Validate tag equals package version
+        env:
+          TAG: ${{ steps.tag.outputs.value }}
+        run: |
+          package_version="$(node -p 'require("./package.json").version')"
+          if [[ "v$package_version" != "$TAG" ]]; then
+            echo "Tag and package.json version mismatch: $TAG vs v$package_version"
+            exit 1
+          fi
+
+      - name: Build
+        run: pnpm build
+
+      - name: Publish package to npm (Trusted Publishing)
+        run: npm publish --access public --provenance
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ steps.tag.outputs.value }}
+          name: ${{ steps.tag.outputs.value }}
+          body: "Release ${{ steps.tag.outputs.value }}"

package/.husky/pre-commit

@@ -0,0 +1 @@
+pnpm lint-staged

package/dist/index.cjs

@@ -30,6 +30,9 @@ function _interopNamespaceDefault(e) {
 
 var vite__namespace = /*#__PURE__*/_interopNamespaceDefault(vite);
 
+function isNumber(v) {
+  return typeof v === "number";
+}
 function isUndefined(v) {
   return void 0 === v;
 }
@@ -211,24 +214,66 @@ function qingkuai(options = {}) {
       }
       let virtualFileName;
       const compileRes = compileResultCache.get(fileId);
-      const style = compileRes.styleDescriptors[index];
+      const styleDescriptor = compileRes.styleDescriptors[index];
       while (true) {
         const hash = nodeCrypto.randomBytes(6).toString("hex");
-        virtualFileName = `${fileId}.${hash}.${style.lang}`;
+        virtualFileName = `${fileId}.${hash}.${styleDescriptor.lang}`;
         if (!nodeFs.existsSync(virtualFileName)) {
           break;
         }
       }
-      const preprocessRes = await vite__namespace.preprocessCSS(style.code, virtualFileName, {
-        ...viteConfig,
-        css: {
-          ...viteConfig.css,
-          postcss: {
-            from: virtualFileName
+      let preprocessRes;
+      try {
+        preprocessRes = await vite__namespace.preprocessCSS(styleDescriptor.code, virtualFileName, {
+          ...viteConfig,
+          css: {
+            ...viteConfig.css,
+            postcss: {
+              from: virtualFileName
+            }
+          }
+        });
+      } catch (err) {
+        let errorPos = null;
+        const lac = new linesAndColumns.LinesAndColumns(styleDescriptor.code);
+        switch (styleDescriptor.lang) {
+          case "css":
+          case "less":
+          case "stylus": {
+            delete err.loc;
+            err.message += `
+
+Caused by: "${fileId}".`;
+            break;
+          }
+          case "sass":
+          case "scss": {
+            if (err.sassMessage) {
+              err.message = err.sassMessage;
+            }
+            if (isNumber(err.line) && isNumber(err.column)) {
+              errorPos = lac.indexForLocation({
+                line: err.line - 1,
+                column: err.column - 1
+              });
+            }
+            break;
           }
         }
-      });
-      if (!cssSourcemap || style.global) {
+        if (isNumber(errorPos) && !isNaN(errorPos)) {
+          const loc = lac.locationForIndex(errorPos + styleDescriptor.loc.start.index);
+          if (loc) {
+            err.loc = {
+              file: fileId,
+              line: loc.line + 1,
+              column: loc.column
+            };
+            delete err.frame;
+          }
+        }
+        return this.error(err);
+      }
+      if (!cssSourcemap || styleDescriptor.global) {
         return preprocessRes;
       }
       const assertedPreprocessMap = preprocessRes.map;
@@ -248,8 +293,8 @@ function qingkuai(options = {}) {
         offsetSourceMap(
           attachScopeResult.mappings,
           currentSourceIndex,
-          style.loc.start.line - 1,
-          style.loc.start.column - 1
+          styleDescriptor.loc.start.line - 1,
+          styleDescriptor.loc.start.column - 1
         )
       );
       if (attachScopeResult.error) {
@@ -271,11 +316,11 @@ function qingkuai(options = {}) {
               }
             });
           }
-          const preprocessedIndex = new linesAndColumns.LinesAndColumns(style.code).indexForLocation({
+          const preprocessedIndex = new linesAndColumns.LinesAndColumns(styleDescriptor.code).indexForLocation({
             line: preprocessedPosition.line - 1,
             column: preprocessedPosition.column
           }) || 0;
-          const position = compileRes.positions[style.loc.start.index + preprocessedIndex];
+          const position = compileRes.positions[styleDescriptor.loc.start.index + preprocessedIndex];
           this.error({
             message: attachScopeResult.error.message,
             loc: {
@@ -383,8 +428,10 @@ function qingkuai(options = {}) {
           })
         };
       } catch (err) {
-        if (err.loc && "start" in err.loc && "index" in err.loc.start) {
-          err.pos = err.loc.start.index, this.error(err);
+        if (compiler.isCompileError(err)) {
+          this.error(err.message, err.loc.start.index);
+        } else if (err.cause && isNumber(err.cause.pos)) {
+          this.error(err, err.cause.pos);
         } else {
           this.error(
             "Qingkuai compile result is invalid. Please report this at https://github.com/qingkuai-js/qingkuai/issues and include your .qk source for reproduction."

package/dist/index.js

@@ -2,13 +2,16 @@ import * as vite from 'vite';
 import nodeFs from 'node:fs';
 import nodePath from 'node:path';
 import nodeCrypto from 'node:crypto';
-import { util, compile } from 'qingkuai/compiler';
+import { util, compile, isCompileError } from 'qingkuai/compiler';
 import { LinesAndColumns } from 'lines-and-columns';
 import { decode, encode } from '@jridgewell/sourcemap-codec';
 import postcss from 'postcss';
 import selectorParser from 'postcss-selector-parser';
 import { SourceMapConsumer } from 'source-map-js';
 
+function isNumber(v) {
+  return typeof v === "number";
+}
 function isUndefined(v) {
   return void 0 === v;
 }
@@ -190,24 +193,66 @@ function qingkuai(options = {}) {
       }
       let virtualFileName;
       const compileRes = compileResultCache.get(fileId);
-      const style = compileRes.styleDescriptors[index];
+      const styleDescriptor = compileRes.styleDescriptors[index];
       while (true) {
         const hash = nodeCrypto.randomBytes(6).toString("hex");
-        virtualFileName = `${fileId}.${hash}.${style.lang}`;
+        virtualFileName = `${fileId}.${hash}.${styleDescriptor.lang}`;
         if (!nodeFs.existsSync(virtualFileName)) {
           break;
         }
       }
-      const preprocessRes = await vite.preprocessCSS(style.code, virtualFileName, {
-        ...viteConfig,
-        css: {
-          ...viteConfig.css,
-          postcss: {
-            from: virtualFileName
+      let preprocessRes;
+      try {
+        preprocessRes = await vite.preprocessCSS(styleDescriptor.code, virtualFileName, {
+          ...viteConfig,
+          css: {
+            ...viteConfig.css,
+            postcss: {
+              from: virtualFileName
+            }
+          }
+        });
+      } catch (err) {
+        let errorPos = null;
+        const lac = new LinesAndColumns(styleDescriptor.code);
+        switch (styleDescriptor.lang) {
+          case "css":
+          case "less":
+          case "stylus": {
+            delete err.loc;
+            err.message += `
+
+Caused by: "${fileId}".`;
+            break;
+          }
+          case "sass":
+          case "scss": {
+            if (err.sassMessage) {
+              err.message = err.sassMessage;
+            }
+            if (isNumber(err.line) && isNumber(err.column)) {
+              errorPos = lac.indexForLocation({
+                line: err.line - 1,
+                column: err.column - 1
+              });
+            }
+            break;
           }
         }
-      });
-      if (!cssSourcemap || style.global) {
+        if (isNumber(errorPos) && !isNaN(errorPos)) {
+          const loc = lac.locationForIndex(errorPos + styleDescriptor.loc.start.index);
+          if (loc) {
+            err.loc = {
+              file: fileId,
+              line: loc.line + 1,
+              column: loc.column
+            };
+            delete err.frame;
+          }
+        }
+        return this.error(err);
+      }
+      if (!cssSourcemap || styleDescriptor.global) {
         return preprocessRes;
       }
       const assertedPreprocessMap = preprocessRes.map;
@@ -227,8 +272,8 @@ function qingkuai(options = {}) {
         offsetSourceMap(
           attachScopeResult.mappings,
           currentSourceIndex,
-          style.loc.start.line - 1,
-          style.loc.start.column - 1
+          styleDescriptor.loc.start.line - 1,
+          styleDescriptor.loc.start.column - 1
         )
       );
       if (attachScopeResult.error) {
@@ -250,11 +295,11 @@ function qingkuai(options = {}) {
               }
             });
           }
-          const preprocessedIndex = new LinesAndColumns(style.code).indexForLocation({
+          const preprocessedIndex = new LinesAndColumns(styleDescriptor.code).indexForLocation({
             line: preprocessedPosition.line - 1,
             column: preprocessedPosition.column
           }) || 0;
-          const position = compileRes.positions[style.loc.start.index + preprocessedIndex];
+          const position = compileRes.positions[styleDescriptor.loc.start.index + preprocessedIndex];
           this.error({
             message: attachScopeResult.error.message,
             loc: {
@@ -362,8 +407,10 @@ function qingkuai(options = {}) {
           })
         };
       } catch (err) {
-        if (err.loc && "start" in err.loc && "index" in err.loc.start) {
-          err.pos = err.loc.start.index, this.error(err);
+        if (isCompileError(err)) {
+          this.error(err.message, err.loc.start.index);
+        } else if (err.cause && isNumber(err.cause.pos)) {
+          this.error(err, err.cause.pos);
         } else {
           this.error(
             "Qingkuai compile result is invalid. Please report this at https://github.com/qingkuai-js/qingkuai/issues and include your .qk source for reproduction."

package/package.json

@@ -1,46 +1,57 @@
 {
-    "name": "vite-plugin-qingkuai",
-    "author": "mlgq",
-    "license": "MIT",
-    "version": "1.0.22",
-    "type": "module",
-    "keywords": [
-        "vite",
-        "qingkuai",
-        "vite plugin",
-        "vite-plugin"
-    ],
-    "exports": {
-        ".": {
-            "import": "./dist/index.js",
-            "require": "./dist/index.cjs"
-        }
-    },
-    "scripts": {
-        "dev": "rollup -c -w",
-        "build": "rimraf dist && tsc && rollup -c && rimraf dist/temp-types",
-        "postpublish": "curl -X PUT 'https://registry-direct.npmmirror.com/-/package/vite-plugin-qingkuai/syncs'"
-    },
-    "devDependencies": {
-        "@types/fs-extra": "^11.0.4",
-        "@types/node": "^22.13.14",
-        "fs-extra": "^11.3.0",
-        "qingkuai": "^1.0.45",
-        "rimraf": "^6.0.1",
-        "rollup": "^4.38.0",
-        "rollup-plugin-dts": "^6.2.1",
-        "rollup-plugin-esbuild": "^6.2.1",
-        "vite": "8.0.0"
-    },
-    "peerDependencies": {
-        "qingkuai": ">=1.0.50",
-        "vite": ">=6.2.4 <9"
-    },
-    "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0",
-        "lines-and-columns": "^2.0.4",
-        "postcss": "^8.5.3",
-        "postcss-selector-parser": "^7.1.0",
-        "source-map-js": "^1.2.1"
+  "name": "vite-plugin-qingkuai",
+  "author": "mlgq",
+  "license": "MIT",
+  "type": "module",
+  "version": "1.0.24",
+  "packageManager": "pnpm@9.9.0",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
     }
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/qingkuai-js/vite-plugin.git"
+  },
+  "lint-staged": {
+    "*.{ts,js,mjs,cjs,json,md,yml,yaml}": "prettier --write"
+  },
+  "scripts": {
+    "dev": "rollup -c -w",
+    "release": "node scripts/release.js",
+    "build": "rimraf dist && tsc && rollup -c && rimraf dist/temp-types",
+    "postpublish": "curl -X PUT 'https://registry-direct.npmmirror.com/-/package/vite-plugin-qingkuai/syncs'"
+  },
+  "devDependencies": {
+    "@types/fs-extra": "^11.0.4",
+    "@types/node": "^22.13.14",
+    "fs-extra": "^11.3.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^17.3.0",
+    "qingkuai": "^1.0.83",
+    "rimraf": "^6.0.1",
+    "rollup": "^4.38.0",
+    "rollup-plugin-dts": "^6.2.1",
+    "rollup-plugin-esbuild": "^6.2.1",
+    "vite": "8.0.0"
+  },
+  "peerDependencies": {
+    "qingkuai": ">=1.0.50",
+    "vite": ">=6.2.4 <9"
+  },
+  "dependencies": {
+    "@jridgewell/sourcemap-codec": "^1.5.0",
+    "lines-and-columns": "^2.0.4",
+    "postcss": "^8.5.3",
+    "postcss-selector-parser": "^7.1.0",
+    "source-map-js": "^1.2.1"
+  },
+  "keywords": [
+    "vite",
+    "qingkuai",
+    "vite plugin",
+    "vite-plugin"
+  ]
 }

package/scripts/release.js

@@ -0,0 +1,94 @@
+#!/usr/bin/env node
+import nodeFs from "node:fs"
+import nodePath from "node:path"
+
+import { spawnSync } from "node:child_process"
+
+const ROOT = nodePath.resolve(process.cwd())
+const PKG_PATH = nodePath.join(ROOT, "package.json")
+
+main()
+
+function readPackageJson() {
+    return JSON.parse(nodeFs.readFileSync(PKG_PATH, "utf-8"))
+}
+
+function writePackageJson(pkg) {
+    nodeFs.writeFileSync(PKG_PATH, JSON.stringify(pkg, null, 2) + "\n", "utf-8")
+}
+
+function bumpVersion(version) {
+    const parts = version.split(".").map(Number)
+    if (parts.length !== 3 || parts.some(n => Number.isNaN(n) || n < 0)) {
+        throw new Error(`Unsupported version format: ${version}`)
+    }
+    parts[2] += 1
+    return parts.join(".")
+}
+
+async function run(command, args, opts = {}) {
+    const result = spawnSync(command, args, { stdio: "inherit", ...opts })
+    if (result.error) {
+        throw result.error
+    }
+    if (result.status !== 0) {
+        throw new Error(`Command failed: ${command} ${args.join(" ")}`)
+    }
+    return result
+}
+
+function verifyCleanWorkingTree() {
+    const result = spawnSync("git", ["status", "--porcelain"], {
+        encoding: "utf-8",
+        stdio: ["ignore", "pipe", "inherit"]
+    })
+    if (result.error) {
+        throw result.error
+    }
+    if (result.status !== 0) {
+        throw new Error("Failed to check git working tree status")
+    }
+    if (result.stdout.trim()) {
+        throw new Error(
+            "Git working tree is not clean. Please commit or stash your changes before releasing."
+        )
+    }
+}
+
+async function release() {
+    verifyCleanWorkingTree()
+    const pkg = readPackageJson()
+    const currentVersion = pkg.version
+    if (!currentVersion) {
+        throw new Error("package.json is missing version")
+    }
+
+    const arg = process.argv[2]
+    const newVersion = arg ? arg.replace(/^v/, "") : bumpVersion(currentVersion)
+    const tag = `v${newVersion}`
+
+    if (newVersion === currentVersion) {
+        console.log(`Version unchanged: ${newVersion}`)
+        return
+    }
+
+    pkg.version = newVersion
+    writePackageJson(pkg)
+
+    await run("git", ["add", "package.json"])
+    await run("git", ["commit", "-m", `release: bump version to ${tag}`])
+    await run("git", ["tag", tag])
+    await run("git", ["push"])
+    await run("git", ["push", "origin", tag])
+
+    console.log(`Released ${tag}`)
+}
+
+async function main() {
+    try {
+        await release()
+    } catch (error) {
+        console.error(error instanceof Error ? error.message : error)
+        process.exit(1)
+    }
+}

package/.vscode/extensions.json

@@ -1,3 +0,0 @@
-{
-    "recommendations": []
-}