@salty-css/next 0.1.0-alpha.33 → 0.1.0-alpha.35

package/README.md

@@ -617,6 +617,8 @@ And note: steps 2 & 3 are just to show how get new components up and running, st
 - **Next.js 15:** In `next.config.ts` add import for salty plugin `import { withSaltyCss } from '@salty-css/next';` and then add `withSaltyCss` to wrap your nextConfig export like so `export default withSaltyCss(nextConfig);`
 - **Next.js 14 and older:** In `next.config.js` add import for salty plugin `const { withSaltyCss } = require('@salty-css/next');` and then add `withSaltyCss` to wrap your nextConfig export like so `module.exports = withSaltyCss(nextConfig);`
 
+Both Webpack and Turbopack are supported. `withSaltyCss` auto-detects which bundler Next.js is using (`next dev --turbopack` sets `process.env.TURBOPACK=1`), so no extra config is required. To force a specific bundler, pass `{ bundler: 'webpack' | 'turbopack' }` as the second argument.
+
 4. Make sure that `salty.config.ts` and `next.config.ts` are in the same folder!
 5. Build `saltygen` directory by running your app once or with cli `npx salty-css build [directory]`
 6. Import global styles from `saltygen/index.css` to some global css file with `@import 'insert_path_to_index_css';`.

package/detect-bundler.d.ts

@@ -0,0 +1,12 @@
+import { SaltyCompilerMode } from '@salty-css/core/compiler/salty-compiler';
+export type Bundler = 'webpack' | 'turbopack';
+export type BundlerOption = Bundler | 'auto';
+export declare const resolveBundler: (option: BundlerOption | undefined) => Bundler;
+export type TurbopackLoaderRule = {
+    loaders: Array<{
+        loader: string;
+        options: Record<string, unknown>;
+    }>;
+    as: string;
+};
+export declare const buildSaltyTurbopackRules: (dir: string, mode?: SaltyCompilerMode) => Record<string, TurbopackLoaderRule>;

package/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const n=require("@salty-css/webpack"),s=(a,u={})=>{const{webpack:e,...i}=a;return{...i,webpack(t,r){const{dir:l,isServer:c}=r;return n.saltyPlugin(t,l,c,!1,{mode:u.mode}),e&&typeof e=="function"&&e(t,r),t}}};exports.default=s;exports.withSaltyCss=s;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const u=require("@salty-css/core/compiler/helpers"),d=require("@salty-css/webpack"),b=require("fs"),p=require("path"),y=require("@salty-css/core/compiler/salty-compiler"),k=require("@salty-css/core/server"),m=e=>e&&e!=="auto"?e:process.env.TURBOPACK!==void 0?"turbopack":"webpack",w=(e,t)=>{const r={},s={dir:e};t!==void 0&&(s.mode=t);const o={loader:"@salty-css/webpack/loader",options:s};for(const a of u.saltyFileExtensions)r[`**/*.${a}.ts`]={loaders:[o],as:"*.ts"},r[`**/*.${a}.tsx`]={loaders:[o],as:"*.tsx"};return r},f=(e,t={})=>{const{webpack:r,...s}=e;return{...s,webpack(o,a){const{dir:c,isServer:l}=a;return d.saltyPlugin(o,c,l,!1,{mode:t.mode}),r&&typeof r=="function"&&r(o,a),o}}},n=new Map,h=(e,t)=>{const r=`${e}|${t??""}`;if(n.get(r))return;n.set(r,!0);const s=new y.SaltyCompiler(e,{mode:t});s.generateCss().then(()=>{b.watch(e,{recursive:!0},async(o,a)=>{if(!a)return;const c=p.resolve(e,a.toString());await k.checkShouldRestart(c)?await s.generateCss():u.isSaltyFile(c)&&await s.generateFile(c)})}).catch(o=>{n.set(r,!1),console.error("[salty-css/next] failed to initialize Turbopack runtime:",o)})},S=(e,t={})=>{const r=e.turbopack??{},s=t.dir??r.root??process.cwd(),o=w(s,t.mode),c={...r.rules??{},...o};return h(s,t.mode),{...e,turbopack:{...r,rules:c}}},i=(e,t={})=>m(t.bundler)==="turbopack"?S(e,{mode:t.mode,dir:t.dir}):f(e,{mode:t.mode});exports.default=i;exports.withSaltyCss=i;

package/index.d.ts

@@ -1,12 +1,30 @@
 import { SaltyCompilerMode } from '@salty-css/core/compiler/salty-compiler';
+import { BundlerOption } from './detect-bundler';
 type AnyRecord = Record<any, any>;
+export type { Bundler, BundlerOption } from './detect-bundler';
 export interface SaltyNextOptions {
     /**
      * Explicit build mode. Defaults to NODE_ENV-based detection.
      */
     mode?: SaltyCompilerMode;
+    /**
+     * Force a specific bundler integration. Defaults to 'auto', which picks
+     * turbopack when `process.env.TURBOPACK === '1'` (set by `next dev --turbopack`)
+     * and webpack otherwise.
+     */
+    bundler?: BundlerOption;
+    /**
+     * Project root directory used by the Turbopack runtime (the webpack path
+     * receives `dir` from Next.js itself). Defaults to `nextConfig.turbopack.root`
+     * or `process.cwd()`.
+     */
+    dir?: string;
 }
