@nuee/cli 0.3.0 → 0.4.0

package/dist/add.js

@@ -1,5 +1,5 @@
 import { mkdir, readFile, writeFile } from "node:fs/promises";
-import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
+import { dirname, isAbsolute, relative, resolve } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { defaultConfig, hasConfig, readConfig, resolveConfigAlias } from "./config.js";
 import { installDependencies } from "./dependencies.js";
@@ -49,11 +49,8 @@ function resolveTargetPath(uiDirectory, filePath) {
     }
     return targetPath;
 }
-function replaceTokenImport(source, targetPath, stylesDirectory) {
-    const tokenPath = join(stylesDirectory, "semantic.stylex");
-    const importPath = relative(dirname(targetPath), tokenPath).split(sep).join("/");
-    const relativeImportPath = importPath.startsWith(".") ? importPath : `./${importPath}`;
-    return source.replaceAll("@nuee/tokens/semantic.stylex", relativeImportPath);
+function replaceTokenImport(source, stylesAlias) {
+    return source.replaceAll("@nuee/tokens/semantic.stylex", `${stylesAlias}/semantic.stylex`);
 }
 function removeReducedMotionStyles(source) {
     const mediaQuery = '"@media (prefers-reduced-motion: reduce)":';
@@ -101,7 +98,6 @@ export async function add(projectDirectory, componentNames, options = {}) {
     const config = options["dry-run"] && shouldInitialize ? defaultConfig : await readConfig(projectDirectory);
     const resolvedList = await Promise.all(componentNameList.map(resolveComponent));
     const uiDirectory = await resolveConfigAlias(projectDirectory, config.aliases.ui, "aliases.ui");
-    const stylesDirectory = await resolveConfigAlias(projectDirectory, config.aliases.styles, "aliases.styles");
     let isOverwriteConfirmed = false;
     async function confirmOverwrite() {
         if (isOverwriteConfirmed)
@@ -115,8 +111,8 @@ export async function add(projectDirectory, componentNames, options = {}) {
             if (options["dry-run"])
                 continue;
             await writeSource(config.accessibility.respectReducedMotion
-                ? replaceTokenImport(file.content, targetPath, stylesDirectory)
-                : removeReducedMotionStyles(replaceTokenImport(file.content, targetPath, stylesDirectory)), targetPath, confirmOverwrite);
+                ? replaceTokenImport(file.content, config.aliases.styles)
+                : removeReducedMotionStyles(replaceTokenImport(file.content, config.aliases.styles)), targetPath, confirmOverwrite);
         }
     }
     const externalDependencySet = new Set();

package/dist/dependencies.js

@@ -18,7 +18,7 @@ export function installDependencies(projectDirectory, dependencies, isDevelopmen
         ? ["install", developmentFlag, ...dependencies].filter((argument) => Boolean(argument))
         : ["add", developmentFlag, ...dependencies].filter((argument) => Boolean(argument));
     return new Promise((resolvePromise, reject) => {
-        const child = spawn(packageManager, arguments_, { cwd: projectDirectory, stdio: "inherit" });
+        const child = spawn(packageManager, arguments_, { cwd: projectDirectory, stdio: "ignore" });
         child.on("error", reject);
         child.on("exit", (code) => {
             if (code === 0)

package/dist/init.js

@@ -37,38 +37,15 @@ function configureVite(source) {
     const importLine = 'import stylex from "@stylexjs/unplugin";';
     const pluginPattern = /plugins:\s*\[([^\]]*)\]/s;
     const stylexPlugin = 'stylex.vite({ unstable_moduleResolution: { type: "commonJS" } })';
-    const legacyStylexPluginPattern = /stylex\.vite\(\{\s*useCSSLayers:\s*true\s*\}\)/;
-    const emptyStylexPluginPattern = /stylex\.vite\(\)/;
-    const moduleResolutionPluginPattern = /stylex\.vite\(\{\s*unstable_moduleResolution:\s*\{\s*type:\s*["']commonJS["']\s*\},?\s*\}\)/s;
-    const nueeStylexPluginPattern = /stylex\.vite\(\{\s*(?:\/\/[^\n]*\s*)?(?:useCSSLayers:\s*true,?\s*)?aliases:\s*\{[^}]*\},\s*unstable_moduleResolution:\s*\{\s*type:\s*["']commonJS["'],\s*rootDir:\s*new URL\(["']\.["'],\s*import\.meta\.url\)\.pathname,?\s*\},\s*\}\)/s;
     if (!source.includes("stylex.vite(") && !pluginPattern.test(source)) {
         throw new Error("Could not safely update the Vite plugins array. Add stylex.vite() manually.");
     }
-    if (nueeStylexPluginPattern.test(source)) {
-        return source.replace(nueeStylexPluginPattern, stylexPlugin);
-    }
-    if (moduleResolutionPluginPattern.test(source))
+    if (source.includes("stylex.vite("))
         return source;
-    if (source.includes("unstable_moduleResolution")) {
-        throw new Error("Could not safely simplify the existing StyleX plugin. Remove Nuee's aliases and unstable_moduleResolution manually, then use stylex.vite().");
-    }
-    let withStylex = source;
-    if (legacyStylexPluginPattern.test(source)) {
-        withStylex = source.replace(legacyStylexPluginPattern, stylexPlugin);
-    }
-    else if (emptyStylexPluginPattern.test(source)) {
-        withStylex = source.replace(emptyStylexPluginPattern, stylexPlugin);
-    }
-    else if (source.includes("stylex.vite(")) {
-        throw new Error("Could not safely update the existing StyleX plugin. Configure stylex.vite() manually.");
-    }
-    else {
-        withStylex = (source.includes(importLine) ? source : `${importLine}\n${source}`).replace(pluginPattern, (_, plugins) => {
-            const prefix = plugins.trim() ? `${stylexPlugin}, ${plugins}` : stylexPlugin;
-            return `plugins: [${prefix}]`;
-        });
-    }
-    return withStylex;
+    return (source.includes(importLine) ? source : `${importLine}\n${source}`).replace(pluginPattern, (_, plugins) => {
+        const prefix = plugins.trim() ? `${stylexPlugin}, ${plugins}` : stylexPlugin;
+        return `plugins: [${prefix}]`;
+    });
 }
 async function writeViteFiles(projectDirectory, tokenDirectory, refreshLegacyTokens) {
     const { path: configPath, source: configSource } = await readViteConfig(projectDirectory);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuee/cli",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "private": false,
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@nuee/registry": "0.3.0",
+    "@nuee/registry": "0.4.0",
     "jsonc-parser": "^3.3.1"
   },
   "devDependencies": {