@salty-css/core 0.2.0-fix-astro-fixes-06-2026.3 → 0.2.0

package/bin/main.cjs

@@ -613,7 +613,7 @@ const ensureGitignoreSaltygen = async (rootDir) => {
   compiler_saltyCompiler.logger.info("Edit file: " + path$1);
   await promises.writeFile(path$1, existing + "\n\n# Salty-CSS\nsaltygen\n");
 };
-const importSaltygenIntoCss = async (projectDir, saltygenDir, explicitCssFile) => {
+const importSaltygenIntoCss = async (projectDir, explicitCssFile) => {
   const target = explicitCssFile ?? await findGlobalCssFile(projectDir);
   if (!target) {
     compiler_saltyCompiler.logger.warn("Could not find a CSS file to import the generated CSS. Please add it manually.");
@@ -624,7 +624,7 @@ const importSaltygenIntoCss = async (projectDir, saltygenDir, explicitCssFile) =
   if (cssFileContent === void 0) return;
   if (cssFileContent.includes("saltygen")) return;
   const cssFileFolder = path.join(cssFilePath, "..");
-  const relPath = path.relative(cssFileFolder, path.join(saltygenDir, "saltygen/index.css"));
+  const relPath = path.relative(cssFileFolder, path.join(projectDir, "saltygen/index.css"));
   compiler_saltyCompiler.logger.info("Adding global import statement to CSS file: " + cssFilePath);
   await promises.writeFile(cssFilePath, `@import '${relPath}';
 ` + cssFileContent);
@@ -649,7 +649,6 @@ const registerInitCommand = (program) => {
       compiler_saltyCompiler.logger.info("Initializing a new Salty-CSS project!");
       const framework = await detectFramework(ctx);
       compiler_saltyCompiler.logger.info(`Detected framework: ${framework.name}`);
-      const sourceDir = path.join(ctx.projectDir, framework.srcDirectory);
       const plannedIntegrations = await planIntegrations(ctx);
       if (!ctx.skipInstall) {
         const packages = [
@@ -661,8 +660,8 @@ const registerInitCommand = (program) => {
         await npmInstall(...packages);
       }
       const projectFiles = await Promise.all([readTemplate("salty.config.ts"), readTemplate("saltygen/index.css")]);
-      await promises.mkdir(sourceDir, { recursive: true });
-      await Promise.all(projectFiles.map(({ fileName, content }) => writeProjectFile(sourceDir, fileName, content)));
+      await promises.mkdir(ctx.projectDir, { recursive: true });
+      await Promise.all(projectFiles.map(({ fileName, content }) => writeProjectFile(ctx.projectDir, fileName, content)));
       const pathDefaults = computePathDefaults({
         framework: framework.name,
         integrations: plannedIntegrations.map((p) => p.name),
@@ -670,11 +669,11 @@ const registerInitCommand = (program) => {
       });
       await writeProjectToRc(ctx.cwd, ctx.relativeProjectPath, framework, pathDefaults);
       await ensureGitignoreSaltygen(ctx.cwd);
-      await importSaltygenIntoCss(ctx.projectDir, sourceDir, opts.cssFile);
+      await importSaltygenIntoCss(ctx.projectDir, opts.cssFile);
       await applyIntegrationPlans(plannedIntegrations);
       await wirePrepareScript();
       compiler_saltyCompiler.logger.info("Running the build to generate initial CSS...");
-      const compiler = new compiler_saltyCompiler.SaltyCompiler(sourceDir);
+      const compiler = new compiler_saltyCompiler.SaltyCompiler(ctx.projectDir);
       await compiler.generateCss();
       compiler_saltyCompiler.logger.info("🎉 Salty CSS project initialized successfully!");
       compiler_saltyCompiler.logger.info("Next steps:");

package/bin/main.js

@@ -610,7 +610,7 @@ const ensureGitignoreSaltygen = async (rootDir) => {
   logger.info("Edit file: " + path);
   await writeFile(path, existing + "\n\n# Salty-CSS\nsaltygen\n");
 };
-const importSaltygenIntoCss = async (projectDir, saltygenDir, explicitCssFile) => {
+const importSaltygenIntoCss = async (projectDir, explicitCssFile) => {
   const target = explicitCssFile ?? await findGlobalCssFile(projectDir);
   if (!target) {
     logger.warn("Could not find a CSS file to import the generated CSS. Please add it manually.");
@@ -621,7 +621,7 @@ const importSaltygenIntoCss = async (projectDir, saltygenDir, explicitCssFile) =
   if (cssFileContent === void 0) return;
   if (cssFileContent.includes("saltygen")) return;
   const cssFileFolder = join(cssFilePath, "..");
-  const relPath = relative(cssFileFolder, join(saltygenDir, "saltygen/index.css"));
+  const relPath = relative(cssFileFolder, join(projectDir, "saltygen/index.css"));
   logger.info("Adding global import statement to CSS file: " + cssFilePath);
   await writeFile(cssFilePath, `@import '${relPath}';
 ` + cssFileContent);
@@ -646,7 +646,6 @@ const registerInitCommand = (program) => {
       logger.info("Initializing a new Salty-CSS project!");
       const framework = await detectFramework(ctx);
       logger.info(`Detected framework: ${framework.name}`);
-      const sourceDir = join(ctx.projectDir, framework.srcDirectory);
       const plannedIntegrations = await planIntegrations(ctx);
       if (!ctx.skipInstall) {
         const packages = [
@@ -658,8 +657,8 @@ const registerInitCommand = (program) => {
         await npmInstall(...packages);
       }
       const projectFiles = await Promise.all([readTemplate("salty.config.ts"), readTemplate("saltygen/index.css")]);
-      await mkdir(sourceDir, { recursive: true });
-      await Promise.all(projectFiles.map(({ fileName, content }) => writeProjectFile(sourceDir, fileName, content)));
+      await mkdir(ctx.projectDir, { recursive: true });
+      await Promise.all(projectFiles.map(({ fileName, content }) => writeProjectFile(ctx.projectDir, fileName, content)));
       const pathDefaults = computePathDefaults({
         framework: framework.name,
         integrations: plannedIntegrations.map((p) => p.name),
@@ -667,11 +666,11 @@ const registerInitCommand = (program) => {
       });
       await writeProjectToRc(ctx.cwd, ctx.relativeProjectPath, framework, pathDefaults);
       await ensureGitignoreSaltygen(ctx.cwd);
-      await importSaltygenIntoCss(ctx.projectDir, sourceDir, opts.cssFile);
+      await importSaltygenIntoCss(ctx.projectDir, opts.cssFile);
       await applyIntegrationPlans(plannedIntegrations);
       await wirePrepareScript();
       logger.info("Running the build to generate initial CSS...");
-      const compiler = new SaltyCompiler(sourceDir);
+      const compiler = new SaltyCompiler(ctx.projectDir);
       await compiler.generateCss();
       logger.info("🎉 Salty CSS project initialized successfully!");
       logger.info("Next steps:");

package/compiler/salty-compiler.cjs

@@ -278,7 +278,7 @@ ${currentFile}`;
       const destDir = await this.getDestDir();
       const coreConfigDest = path.join(destDir, "salty.config.js");
       const { config } = await this.importFile(coreConfigDest);
-      return css_merge.mergeObjects(config, cached);
+      return css_merge.mergeObjects(cached, config);
     });
     /**
      * Generate CSS files based on the Salty CSS configuration and source files.
@@ -760,6 +760,7 @@ ${css}
               continue;
             }
             if (!resolved.generator) continue;
+            console.log(`config`, config);
             const generator = resolved.generator._withBuildContext({
               callerName: name,
               isProduction: this.isProduction,

package/compiler/salty-compiler.js

@@ -258,7 +258,7 @@ ${currentFile}`;
       const destDir = await this.getDestDir();
       const coreConfigDest = join(destDir, "salty.config.js");
       const { config } = await this.importFile(coreConfigDest);
-      return mergeObjects(config, cached);
+      return mergeObjects(cached, config);
     });
     /**
      * Generate CSS files based on the Salty CSS configuration and source files.
@@ -740,6 +740,7 @@ ${css}
               continue;
             }
             if (!resolved.generator) continue;
+            console.log(`config`, config);
             const generator = resolved.generator._withBuildContext({
               callerName: name,
               isProduction: this.isProduction,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salty-css/core",
-  "version": "0.2.0-fix-astro-fixes-06-2026.3",
+  "version": "0.2.0",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "typings": "./dist/index.d.ts",