@varlet/cli 3.4.0 → 3.5.0-alpha.1726249557629

package/lib/node/commands/lint.js

@@ -1,4 +1,4 @@
-import execa from 'execa';
+import { x } from 'tinyexec';
 import { createSpinner } from 'nanospinner';
 import { CWD, ESLINT_EXTENSIONS } from '../shared/constant.js';
 import { isDir } from '../shared/fsUtils.js';
@@ -7,7 +7,7 @@ export async function lint() {
     const spinner = createSpinner();
     try {
         spinner.start({ text: 'prettier starting...' });
-        await execa('prettier', ['--write', '--cache', '.']);
+        await x('prettier', ['--write', '--cache', '.'], { nodeOptions: { stdio: 'inherit' }, throwOnError: true });
         spinner.success({ text: 'prettier success' });
         spinner.start({ text: 'eslint starting...' });
         const eslintPatterns = [
@@ -22,13 +22,13 @@ export async function lint() {
             './packages/varlet-ui-playground/src',
             './packages/varlet-import-resolver/src',
         ];
-        const { stdout } = await execa('eslint', [
+        const { stdout } = await x('eslint', [
             ...eslintPatterns.filter((pattern) => isDir(resolve(CWD, pattern))),
             '--fix',
             '--cache',
             '--ext',
             ESLINT_EXTENSIONS.join(),
-        ]);
+        ], { nodeOptions: { stdio: 'inherit' }, throwOnError: true });
         const type = stdout ? 'warn' : 'success';
         spinner[type]({ text: stdout || 'eslint success' });
     }

package/lib/node/commands/preview.js

@@ -1,6 +1,6 @@
 import fse from 'fs-extra';
 import logger from '../shared/logger.js';
-import execa from 'execa';
+import { x } from 'tinyexec';
 import { SITE_OUTPUT_PATH } from '../shared/constant.js';
 const { pathExistsSync } = fse;
 export async function preview() {
@@ -9,7 +9,7 @@ export async function preview() {
         return;
     }
     try {
-        await execa.command('live-server --port=5500', { cwd: SITE_OUTPUT_PATH }).stdout?.pipe(process.stdout);
+        await x('live-server', ['--port=5500'], { nodeOptions: { cwd: SITE_OUTPUT_PATH, stdio: 'inherit' } });
     }
     catch (e) {
         logger.error(e.toString());

package/lib/node/commands/test.js

@@ -1,4 +1,4 @@
-import execa from 'execa';
+import { x } from 'tinyexec';
 import { VITEST_CONFIG } from '../shared/constant.js';
 export async function test({ component, watch, coverage }) {
     process.env.NODE_ENV = 'test';
@@ -12,5 +12,5 @@ export async function test({ component, watch, coverage }) {
     if (component) {
         args.push('--dir', `src/${component.trim()}`);
     }
-    await execa('vitest', args, { stdin: 'inherit', stdout: 'inherit', stderr: 'inherit' });
+    await x('vitest', args, { nodeOptions: { stdio: 'inherit' }, throwOnError: true });
 }

package/lib/node/compiler/compileStyle.js

@@ -6,11 +6,8 @@ import { replaceExt, smartAppendFileSync } from '../shared/fsUtils.js';
 import { parse, resolve } from 'path';
 import { getScriptExtname } from './compileScript.js';
 import { CWD } from '../shared/constant.js';
-import { createRequire } from 'module';
 const { render: renderLess } = less;
-const { renderSync: renderScss } = sass;
 const { readFileSync, writeFileSync, unlinkSync } = fse;
-const require = createRequire(import.meta.url);
 export const EMPTY_SPACE_RE = /[\s]+/g;
 export const EMPTY_LINE_RE = /[\n\r]*/g;
 export const IMPORT_CSS_RE = /(?<!['"`])import\s+['"](\.{1,2}\/.+\.css)['"]\s*;?(?!\s*['"`])/g;
@@ -45,22 +42,10 @@ export async function compileLess(file) {
     writeFileSync(replaceExt(file, '.css'), compressCss(css), 'utf-8');
 }
 export function compileScss(file) {
-    const source = readFileSync(file, 'utf-8');
-    const { css } = renderScss({
-        data: source,
-        file,
-        importer(path) {
-            if (!path.endsWith('.scss') || !path.endsWith('.css')) {
-                path += '.scss';
-            }
-            if (path.startsWith('~')) {
-                path = path.replace('~', '');
-                path = require.resolve(path);
-            }
-            return { file: path };
-        },
+    const { css } = sass.compile(file, {
+        loadPaths: [resolve(CWD, 'node_modules')],
     });
-    writeFileSync(replaceExt(file, '.css'), compressCss(css.toString('utf8')), 'utf-8');
+    writeFileSync(replaceExt(file, '.css'), compressCss(css), 'utf-8');
 }
 export function clearLessFiles(dir) {
     glob.sync(`${dir}/**/*.less`).forEach(unlinkSync);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "3.4.0",
+  "version": "3.5.0-alpha.1726249557629",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -46,7 +46,7 @@
     "commander": "^8.3.0",
     "ejs": "^3.1.8",
     "esbuild": "0.19.3",
-    "execa": "^5.0.0",
+    "tinyexec": "^0.3.0",
     "fs-extra": "^9.0.1",
     "glob": "^7.2.0",
     "hash-sum": "^2.0.0",
@@ -61,8 +61,8 @@
     "vite": "5.0.10",
     "vitest": "2.0.5",
     "vue": "3.4.21",
-    "@varlet/vite-plugins": "3.4.0",
-    "@varlet/shared": "3.4.0"
+    "@varlet/shared": "3.5.0-alpha.1726249557629",
+    "@varlet/vite-plugins": "3.5.0-alpha.1726249557629"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.1",
@@ -75,9 +75,9 @@
     "@types/node": "^18.7.20",
     "@types/sharp": "0.31.1",
     "rimraf": "^5.0.1",
-    "@varlet/touch-emulator": "3.4.0",
-    "@varlet/icons": "3.4.0",
-    "@varlet/ui": "3.4.0"
+    "@varlet/icons": "3.5.0-alpha.1726249557629",
+    "@varlet/ui": "3.5.0-alpha.1726249557629",
+    "@varlet/touch-emulator": "3.5.0-alpha.1726249557629"
   },
   "peerDependencies": {
     "@vitest/coverage-istanbul": "2.0.5",
@@ -88,9 +88,9 @@
     "live-server": "^1.2.1",
     "vue": "3.4.21",
     "vue-router": "4.2.0",
-    "@varlet/touch-emulator": "3.4.0",
-    "@varlet/icons": "3.4.0",
-    "@varlet/ui": "3.4.0"
+    "@varlet/icons": "3.5.0-alpha.1726249557629",
+    "@varlet/ui": "3.5.0-alpha.1726249557629",
+    "@varlet/touch-emulator": "3.5.0-alpha.1726249557629"
   },
   "scripts": {
     "dev": "tsc --watch",