-export declare const withSaltyCss: <T extends AnyRecord>(nextConfig: T, saltyOptions?: SaltyNextOptions) => Omit<T, "webpack"> & {
-    webpack(config: any, options: any): any;
-};
+export declare const withSaltyCss: <T extends AnyRecord>(nextConfig: T, options?: SaltyNextOptions) => (T & {
+    turbopack: {
+        rules: any;
+    };
+}) | (Omit<T, "webpack"> & {
+    webpack(config: any, webpackOptions: any): any;
+});
 export default withSaltyCss;

package/index.js

@@ -1,15 +1,50 @@
-import { saltyPlugin as i } from "@salty-css/webpack";
-const m = (s, a = {}) => {
-  const { webpack: e, ...n } = s;
+import { saltyFileExtensions as u, isSaltyFile as i } from "@salty-css/core/compiler/helpers";
+import { saltyPlugin as d } from "@salty-css/webpack";
+import { watch as m } from "fs";
+import { resolve as p } from "path";
+import { SaltyCompiler as b } from "@salty-css/core/compiler/salty-compiler";
+import { checkShouldRestart as f } from "@salty-css/core/server";
+const k = (e) => e && e !== "auto" ? e : process.env.TURBOPACK !== void 0 ? "turbopack" : "webpack", y = (e, t) => {
+  const r = {}, s = { dir: e };
+  t !== void 0 && (s.mode = t);
+  const o = { loader: "@salty-css/webpack/loader", options: s };
+  for (const a of u)
+    r[`**/*.${a}.ts`] = { loaders: [o], as: "*.ts" }, r[`**/*.${a}.tsx`] = { loaders: [o], as: "*.tsx" };
+  return r;
+}, w = (e, t = {}) => {
+  const { webpack: r, ...s } = e;
   return {
-    ...n,
-    webpack(t, r) {
-      const { dir: o, isServer: c } = r;
-      return i(t, o, c, !1, { mode: a.mode }), e && typeof e == "function" && e(t, r), t;
+    ...s,
+    webpack(o, a) {
+      const { dir: c, isServer: l } = a;
+      return d(o, c, l, !1, { mode: t.mode }), r && typeof r == "function" && r(o, a), o;
     }
   };
-};
+}, n = /* @__PURE__ */ new Map(), h = (e, t) => {
+  const r = `${e}|${t ?? ""}`;
+  if (n.get(r)) return;
+  n.set(r, !0);
+  const s = new b(e, { mode: t });
+  s.generateCss().then(() => {
+    m(e, { recursive: !0 }, async (o, a) => {
+      if (!a) return;
+      const c = p(e, a.toString());
+      await f(c) ? await s.generateCss() : i(c) && await s.generateFile(c);
+    });
+  }).catch((o) => {
+    n.set(r, !1), console.error("[salty-css/next] failed to initialize Turbopack runtime:", o);
+  });
+}, S = (e, t = {}) => {
+  const r = e.turbopack ?? {}, s = t.dir ?? r.root ?? process.cwd(), o = y(s, t.mode), c = { ...r.rules ?? {}, ...o };
+  return h(s, t.mode), {
+    ...e,
+    turbopack: {
+      ...r,
+      rules: c
+    }
+  };
+}, C = (e, t = {}) => k(t.bundler) === "turbopack" ? S(e, { mode: t.mode, dir: t.dir }) : w(e, { mode: t.mode });
 export {
-  m as default,
-  m as withSaltyCss
+  C as default,
+  C as withSaltyCss
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salty-css/next",
-  "version": "0.1.0-alpha.33",
+  "version": "0.1.0-alpha.35",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "typings": "./dist/index.d.ts",
@@ -34,7 +34,7 @@
     }
   },
   "dependencies": {
-    "@salty-css/core": "0.1.0-alpha.33",
-    "@salty-css/webpack": "0.1.0-alpha.33"
+    "@salty-css/core": "0.1.0-alpha.35",
+    "@salty-css/webpack": "0.1.0-alpha.35"
   }
 }

package/with-salty-turbopack.d.ts

@@ -0,0 +1,13 @@
+import { SaltyCompilerMode } from '@salty-css/core/compiler/salty-compiler';
+type AnyRecord = Record<any, any>;
+export interface SaltyTurbopackWrapperOptions {
+    mode?: SaltyCompilerMode;
+    dir?: string;
+}
+export declare const __resetSaltyTurbopackRuntimeForTests: () => void;
+export declare const withSaltyTurbopack: <T extends AnyRecord>(nextConfig: T, options?: SaltyTurbopackWrapperOptions) => T & {
+    turbopack: {
+        rules: any;
+    };
+};
+export {};

package/with-salty-webpack.d.ts

@@ -0,0 +1,9 @@
+import { SaltyCompilerMode } from '@salty-css/core/compiler/salty-compiler';
+type AnyRecord = Record<any, any>;
+export interface SaltyWebpackWrapperOptions {
+    mode?: SaltyCompilerMode;
+}
+export declare const withSaltyWebpack: <T extends AnyRecord>(nextConfig: T, options?: SaltyWebpackWrapperOptions) => Omit<T, "webpack"> & {
+    webpack(config: any, webpackOptions: any): any;
+};
+export {};