vite-plugin-qingkuai 1.0.5 → 1.0.7

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,24 +41,13 @@ 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) {
+        if (rule.parent && "name" in rule?.parent && rule.parent.name === "keyframes") {
           return;
         }
         rule.selector = selectorParser((selectors) => {
@@ -129,7 +117,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) {
@@ -175,6 +163,7 @@ function qingkuaiPlugin() {
             style.loc.start.column - 1
           )
         );
+        console.log(attachScopeResult.code);
         return {
           code: attachScopeResult.code,
           map: {

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,24 +39,13 @@ 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) {
+        if (rule.parent && "name" in rule?.parent && rule.parent.name === "keyframes") {
           return;
         }
         rule.selector = selectorParser((selectors) => {
@@ -127,7 +115,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) {
@@ -173,6 +161,7 @@ function qingkuaiPlugin() {
             style.loc.start.column - 1
           )
         );
+        console.log(attachScopeResult.code);
         return {
           code: attachScopeResult.code,
           map: {

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.5",
+    "version": "1.0.7",
     "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"
     }
 }