@gjsify/esbuild-plugin-gjsify 0.0.2 → 0.0.3

package/dist/esm/index.mjs

@@ -3371,7 +3371,7 @@ var require_stream = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.merge = void 0;
     var merge22 = require_merge2();
-    function merge7(streams) {
+    function merge6(streams) {
       const mergedStream = merge22(streams);
       streams.forEach((stream) => {
         stream.once("error", (error) => mergedStream.emit("error", error));
@@ -3380,7 +3380,7 @@ var require_stream = __commonJS({
       mergedStream.once("end", () => propagateCloseEventToSources(streams));
       return mergedStream;
     }
-    exports.merge = merge7;
+    exports.merge = merge6;
     function propagateCloseEventToSources(streams) {
       streams.forEach((stream) => stream.emit("close"));
     }
@@ -5455,6 +5455,84 @@ var require_out4 = __commonJS({
   }
 });
 
+// ../esbuild-plugin-alias/dist/cjs/index.cjs
+var require_cjs = __commonJS({
+  "../esbuild-plugin-alias/dist/cjs/index.cjs"(exports, module) {
+    var __defProp2 = Object.defineProperty;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames2 = Object.getOwnPropertyNames;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __export = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: true });
+    };
+    var __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from === "object" || typeof from === "function") {
+        for (let key of __getOwnPropNames2(from))
+          if (!__hasOwnProp2.call(to, key) && key !== except)
+            __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      }
+      return to;
+    };
+    var __toCommonJS = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
+    var src_exports = {};
+    __export(src_exports, {
+      aliasPlugin: () => aliasPlugin6
+    });
+    module.exports = __toCommonJS(src_exports);
+    var import_fs = __require("fs");
+    var import_promises = __require("fs/promises");
+    function escapeRegExp(str) {
+      return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    }
+    var aliasPlugin6 = (aliasObj) => {
+      const aliases = Object.keys(aliasObj);
+      const re = new RegExp(`^(${aliases.map((x) => escapeRegExp(x)).join("|")})$`);
+      const plugin = {
+        name: "alias",
+        setup(build) {
+          build.onResolve({ filter: re }, async (args) => {
+            let resolvedAliasPath = aliasObj[args.path];
+            let namespace = args.namespace;
+            if (resolvedAliasPath) {
+              if (resolvedAliasPath.startsWith("http://")) {
+                namespace = "http";
+                resolvedAliasPath = resolvedAliasPath.slice(5);
+              } else if (resolvedAliasPath.startsWith("https://")) {
+                namespace = "https";
+                resolvedAliasPath = resolvedAliasPath.slice(6);
+              } else {
+                const resolvedAlias = await build.resolve(resolvedAliasPath, {
+                  importer: args.importer,
+                  kind: args.kind,
+                  namespace,
+                  resolveDir: args.resolveDir,
+                  pluginData: args.pluginData
+                });
+                if (resolvedAlias.errors) {
+                  return resolvedAlias;
+                } else {
+                  resolvedAliasPath = resolvedAlias.path;
+                  namespace = resolvedAlias.namespace;
+                }
+              }
+              if ((0, import_fs.existsSync)(resolvedAliasPath)) {
+                resolvedAliasPath = await (0, import_promises.realpath)(resolvedAliasPath);
+              }
+              return {
+                path: resolvedAliasPath,
+                namespace
+              };
+            }
+            return null;
+          });
+        }
+      };
+      return plugin;
+    };
+  }
+});
+
 // ../../../node_modules/lodash/lodash.js
 var require_lodash = __commonJS({
   "../../../node_modules/lodash/lodash.js"(exports, module) {
@@ -9821,7 +9899,7 @@ var require_lodash = __commonJS({
           });
           return result2;
         }
-        var merge7 = createAssigner(function(object, source, srcIndex) {
+        var merge6 = createAssigner(function(object, source, srcIndex) {
           baseMerge(object, source, srcIndex);
         });
         var mergeWith = createAssigner(function(object, source, srcIndex, customizer) {
@@ -10012,7 +10090,7 @@ var require_lodash = __commonJS({
           string = toString(string);
           return string && reHasUnescapedHtml.test(string) ? string.replace(reUnescapedHtml, escapeHtmlChar) : string;
         }
-        function escapeRegExp2(string) {
+        function escapeRegExp(string) {
           string = toString(string);
           return string && reHasRegExpChar.test(string) ? string.replace(reRegExpChar, "\\$&") : string;
         }
@@ -10511,7 +10589,7 @@ var require_lodash = __commonJS({
         lodash.matches = matches;
         lodash.matchesProperty = matchesProperty;
         lodash.memoize = memoize;
-        lodash.merge = merge7;
+        lodash.merge = merge6;
         lodash.mergeWith = mergeWith;
         lodash.method = method;
         lodash.methodOf = methodOf;
@@ -10615,7 +10693,7 @@ var require_lodash = __commonJS({
         lodash.endsWith = endsWith;
         lodash.eq = eq;
         lodash.escape = escape;
-        lodash.escapeRegExp = escapeRegExp2;
+        lodash.escapeRegExp = escapeRegExp;
         lodash.every = every;
         lodash.find = find;
         lodash.findIndex = findIndex;
@@ -11278,76 +11356,27 @@ var globToEntryPoints = async (_entryPoints, ignore = []) => {
 // src/utils/extension.ts
 var getJsExtensions = (allowExt) => {
   const extensions = { ".js": ".js", ".ts": ".js", ".mts": ".js", ".cts": ".js", ".cjs": ".js", ".mjs": ".js" };
-  if (extensions[allowExt]) {
+  if (allowExt && extensions[allowExt]) {
     delete extensions[allowExt];
   }
   return extensions;
 };
 
-// src/alias-plugin.ts
-import { existsSync } from "fs";
-import { realpath } from "fs/promises";
-var aliasPlugin = (aliasObj) => {
-  const aliases = Object.keys(aliasObj);
-  const re = new RegExp(`^(${aliases.map((x) => escapeRegExp(x)).join("|")})$`);
-  const plugin = {
-    name: "alias",
-    setup(build) {
-      build.onResolve({ filter: re }, async (args) => {
-        let resolvedAliasPath = aliasObj[args.path];
-        let namespace = args.namespace;
-        if (resolvedAliasPath) {
-          if (resolvedAliasPath.startsWith("http://")) {
-            namespace = "http";
-            resolvedAliasPath = resolvedAliasPath.slice(5);
-          } else if (resolvedAliasPath.startsWith("https://")) {
-            namespace = "https";
-            resolvedAliasPath = resolvedAliasPath.slice(6);
-          } else {
-            const resolvedAlias = await build.resolve(resolvedAliasPath, {
-              importer: args.importer,
-              kind: args.kind,
-              namespace,
-              resolveDir: args.resolveDir,
-              pluginData: args.pluginData
-            });
-            if (resolvedAlias.errors) {
-              return resolvedAlias;
-            } else {
-              resolvedAliasPath = resolvedAlias.path;
-              namespace = resolvedAlias.namespace;
-            }
-          }
-          if (existsSync(resolvedAliasPath)) {
-            resolvedAliasPath = await realpath(resolvedAliasPath);
-          }
-          return {
-            path: resolvedAliasPath,
-            namespace
-          };
-        }
-        return null;
-      });
-    }
-  };
-  return plugin;
-};
-function escapeRegExp(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
-// src/lib/cjs.ts
+// src/lib/lib.ts
+var import_esbuild_plugin_alias = __toESM(require_cjs(), 1);
 var import_lodash = __toESM(require_lodash(), 1);
 import { transformExtPlugin } from "@gjsify/esbuild-plugin-transform-ext";
-var setupCjsLib = async (build, pluginOptions) => {
+var setupLib = async (build, pluginOptions) => {
+  const format = pluginOptions.format || "esm";
   pluginOptions.aliases ||= {};
   pluginOptions.exclude ||= [];
   const esbuildOptions = {
+    format,
     bundle: false,
-    splitting: false,
-    // only works with esm, see https://esbuild.github.io/api/#splitting
     minify: false,
     sourcemap: false,
+    splitting: format === "esm" ? true : false,
+    // Works only on esm
     loader: {
       ".ts": "ts",
       ".mts": "ts",
@@ -11360,56 +11389,20 @@ var setupCjsLib = async (build, pluginOptions) => {
       ".js": "ts"
     },
     target: ["esnext"],
-    platform: "browser",
+    platform: "neutral",
+    mainFields: format === "esm" ? ["module", "main"] : ["main"],
     // https://esbuild.github.io/api/#conditions
-    conditions: ["require"],
-    format: "cjs"
+    conditions: format === "esm" ? ["module", "import"] : ["require"]
   };
   (0, import_lodash.merge)(build.initialOptions, esbuildOptions);
   build.initialOptions.entryPoints = await globToEntryPoints(build.initialOptions.entryPoints, pluginOptions.exclude);
-  if (pluginOptions.debug)
-    console.debug("initialOptions", build.initialOptions);
-  await aliasPlugin(pluginOptions.aliases).setup(build);
+  await (0, import_esbuild_plugin_alias.aliasPlugin)(pluginOptions.aliases).setup(build);
   await transformExtPlugin({ outExtension: getJsExtensions(pluginOptions.jsExtension) }).setup(build);
 };
 
-// src/lib/esm.ts
-var import_lodash2 = __toESM(require_lodash(), 1);
-import { transformExtPlugin as transformExtPlugin2 } from "@gjsify/esbuild-plugin-transform-ext";
-var setupEsmLib = async (build, pluginOptions) => {
-  pluginOptions.aliases ||= {};
-  pluginOptions.exclude ||= [];
-  const esbuildOptions = {
-    bundle: false,
-    minify: false,
-    sourcemap: false,
-    splitting: true,
-    // Works only on esm
-    loader: {
-      ".ts": "ts",
-      ".mts": "ts",
-      ".cts": "ts",
-      ".tsx": "ts",
-      ".mtsx": "ts",
-      ".ctsx": "ts",
-      ".mjs": "ts",
-      ".cjs": "ts",
-      ".js": "ts"
-    },
-    target: ["esnext"],
-    platform: "browser",
-    // https://esbuild.github.io/api/#conditions
-    conditions: ["module", "import"],
-    format: "esm"
-  };
-  (0, import_lodash2.merge)(build.initialOptions, esbuildOptions);
-  build.initialOptions.entryPoints = await globToEntryPoints(build.initialOptions.entryPoints, pluginOptions.exclude);
-  await aliasPlugin(pluginOptions.aliases).setup(build);
-  await transformExtPlugin2({ outExtension: getJsExtensions(pluginOptions.jsExtension) }).setup(build);
-};
-
 // src/app/browser.ts
-var import_lodash3 = __toESM(require_lodash(), 1);
+var import_esbuild_plugin_alias2 = __toESM(require_cjs(), 1);
+var import_lodash2 = __toESM(require_lodash(), 1);
 import { denoPlugin } from "@gjsify/esbuild-plugin-deno-loader";
 import * as deepkitPlugin from "@gjsify/esbuild-plugin-deepkit";
 var setupForBrowser = async (build, pluginOptions) => {
@@ -11446,26 +11439,31 @@ var setupForBrowser = async (build, pluginOptions) => {
       window: "globalThis"
     }
   };
-  (0, import_lodash3.merge)(build.initialOptions, esbuildOptions);
+  (0, import_lodash2.merge)(build.initialOptions, esbuildOptions);
   build.initialOptions.entryPoints = await globToEntryPoints(build.initialOptions.entryPoints, pluginOptions.exclude);
   const aliases = { ...pluginOptions.aliases };
   if (pluginOptions.debug)
     console.debug("initialOptions", build.initialOptions);
-  await aliasPlugin(aliases).setup(build);
+  await (0, import_esbuild_plugin_alias2.aliasPlugin)(aliases).setup(build);
   await denoPlugin({ reflection: pluginOptions.reflection }).setup(build);
   await deepkitPlugin.deepkitPlugin({ reflection: pluginOptions.reflection }).setup(build);
 };
 
 // src/app/deno.ts
-var import_lodash4 = __toESM(require_lodash(), 1);
+var import_esbuild_plugin_alias3 = __toESM(require_cjs(), 1);
+var import_lodash3 = __toESM(require_lodash(), 1);
 import { denoPlugin as denoPlugin2 } from "@gjsify/esbuild-plugin-deno-loader";
 import * as deepkitPlugin3 from "@gjsify/esbuild-plugin-deepkit";
 var setupForDeno = async (build, pluginOptions) => {
   const external = [];
+  const format = pluginOptions.format || "esm";
+  if (format !== "esm")
+    throw new TypeError("Only ESM format is supported for Deno");
   pluginOptions.aliases ||= {};
   pluginOptions.exclude ||= [];
   const esbuildOptions = {
-    format: "esm",
+    format,
+    // Only 'esm' is supported for Deno
     bundle: true,
     minify: false,
     sourcemap: false,
@@ -11494,29 +11492,30 @@ var setupForDeno = async (build, pluginOptions) => {
       window: "globalThis"
     }
   };
-  (0, import_lodash4.merge)(build.initialOptions, esbuildOptions);
+  (0, import_lodash3.merge)(build.initialOptions, esbuildOptions);
   build.initialOptions.entryPoints = await globToEntryPoints(build.initialOptions.entryPoints, pluginOptions.exclude);
   const aliases = { ...getAliasesForDeno({ external }), ...pluginOptions.aliases };
   if (pluginOptions.debug)
     console.debug("initialOptions", build.initialOptions);
-  await aliasPlugin(aliases).setup(build);
+  await (0, import_esbuild_plugin_alias3.aliasPlugin)(aliases).setup(build);
   await denoPlugin2({ reflection: pluginOptions.reflection }).setup(build);
   await deepkitPlugin3.deepkitPlugin({ reflection: pluginOptions.reflection }).setup(build);
 };
 
 // src/app/gjs.ts
-var import_lodash5 = __toESM(require_lodash(), 1);
+var import_esbuild_plugin_alias4 = __toESM(require_cjs(), 1);
+var import_lodash4 = __toESM(require_lodash(), 1);
 import { denoPlugin as denoPlugin3 } from "@gjsify/esbuild-plugin-deno-loader";
 import * as deepkitPlugin5 from "@gjsify/esbuild-plugin-deepkit";
 var setupForGjs = async (build, pluginOptions) => {
   const external = ["gi://*", "cairo", "gettext", "system"];
+  const format = pluginOptions.format || "esm";
   pluginOptions.aliases ||= {};
   pluginOptions.exclude ||= [];
   const esbuildOptions = {
-    format: "esm",
-    // On Gjs we only support esm
+    format,
     bundle: true,
-    metafile: true,
+    metafile: false,
     minify: false,
     sourcemap: false,
     treeShaking: true,
@@ -11529,9 +11528,9 @@ var setupForGjs = async (build, pluginOptions) => {
     // firefox102 // Since GJS 1.73.2
     target: ["firefox102"],
     platform: "neutral",
-    mainFields: ["module", "main"],
+    mainFields: format === "esm" ? ["module", "main"] : ["main", "module"],
     // https://esbuild.github.io/api/#conditions
-    conditions: ["module", "import"],
+    conditions: format === "esm" ? ["import", "require"] : ["require", "import"],
     external,
     loader: {
       ".ts": "ts",
@@ -11549,25 +11548,26 @@ var setupForGjs = async (build, pluginOptions) => {
       window: "globalThis"
     }
   };
-  (0, import_lodash5.merge)(build.initialOptions, esbuildOptions);
+  (0, import_lodash4.merge)(build.initialOptions, esbuildOptions);
   build.initialOptions.entryPoints = await globToEntryPoints(build.initialOptions.entryPoints, pluginOptions.exclude);
   const aliases = { ...getAliasesForGjs({ external }), ...pluginOptions.aliases };
   if (pluginOptions.debug)
     console.debug("initialOptions", build.initialOptions);
-  await aliasPlugin(aliases).setup(build);
+  await (0, import_esbuild_plugin_alias4.aliasPlugin)(aliases).setup(build);
   await denoPlugin3({ reflection: pluginOptions.reflection }).setup(build);
   await deepkitPlugin5.deepkitPlugin({ reflection: pluginOptions.reflection }).setup(build);
 };
 
 // src/app/node.ts
-var import_lodash6 = __toESM(require_lodash(), 1);
+var import_esbuild_plugin_alias5 = __toESM(require_cjs(), 1);
+var import_lodash5 = __toESM(require_lodash(), 1);
 import { denoPlugin as denoPlugin4 } from "@gjsify/esbuild-plugin-deno-loader";
 import * as deepkitPlugin7 from "@gjsify/esbuild-plugin-deepkit";
 var setupForNode = async (build, pluginOptions) => {
   const external = [...EXTERNALS_NODE, "gi://*"];
+  const format = pluginOptions.format || "esm";
   pluginOptions.aliases ||= {};
   pluginOptions.exclude ||= [];
-  const format = pluginOptions.format || "esm";
   const esbuildOptions = {
     format,
     bundle: true,
@@ -11578,7 +11578,7 @@ var setupForNode = async (build, pluginOptions) => {
     // false means follow symlinks
     target: ["node18"],
     platform: "node",
-    mainFields: format === "esm" ? ["module", "main"] : ["main", "module", "browser"],
+    mainFields: format === "esm" ? ["module", "main", "browser"] : ["main", "module", "browser"],
     conditions: format === "esm" ? ["module", "import"] : ["require"],
     external,
     loader: {
@@ -11597,12 +11597,12 @@ var setupForNode = async (build, pluginOptions) => {
       window: "globalThis"
     }
   };
-  (0, import_lodash6.merge)(build.initialOptions, esbuildOptions);
+  (0, import_lodash5.merge)(build.initialOptions, esbuildOptions);
   build.initialOptions.entryPoints = await globToEntryPoints(build.initialOptions.entryPoints, pluginOptions.exclude);
   const aliases = { ...getAliasesForNode({ external }), ...pluginOptions.aliases };
   if (pluginOptions.debug)
     console.debug("initialOptions", build.initialOptions);
-  await aliasPlugin(aliases).setup(build);
+  await (0, import_esbuild_plugin_alias5.aliasPlugin)(aliases).setup(build);
   await denoPlugin4({ reflection: pluginOptions.reflection }).setup(build);
   await deepkitPlugin7.deepkitPlugin({ reflection: pluginOptions.reflection }).setup(build);
 };
@@ -11615,9 +11615,8 @@ var gjsifyPlugin = (pluginOptions = {}) => {
       if (pluginOptions.library) {
         switch (pluginOptions.library) {
           case "esm":
-            return setupEsmLib(build, pluginOptions);
           case "cjs":
-            return setupCjsLib(build, pluginOptions);
+            return setupLib(build, pluginOptions);
           default:
             throw new TypeError("Unknown library type: " + pluginOptions.library);
         }

package/dist/types/lib/index.d.ts

@@ -1,2 +1 @@
-export * from './cjs.js';
-export * from './esm.js';
+export * from './lib.js';

package/dist/types/lib/{cjs.d.ts → lib.d.ts}

@@ -1,3 +1,3 @@
 import type { PluginBuild } from "esbuild";
 import type { PluginOptions } from '../types/plugin-options.js';
-export declare const setupCjsLib: (build: PluginBuild, pluginOptions: PluginOptions) => Promise<void>;
+export declare const setupLib: (build: PluginBuild, pluginOptions: PluginOptions) => Promise<void>;

package/dist/types/types/plugin-options.d.ts

@@ -7,7 +7,7 @@ export interface PluginOptions extends DeepkitPluginOptions {
     /** An array of glob patterns to exclude matches and aliases */
     exclude?: string[];
     jsExtension?: string;
-    /** Override the format, only be considered if the target app platform is `'node'`, otherwise it is always `'esm'` */
+    /** Override the format */
     format?: 'esm' | 'cjs';
     /**
      * Library Mode

package/dist/types/utils/extension.d.ts

@@ -1,4 +1,4 @@
-export declare const getJsExtensions: (allowExt: string) => {
+export declare const getJsExtensions: (allowExt?: string) => {
     '.js': string;
     '.ts': string;
     '.mts': string;

package/esbuild.mjs

@@ -17,6 +17,7 @@ const baseConfig = {
     entryPoints: ['src/index.ts'],
     bundle: true,
     minify: false,
+    platform: "node",
     external: [
         ...EXTERNALS_NODE,
         'typescript',
@@ -35,7 +36,6 @@ if (pkg.main) {
         outdir: dirname(pkg.main),
         format: 'cjs',
         outExtension: {'.js': extname(pkg.main)},
-        platform: "node",
     });    
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/esbuild-plugin-gjsify",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Deepkit type compiler plugin for esbuild",
   "type": "module",
   "main": "dist/cjs/index.cjs",
@@ -12,7 +12,7 @@
     "test": "yarn print:name && echo 'nothing to do'",
     "build": "yarn print:name && yarn build:js && yarn build:types",
     "build:js": "node esbuild.mjs",
-    "build:types": "tsc --emitDeclarationOnly || exit 0"
+    "build:types": "tsc --project ./tsconfig.json"
   },
   "keywords": [
     "gjs",
@@ -20,27 +20,15 @@
     "esbuild"
   ],
   "dependencies": {
-    "@gjsify/esbuild-plugin-deepkit": "^0.0.2",
-    "@gjsify/esbuild-plugin-deno-loader": "^0.0.2",
-    "@gjsify/esbuild-plugin-transform-ext": "^0.0.2",
-    "assert": "^2.0.0",
-    "constants-browserify": "^1.0.0",
-    "core-js": "^3.31.0",
-    "crypto-browserify": "^3.12.0",
-    "esm": "^3.2.25",
+    "@gjsify/esbuild-plugin-alias": "^0.0.3",
+    "@gjsify/esbuild-plugin-deepkit": "^0.0.3",
+    "@gjsify/esbuild-plugin-deno-loader": "^0.0.3",
+    "@gjsify/esbuild-plugin-transform-ext": "^0.0.3",
     "fast-glob": "^3.2.12",
-    "lodash": "^4.17.21",
-    "micromatch": "^4.0.5",
-    "path-browserify": "^1.0.1",
-    "punycode": "^2.3.0",
-    "stream-browserify": "^3.0.0",
-    "string_decoder": "^1.3.0",
-    "test": "^3.3.0"
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.195",
-    "@types/micromatch": "^4.0.2",
-    "esbuild": "^0.18.2",
+    "esbuild": "^0.18.3",
     "typescript": "^5.1.3"
   }
 }

package/src/app/browser.ts

@@ -1,4 +1,4 @@
-import { aliasPlugin } from '../alias-plugin.js';
+import { aliasPlugin } from '@gjsify/esbuild-plugin-alias';
 import { denoPlugin } from '@gjsify/esbuild-plugin-deno-loader';
 import * as deepkitPlugin from '@gjsify/esbuild-plugin-deepkit';
 import { merge } from "lodash";

package/src/app/deno.ts

@@ -1,4 +1,4 @@
-import { aliasPlugin } from '../alias-plugin.js';
+import { aliasPlugin } from '@gjsify/esbuild-plugin-alias';
 import { denoPlugin } from '@gjsify/esbuild-plugin-deno-loader';
 import * as deepkitPlugin from '@gjsify/esbuild-plugin-deepkit';
 import { merge } from "lodash";
@@ -11,13 +11,16 @@ import { getAliasesForDeno, globToEntryPoints } from "../utils/index.js";
 export const setupForDeno = async (build: PluginBuild, pluginOptions: PluginOptions) => {
 
     const external = [];
+    const format = pluginOptions.format || 'esm';
+
+    if(format !== 'esm') throw new TypeError('Only ESM format is supported for Deno');
 
     pluginOptions.aliases ||= {};
     pluginOptions.exclude ||= [];
 
     // Set default options
     const esbuildOptions: BuildOptions = {
-        format: 'esm',
+        format, // Only 'esm' is supported for Deno
         bundle: true,
         minify: false,
         sourcemap: false,

package/src/app/gjs.ts

@@ -1,4 +1,4 @@
-import { aliasPlugin } from '../alias-plugin.js';
+import { aliasPlugin } from '@gjsify/esbuild-plugin-alias';
 import { denoPlugin } from '@gjsify/esbuild-plugin-deno-loader';
 import * as deepkitPlugin from '@gjsify/esbuild-plugin-deepkit';
 import { merge } from "lodash";
@@ -11,15 +11,16 @@ import type { PluginOptions } from '../types/plugin-options.js';
 export const setupForGjs = async (build: PluginBuild, pluginOptions: PluginOptions) => {
 
     const external = ['gi://*', 'cairo', 'gettext', 'system'];
+    const format = pluginOptions.format || 'esm';
 
     pluginOptions.aliases ||= {};
     pluginOptions.exclude ||= [];
 
     // Set default options
     const esbuildOptions: BuildOptions = {
-        format: 'esm', // On Gjs we only support esm
+        format, 
         bundle: true,
-        metafile: true,
+        metafile: false,
         minify: false,
         sourcemap: false,
         treeShaking: true,
@@ -30,10 +31,10 @@ export const setupForGjs = async (build: PluginBuild, pluginOptions: PluginOptio
         // firefox91  // Since GJS 1.71.1
         // firefox102 // Since GJS 1.73.2
         target: [ "firefox102" ],
-        platform: "neutral",
-        mainFields: ['module', 'main'],
+        platform: 'neutral',
+        mainFields: format === 'esm' ? ['module', 'main'] : ['main', 'module'],
         // https://esbuild.github.io/api/#conditions
-        conditions: ['module','import'],
+        conditions: format === 'esm' ? ['import', 'require'] : ['require', 'import'],
         external,
         loader: {
             '.ts': 'ts',

package/src/app/node.ts

@@ -1,5 +1,4 @@
-
-import { aliasPlugin } from '../alias-plugin.js';
+import { aliasPlugin } from '@gjsify/esbuild-plugin-alias';
 import { denoPlugin } from '@gjsify/esbuild-plugin-deno-loader';
 import * as deepkitPlugin from '@gjsify/esbuild-plugin-deepkit';
 import { merge } from "lodash";
@@ -13,12 +12,11 @@ import type { PluginOptions } from '../types/plugin-options.js';
 export const setupForNode = async (build: PluginBuild, pluginOptions: PluginOptions) => {
 
     const external = [...EXTERNALS_NODE, 'gi://*'];
+    const format = pluginOptions.format || 'esm';
 
     pluginOptions.aliases ||= {};
     pluginOptions.exclude ||= [];
 
-    const format = pluginOptions.format || 'esm';
-
     // Set default options
     const esbuildOptions: BuildOptions = {
         format,
@@ -29,7 +27,7 @@ export const setupForNode = async (build: PluginBuild, pluginOptions: PluginOpti
         preserveSymlinks: false, // false means follow symlinks
         target: [ "node18" ],
         platform: "node",
-        mainFields: format === 'esm' ? ['module', 'main'] : ['main', 'module', 'browser'],
+        mainFields: format === 'esm' ? ['module', 'main', 'browser'] : ['main', 'module', 'browser'],
         conditions: format === 'esm' ? ['module', 'import'] : ['require'],
         external,
         loader: {

package/src/lib/index.ts

@@ -1,2 +1 @@
-export * from './cjs.js';
-export * from './esm.js';
+export * from './lib.js';