@nooeh/cli 0.2.6 → 0.2.8

package/dist/doctor.js

@@ -55,7 +55,7 @@ async function hasStylexCompiler(projectDirectory) {
         "rspack.config.js",
     ];
     const sources = await Promise.all(configFileNames.map(async (fileName) => readProjectFile(projectDirectory, fileName)));
-    return sources.some((source) => source?.includes("@stylexjs/unplugin") && source.includes("stylex.vite("));
+    return sources.some((source) => source?.includes("@stylexjs/unplugin") && /\b(?:stylex|unplugin)\.vite\(/.test(source));
 }
 function hasDependency(packageJson, dependency) {
     return Boolean(packageJson?.dependencies?.[dependency] ?? packageJson?.devDependencies?.[dependency]);
@@ -81,12 +81,7 @@ export async function doctor(projectDirectory) {
                 name: "UI path",
                 status: "pass",
             });
-            const tokenFiles = [
-                "color-palette.stylex.ts",
-                "semantic.stylex.ts",
-                "themes.stylex.ts",
-                "theme-provider.tsx",
-            ];
+            const tokenFiles = ["color-palette.stylex.ts", "semantic.stylex.ts", "themes.stylex.ts"];
             const hasTokenFiles = await Promise.all(tokenFiles.map(async (fileName) => {
                 try {
                     await access(resolve(tokenDirectory, fileName));

package/dist/init.js

@@ -36,9 +36,10 @@ async function readViteConfig(projectDirectory) {
 function configureVite(source) {
     const importLine = 'import stylex from "@stylexjs/unplugin";';
     const pluginPattern = /plugins:\s*\[([^\]]*)\]/s;
-    const stylexPlugin = "stylex.vite()";
+    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 nooehStylexPluginPattern = /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.");
@@ -46,6 +47,8 @@ function configureVite(source) {
     if (nooehStylexPluginPattern.test(source)) {
         return source.replace(nooehStylexPluginPattern, stylexPlugin);
     }
+    if (moduleResolutionPluginPattern.test(source))
+        return source;
     if (source.includes("unstable_moduleResolution")) {
         throw new Error("Could not safely simplify the existing StyleX plugin. Remove Nooeh's aliases and unstable_moduleResolution manually, then use stylex.vite().");
     }
@@ -70,28 +73,43 @@ function configureVite(source) {
 async function writeViteFiles(projectDirectory, tokenDirectory, refreshLegacyTokens) {
     const { path: configPath, source: configSource } = await readViteConfig(projectDirectory);
     const configuredVite = configureVite(configSource);
+    await addResetImport(projectDirectory);
     await writeNooehFiles(projectDirectory, tokenDirectory, refreshLegacyTokens);
     await writeFile(configPath, configuredVite, "utf8");
     console.log(`Configured Vite and created ${relative(projectDirectory, tokenDirectory)}.`);
 }
+async function addResetImport(projectDirectory) {
+    const cssPath = join(projectDirectory, "src/index.css");
+    const resetImport = '@import "@nooeh/ui/reset.css";';
+    try {
+        const source = await readFile(cssPath, "utf8");
+        if (source.includes(resetImport))
+            return;
+        await writeFile(cssPath, `${resetImport}\n\n${source}`, "utf8");
+    }
+    catch (error) {
+        if (typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT") {
+            await writeFile(cssPath, `${resetImport}\n`, "utf8");
+            return;
+        }
+        throw error;
+    }
+}
 async function writeNooehFiles(projectDirectory, tokenDirectory, refreshLegacyTokens = false) {
     await mkdir(tokenDirectory, { recursive: true });
     for (const file of await getTokenFiles()) {
         await writeTokenFile(join(tokenDirectory, file.name), file.content, refreshLegacyTokens, file.name);
     }
 }
-function isLegacyNooehSource(fileName, source) {
-    if (fileName === "semantic.stylex.ts") {
-        return source.includes('bgCanvas: "initial"') && source.includes('overlay: "initial"');
-    }
-    return (fileName === "theme-provider.tsx" &&
-        source.includes("const styles = stylex.create({") &&
-        source.includes("data-theme={resolvedTheme}"));
+function isLegacySemanticSource(fileName, source) {
+    return (fileName === "semantic.stylex.ts" &&
+        source.includes('bgCanvas: "initial"') &&
+        source.includes('overlay: "initial"'));
 }
 async function writeTokenFile(path, source, shouldRefreshLegacySources, fileName) {
     try {
         const currentSource = await readFile(path, "utf8");
-        if (shouldRefreshLegacySources && isLegacyNooehSource(fileName, currentSource)) {
+        if (shouldRefreshLegacySources && isLegacySemanticSource(fileName, currentSource)) {
             await writeFile(path, source, "utf8");
         }
     }
@@ -125,7 +143,7 @@ export async function init(projectDirectory, options) {
         if (!options["skip-dependencies"]) {
             await installDependencies(projectDirectory, ["@stylexjs/stylex"]);
             if (options.framework === "vite") {
-                await installDependencies(projectDirectory, ["@stylexjs/unplugin"], true);
+                await installDependencies(projectDirectory, ["@nooeh/ui", "@stylexjs/unplugin"], true);
             }
         }
         if (options.framework === "vite") {

package/package.json

@@ -1,7 +1,11 @@
 {
   "name": "@nooeh/cli",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "private": false,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/nooeh/ui.git"
+  },
   "bin": {
     "nooeh": "./dist/cli.js"
   },