@salty-css/core 0.0.1-alpha.302 → 0.0.1-alpha.304

package/bin/main.cjs

@@ -7,6 +7,7 @@ const path = require("path");
 const ejs = require("ejs");
 const compiler_index = require("../compiler/index.cjs");
 const pascalCase = require("../pascal-case-By_l58S-.cjs");
+const saltyReset = require("../salty-reset-wJhVT2ys.cjs");
 const child_process = require("child_process");
 const ora = require("ora");
 const shouldRestart = require("../should-restart-DoaGoD5T.cjs");
@@ -34,9 +35,9 @@ async function formatWithPrettier(filePath) {
     const hasPrettier = hasPrettierInstalled();
     if (!hasPrettier) return;
     await execAsync(`./node_modules/.bin/prettier --write "${filePath}"`);
-    compiler_index.logger.info(`Formatted ${filePath} with Prettier`);
+    saltyReset.logger.info(`Formatted ${filePath} with Prettier`);
   } catch (error) {
-    compiler_index.logger.error(`Error formatting ${filePath} with Prettier:`, error);
+    saltyReset.logger.error(`Error formatting ${filePath} with Prettier:`, error);
   }
 }
 async function main() {
@@ -95,10 +96,10 @@ async function main() {
   };
   program.command("init [directory]").description("Initialize a new Salty-CSS project.").option("-d, --dir <dir>", "Project directory to initialize the project in.").option("--css-file <css-file>", "Existing CSS file where to import the generated CSS. Path must be relative to the given project directory.").option("--skip-install", "Skip installing dependencies.").action(async function(_dir = ".") {
     const packageJson = await readPackageJson().catch(() => void 0);
-    if (!packageJson) return compiler_index.logError("Salty CSS project must be initialized in a directory with a package.json file.");
-    compiler_index.logger.info("Initializing a new Salty-CSS project!");
+    if (!packageJson) return saltyReset.logError("Salty CSS project must be initialized in a directory with a package.json file.");
+    saltyReset.logger.info("Initializing a new Salty-CSS project!");
     const { dir = _dir, cssFile, skipInstall } = this.opts();
-    if (!dir) return compiler_index.logError("Project directory must be provided. Add it as the first argument after init command or use the --dir option.");
+    if (!dir) return saltyReset.logError("Project directory must be provided. Add it as the first argument after init command or use the --dir option.");
     if (!skipInstall) await npmInstall(packages.core, packages.react);
     const rootDir = process.cwd();
     const projectDir = resolveProjectDir(dir);
@@ -108,12 +109,12 @@ async function main() {
       const filePath = path.join(projectDir, fileName);
       const existingContent = await promises.readFile(filePath, "utf-8").catch(() => void 0);
       if (existingContent !== void 0) {
-        compiler_index.logger.debug("File already exists: " + filePath);
+        saltyReset.logger.debug("File already exists: " + filePath);
         return;
       }
       const additionalFolders = fileName.split("/").slice(0, -1).join("/");
       if (additionalFolders) await promises.mkdir(path.join(projectDir, additionalFolders), { recursive: true });
-      compiler_index.logger.info("Creating file: " + filePath);
+      saltyReset.logger.info("Creating file: " + filePath);
       await promises.writeFile(filePath, content);
       await formatWithPrettier(filePath);
     });
@@ -122,7 +123,7 @@ async function main() {
     const saltyrcPath = path.join(rootDir, ".saltyrc.json");
     const existingSaltyrc = await promises.readFile(saltyrcPath, "utf-8").catch(() => void 0);
     if (existingSaltyrc === void 0) {
-      compiler_index.logger.info("Creating file: " + saltyrcPath);
+      saltyReset.logger.info("Creating file: " + saltyrcPath);
       const rcContent = {
         $schema: "./node_modules/@salty-css/core/.saltyrc.schema.json",
         info: "This file is used to define projects and their configurations for Salty CSS cli. Do not delete, modify or add this file to .gitignore.",
@@ -146,7 +147,7 @@ async function main() {
         rcContent.projects = [...projects];
         const content = JSON.stringify(rcContent, null, 2);
         if (content !== existingSaltyrc) {
-          compiler_index.logger.info("Edit file: " + saltyrcPath);
+          saltyReset.logger.info("Edit file: " + saltyrcPath);
           await promises.writeFile(saltyrcPath, content);
           await formatWithPrettier(saltyrcPath);
         }
@@ -157,7 +158,7 @@ async function main() {
     if (gitIgnoreContent !== void 0) {
       const alreadyIgnoresSaltygen = gitIgnoreContent.includes("saltygen");
       if (!alreadyIgnoresSaltygen) {
-        compiler_index.logger.info("Edit file: " + gitIgnorePath);
+        saltyReset.logger.info("Edit file: " + gitIgnorePath);
         await promises.writeFile(gitIgnorePath, gitIgnoreContent + "\n\n# Salty-CSS\nsaltygen\n");
       }
     }
@@ -193,13 +194,13 @@ async function main() {
           const cssFileFolder = path.join(cssFilePath, "..");
           const relativePath = path.relative(cssFileFolder, path.join(projectDir, "saltygen/index.css"));
           const importStatement = `@import '${relativePath}';`;
-          compiler_index.logger.info("Adding global import statement to CSS file: " + cssFilePath);
+          saltyReset.logger.info("Adding global import statement to CSS file: " + cssFilePath);
           await promises.writeFile(cssFilePath, importStatement + "\n" + cssFileContent);
           await formatWithPrettier(cssFilePath);
         }
       }
     } else {
-      compiler_index.logger.warn("Could not find a CSS file to import the generated CSS. Please add it manually.");
+      saltyReset.logger.warn("Could not find a CSS file to import the generated CSS. Please add it manually.");
     }
     const eslintConfigs = {
       projectJs: path.join(projectDir, "eslint.config.js"),
@@ -213,10 +214,10 @@ async function main() {
     if (eslintConfigToUse) {
       if (!skipInstall) await npmInstall(packages.eslintConfigCore);
       const eslintConfigContent = await promises.readFile(eslintConfigToUse, "utf-8").catch(() => void 0);
-      if (!eslintConfigContent) return compiler_index.logError("Could not read ESLint config file.");
+      if (!eslintConfigContent) return saltyReset.logError("Could not read ESLint config file.");
       const alreadyHasSaltyConfig = eslintConfigContent.includes("salty-css");
       if (!alreadyHasSaltyConfig) {
-        compiler_index.logger.info("Edit file: " + eslintConfigToUse);
+        saltyReset.logger.info("Edit file: " + eslintConfigToUse);
         if (eslintConfigToUse.endsWith("js")) {
           const importStatement = 'import saltyCss from "@salty-css/eslint-config-core/flat";';
           let newContent = `${importStatement}
@@ -224,11 +225,11 @@ ${eslintConfigContent}`;
           const isTsEslint = eslintConfigContent.includes("typescript-eslint");
           if (isTsEslint) {
             if (newContent.includes(".config(")) newContent = newContent.replace(".config(", ".config(saltyCss,");
-            else compiler_index.logger.warn("Could not find the correct place to add the Salty-CSS config for ESLint. Please add it manually.");
+            else saltyReset.logger.warn("Could not find the correct place to add the Salty-CSS config for ESLint. Please add it manually.");
           } else {
             if (newContent.includes("export default [")) newContent = newContent.replace("export default [", "export default [ saltyCss,");
             else if (newContent.includes("eslintConfig = [")) newContent = newContent.replace("eslintConfig = [", "eslintConfig = [ saltyCss,");
-            else compiler_index.logger.warn("Could not find the correct place to add the Salty-CSS config for ESLint. Please add it manually.");
+            else saltyReset.logger.warn("Could not find the correct place to add the Salty-CSS config for ESLint. Please add it manually.");
           }
           await promises.writeFile(eslintConfigToUse, newContent);
           await formatWithPrettier(eslintConfigToUse);
@@ -247,13 +248,13 @@ ${eslintConfigContent}`;
     if (viteConfigContent !== void 0) {
       const alreadyHasPlugin = viteConfigContent.includes("saltyPlugin");
       if (!alreadyHasPlugin) {
-        compiler_index.logger.info("Edit file: " + viteConfigPath);
+        saltyReset.logger.info("Edit file: " + viteConfigPath);
         const pluginImport = "import { saltyPlugin } from '@salty-css/vite';\n";
         const pluginConfig = "saltyPlugin(__dirname),";
         const newContent = viteConfigContent.replace(/(plugins: \[)/, `$1
   ${pluginConfig}`);
         if (!skipInstall) await npmInstall(`-D ${packages.vite}`);
-        compiler_index.logger.info("Adding Salty-CSS plugin to Vite config...");
+        saltyReset.logger.info("Adding Salty-CSS plugin to Vite config...");
         await promises.writeFile(viteConfigPath, pluginImport + newContent);
         await formatWithPrettier(viteConfigPath);
       }
@@ -286,45 +287,45 @@ ${eslintConfigContent}`;
             });
           }
           if (!skipInstall) await npmInstall(`-D ${packages.next}`);
-          compiler_index.logger.info("Adding Salty-CSS plugin to Next.js config...");
+          saltyReset.logger.info("Adding Salty-CSS plugin to Next.js config...");
           await promises.writeFile(nextConfigPath, pluginImport + nextConfigContent);
           await formatWithPrettier(nextConfigPath);
         }
       }
     }
-    const packageJsonContent = await readPackageJson().catch(() => compiler_index.logError("Could not read package.json file.")).then((content) => {
+    const packageJsonContent = await readPackageJson().catch(() => saltyReset.logError("Could not read package.json file.")).then((content) => {
       if (!content.scripts) content.scripts = {};
       if (content.scripts.prepare) {
         const alreadyHasSaltyCss = content.scripts.prepare.includes("salty-css");
         if (!alreadyHasSaltyCss) {
-          compiler_index.logger.info("Edit file: " + defaultPackageJsonPath);
+          saltyReset.logger.info("Edit file: " + defaultPackageJsonPath);
           content.scripts.prepare = content.scripts.prepare + " && npx salty-css build";
         }
       } else {
-        compiler_index.logger.info("Edit file: " + defaultPackageJsonPath);
+        saltyReset.logger.info("Edit file: " + defaultPackageJsonPath);
         content.scripts.prepare = "npx salty-css build";
       }
       return content;
     });
     await updatePackageJson(packageJsonContent);
-    compiler_index.logger.info("Running the build to generate initial CSS...");
+    saltyReset.logger.info("Running the build to generate initial CSS...");
     await compiler_index.generateCss(projectDir);
-    compiler_index.logger.info("🎉 Salty CSS project initialized successfully!");
-    compiler_index.logger.info("Next steps:");
-    compiler_index.logger.info("1. Configure variables and templates in `salty.config.ts`");
-    compiler_index.logger.info("2. Create a new component with `npx salty-css generate [component-name]`");
-    compiler_index.logger.info("3. Run `npx salty-css build` to generate the CSS");
-    compiler_index.logger.info("4. Read about the features in the documentation: https://salty-css.dev");
-    compiler_index.logger.info("5. Star the project on GitHub: https://github.com/margarita-form/salty-css ⭐");
+    saltyReset.logger.info("🎉 Salty CSS project initialized successfully!");
+    saltyReset.logger.info("Next steps:");
+    saltyReset.logger.info("1. Configure variables and templates in `salty.config.ts`");
+    saltyReset.logger.info("2. Create a new component with `npx salty-css generate [component-name]`");
+    saltyReset.logger.info("3. Run `npx salty-css build` to generate the CSS");
+    saltyReset.logger.info("4. Read about the features in the documentation: https://salty-css.dev");
+    saltyReset.logger.info("5. Star the project on GitHub: https://github.com/margarita-form/salty-css ⭐");
   });
   program.command("build [directory]").alias("b").description("Build the Salty-CSS project.").option("-d, --dir <dir>", "Project directory to build the project in.").option("--watch", "Watch for changes and rebuild the project.").action(async function(_dir = defaultProject) {
-    compiler_index.logger.info("Building the Salty-CSS project...");
+    saltyReset.logger.info("Building the Salty-CSS project...");
     const { dir = _dir, watch } = this.opts();
-    if (!dir) return compiler_index.logError("Project directory must be provided. Add it as the first argument after build command or use the --dir option.");
+    if (!dir) return saltyReset.logError("Project directory must be provided. Add it as the first argument after build command or use the --dir option.");
     const projectDir = resolveProjectDir(dir);
     await compiler_index.generateCss(projectDir);
     if (watch) {
-      compiler_index.logger.info("Watching for changes in the project directory...");
+      saltyReset.logger.info("Watching for changes in the project directory...");
       fs.watch(projectDir, { recursive: true }, async (event, filePath) => {
         const shouldRestart$1 = await shouldRestart.checkShouldRestart(filePath);
         if (shouldRestart$1) {
@@ -338,8 +339,8 @@ ${eslintConfigContent}`;
   });
   program.command("generate [file] [directory]").alias("g").description("Generate a new component file.").option("-f, --file <file>", "File to generate.").option("-d, --dir <dir>", "Project directory to generate the file in.").option("-t, --tag <tag>", "HTML tag of the component.", "div").option("-n, --name <name>", "Name of the component.").option("-c, --className <className>", "CSS class of the component.").option("-r, --reactComponent", "Generate a React component as well.").action(async function(_file, _dir = defaultProject) {
     const { file = _file, dir = _dir, tag, name, className, reactComponent = false } = this.opts();
-    if (!file) return compiler_index.logError("File to generate must be provided. Add it as the first argument after generate command or use the --file option.");
-    if (!dir) return compiler_index.logError("Project directory must be provided. Add it as the second argument after generate command or use the --dir option.");
+    if (!file) return saltyReset.logError("File to generate must be provided. Add it as the first argument after generate command or use the --file option.");
+    if (!dir) return saltyReset.logError("Project directory must be provided. Add it as the second argument after generate command or use the --dir option.");
     const projectDir = resolveProjectDir(dir);
     const additionalFolders = file.split("/").slice(0, -1).join("/");
     if (additionalFolders) await promises.mkdir(path.join(projectDir, additionalFolders), { recursive: true });
@@ -355,7 +356,7 @@ ${eslintConfigContent}`;
     const formattedStyledFilePath = path.format(parsedFilePath);
     const alreadyExists = await promises.readFile(formattedStyledFilePath, "utf-8").catch(() => void 0);
     if (alreadyExists !== void 0) {
-      compiler_index.logger.error("File already exists:", formattedStyledFilePath);
+      saltyReset.logger.error("File already exists:", formattedStyledFilePath);
       return;
     }
     let styledComponentName = pascalCase.pascalCase(name || parsedFilePath.base.replace(/\.css\.\w+$/, ""));
@@ -368,23 +369,23 @@ ${eslintConfigContent}`;
       parsedFilePath.ext = ".tsx";
       parsedFilePath.base = parsedFilePath.name + parsedFilePath.ext;
       const formattedReactFilePath = path.format(parsedFilePath);
-      compiler_index.logger.info("Generating a new file: " + formattedReactFilePath);
+      saltyReset.logger.info("Generating a new file: " + formattedReactFilePath);
       await promises.writeFile(formattedReactFilePath, reactContent);
       await formatWithPrettier(formattedReactFilePath);
     }
     const { content } = await readTemplate("react/react-styled-file.ts", { tag, name: styledComponentName, className });
-    compiler_index.logger.info("Generating a new file: " + formattedStyledFilePath);
+    saltyReset.logger.info("Generating a new file: " + formattedStyledFilePath);
     await promises.writeFile(formattedStyledFilePath, content);
     await formatWithPrettier(formattedStyledFilePath);
   });
   const getSaltyCssPackages = async () => {
     const packageJSONPath = path.join(process.cwd(), "package.json");
-    const packageJson = await readPackageJson(packageJSONPath).catch((err) => compiler_index.logError(err));
-    if (!packageJson) return compiler_index.logError("Could not read package.json file.");
+    const packageJson = await readPackageJson(packageJSONPath).catch((err) => saltyReset.logError(err));
+    if (!packageJson) return saltyReset.logError("Could not read package.json file.");
     const allDependencies = { ...packageJson.dependencies, ...packageJson.devDependencies };
     const saltyCssPackages = Object.entries(allDependencies).filter(([name]) => name === "salty-css" || name.startsWith("@salty-css/"));
     if (!saltyCssPackages.length) {
-      return compiler_index.logError(
+      return saltyReset.logError(
         "No Salty-CSS packages found in package.json. Make sure you are running update command in the same directory! Used package.json path: " + packageJSONPath
       );
     }
@@ -393,19 +394,19 @@ ${eslintConfigContent}`;
   program.command("update [version]").alias("up").description("Update Salty-CSS packages to the latest or specified version.").option("-v, --version <version>", "Version to update to.").option("--legacy-peer-deps <legacyPeerDeps>", "Use legacy peer dependencies (not recommended).", false).action(async function(_version = "latest") {
     const { legacyPeerDeps, version = _version } = this.opts();
     const saltyCssPackages = await getSaltyCssPackages();
-    if (!saltyCssPackages) return compiler_index.logError("Could not update Salty-CSS packages as any were found in package.json.");
+    if (!saltyCssPackages) return saltyReset.logError("Could not update Salty-CSS packages as any were found in package.json.");
     const packagesToUpdate = saltyCssPackages.map(([name]) => {
       if (version === "@") return `${name}@${currentPackageJson.version}`;
       return `${name}@${version.replace(/^@/, "")}`;
     });
     if (legacyPeerDeps) {
-      compiler_index.logger.warn("Using legacy peer dependencies to update packages.");
+      saltyReset.logger.warn("Using legacy peer dependencies to update packages.");
       await npmInstall(...packagesToUpdate, "--legacy-peer-deps");
     } else {
       await npmInstall(...packagesToUpdate);
     }
     const updatedPackages = await getSaltyCssPackages();
-    if (!updatedPackages) return compiler_index.logError("Something went wrong while reading the updated packages.");
+    if (!updatedPackages) return saltyReset.logError("Something went wrong while reading the updated packages.");
     const mappedByVersions = updatedPackages.reduce((acc, [name, version2]) => {
       if (!acc[version2]) acc[version2] = [];
       acc[version2].push(name);
@@ -415,29 +416,29 @@ ${eslintConfigContent}`;
     if (versionsCount === 1) {
       const version2 = Object.keys(mappedByVersions)[0];
       const versionString = version2.replace(/^\^/, "");
-      compiler_index.logger.info(`Updated to all Salty CSS packages successfully to ${versionString}`);
+      saltyReset.logger.info(`Updated to all Salty CSS packages successfully to ${versionString}`);
     } else {
       for (const [version2, names] of Object.entries(mappedByVersions)) {
         const versionString = version2.replace(/^\^/, "");
-        compiler_index.logger.info(`Updated to ${versionString}: ${names.join(", ")}`);
+        saltyReset.logger.info(`Updated to ${versionString}: ${names.join(", ")}`);
       }
     }
   });
   program.option("-v, --version", "Show the current version of Salty-CSS.").action(async function() {
     const currentPackageJson2 = await readThisPackageJson();
-    compiler_index.logger.info("CLI is running: " + currentPackageJson2.version);
+    saltyReset.logger.info("CLI is running: " + currentPackageJson2.version);
     const packageJSONPath = path.join(process.cwd(), "package.json");
-    const packageJson = await readPackageJson(packageJSONPath).catch((err) => compiler_index.logError(err));
+    const packageJson = await readPackageJson(packageJSONPath).catch((err) => saltyReset.logError(err));
     if (!packageJson) return;
     const allDependencies = { ...packageJson.dependencies, ...packageJson.devDependencies };
     const saltyCssPackages = Object.keys(allDependencies).filter((dep) => dep === "salty-css" || dep.startsWith("@salty-css/"));
     if (!saltyCssPackages.length) {
-      return compiler_index.logError(
+      return saltyReset.logError(
         "No Salty-CSS packages found in package.json. Make sure you are running update command in the same directory! Used package.json path: " + packageJSONPath
       );
     }
     for (const dep of saltyCssPackages) {
-      compiler_index.logger.info(`${dep}: ${allDependencies[dep]}`);
+      saltyReset.logger.info(`${dep}: ${allDependencies[dep]}`);
     }
   });
   program.parseAsync(process.argv);

package/bin/main.js

@@ -3,8 +3,9 @@ import { existsSync, watch } from "fs";
 import { mkdir, readFile, writeFile } from "fs/promises";
 import { join, relative, parse, format } from "path";
 import { render } from "ejs";
-import { l as logger, a as logError, generateCss, isSaltyFile, generateFile } from "../compiler/index.js";
+import { generateCss, isSaltyFile, generateFile } from "../compiler/index.js";
 import { p as pascalCase } from "../pascal-case-F3Usi5Wf.js";
+import { l as logger, b as logError } from "../salty-reset-StBt2yzJ.js";
 import { exec } from "child_process";
 import ora from "ora";
 import { c as checkShouldRestart } from "../should-restart-5jI-bzz0.js";

package/cache/resolve-dynamic-config-cache.cjs

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const promises = require("fs/promises");
 const path = require("path");
-const helpers = require("../helpers-wv74jTRI.cjs");
+const compiler_helpers = require("../compiler/helpers.cjs");
 const resolveDynamicConfigCache = async () => {
-  const corePackageRoot = helpers.getCorePackageRoot();
+  const corePackageRoot = compiler_helpers.getCorePackageRoot();
   const coreConfigDest = path.join(corePackageRoot, "cache/config-cache.json");
   const contents = await promises.readFile(coreConfigDest, "utf8");
   if (!contents) throw new Error("Could not find config cache file");

package/cache/resolve-dynamic-config-cache.js

@@ -1,6 +1,6 @@
 import { readFile } from "fs/promises";
 import { join } from "path";
-import { g as getCorePackageRoot } from "../helpers-DM2fbDDz.js";
+import { getCorePackageRoot } from "../compiler/helpers.js";
 const resolveDynamicConfigCache = async () => {
   const corePackageRoot = getCorePackageRoot();
   const coreConfigDest = join(corePackageRoot, "cache/config-cache.json");