@salty-css/core 0.2.0-alpha.3 → 0.2.0-alpha.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/compiler/salty-compiler.cjs +2 -1
  2. package/compiler/salty-compiler.js +2 -1
  3. package/package.json +1 -1
package/compiler/salty-compiler.cjs CHANGED
@@ -278,7 +278,7 @@ ${currentFile}`;
278
278
  const destDir = await this.getDestDir();
279
279
  const coreConfigDest = path.join(destDir, "salty.config.js");
280
280
  const { config } = await this.importFile(coreConfigDest);
281
- return css_merge.mergeObjects(config, cached);
281
+ return css_merge.mergeObjects(cached, config);
282
282
  });
283
283
  /**
284
284
  * Generate CSS files based on the Salty CSS configuration and source files.
@@ -760,6 +760,7 @@ ${css}
760
760
  continue;
761
761
  }
762
762
  if (!resolved.generator) continue;
763
+ console.log(`config`, config);
763
764
  const generator = resolved.generator._withBuildContext({
764
765
  callerName: name,
765
766
  isProduction: this.isProduction,
package/compiler/salty-compiler.js CHANGED
@@ -258,7 +258,7 @@ ${currentFile}`;
258
258
  const destDir = await this.getDestDir();
259
259
  const coreConfigDest = join(destDir, "salty.config.js");
260
260
  const { config } = await this.importFile(coreConfigDest);
261
- return mergeObjects(config, cached);
261
+ return mergeObjects(cached, config);
262
262
  });
263
263
  /**
264
264
  * Generate CSS files based on the Salty CSS configuration and source files.
@@ -740,6 +740,7 @@ ${css}
740
740
  continue;
741
741
  }
742
742
  if (!resolved.generator) continue;
743
+ console.log(`config`, config);
743
744
  const generator = resolved.generator._withBuildContext({
744
745
  callerName: name,
745
746
  isProduction: this.isProduction,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@salty-css/core",
3
- "version": "0.2.0-alpha.3",
3
+ "version": "0.2.0-alpha.4",
4
4
  "main": "./dist/index.js",
5
5
  "module": "./dist/index.mjs",
6
6
  "typings": "./dist/index.d.ts",