@gjsify/cli 0.3.12 → 0.3.14

package/lib/utils/normalize-bundler-options.js

@@ -0,0 +1,123 @@
+// One-release deprecation shim: maps the legacy `esbuild?: BuildOptions`
+// field on `.gjsifyrc.js` / `package.json#gjsify` into the equivalent
+// `bundler?: RolldownOptions` shape. Logs a single warning per build.
+//
+// Drop in 0.5.0.
+let warnedOnce = false;
+export function normalizeBundlerOptions(configData) {
+    const fromBundler = (configData.bundler ?? {});
+    if (!configData.esbuild)
+        return fromBundler;
+    if (!warnedOnce) {
+        warnedOnce = true;
+        // eslint-disable-next-line no-console
+        console.warn("[gjsify] DEPRECATION: the 'esbuild' config key is deprecated and will be removed in 0.5.0. " +
+            "Rename it to 'bundler' (typed as RolldownOptions). See the migration notes in the gjsify CHANGELOG.");
+    }
+    const fromEsbuild = legacyEsbuildToRolldown(configData.esbuild);
+    // Plain user-config merge — we deliberately do NOT call
+    // `mergeBundlerOptions` here, because that function strips `input` and
+    // `external` from its overrides arg (it assumes the *orchestrator* is
+    // the override source and the user the base). Here both inputs are
+    // user-provided config and `input` must survive the merge.
+    const out = { ...fromEsbuild, ...fromBundler };
+    if (fromEsbuild.output || fromBundler.output) {
+        out.output = { ...(fromEsbuild.output ?? {}), ...(fromBundler.output ?? {}) };
+    }
+    if (fromEsbuild.transform || fromBundler.transform) {
+        out.transform = { ...(fromEsbuild.transform ?? {}), ...(fromBundler.transform ?? {}) };
+        if (fromEsbuild.transform?.define || fromBundler.transform?.define) {
+            out.transform.define = {
+                ...(fromEsbuild.transform?.define ?? {}),
+                ...(fromBundler.transform?.define ?? {}),
+            };
+        }
+    }
+    if (fromEsbuild.resolve || fromBundler.resolve) {
+        out.resolve = { ...(fromEsbuild.resolve ?? {}), ...(fromBundler.resolve ?? {}) };
+    }
+    return out;
+}
+/** Map the supported subset of esbuild BuildOptions into RolldownOptions. */
+function legacyEsbuildToRolldown(esb) {
+    const out = {};
+    const output = {};
+    const transform = {};
+    const resolve = {};
+    if (esb.outfile !== undefined)
+        output.file = esb.outfile;
+    if (esb.outdir !== undefined)
+        output.dir = esb.outdir;
+    if (esb.format !== undefined)
+        output.format = esb.format;
+    if (esb.minify !== undefined)
+        output.minify = esb.minify;
+    if (esb.sourcemap !== undefined) {
+        // esbuild has 'external' / 'both' which Rolldown doesn't — coerce to boolean.
+        output.sourcemap =
+            esb.sourcemap === 'inline'
+                ? 'inline'
+                : Boolean(esb.sourcemap);
+    }
+    if (esb.banner?.js !== undefined)
+        output.banner = esb.banner.js;
+    if (esb.target !== undefined) {
+        transform.target = Array.isArray(esb.target) ? esb.target.join(',') : esb.target;
+    }
+    if (esb.define !== undefined)
+        transform.define = esb.define;
+    if (esb.mainFields !== undefined)
+        resolve.mainFields = esb.mainFields;
+    if (esb.conditions !== undefined)
+        resolve.conditionNames = esb.conditions;
+    if (esb.external !== undefined)
+        out.external = esb.external;
+    if (esb.platform !== undefined)
+        out.platform = esb.platform;
+    if (Object.keys(output).length > 0)
+        out.output = output;
+    if (Object.keys(transform).length > 0)
+        out.transform = transform;
+    if (Object.keys(resolve).length > 0)
+        out.resolve = resolve;
+    // Discarded silently:
+    //   esb.inject  — esbuild's array-of-side-effect-files; surfaced at the
+    //                 CLI layer instead, via input expansion.
+    //   esb.loader  — Rolldown infers module types from extensions natively.
+    return out;
+}
+/**
+ * Shallow merge with deep-merge of `output`, `transform`, and `resolve`. The
+ * second argument wins on conflicts, matching `merge(target, ...sources)`
+ * semantics from `@gjsify/rolldown-plugin-gjsify/utils/merge`.
+ *
+ * `base` is typically the Rolldown-generic shape returned by the orchestrator;
+ * `overrides` is the user's `BundlerOptions` from `.gjsifyrc.js` plus CLI
+ * flag merges. Single-output assumption matches `BundlerOptions['output']`.
+ *
+ * The orchestrator-side `input` is authoritative — it's the post-glob-expansion
+ * value. Overriding it with the user's raw glob string would re-introduce
+ * unresolved glob patterns into the final Rolldown call. Same for `external`,
+ * which the orchestrator concatenates with platform defaults already.
+ */
+export function mergeBundlerOptions(base, overrides) {
+    // Strip fields the orchestrator owns authoritatively — the user has
+    // already had their say via the orchestrator's `userExternal` / input
+    // expansion; merging the raw values back on top would clobber the
+    // post-processing.
+    const { input: _ignoredInput, external: _ignoredExternal, ...overridesRest } = overrides;
+    const out = { ...base, ...overridesRest };
+    if (base.output || overrides.output) {
+        out.output = { ...(base.output ?? {}), ...(overrides.output ?? {}) };
+    }
+    if (base.transform || overrides.transform) {
+        out.transform = { ...(base.transform ?? {}), ...(overrides.transform ?? {}) };
+        if (base.transform?.define || overrides.transform?.define) {
+            out.transform.define = { ...(base.transform?.define ?? {}), ...(overrides.transform?.define ?? {}) };
+        }
+    }
+    if (base.resolve || overrides.resolve) {
+        out.resolve = { ...(base.resolve ?? {}), ...(overrides.resolve ?? {}) };
+    }
+    return out;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/cli",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "description": "CLI for Gjsify",
   "type": "module",
   "main": "lib/index.js",
@@ -23,19 +23,19 @@
     "cli"
   ],
   "dependencies": {
-    "@gjsify/create-app": "^0.3.12",
-    "@gjsify/esbuild-plugin-gjsify": "^0.3.12",
-    "@gjsify/node-polyfills": "^0.3.12",
-    "@gjsify/npm-registry": "^0.3.12",
-    "@gjsify/resolve-npm": "^0.3.12",
-    "@gjsify/semver": "^0.3.12",
-    "@gjsify/tar": "^0.3.12",
-    "@gjsify/web-polyfills": "^0.3.12",
-    "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.15",
+    "@gjsify/create-app": "^0.3.14",
+    "@gjsify/node-polyfills": "^0.3.14",
+    "@gjsify/npm-registry": "^0.3.14",
+    "@gjsify/resolve-npm": "^0.3.14",
+    "@gjsify/rolldown-plugin-gjsify": "^0.3.14",
+    "@gjsify/rolldown-plugin-pnp": "^0.3.14",
+    "@gjsify/semver": "^0.3.14",
+    "@gjsify/tar": "^0.3.14",
+    "@gjsify/web-polyfills": "^0.3.14",
     "cosmiconfig": "^9.0.1",
-    "esbuild": "^0.28.0",
     "get-tsconfig": "^4.14.0",
     "pkg-types": "^2.3.1",
+    "rolldown": "^1.0.0-rc.18",
     "yargs": "^18.0.0"
   },
   "devDependencies": {