vite-plugin-qingkuai 1.0.4 → 1.0.6

package/dist/index.cjs

@@ -3,7 +3,6 @@
 var node_path = require('node:path');
 var node_fs = require('node:fs');
 var node_crypto = require('node:crypto');
-var sourceMapJs = require('source-map-js');
 var sourcemapCodec = require('@jridgewell/sourcemap-codec');
 var compiler = require('qingkuai/compiler');
 var postcss = require('postcss');
@@ -42,26 +41,12 @@ function offsetSourceMap(mappings, sourceIndex, preLine, preColumn) {
     });
   });
 }
-function getSourceFile(sourcemap, line, column) {
-  const consumer = new sourceMapJs.SourceMapConsumer({
-    ...sourcemap,
-    version: sourcemap.version.toString()
-  });
-  return consumer.originalPositionFor({
-    line,
-    column
-  }).source;
-}
 
 async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
   const processor = postcss([
     {
       postcssPlugin: "postcss-attach-scope-qingkuai",
       Rule(rule) {
-        const { line, column } = rule.source.start;
-        if (map && getSourceFile(map, line, column) !== sourceFile) {
-          return;
-        }
         rule.selector = selectorParser((selectors) => {
           selectors.each((selector) => {
             const index = selector.nodes.findLastIndex(({ type }) => {
@@ -100,10 +85,10 @@ function qingkuaiPlugin() {
   let viteConfig;
   const compileResultCache = /* @__PURE__ */ new Map();
   const qingkuaiConfigurations = /* @__PURE__ */ new Map();
-  const qingkuaiPackageServeRE = /node_modules\/\.vite\/deps\/chunk.*$/;
+  const qingkuaiPackageServeRE = /node_modules\/\.vite\/deps\/chunk-.*$/;
   const confIdentifierRE = /__qk_expose_(?:dependencies|destructions)__/g;
   const styleIdRE = /^virtual:\[\d+\].*?\.qk.(?:css|s[ac]ss|less|stylus|postcss)\?\d{13}$/;
-  const qingkuaiPackageBuildRE = /node_modules\/qingkuai\/dist\/esm\/(?:chunks|runtime)\/\w+\.js$/;
+  const qingkuaiPackageBuildRE = /(?:node_modules)?\/qingkuai\/dist\/esm\/(?:chunks|runtime)\/\w+\.js$/;
   return {
     name: "qingkuai-compiler",
     config(_, env) {
@@ -129,7 +114,7 @@ function qingkuaiPlugin() {
       }
       if (importer?.endsWith(".qk") && !node_path.extname(id)) {
         const qingkuaiConfig = getQingkuaiConfiguration(id);
-        return id + (qingkuaiConfig.resolveImportExtension ? ".qk" : "");
+        return node_path.join(node_path.dirname(importer), id + (qingkuaiConfig.resolveImportExtension ? ".qk" : ""));
       }
     },
     async load(id) {
@@ -189,7 +174,7 @@ function qingkuaiPlugin() {
     async transform(src, id) {
       const qingkuaiConfig = getQingkuaiConfiguration(id);
       if (!id.endsWith(".qk")) {
-        if (isDev && qingkuaiPackageServeRE.test(id) || !isDev && qingkuaiPackageBuildRE.test(id)) {
+        if (qingkuaiPackageServeRE.test(id) || qingkuaiPackageBuildRE.test(id)) {
           const ret = src.replace(confIdentifierRE, (s) => {
             switch (s) {
               case "__qk_expose_dependencies__":

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { Plugin } from 'vite';
+import { PluginOption } from 'vite';
 
-declare function qingkuaiPlugin(): Plugin;
+declare function qingkuaiPlugin(): PluginOption;
 
 export { qingkuaiPlugin as default };

package/dist/index.js

@@ -1,7 +1,6 @@
 import { join, basename, extname, dirname } from 'node:path';
 import { readdirSync, existsSync, readFileSync } from 'node:fs';
 import { randomBytes } from 'node:crypto';
-import { SourceMapConsumer } from 'source-map-js';
 import { decode, encode } from '@jridgewell/sourcemap-codec';
 import { compile, util } from 'qingkuai/compiler';
 import postcss from 'postcss';
@@ -40,26 +39,12 @@ function offsetSourceMap(mappings, sourceIndex, preLine, preColumn) {
     });
   });
 }
-function getSourceFile(sourcemap, line, column) {
-  const consumer = new SourceMapConsumer({
-    ...sourcemap,
-    version: sourcemap.version.toString()
-  });
-  return consumer.originalPositionFor({
-    line,
-    column
-  }).source;
-}
 
 async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
   const processor = postcss([
     {
       postcssPlugin: "postcss-attach-scope-qingkuai",
       Rule(rule) {
-        const { line, column } = rule.source.start;
-        if (map && getSourceFile(map, line, column) !== sourceFile) {
-          return;
-        }
         rule.selector = selectorParser((selectors) => {
           selectors.each((selector) => {
             const index = selector.nodes.findLastIndex(({ type }) => {
@@ -98,10 +83,10 @@ function qingkuaiPlugin() {
   let viteConfig;
   const compileResultCache = /* @__PURE__ */ new Map();
   const qingkuaiConfigurations = /* @__PURE__ */ new Map();
-  const qingkuaiPackageServeRE = /node_modules\/\.vite\/deps\/chunk.*$/;
+  const qingkuaiPackageServeRE = /node_modules\/\.vite\/deps\/chunk-.*$/;
   const confIdentifierRE = /__qk_expose_(?:dependencies|destructions)__/g;
   const styleIdRE = /^virtual:\[\d+\].*?\.qk.(?:css|s[ac]ss|less|stylus|postcss)\?\d{13}$/;
-  const qingkuaiPackageBuildRE = /node_modules\/qingkuai\/dist\/esm\/(?:chunks|runtime)\/\w+\.js$/;
+  const qingkuaiPackageBuildRE = /(?:node_modules)?\/qingkuai\/dist\/esm\/(?:chunks|runtime)\/\w+\.js$/;
   return {
     name: "qingkuai-compiler",
     config(_, env) {
@@ -127,7 +112,7 @@ function qingkuaiPlugin() {
       }
       if (importer?.endsWith(".qk") && !extname(id)) {
         const qingkuaiConfig = getQingkuaiConfiguration(id);
-        return id + (qingkuaiConfig.resolveImportExtension ? ".qk" : "");
+        return join(dirname(importer), id + (qingkuaiConfig.resolveImportExtension ? ".qk" : ""));
       }
     },
     async load(id) {
@@ -187,7 +172,7 @@ function qingkuaiPlugin() {
     async transform(src, id) {
       const qingkuaiConfig = getQingkuaiConfiguration(id);
       if (!id.endsWith(".qk")) {
-        if (isDev && qingkuaiPackageServeRE.test(id) || !isDev && qingkuaiPackageBuildRE.test(id)) {
+        if (qingkuaiPackageServeRE.test(id) || qingkuaiPackageBuildRE.test(id)) {
           const ret = src.replace(confIdentifierRE, (s) => {
             switch (s) {
               case "__qk_expose_dependencies__":

package/dist/temp-type/index.d.ts

@@ -1,2 +1,2 @@
-import type { Plugin } from "vite";
-export default function qingkuaiPlugin(): Plugin;
+import type { PluginOption } from "vite";
+export default function qingkuaiPlugin(): PluginOption;

package/dist/temp-type/scope.d.ts

@@ -1,5 +1,5 @@
 import type { SourceMap } from "./types";
-export declare function attachScopeForStyleSelectors(code: string, hash: string, map: SourceMap, sourceFile: string): Promise<{
+export declare function attachScopeForStyleSelectors(code: string, hash: string, sourceFile: string, map: SourceMap | undefined): Promise<{
     code: string;
     mappings: string;
 }>;

package/dist/temp-type/sourcemap.d.ts

@@ -1,4 +1,2 @@
-import type { SourceMap } from "./types";
 import type { SourceMapMappings } from "@jridgewell/sourcemap-codec";
 export declare function offsetSourceMap(mappings: string, sourceIndex: number, preLine: number, preColumn: number): SourceMapMappings;
-export declare function getSourceFile(sourcemap: SourceMap, line: number, column: number): string;

package/package.json

@@ -2,7 +2,7 @@
     "name": "vite-plugin-qingkuai",
     "author": "mlgq",
     "license": "MIT",
-    "version": "1.0.4",
+    "version": "1.0.6",
     "type": "module",
     "keywords": [
         "vite",
@@ -39,7 +39,6 @@
     "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0",
         "postcss": "^8.5.3",
-        "postcss-selector-parser": "^7.1.0",
-        "source-map-js": "^1.2.1"
+        "postcss-selector-parser": "^7.1.0"
     }
 }