@varlet/cli 2.22.2 → 2.22.3

package/lib/node/compiler/compileSFC.d.ts

@@ -3,5 +3,4 @@ export declare function replaceExportToDeclare(script: string): string;
 export declare function injectExport(script: string): string;
 export declare function injectScopeId(script: string, scopeId: string): string;
 export declare function injectRender(script: string, render: string): string;
-export declare function getFsPath(sfc: string, fsFile: string): string;
 export declare function compileSFC(sfc: string): Promise<void>;

package/lib/node/compiler/compileSFC.js

@@ -3,7 +3,7 @@ import hash from 'hash-sum';
 import { parse, resolve } from 'path';
 import { parse as parseSFC, compileTemplate, compileStyle, compileScript as compileScriptSFC, registerTS, } from '@vue/compiler-sfc';
 import { replaceExt, smartAppendFileSync } from '../shared/fsUtils.js';
-import { CWD, SRC_DIR, ES_DIR } from '../shared/constant.js';
+import { SRC_DIR, ES_DIR } from '../shared/constant.js';
 import { compileScript, getScriptExtname } from './compileScript.js';
 import ts from 'typescript';
 import { clearEmptyLine, compileLess, extractStyleDependencies, normalizeStyleDependency, STYLE_IMPORT_RE, } from './compileStyle.js';
@@ -34,16 +34,10 @@ export function injectRender(script, render) {
     script += `\n${SFC}.render = ${RENDER}`;
     return script;
 }
-export function getFsPath(sfc, fsFile) {
-    if (fsFile === 'tsconfig.json' || fsFile.startsWith('node_modules')) {
-        return resolve(CWD, fsFile);
-    }
-    return resolve(sfc.replace(ES_DIR, SRC_DIR), '..', fsFile);
-}
 export async function compileSFC(sfc) {
     const sources = await readFile(sfc, 'utf-8');
     const id = hash(sources);
-    const { descriptor } = parseSFC(sources, { sourceMap: false });
+    const { descriptor } = parseSFC(sources, { filename: sfc, sourceMap: false });
     const { script, scriptSetup, template, styles } = descriptor;
     let scriptContent;
     let bindingMetadata;
@@ -53,8 +47,8 @@ export async function compileSFC(sfc) {
                 id,
                 // issue https://github.com/varletjs/varlet/issues/1458
                 fs: {
-                    fileExists: (file) => existsSync(getFsPath(sfc, file)),
-                    readFile: (file) => readFileSync(getFsPath(sfc, file), 'utf-8'),
+                    fileExists: (file) => existsSync(file.replace(ES_DIR, SRC_DIR)),
+                    readFile: (file) => readFileSync(file.replace(ES_DIR, SRC_DIR), 'utf-8'),
                 },
             });
             scriptContent = content;

package/lib/node/compiler/compileScript.js

@@ -113,9 +113,9 @@ export async function compileScript(script, file) {
         code = resolveDependence(file, code);
         code = extractStyleDependencies(file, code, IMPORT_CSS_RE);
         code = extractStyleDependencies(file, code, IMPORT_LESS_RE);
-        removeSync(file);
-        writeFileSync(replaceExt(file, getScriptExtname()), code, 'utf8');
     }
+    removeSync(file);
+    writeFileSync(replaceExt(file, getScriptExtname()), code, 'utf8');
 }
 export async function compileScriptFile(file) {
     const sources = readFileSync(file, 'utf-8');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.22.2",
+  "version": "2.22.3",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -37,12 +37,12 @@
     "@varlet/release": "^0.2.1",
     "@babel/core": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
-    "@vitejs/plugin-vue": "5.0.1",
+    "@vitejs/plugin-vue": "5.0.3",
     "@vitejs/plugin-vue-jsx": "3.1.0",
-    "@vue/babel-plugin-jsx": "1.1.5",
-    "@vue/compiler-sfc": "3.4.3",
-    "@vue/runtime-core": "3.4.3",
-    "vue": "3.4.3",
+    "@vue/babel-plugin-jsx": "1.2.1",
+    "@vue/compiler-sfc": "3.4.15",
+    "@vue/runtime-core": "3.4.15",
+    "vue": "3.4.15",
     "vite": "5.0.10",
     "esbuild": "0.19.3",
     "vitest": "1.1.0",
@@ -64,8 +64,8 @@
     "slash": "^3.0.0",
     "typescript": "^5.1.5",
     "webfont": "11.2.26",
-    "@varlet/shared": "2.22.2",
-    "@varlet/vite-plugins": "2.22.2"
+    "@varlet/shared": "2.22.3",
+    "@varlet/vite-plugins": "2.22.3"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.1",
@@ -80,12 +80,12 @@
     "@types/semver": "^7.3.9",
     "@types/sharp": "0.31.1",
     "rimraf": "^5.0.1",
-    "@varlet/icons": "2.22.2",
-    "@varlet/touch-emulator": "2.22.2",
-    "@varlet/ui": "2.22.2"
+    "@varlet/ui": "2.22.3",
+    "@varlet/touch-emulator": "2.22.3",
+    "@varlet/icons": "2.22.3"
   },
   "peerDependencies": {
-    "@vue/runtime-core": "3.4.3",
+    "@vue/runtime-core": "3.4.15",
     "@vue/test-utils": "2.4.1",
     "@vitest/coverage-istanbul": "1.1.0",
     "vitest": "1.1.0",
@@ -93,11 +93,11 @@
     "clipboard": "^2.0.6",
     "live-server": "^1.2.1",
     "lodash-es": "^4.17.21",
-    "vue": "3.4.3",
+    "vue": "3.4.15",
     "vue-router": "4.2.0",
-    "@varlet/icons": "2.22.2",
-    "@varlet/touch-emulator": "2.22.2",
-    "@varlet/ui": "2.22.2"
+    "@varlet/ui": "2.22.3",
+    "@varlet/icons": "2.22.3",
+    "@varlet/touch-emulator": "2.22.3"
   },
   "scripts": {
     "dev": "tsc --watch",

package/template/generators/base/package.json

@@ -44,7 +44,7 @@
     "@varlet/shared": "workspace:*",
     "@varlet/ui": "workspace:*",
     "@vue/test-utils": "2.4.1",
-    "@vue/runtime-core": "3.4.3",
+    "@vue/runtime-core": "3.4.15",
     "@vitest/coverage-istanbul": "1.1.0",
     "jsdom": "22.1.0",
     "vitest": "1.1.0",
@@ -56,7 +56,7 @@
     "prettier": "^2.8.8",
     "simple-git-hooks": "^2.8.0",
     "typescript": "^5.1.5",
-    "vue": "3.4.3",
+    "vue": "3.4.15",
     "vue-router": "4.2.0"
   },
   "lint-staged": {