adnbn 0.12.0 → 0.14.0

package/dist/cli/plugins/override/index.js

@@ -0,0 +1,48 @@
+import { HtmlRspackPlugin } from "@rspack/core";
+import HtmlRspackTagsPlugin from "html-rspack-tags-plugin";
+import Override from "./Override.js";
+import { definePlugin } from "./../../../main/plugin.js";
+import { EntrypointPlugin } from "./../../../cli/bundler/index.js";
+import { virtualViewModule } from "./../../../cli/virtual/index.js";
+import { Command } from "./../../../types/app.js";
+import { EntrypointType } from "./../../../types/entrypoint.js";
+var override_default = definePlugin(() => {
+  let override;
+  return {
+    name: "adnbn:override",
+    startup: ({ config }) => {
+      override = new Override(config);
+    },
+    newtab: () => override.files(EntrypointType.Newtab),
+    bookmarks: () => override.files(EntrypointType.Bookmarks),
+    history: () => override.files(EntrypointType.History),
+    bundler: async ({ config }) => {
+      const view = await override.view();
+      if (!view) {
+        if (config.debug) {
+          console.info("Override entry not found");
+        }
+        return {};
+      }
+      const plugin = EntrypointPlugin.from(await view.entries()).virtual(virtualViewModule);
+      if (config.command === Command.Watch) {
+        plugin.watch(async () => {
+          var _a;
+          return ((_a = await override.clear().view()) == null ? void 0 : _a.entries()) ?? /* @__PURE__ */ new Map();
+        });
+      }
+      const htmlPlugins = (await view.html()).map((options) => new HtmlRspackPlugin(options));
+      const tagsPlugins = (await view.tags()).map((options) => new HtmlRspackTagsPlugin(options));
+      return {
+        plugins: [plugin, ...htmlPlugins, ...tagsPlugins]
+      };
+    },
+    manifest: async ({ manifest }) => {
+      manifest.setOverride(await override.manifest()).appendCsp(await override.csp()).appendPermissions(await override.permissions()).appendOptionalPermissions(await override.optionalPermissions()).appendHostPermissions(await override.hostPermissions()).appendOptionalHostPermissions(await override.optionalHostPermissions());
+    }
+  };
+});
+export {
+  override_default as default
+};
+//# sourceMappingURL=index.js.map

package/dist/cli/plugins/override/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/cli/plugins/override/index.ts"],"sourcesContent":["import {Configuration as RspackConfig, HtmlRspackPlugin} from \"@rspack/core\";\nimport HtmlRspackTagsPlugin from \"html-rspack-tags-plugin\";\n\nimport Override from \"./Override\";\n\nimport {definePlugin} from \"@main/plugin\";\nimport {EntrypointPlugin} from \"@cli/bundler\";\nimport {virtualViewModule} from \"@cli/virtual/index.js\";\n\nimport {Command} from \"@typing/app\";\nimport {EntrypointType} from \"@typing/entrypoint\";\n\nexport default definePlugin(() => {\n    let override: Override;\n\n    return {\n        name: \"adnbn:override\",\n        startup: ({config}) => {\n            override = new Override(config);\n        },\n        newtab: () => override.files(EntrypointType.Newtab),\n        bookmarks: () => override.files(EntrypointType.Bookmarks),\n        history: () => override.files(EntrypointType.History),\n        bundler: async ({config}) => {\n            const view = await override.view();\n\n            if (!view) {\n                if (config.debug) {\n                    console.info(\"Override entry not found\");\n                }\n\n                return {};\n            }\n\n            const plugin = EntrypointPlugin.from(await view.entries()).virtual(virtualViewModule);\n\n            if (config.command === Command.Watch) {\n                plugin.watch(async () => (await override.clear().view())?.entries() ?? new Map());\n            }\n\n            const htmlPlugins = (await view.html()).map(options => new HtmlRspackPlugin(options));\n            const tagsPlugins = (await view.tags()).map(options => new HtmlRspackTagsPlugin(options));\n\n            return {\n                plugins: [plugin, ...htmlPlugins, ...tagsPlugins],\n            } satisfies RspackConfig;\n        },\n        manifest: async ({manifest}) => {\n            manifest\n                .setOverride(await override.manifest())\n                .appendCsp(await override.csp())\n                .appendPermissions(await override.permissions())\n                .appendOptionalPermissions(await override.optionalPermissions())\n                .appendHostPermissions(await override.hostPermissions())\n                .appendOptionalHostPermissions(await override.optionalHostPermissions());\n        },\n    };\n});\n"],"mappings":"AAAA,SAAuC,wBAAuB;AAC9D,OAAO,0BAA0B;AAEjC,OAAO,cAAc;AAErB,SAAQ,oBAAmB;AAC3B,SAAQ,wBAAuB;AAC/B,SAAQ,yBAAwB;AAEhC,SAAQ,eAAc;AACtB,SAAQ,sBAAqB;AAE7B,IAAO,mBAAQ,aAAa,MAAM;AAC9B,MAAI;AAEJ,SAAO;AAAA,IACH,MAAM;AAAA,IACN,SAAS,CAAC,EAAC,OAAM,MAAM;AACnB,iBAAW,IAAI,SAAS,MAAM;AAAA,IAClC;AAAA,IACA,QAAQ,MAAM,SAAS,MAAM,eAAe,MAAM;AAAA,IAClD,WAAW,MAAM,SAAS,MAAM,eAAe,SAAS;AAAA,IACxD,SAAS,MAAM,SAAS,MAAM,eAAe,OAAO;AAAA,IACpD,SAAS,OAAO,EAAC,OAAM,MAAM;AACzB,YAAM,OAAO,MAAM,SAAS,KAAK;AAEjC,UAAI,CAAC,MAAM;AACP,YAAI,OAAO,OAAO;AACd,kBAAQ,KAAK,0BAA0B;AAAA,QAC3C;AAEA,eAAO,CAAC;AAAA,MACZ;AAEA,YAAM,SAAS,iBAAiB,KAAK,MAAM,KAAK,QAAQ,CAAC,EAAE,QAAQ,iBAAiB;AAEpF,UAAI,OAAO,YAAY,QAAQ,OAAO;AAClC,eAAO,MAAM,YAAS;AArCtC;AAqC0C,8BAAM,SAAS,MAAM,EAAE,KAAK,MAA5B,mBAAgC,cAAa,oBAAI,IAAI;AAAA,SAAC;AAAA,MACpF;AAEA,YAAM,eAAe,MAAM,KAAK,KAAK,GAAG,IAAI,aAAW,IAAI,iBAAiB,OAAO,CAAC;AACpF,YAAM,eAAe,MAAM,KAAK,KAAK,GAAG,IAAI,aAAW,IAAI,qBAAqB,OAAO,CAAC;AAExF,aAAO;AAAA,QACH,SAAS,CAAC,QAAQ,GAAG,aAAa,GAAG,WAAW;AAAA,MACpD;AAAA,IACJ;AAAA,IACA,UAAU,OAAO,EAAC,SAAQ,MAAM;AAC5B,eACK,YAAY,MAAM,SAAS,SAAS,CAAC,EACrC,UAAU,MAAM,SAAS,IAAI,CAAC,EAC9B,kBAAkB,MAAM,SAAS,YAAY,CAAC,EAC9C,0BAA0B,MAAM,SAAS,oBAAoB,CAAC,EAC9D,sBAAsB,MAAM,SAAS,gBAAgB,CAAC,EACtD,8BAA8B,MAAM,SAAS,wBAAwB,CAAC;AAAA,IAC/E;AAAA,EACJ;AACJ,CAAC;","names":[]}

package/dist/cli/plugins/popup/index.js

@@ -48,7 +48,7 @@ var popup_default = definePlugin(() => {
       };
     },
     manifest: async ({ manifest }) => {
-      manifest.setPopup(await popup.manifest()).appendCsp(await popup.csp());
+      manifest.setPopup(await popup.manifest()).appendCsp(await popup.csp()).appendPermissions(await popup.permissions()).appendOptionalPermissions(await popup.optionalPermissions()).appendHostPermissions(await popup.hostPermissions()).appendOptionalHostPermissions(await popup.optionalHostPermissions());
     }
   };
 });

package/dist/cli/plugins/popup/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/popup/index.ts"],"sourcesContent":["import {Configuration as RspackConfig, HtmlRspackPlugin, Plugins} from \"@rspack/core\";\nimport HtmlRspackTagsPlugin from \"html-rspack-tags-plugin\";\n\nimport {definePlugin} from \"@main/plugin\";\n\nimport {EntrypointPlugin, GenerateModulePlugin} from \"@cli/bundler\";\nimport {virtualViewModule} from \"@cli/virtual/index.js\";\n\nimport Popup, {PopupNameToManifest} from \"./Popup\";\nimport {createPopupModule, PopupModuleName} from \"./popup-module\";\n\nimport {PopupDeclaration} from \"./declaration\";\n\nimport {Command} from \"@typing/app\";\n\nexport default definePlugin(() => {\n    let popup: Popup;\n    let declaration: PopupDeclaration;\n\n    return {\n        name: \"adnbn:popup\",\n        startup: ({config}) => {\n            popup = new Popup(config);\n            declaration = new PopupDeclaration(config);\n        },\n        popup: () => popup.files(),\n        bundler: async ({config}) => {\n            declaration.setAlias(await popup.getAlias()).build();\n\n            const plugins: Plugins = [];\n\n            let alias: PopupNameToManifest = {};\n\n            if (await popup.empty()) {\n                if (config.debug) {\n                    console.info(\"Popup entries not found\");\n                }\n            } else {\n                alias = await popup.manifestByAlias();\n\n                // prettier-ignore\n                const plugin = EntrypointPlugin.from(await popup.view().entries())\n                    .virtual(file => virtualViewModule(file));\n\n                if (config.command === Command.Watch) {\n                    plugin.watch(async () => {\n                        declaration.setAlias(await popup.clear().getAlias()).build();\n\n                        return popup.view().entries();\n                    });\n                }\n\n                const htmlPlugins = (await popup.view().html()).map(options => new HtmlRspackPlugin(options));\n                const tagsPlugins = (await popup.view().tags()).map(options => new HtmlRspackTagsPlugin(options));\n\n                plugins.push(plugin, ...htmlPlugins, ...tagsPlugins);\n            }\n\n            return {\n                plugins: [\n                    new GenerateModulePlugin({\n                        [PopupModuleName]: createPopupModule(alias),\n                    }),\n                    ...plugins,\n                ],\n            } as RspackConfig;\n        },\n        manifest: async ({manifest}) => {\n            manifest.setPopup(await popup.manifest()).appendCsp(await popup.csp());\n        },\n    };\n});\n"],"mappings":"AAAA,SAAuC,wBAAgC;AACvE,OAAO,0BAA0B;AAEjC,SAAQ,oBAAmB;AAE3B,SAAQ,kBAAkB,4BAA2B;AACrD,SAAQ,yBAAwB;AAEhC,OAAO,WAAkC;AACzC,SAAQ,mBAAmB,uBAAsB;AAEjD,SAAQ,wBAAuB;AAE/B,SAAQ,eAAc;AAEtB,IAAO,gBAAQ,aAAa,MAAM;AAC9B,MAAI;AACJ,MAAI;AAEJ,SAAO;AAAA,IACH,MAAM;AAAA,IACN,SAAS,CAAC,EAAC,OAAM,MAAM;AACnB,cAAQ,IAAI,MAAM,MAAM;AACxB,oBAAc,IAAI,iBAAiB,MAAM;AAAA,IAC7C;AAAA,IACA,OAAO,MAAM,MAAM,MAAM;AAAA,IACzB,SAAS,OAAO,EAAC,OAAM,MAAM;AACzB,kBAAY,SAAS,MAAM,MAAM,SAAS,CAAC,EAAE,MAAM;AAEnD,YAAM,UAAmB,CAAC;AAE1B,UAAI,QAA6B,CAAC;AAElC,UAAI,MAAM,MAAM,MAAM,GAAG;AACrB,YAAI,OAAO,OAAO;AACd,kBAAQ,KAAK,yBAAyB;AAAA,QAC1C;AAAA,MACJ,OAAO;AACH,gBAAQ,MAAM,MAAM,gBAAgB;AAGpC,cAAM,SAAS,iBAAiB,KAAK,MAAM,MAAM,KAAK,EAAE,QAAQ,CAAC,EAC5D,QAAQ,UAAQ,kBAAkB,IAAI,CAAC;AAE5C,YAAI,OAAO,YAAY,QAAQ,OAAO;AAClC,iBAAO,MAAM,YAAY;AACrB,wBAAY,SAAS,MAAM,MAAM,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;AAE3D,mBAAO,MAAM,KAAK,EAAE,QAAQ;AAAA,UAChC,CAAC;AAAA,QACL;AAEA,cAAM,eAAe,MAAM,MAAM,KAAK,EAAE,KAAK,GAAG,IAAI,aAAW,IAAI,iBAAiB,OAAO,CAAC;AAC5F,cAAM,eAAe,MAAM,MAAM,KAAK,EAAE,KAAK,GAAG,IAAI,aAAW,IAAI,qBAAqB,OAAO,CAAC;AAEhG,gBAAQ,KAAK,QAAQ,GAAG,aAAa,GAAG,WAAW;AAAA,MACvD;AAEA,aAAO;AAAA,QACH,SAAS;AAAA,UACL,IAAI,qBAAqB;AAAA,YACrB,CAAC,eAAe,GAAG,kBAAkB,KAAK;AAAA,UAC9C,CAAC;AAAA,UACD,GAAG;AAAA,QACP;AAAA,MACJ;AAAA,IACJ;AAAA,IACA,UAAU,OAAO,EAAC,SAAQ,MAAM;AAC5B,eAAS,SAAS,MAAM,MAAM,SAAS,CAAC,EAAE,UAAU,MAAM,MAAM,IAAI,CAAC;AAAA,IACzE;AAAA,EACJ;AACJ,CAAC;","names":[]}
+{"version":3,"sources":["../../../../src/cli/plugins/popup/index.ts"],"sourcesContent":["import {Configuration as RspackConfig, HtmlRspackPlugin, Plugins} from \"@rspack/core\";\nimport HtmlRspackTagsPlugin from \"html-rspack-tags-plugin\";\n\nimport {definePlugin} from \"@main/plugin\";\n\nimport {EntrypointPlugin, GenerateModulePlugin} from \"@cli/bundler\";\nimport {virtualViewModule} from \"@cli/virtual/index.js\";\n\nimport Popup, {PopupNameToManifest} from \"./Popup\";\nimport {createPopupModule, PopupModuleName} from \"./popup-module\";\n\nimport {PopupDeclaration} from \"./declaration\";\n\nimport {Command} from \"@typing/app\";\n\nexport default definePlugin(() => {\n    let popup: Popup;\n    let declaration: PopupDeclaration;\n\n    return {\n        name: \"adnbn:popup\",\n        startup: ({config}) => {\n            popup = new Popup(config);\n            declaration = new PopupDeclaration(config);\n        },\n        popup: () => popup.files(),\n        bundler: async ({config}) => {\n            declaration.setAlias(await popup.getAlias()).build();\n\n            const plugins: Plugins = [];\n\n            let alias: PopupNameToManifest = {};\n\n            if (await popup.empty()) {\n                if (config.debug) {\n                    console.info(\"Popup entries not found\");\n                }\n            } else {\n                alias = await popup.manifestByAlias();\n\n                // prettier-ignore\n                const plugin = EntrypointPlugin.from(await popup.view().entries())\n                    .virtual(file => virtualViewModule(file));\n\n                if (config.command === Command.Watch) {\n                    plugin.watch(async () => {\n                        declaration.setAlias(await popup.clear().getAlias()).build();\n\n                        return popup.view().entries();\n                    });\n                }\n\n                const htmlPlugins = (await popup.view().html()).map(options => new HtmlRspackPlugin(options));\n                const tagsPlugins = (await popup.view().tags()).map(options => new HtmlRspackTagsPlugin(options));\n\n                plugins.push(plugin, ...htmlPlugins, ...tagsPlugins);\n            }\n\n            return {\n                plugins: [\n                    new GenerateModulePlugin({\n                        [PopupModuleName]: createPopupModule(alias),\n                    }),\n                    ...plugins,\n                ],\n            } as RspackConfig;\n        },\n        manifest: async ({manifest}) => {\n            // Every built popup can be switched to at runtime, so all of them contribute their permissions.\n            manifest\n                .setPopup(await popup.manifest())\n                .appendCsp(await popup.csp())\n                .appendPermissions(await popup.permissions())\n                .appendOptionalPermissions(await popup.optionalPermissions())\n                .appendHostPermissions(await popup.hostPermissions())\n                .appendOptionalHostPermissions(await popup.optionalHostPermissions());\n        },\n    };\n});\n"],"mappings":"AAAA,SAAuC,wBAAgC;AACvE,OAAO,0BAA0B;AAEjC,SAAQ,oBAAmB;AAE3B,SAAQ,kBAAkB,4BAA2B;AACrD,SAAQ,yBAAwB;AAEhC,OAAO,WAAkC;AACzC,SAAQ,mBAAmB,uBAAsB;AAEjD,SAAQ,wBAAuB;AAE/B,SAAQ,eAAc;AAEtB,IAAO,gBAAQ,aAAa,MAAM;AAC9B,MAAI;AACJ,MAAI;AAEJ,SAAO;AAAA,IACH,MAAM;AAAA,IACN,SAAS,CAAC,EAAC,OAAM,MAAM;AACnB,cAAQ,IAAI,MAAM,MAAM;AACxB,oBAAc,IAAI,iBAAiB,MAAM;AAAA,IAC7C;AAAA,IACA,OAAO,MAAM,MAAM,MAAM;AAAA,IACzB,SAAS,OAAO,EAAC,OAAM,MAAM;AACzB,kBAAY,SAAS,MAAM,MAAM,SAAS,CAAC,EAAE,MAAM;AAEnD,YAAM,UAAmB,CAAC;AAE1B,UAAI,QAA6B,CAAC;AAElC,UAAI,MAAM,MAAM,MAAM,GAAG;AACrB,YAAI,OAAO,OAAO;AACd,kBAAQ,KAAK,yBAAyB;AAAA,QAC1C;AAAA,MACJ,OAAO;AACH,gBAAQ,MAAM,MAAM,gBAAgB;AAGpC,cAAM,SAAS,iBAAiB,KAAK,MAAM,MAAM,KAAK,EAAE,QAAQ,CAAC,EAC5D,QAAQ,UAAQ,kBAAkB,IAAI,CAAC;AAE5C,YAAI,OAAO,YAAY,QAAQ,OAAO;AAClC,iBAAO,MAAM,YAAY;AACrB,wBAAY,SAAS,MAAM,MAAM,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;AAE3D,mBAAO,MAAM,KAAK,EAAE,QAAQ;AAAA,UAChC,CAAC;AAAA,QACL;AAEA,cAAM,eAAe,MAAM,MAAM,KAAK,EAAE,KAAK,GAAG,IAAI,aAAW,IAAI,iBAAiB,OAAO,CAAC;AAC5F,cAAM,eAAe,MAAM,MAAM,KAAK,EAAE,KAAK,GAAG,IAAI,aAAW,IAAI,qBAAqB,OAAO,CAAC;AAEhG,gBAAQ,KAAK,QAAQ,GAAG,aAAa,GAAG,WAAW;AAAA,MACvD;AAEA,aAAO;AAAA,QACH,SAAS;AAAA,UACL,IAAI,qBAAqB;AAAA,YACrB,CAAC,eAAe,GAAG,kBAAkB,KAAK;AAAA,UAC9C,CAAC;AAAA,UACD,GAAG;AAAA,QACP;AAAA,MACJ;AAAA,IACJ;AAAA,IACA,UAAU,OAAO,EAAC,SAAQ,MAAM;AAE5B,eACK,SAAS,MAAM,MAAM,SAAS,CAAC,EAC/B,UAAU,MAAM,MAAM,IAAI,CAAC,EAC3B,kBAAkB,MAAM,MAAM,YAAY,CAAC,EAC3C,0BAA0B,MAAM,MAAM,oBAAoB,CAAC,EAC3D,sBAAsB,MAAM,MAAM,gBAAgB,CAAC,EACnD,8BAA8B,MAAM,MAAM,wBAAwB,CAAC;AAAA,IAC5E;AAAA,EACJ;AACJ,CAAC;","names":[]}

package/dist/cli/plugins/sidebar/index.js

@@ -62,8 +62,7 @@ var sidebar_default = definePlugin(() => {
       if (!sidebarAvailable) {
         return;
       }
-      manifest.setSidebar(await sidebar.manifest());
-      manifest.appendCsp(await sidebar.csp());
+      manifest.setSidebar(await sidebar.manifest()).appendCsp(await sidebar.csp()).appendPermissions(await sidebar.permissions()).appendOptionalPermissions(await sidebar.optionalPermissions()).appendHostPermissions(await sidebar.hostPermissions()).appendOptionalHostPermissions(await sidebar.optionalHostPermissions());
       if (await sidebar.exists() && !SidebarAlternativeBrowsers.has(config.browser)) {
         manifest.addPermission("sidePanel");
       }

package/dist/cli/plugins/sidebar/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/sidebar/index.ts"],"sourcesContent":["import {Configuration as RspackConfig, HtmlRspackPlugin, Plugins} from \"@rspack/core\";\nimport HtmlRspackTagsPlugin from \"html-rspack-tags-plugin\";\n\nimport {definePlugin} from \"@main/plugin\";\n\nimport {EntrypointPlugin, GenerateModulePlugin} from \"@cli/bundler\";\nimport {virtualViewModule} from \"@cli/virtual/index.js\";\n\nimport Sidebar, {SidebarNameToManifest} from \"./Sidebar\";\nimport {createSidebarModule, SidebarModuleName} from \"./sidebar-module\";\n\nimport {SidebarDeclaration} from \"./declaration\";\n\nimport {Command} from \"@typing/app\";\nimport {SidebarAlternativeBrowsers} from \"@typing/sidebar\";\n\nexport default definePlugin(() => {\n    let sidebar: Sidebar;\n    let declaration: SidebarDeclaration;\n\n    let sidebarAvailable: boolean = false;\n\n    return {\n        name: \"adnbn:sidebar\",\n        startup: ({config}) => {\n            sidebar = new Sidebar(config);\n            declaration = new SidebarDeclaration(config);\n\n            sidebarAvailable = SidebarAlternativeBrowsers.has(config.browser) || config.manifestVersion !== 2;\n        },\n        sidebar: () => sidebar.files(),\n        bundler: async ({config}) => {\n            declaration.setAlias(await sidebar.getAlias()).build();\n\n            let build: boolean = true;\n\n            if (await sidebar.empty()) {\n                if (config.debug) {\n                    console.info(\"Sidebar entries not found\");\n                }\n\n                build = false;\n            } else if (!sidebarAvailable) {\n                if (config.debug) {\n                    console.warn(\"Sidebar not supported for manifest version 2\");\n                }\n\n                build = false;\n            }\n\n            const plugins: Plugins = [];\n\n            let alias: SidebarNameToManifest = {};\n\n            if (build) {\n                alias = await sidebar.manifestByAlias();\n\n                // prettier-ignore\n                const plugin = EntrypointPlugin.from(await sidebar.view().entries())\n                    .virtual(file => virtualViewModule(file));\n\n                if (config.command === Command.Watch) {\n                    plugin.watch(async () => {\n                        declaration.setAlias(await sidebar.clear().getAlias()).build();\n\n                        return sidebar.view().entries();\n                    });\n                }\n\n                const htmlPlugins = (await sidebar.view().html()).map(options => new HtmlRspackPlugin(options));\n                const tagsPlugins = (await sidebar.view().tags()).map(options => new HtmlRspackTagsPlugin(options));\n\n                plugins.push(plugin, ...htmlPlugins, ...tagsPlugins);\n            }\n\n            return {\n                plugins: [\n                    new GenerateModulePlugin({\n                        [SidebarModuleName]: createSidebarModule(alias),\n                    }),\n                    ...plugins,\n                ],\n            } as RspackConfig;\n        },\n        manifest: async ({manifest, config}) => {\n            if (!sidebarAvailable) {\n                return;\n            }\n\n            manifest.setSidebar(await sidebar.manifest());\n            manifest.appendCsp(await sidebar.csp());\n\n            if ((await sidebar.exists()) && !SidebarAlternativeBrowsers.has(config.browser)) {\n                manifest.addPermission(\"sidePanel\");\n            }\n        },\n    };\n});\n"],"mappings":"AAAA,SAAuC,wBAAgC;AACvE,OAAO,0BAA0B;AAEjC,SAAQ,oBAAmB;AAE3B,SAAQ,kBAAkB,4BAA2B;AACrD,SAAQ,yBAAwB;AAEhC,OAAO,aAAsC;AAC7C,SAAQ,qBAAqB,yBAAwB;AAErD,SAAQ,0BAAyB;AAEjC,SAAQ,eAAc;AACtB,SAAQ,kCAAiC;AAEzC,IAAO,kBAAQ,aAAa,MAAM;AAC9B,MAAI;AACJ,MAAI;AAEJ,MAAI,mBAA4B;AAEhC,SAAO;AAAA,IACH,MAAM;AAAA,IACN,SAAS,CAAC,EAAC,OAAM,MAAM;AACnB,gBAAU,IAAI,QAAQ,MAAM;AAC5B,oBAAc,IAAI,mBAAmB,MAAM;AAE3C,yBAAmB,2BAA2B,IAAI,OAAO,OAAO,KAAK,OAAO,oBAAoB;AAAA,IACpG;AAAA,IACA,SAAS,MAAM,QAAQ,MAAM;AAAA,IAC7B,SAAS,OAAO,EAAC,OAAM,MAAM;AACzB,kBAAY,SAAS,MAAM,QAAQ,SAAS,CAAC,EAAE,MAAM;AAErD,UAAI,QAAiB;AAErB,UAAI,MAAM,QAAQ,MAAM,GAAG;AACvB,YAAI,OAAO,OAAO;AACd,kBAAQ,KAAK,2BAA2B;AAAA,QAC5C;AAEA,gBAAQ;AAAA,MACZ,WAAW,CAAC,kBAAkB;AAC1B,YAAI,OAAO,OAAO;AACd,kBAAQ,KAAK,8CAA8C;AAAA,QAC/D;AAEA,gBAAQ;AAAA,MACZ;AAEA,YAAM,UAAmB,CAAC;AAE1B,UAAI,QAA+B,CAAC;AAEpC,UAAI,OAAO;AACP,gBAAQ,MAAM,QAAQ,gBAAgB;AAGtC,cAAM,SAAS,iBAAiB,KAAK,MAAM,QAAQ,KAAK,EAAE,QAAQ,CAAC,EAC9D,QAAQ,UAAQ,kBAAkB,IAAI,CAAC;AAE5C,YAAI,OAAO,YAAY,QAAQ,OAAO;AAClC,iBAAO,MAAM,YAAY;AACrB,wBAAY,SAAS,MAAM,QAAQ,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;AAE7D,mBAAO,QAAQ,KAAK,EAAE,QAAQ;AAAA,UAClC,CAAC;AAAA,QACL;AAEA,cAAM,eAAe,MAAM,QAAQ,KAAK,EAAE,KAAK,GAAG,IAAI,aAAW,IAAI,iBAAiB,OAAO,CAAC;AAC9F,cAAM,eAAe,MAAM,QAAQ,KAAK,EAAE,KAAK,GAAG,IAAI,aAAW,IAAI,qBAAqB,OAAO,CAAC;AAElG,gBAAQ,KAAK,QAAQ,GAAG,aAAa,GAAG,WAAW;AAAA,MACvD;AAEA,aAAO;AAAA,QACH,SAAS;AAAA,UACL,IAAI,qBAAqB;AAAA,YACrB,CAAC,iBAAiB,GAAG,oBAAoB,KAAK;AAAA,UAClD,CAAC;AAAA,UACD,GAAG;AAAA,QACP;AAAA,MACJ;AAAA,IACJ;AAAA,IACA,UAAU,OAAO,EAAC,UAAU,OAAM,MAAM;AACpC,UAAI,CAAC,kBAAkB;AACnB;AAAA,MACJ;AAEA,eAAS,WAAW,MAAM,QAAQ,SAAS,CAAC;AAC5C,eAAS,UAAU,MAAM,QAAQ,IAAI,CAAC;AAEtC,UAAK,MAAM,QAAQ,OAAO,KAAM,CAAC,2BAA2B,IAAI,OAAO,OAAO,GAAG;AAC7E,iBAAS,cAAc,WAAW;AAAA,MACtC;AAAA,IACJ;AAAA,EACJ;AACJ,CAAC;","names":[]}
+{"version":3,"sources":["../../../../src/cli/plugins/sidebar/index.ts"],"sourcesContent":["import {Configuration as RspackConfig, HtmlRspackPlugin, Plugins} from \"@rspack/core\";\nimport HtmlRspackTagsPlugin from \"html-rspack-tags-plugin\";\n\nimport {definePlugin} from \"@main/plugin\";\n\nimport {EntrypointPlugin, GenerateModulePlugin} from \"@cli/bundler\";\nimport {virtualViewModule} from \"@cli/virtual/index.js\";\n\nimport Sidebar, {SidebarNameToManifest} from \"./Sidebar\";\nimport {createSidebarModule, SidebarModuleName} from \"./sidebar-module\";\n\nimport {SidebarDeclaration} from \"./declaration\";\n\nimport {Command} from \"@typing/app\";\nimport {SidebarAlternativeBrowsers} from \"@typing/sidebar\";\n\nexport default definePlugin(() => {\n    let sidebar: Sidebar;\n    let declaration: SidebarDeclaration;\n\n    let sidebarAvailable: boolean = false;\n\n    return {\n        name: \"adnbn:sidebar\",\n        startup: ({config}) => {\n            sidebar = new Sidebar(config);\n            declaration = new SidebarDeclaration(config);\n\n            sidebarAvailable = SidebarAlternativeBrowsers.has(config.browser) || config.manifestVersion !== 2;\n        },\n        sidebar: () => sidebar.files(),\n        bundler: async ({config}) => {\n            declaration.setAlias(await sidebar.getAlias()).build();\n\n            let build: boolean = true;\n\n            if (await sidebar.empty()) {\n                if (config.debug) {\n                    console.info(\"Sidebar entries not found\");\n                }\n\n                build = false;\n            } else if (!sidebarAvailable) {\n                if (config.debug) {\n                    console.warn(\"Sidebar not supported for manifest version 2\");\n                }\n\n                build = false;\n            }\n\n            const plugins: Plugins = [];\n\n            let alias: SidebarNameToManifest = {};\n\n            if (build) {\n                alias = await sidebar.manifestByAlias();\n\n                // prettier-ignore\n                const plugin = EntrypointPlugin.from(await sidebar.view().entries())\n                    .virtual(file => virtualViewModule(file));\n\n                if (config.command === Command.Watch) {\n                    plugin.watch(async () => {\n                        declaration.setAlias(await sidebar.clear().getAlias()).build();\n\n                        return sidebar.view().entries();\n                    });\n                }\n\n                const htmlPlugins = (await sidebar.view().html()).map(options => new HtmlRspackPlugin(options));\n                const tagsPlugins = (await sidebar.view().tags()).map(options => new HtmlRspackTagsPlugin(options));\n\n                plugins.push(plugin, ...htmlPlugins, ...tagsPlugins);\n            }\n\n            return {\n                plugins: [\n                    new GenerateModulePlugin({\n                        [SidebarModuleName]: createSidebarModule(alias),\n                    }),\n                    ...plugins,\n                ],\n            } as RspackConfig;\n        },\n        manifest: async ({manifest, config}) => {\n            if (!sidebarAvailable) {\n                return;\n            }\n\n            // Every built sidebar can be switched to at runtime, so all of them contribute their permissions.\n            manifest\n                .setSidebar(await sidebar.manifest())\n                .appendCsp(await sidebar.csp())\n                .appendPermissions(await sidebar.permissions())\n                .appendOptionalPermissions(await sidebar.optionalPermissions())\n                .appendHostPermissions(await sidebar.hostPermissions())\n                .appendOptionalHostPermissions(await sidebar.optionalHostPermissions());\n\n            if ((await sidebar.exists()) && !SidebarAlternativeBrowsers.has(config.browser)) {\n                manifest.addPermission(\"sidePanel\");\n            }\n        },\n    };\n});\n"],"mappings":"AAAA,SAAuC,wBAAgC;AACvE,OAAO,0BAA0B;AAEjC,SAAQ,oBAAmB;AAE3B,SAAQ,kBAAkB,4BAA2B;AACrD,SAAQ,yBAAwB;AAEhC,OAAO,aAAsC;AAC7C,SAAQ,qBAAqB,yBAAwB;AAErD,SAAQ,0BAAyB;AAEjC,SAAQ,eAAc;AACtB,SAAQ,kCAAiC;AAEzC,IAAO,kBAAQ,aAAa,MAAM;AAC9B,MAAI;AACJ,MAAI;AAEJ,MAAI,mBAA4B;AAEhC,SAAO;AAAA,IACH,MAAM;AAAA,IACN,SAAS,CAAC,EAAC,OAAM,MAAM;AACnB,gBAAU,IAAI,QAAQ,MAAM;AAC5B,oBAAc,IAAI,mBAAmB,MAAM;AAE3C,yBAAmB,2BAA2B,IAAI,OAAO,OAAO,KAAK,OAAO,oBAAoB;AAAA,IACpG;AAAA,IACA,SAAS,MAAM,QAAQ,MAAM;AAAA,IAC7B,SAAS,OAAO,EAAC,OAAM,MAAM;AACzB,kBAAY,SAAS,MAAM,QAAQ,SAAS,CAAC,EAAE,MAAM;AAErD,UAAI,QAAiB;AAErB,UAAI,MAAM,QAAQ,MAAM,GAAG;AACvB,YAAI,OAAO,OAAO;AACd,kBAAQ,KAAK,2BAA2B;AAAA,QAC5C;AAEA,gBAAQ;AAAA,MACZ,WAAW,CAAC,kBAAkB;AAC1B,YAAI,OAAO,OAAO;AACd,kBAAQ,KAAK,8CAA8C;AAAA,QAC/D;AAEA,gBAAQ;AAAA,MACZ;AAEA,YAAM,UAAmB,CAAC;AAE1B,UAAI,QAA+B,CAAC;AAEpC,UAAI,OAAO;AACP,gBAAQ,MAAM,QAAQ,gBAAgB;AAGtC,cAAM,SAAS,iBAAiB,KAAK,MAAM,QAAQ,KAAK,EAAE,QAAQ,CAAC,EAC9D,QAAQ,UAAQ,kBAAkB,IAAI,CAAC;AAE5C,YAAI,OAAO,YAAY,QAAQ,OAAO;AAClC,iBAAO,MAAM,YAAY;AACrB,wBAAY,SAAS,MAAM,QAAQ,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;AAE7D,mBAAO,QAAQ,KAAK,EAAE,QAAQ;AAAA,UAClC,CAAC;AAAA,QACL;AAEA,cAAM,eAAe,MAAM,QAAQ,KAAK,EAAE,KAAK,GAAG,IAAI,aAAW,IAAI,iBAAiB,OAAO,CAAC;AAC9F,cAAM,eAAe,MAAM,QAAQ,KAAK,EAAE,KAAK,GAAG,IAAI,aAAW,IAAI,qBAAqB,OAAO,CAAC;AAElG,gBAAQ,KAAK,QAAQ,GAAG,aAAa,GAAG,WAAW;AAAA,MACvD;AAEA,aAAO;AAAA,QACH,SAAS;AAAA,UACL,IAAI,qBAAqB;AAAA,YACrB,CAAC,iBAAiB,GAAG,oBAAoB,KAAK;AAAA,UAClD,CAAC;AAAA,UACD,GAAG;AAAA,QACP;AAAA,MACJ;AAAA,IACJ;AAAA,IACA,UAAU,OAAO,EAAC,UAAU,OAAM,MAAM;AACpC,UAAI,CAAC,kBAAkB;AACnB;AAAA,MACJ;AAGA,eACK,WAAW,MAAM,QAAQ,SAAS,CAAC,EACnC,UAAU,MAAM,QAAQ,IAAI,CAAC,EAC7B,kBAAkB,MAAM,QAAQ,YAAY,CAAC,EAC7C,0BAA0B,MAAM,QAAQ,oBAAoB,CAAC,EAC7D,sBAAsB,MAAM,QAAQ,gBAAgB,CAAC,EACrD,8BAA8B,MAAM,QAAQ,wBAAwB,CAAC;AAE1E,UAAK,MAAM,QAAQ,OAAO,KAAM,CAAC,2BAA2B,IAAI,OAAO,OAAO,GAAG;AAC7E,iBAAS,cAAc,WAAW;AAAA,MACtC;AAAA,IACJ;AAAA,EACJ;AACJ,CAAC;","names":[]}

package/dist/cli/plugins/style/index.d.ts

@@ -1,3 +1,2 @@
-import type { StylePluginOptions } from "./types.js";
-declare const _default: import("../../../main/plugin.js").PluginDefinition<[(StylePluginOptions | undefined)?]>;
+declare const _default: import("../../../main/plugin.js").PluginDefinition<[]>;
 export default _default;

package/dist/cli/plugins/style/index.js

@@ -3,13 +3,13 @@ import path from "path";
 import fs from "fs";
 import { CssExtractRspackPlugin } from "@rspack/core";
 import { mergeStyleSources } from "./utils.js";
-import { IsolatedStylesLayer } from "./../../../cli/bundler/layers.js";
+import { DocumentStylesLayer, DefaultStylesLayer } from "./../../../cli/bundler/layers.js";
 import { definePlugin } from "./../../../main/plugin.js";
 import { appFilenameResolver } from "./../../../cli/bundler/index.js";
 import { getAppSourcePath, getResolvePath, getSharedPath } from "./../../../cli/resolvers/path.js";
 import { toPosix } from "./../../../cli/utils/path.js";
-const IsolatedAsIsLoaderIdent = "adnbn-isolated-asis";
-const IsolatedModulesLoaderIdent = "adnbn-isolated-modules";
+const DefaultAsIsLoaderIdent = "adnbn-default-asis";
+const DefaultModulesLoaderIdent = "adnbn-default-modules";
 const styleMergerLoader = (config) => (sharedStyle, sharedPath) => {
   const sharedDir = getResolvePath(getSharedPath(config));
   if (sharedPath.startsWith(sharedDir)) {
@@ -32,7 +32,7 @@ const styleMergerLoader = (config) => (sharedStyle, sharedPath) => {
     }
   }
 };
-var style_default = definePlugin(({ isolationIssuerLayer } = {}) => {
+var style_default = definePlugin(() => {
   return {
     name: "adnbn:styles",
     bundler: ({ config }) => {
@@ -51,19 +51,19 @@ var style_default = definePlugin(({ isolationIssuerLayer } = {}) => {
         }
         return rules;
       };
-      const createStyleRules = (isolated = false) => [
+      const createStyleRules = (defaultStyles = false) => [
         {
           resourceQuery: /[?&]asis(?:[=&]|$)/,
           use: createSassRuleSet({
             loader: "css-loader",
-            ...isolated ? { ident: IsolatedAsIsLoaderIdent } : {},
+            ...defaultStyles ? { ident: DefaultAsIsLoaderIdent } : {},
             options: { esModule: true, modules: false }
           })
         },
         {
           use: createSassRuleSet({
             loader: "css-loader",
-            ...isolated ? { ident: IsolatedModulesLoaderIdent } : {},
+            ...defaultStyles ? { ident: DefaultModulesLoaderIdent } : {},
             options: {
               esModule: true,
               modules: {
@@ -86,35 +86,24 @@ var style_default = definePlugin(({ isolationIssuerLayer } = {}) => {
             chunkFilename: filename
           })
         ],
-        optimization: {
-          splitChunks: {
-            cacheGroups: {
-              adnbnIsolatedStyles: {
-                type: "css/mini-extract",
-                layer: IsolatedStylesLayer,
-                chunks: "all",
-                enforce: true,
-                name: false,
-                priority: 100
-              }
-            }
-          }
-        },
         module: {
           rules: [
             {
               test: /\.(scss|css)$/,
               type: "javascript/auto",
               oneOf: [
-                ...isolationIssuerLayer === void 0 ? [] : [
-                  {
-                    issuerLayer: isolationIssuerLayer,
-                    resourceQuery: /[?&]isolation(?:[=&]|$)/,
-                    layer: IsolatedStylesLayer,
-                    oneOf: createStyleRules(true)
-                  }
-                ],
-                { oneOf: createStyleRules() }
+                {
+                  resourceQuery: /[?&]unisolated(?:[=&]|$)/,
+                  layer: DocumentStylesLayer,
+                  oneOf: createStyleRules()
+                },
+                {
+                  // Nested CSS imports preserve an explicit document destination.
+                  issuerLayer: DocumentStylesLayer,
+                  layer: DocumentStylesLayer,
+                  oneOf: createStyleRules()
+                },
+                { layer: DefaultStylesLayer, oneOf: createStyleRules(true) }
               ]
             }
           ]

package/dist/cli/plugins/style/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/style/index.ts"],"sourcesContent":["import _ from \"lodash\";\nimport path from \"path\";\nimport fs from \"fs\";\nimport {Configuration as RspackConfig, CssExtractRspackPlugin, RuleSetUse, RuleSetUseItem} from \"@rspack/core\";\n\nimport {mergeStyleSources} from \"./utils\";\nimport type {StylePluginOptions} from \"./types\";\nimport {IsolatedStylesLayer} from \"@cli/bundler/layers\";\n\nimport {definePlugin} from \"@main/plugin\";\n\nimport {appFilenameResolver} from \"@cli/bundler\";\nimport {getAppSourcePath, getResolvePath, getSharedPath} from \"@cli/resolvers/path\";\nimport {toPosix} from \"@cli/utils/path\";\n\nimport {ReadonlyConfig} from \"@typing/config\";\n\n// CssExtract also identifies dependencies by loader request, not just by layer.\n// Keep isolated requests distinct from ordinary CSS and from each other's options.\nconst IsolatedAsIsLoaderIdent = \"adnbn-isolated-asis\";\nconst IsolatedModulesLoaderIdent = \"adnbn-isolated-modules\";\n\n// prettier-ignore\nconst styleMergerLoader =\n    (config: ReadonlyConfig) =>\n        (sharedStyle: string, sharedPath: string): string | void => {\n            const sharedDir = getResolvePath(getSharedPath(config));\n\n            if (sharedPath.startsWith(sharedDir)) {\n                const relativePath = path.relative(sharedDir, sharedPath);\n\n                const appDir = getResolvePath(getAppSourcePath(config));\n                const appPath = getResolvePath(path.join(appDir, relativePath));\n\n                if (fs.existsSync(appPath)) {\n                    let appStyle = fs.readFileSync(appPath, \"utf8\");\n\n                    appStyle = appStyle.replace(/url\\((['\"]?)(.*?)\\1\\)/g, (match, quote, filePath) => {\n                        if (\n                            filePath.startsWith(\"/\") ||\n                            filePath.startsWith(\"http\") ||\n                            filePath.startsWith(\"data:\")\n                        ) {\n                            return match;\n                        }\n\n                        const cssDir = path.dirname(appPath);\n                        const assetAbs = path.resolve(cssDir, filePath);\n\n                        const sharedFileDir = path.dirname(sharedPath);\n\n                        const relativeToSharedFile = path.relative(sharedFileDir, assetAbs);\n\n                        return `url(\"${toPosix(relativeToSharedFile)}\")`;\n                    });\n\n                    return mergeStyleSources(sharedStyle, appStyle);\n                }\n            }\n        };\n\nexport default definePlugin(({isolationIssuerLayer}: StylePluginOptions = {}) => {\n    return {\n        name: \"adnbn:styles\",\n        bundler: ({config}) => {\n            const {app, cssDir, cssFilename, cssIdentName, mergeStyles} = config;\n\n            const filename = appFilenameResolver(app, cssFilename, cssDir);\n            const kebabApp = _.kebabCase(app);\n\n            const createSassRuleSet = (rule: RuleSetUseItem): RuleSetUse => {\n                const rules: RuleSetUse = [CssExtractRspackPlugin.loader, rule, \"sass-loader\"];\n\n                if (mergeStyles) {\n                    rules.push({\n                        loader: \"source-modifier-loader\",\n                        options: {\n                            modify: styleMergerLoader(config),\n                        },\n                    });\n                }\n\n                return rules;\n            };\n\n            const createStyleRules = (isolated = false) => [\n                {\n                    resourceQuery: /[?&]asis(?:[=&]|$)/,\n                    use: createSassRuleSet({\n                        loader: \"css-loader\",\n                        ...(isolated ? {ident: IsolatedAsIsLoaderIdent} : {}),\n                        options: {esModule: true, modules: false},\n                    }),\n                },\n                {\n                    use: createSassRuleSet({\n                        loader: \"css-loader\",\n                        ...(isolated ? {ident: IsolatedModulesLoaderIdent} : {}),\n                        options: {\n                            esModule: true,\n                            modules: {\n                                exportLocalsConvention: \"as-is\",\n                                namedExport: false,\n                                localIdentName: cssIdentName.replaceAll(\"[app]\", kebabApp),\n                                localIdentHashSalt: kebabApp,\n                            },\n                        },\n                    }),\n                },\n            ];\n\n            return {\n                resolve: {\n                    extensions: [\".css\", \".scss\"],\n                },\n                plugins: [\n                    new CssExtractRspackPlugin({\n                        filename,\n                        chunkFilename: filename,\n                    }),\n                ],\n                optimization: {\n                    splitChunks: {\n                        cacheGroups: {\n                            adnbnIsolatedStyles: {\n                                type: \"css/mini-extract\",\n                                layer: IsolatedStylesLayer,\n                                chunks: \"all\",\n                                enforce: true,\n                                name: false,\n                                priority: 100,\n                            },\n                        },\n                    },\n                },\n                module: {\n                    rules: [\n                        {\n                            test: /\\.(scss|css)$/,\n                            type: \"javascript/auto\",\n                            oneOf: [\n                                ...(isolationIssuerLayer === undefined\n                                    ? []\n                                    : [\n                                          {\n                                              issuerLayer: isolationIssuerLayer,\n                                              resourceQuery: /[?&]isolation(?:[=&]|$)/,\n                                              layer: IsolatedStylesLayer,\n                                              oneOf: createStyleRules(true),\n                                          },\n                                      ]),\n                                {oneOf: createStyleRules()},\n                            ],\n                        },\n                    ],\n                },\n            } satisfies RspackConfig;\n        },\n    };\n});\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../../src/cli/plugins/style/index.ts"],"sourcesContent":["import _ from \"lodash\";\nimport path from \"path\";\nimport fs from \"fs\";\nimport {Configuration as RspackConfig, CssExtractRspackPlugin, RuleSetUse, RuleSetUseItem} from \"@rspack/core\";\n\nimport {mergeStyleSources} from \"./utils\";\nimport {DocumentStylesLayer, DefaultStylesLayer} from \"@cli/bundler/layers\";\n\nimport {definePlugin} from \"@main/plugin\";\n\nimport {appFilenameResolver} from \"@cli/bundler\";\nimport {getAppSourcePath, getResolvePath, getSharedPath} from \"@cli/resolvers/path\";\nimport {toPosix} from \"@cli/utils/path\";\n\nimport {ReadonlyConfig} from \"@typing/config\";\n\n// CssExtract also identifies dependencies by loader request, not just by layer.\n// Keep default and document styles distinct even when their contents are identical.\nconst DefaultAsIsLoaderIdent = \"adnbn-default-asis\";\nconst DefaultModulesLoaderIdent = \"adnbn-default-modules\";\n\n// prettier-ignore\nconst styleMergerLoader =\n    (config: ReadonlyConfig) =>\n        (sharedStyle: string, sharedPath: string): string | void => {\n            const sharedDir = getResolvePath(getSharedPath(config));\n\n            if (sharedPath.startsWith(sharedDir)) {\n                const relativePath = path.relative(sharedDir, sharedPath);\n\n                const appDir = getResolvePath(getAppSourcePath(config));\n                const appPath = getResolvePath(path.join(appDir, relativePath));\n\n                if (fs.existsSync(appPath)) {\n                    let appStyle = fs.readFileSync(appPath, \"utf8\");\n\n                    appStyle = appStyle.replace(/url\\((['\"]?)(.*?)\\1\\)/g, (match, quote, filePath) => {\n                        if (\n                            filePath.startsWith(\"/\") ||\n                            filePath.startsWith(\"http\") ||\n                            filePath.startsWith(\"data:\")\n                        ) {\n                            return match;\n                        }\n\n                        const cssDir = path.dirname(appPath);\n                        const assetAbs = path.resolve(cssDir, filePath);\n\n                        const sharedFileDir = path.dirname(sharedPath);\n\n                        const relativeToSharedFile = path.relative(sharedFileDir, assetAbs);\n\n                        return `url(\"${toPosix(relativeToSharedFile)}\")`;\n                    });\n\n                    return mergeStyleSources(sharedStyle, appStyle);\n                }\n            }\n        };\n\nexport default definePlugin(() => {\n    return {\n        name: \"adnbn:styles\",\n        bundler: ({config}) => {\n            const {app, cssDir, cssFilename, cssIdentName, mergeStyles} = config;\n\n            const filename = appFilenameResolver(app, cssFilename, cssDir);\n            const kebabApp = _.kebabCase(app);\n\n            const createSassRuleSet = (rule: RuleSetUseItem): RuleSetUse => {\n                const rules: RuleSetUse = [CssExtractRspackPlugin.loader, rule, \"sass-loader\"];\n\n                if (mergeStyles) {\n                    rules.push({\n                        loader: \"source-modifier-loader\",\n                        options: {\n                            modify: styleMergerLoader(config),\n                        },\n                    });\n                }\n\n                return rules;\n            };\n\n            const createStyleRules = (defaultStyles = false) => [\n                {\n                    resourceQuery: /[?&]asis(?:[=&]|$)/,\n                    use: createSassRuleSet({\n                        loader: \"css-loader\",\n                        ...(defaultStyles ? {ident: DefaultAsIsLoaderIdent} : {}),\n                        options: {esModule: true, modules: false},\n                    }),\n                },\n                {\n                    use: createSassRuleSet({\n                        loader: \"css-loader\",\n                        ...(defaultStyles ? {ident: DefaultModulesLoaderIdent} : {}),\n                        options: {\n                            esModule: true,\n                            modules: {\n                                exportLocalsConvention: \"as-is\",\n                                namedExport: false,\n                                localIdentName: cssIdentName.replaceAll(\"[app]\", kebabApp),\n                                localIdentHashSalt: kebabApp,\n                            },\n                        },\n                    }),\n                },\n            ];\n\n            return {\n                resolve: {\n                    extensions: [\".css\", \".scss\"],\n                },\n                plugins: [\n                    new CssExtractRspackPlugin({\n                        filename,\n                        chunkFilename: filename,\n                    }),\n                ],\n                module: {\n                    rules: [\n                        {\n                            test: /\\.(scss|css)$/,\n                            type: \"javascript/auto\",\n                            oneOf: [\n                                {\n                                    resourceQuery: /[?&]unisolated(?:[=&]|$)/,\n                                    layer: DocumentStylesLayer,\n                                    oneOf: createStyleRules(),\n                                },\n                                {\n                                    // Nested CSS imports preserve an explicit document destination.\n                                    issuerLayer: DocumentStylesLayer,\n                                    layer: DocumentStylesLayer,\n                                    oneOf: createStyleRules(),\n                                },\n                                {layer: DefaultStylesLayer, oneOf: createStyleRules(true)},\n                            ],\n                        },\n                    ],\n                },\n            } satisfies RspackConfig;\n        },\n    };\n});\n"],"mappings":"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","names":[]}

package/dist/cli/plugins/view/View.d.ts

@@ -2,7 +2,7 @@ import type { HtmlRspackPluginOptions } from "@rspack/core";
 import type { Options as HtmlRspackTagsPluginOptions } from "html-rspack-tags-plugin";
 import { AbstractViewFinder } from "../../entrypoint/index.js";
 import { EntrypointEntries } from "../../../types/entrypoint.js";
-import { ViewEntrypointOptions } from "../../../types/view.js";
+import { ViewEntrypointOptions } from "../../../types/view/index.js";
 import { ReadonlyConfig } from "../../../types/config.js";
 export default class<O extends ViewEntrypointOptions> {
     protected readonly config: ReadonlyConfig;

package/dist/cli/plugins/view/View.js

@@ -1,5 +1,6 @@
 import path from "path";
 import _ from "lodash";
+import { HtmlOptionKeys } from "./../../../cli/entrypoint/index.js";
 class View_default {
   constructor(config, finder) {
     this.config = config;
@@ -33,16 +34,7 @@ class View_default {
     const tags = [];
     const views = await this.finder.views();
     for (const { filename, options } of views.values()) {
-      const {
-        as,
-        title,
-        template,
-        excludeApp,
-        includeApp,
-        excludeBrowser,
-        includeBrowser,
-        ...tagOptions
-      } = options;
+      const tagOptions = _.pick(options, HtmlOptionKeys);
       if (!_.isEmpty(tagOptions)) {
         tags.push({
           ...tagOptions,

package/dist/cli/plugins/view/View.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/view/View.ts"],"sourcesContent":["import path from \"path\";\nimport _ from \"lodash\";\n\nimport type {HtmlRspackPluginOptions} from \"@rspack/core\";\nimport type {Options as HtmlRspackTagsPluginOptions} from \"html-rspack-tags-plugin\";\n\nimport {AbstractViewFinder} from \"@cli/entrypoint/index.js\";\n\nimport {EntrypointEntries} from \"@typing/entrypoint\";\nimport {ViewEntrypointOptions} from \"@typing/view\";\nimport {ReadonlyConfig} from \"@typing/config\";\n\nexport default class<O extends ViewEntrypointOptions> {\n    public constructor(\n        protected readonly config: ReadonlyConfig,\n        protected readonly finder: AbstractViewFinder<O>\n    ) {}\n\n    public async entries(): Promise<EntrypointEntries> {\n        const entries: EntrypointEntries = new Map();\n\n        for (const [name, page] of await this.finder.views()) {\n            entries.set(name, new Set([page.file]));\n        }\n\n        return entries;\n    }\n\n    public async html(): Promise<HtmlRspackPluginOptions[]> {\n        const html: HtmlRspackPluginOptions[] = [];\n\n        for (const [name, {file, filename, options}] of await this.finder.views()) {\n            const {template, title} = options;\n\n            html.push({\n                filename,\n                title: title || _.startCase(this.config.app),\n                template: template ? path.resolve(path.dirname(file.file), template) : undefined,\n                chunks: [name],\n                inject: \"body\",\n                minify: true,\n            });\n        }\n\n        return html;\n    }\n\n    public async tags(): Promise<HtmlRspackTagsPluginOptions[]> {\n        const tags: HtmlRspackTagsPluginOptions[] = [];\n\n        const views = await this.finder.views();\n\n        for (const {filename, options} of views.values()) {\n            // prettier-ignore\n            const {\n                as,\n                title,\n                template,\n                excludeApp,\n                includeApp,\n                excludeBrowser,\n                includeBrowser,\n                ...tagOptions\n            } = options;\n\n            if (!_.isEmpty(tagOptions)) {\n                tags.push({\n                    ...tagOptions,\n                    files: [filename],\n                });\n            }\n        }\n\n        return tags;\n    }\n}\n"],"mappings":"AAAA,OAAO,UAAU;AACjB,OAAO,OAAO;AAWd,MAAO,aAA+C;AAAA,EAC3C,YACgB,QACA,QACrB;AAFqB;AACA;AAAA,EACpB;AAAA,EAFoB;AAAA,EACA;AAAA,EAGvB,MAAa,UAAsC;AAC/C,UAAM,UAA6B,oBAAI,IAAI;AAE3C,eAAW,CAAC,MAAM,IAAI,KAAK,MAAM,KAAK,OAAO,MAAM,GAAG;AAClD,cAAQ,IAAI,MAAM,oBAAI,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;AAAA,IAC1C;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,MAAa,OAA2C;AACpD,UAAM,OAAkC,CAAC;AAEzC,eAAW,CAAC,MAAM,EAAC,MAAM,UAAU,QAAO,CAAC,KAAK,MAAM,KAAK,OAAO,MAAM,GAAG;AACvE,YAAM,EAAC,UAAU,MAAK,IAAI;AAE1B,WAAK,KAAK;AAAA,QACN;AAAA,QACA,OAAO,SAAS,EAAE,UAAU,KAAK,OAAO,GAAG;AAAA,QAC3C,UAAU,WAAW,KAAK,QAAQ,KAAK,QAAQ,KAAK,IAAI,GAAG,QAAQ,IAAI;AAAA,QACvE,QAAQ,CAAC,IAAI;AAAA,QACb,QAAQ;AAAA,QACR,QAAQ;AAAA,MACZ,CAAC;AAAA,IACL;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,MAAa,OAA+C;AACxD,UAAM,OAAsC,CAAC;AAE7C,UAAM,QAAQ,MAAM,KAAK,OAAO,MAAM;AAEtC,eAAW,EAAC,UAAU,QAAO,KAAK,MAAM,OAAO,GAAG;AAE9C,YAAM;AAAA,QACF;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAG;AAAA,MACP,IAAI;AAEJ,UAAI,CAAC,EAAE,QAAQ,UAAU,GAAG;AACxB,aAAK,KAAK;AAAA,UACN,GAAG;AAAA,UACH,OAAO,CAAC,QAAQ;AAAA,QACpB,CAAC;AAAA,MACL;AAAA,IACJ;AAEA,WAAO;AAAA,EACX;AACJ;","names":[]}
+{"version":3,"sources":["../../../../src/cli/plugins/view/View.ts"],"sourcesContent":["import path from \"path\";\nimport _ from \"lodash\";\n\nimport type {HtmlRspackPluginOptions} from \"@rspack/core\";\nimport type {Options as HtmlRspackTagsPluginOptions} from \"html-rspack-tags-plugin\";\n\nimport {AbstractViewFinder, HtmlOptionKeys} from \"@cli/entrypoint/index.js\";\n\nimport {EntrypointEntries} from \"@typing/entrypoint\";\nimport {ViewEntrypointOptions} from \"@typing/view\";\nimport {ReadonlyConfig} from \"@typing/config\";\n\nexport default class<O extends ViewEntrypointOptions> {\n    public constructor(\n        protected readonly config: ReadonlyConfig,\n        protected readonly finder: AbstractViewFinder<O>\n    ) {}\n\n    public async entries(): Promise<EntrypointEntries> {\n        const entries: EntrypointEntries = new Map();\n\n        for (const [name, page] of await this.finder.views()) {\n            entries.set(name, new Set([page.file]));\n        }\n\n        return entries;\n    }\n\n    public async html(): Promise<HtmlRspackPluginOptions[]> {\n        const html: HtmlRspackPluginOptions[] = [];\n\n        for (const [name, {file, filename, options}] of await this.finder.views()) {\n            const {template, title} = options;\n\n            html.push({\n                filename,\n                title: title || _.startCase(this.config.app),\n                template: template ? path.resolve(path.dirname(file.file), template) : undefined,\n                chunks: [name],\n                inject: \"body\",\n                minify: true,\n            });\n        }\n\n        return html;\n    }\n\n    public async tags(): Promise<HtmlRspackTagsPluginOptions[]> {\n        const tags: HtmlRspackTagsPluginOptions[] = [];\n\n        const views = await this.finder.views();\n\n        for (const {filename, options} of views.values()) {\n            // Only HTML options reach the tags plugin; view, build and manifest options stay out of it.\n            const tagOptions = _.pick(options, HtmlOptionKeys);\n\n            if (!_.isEmpty(tagOptions)) {\n                tags.push({\n                    ...tagOptions,\n                    files: [filename],\n                });\n            }\n        }\n\n        return tags;\n    }\n}\n"],"mappings":"AAAA,OAAO,UAAU;AACjB,OAAO,OAAO;AAKd,SAA4B,sBAAqB;AAMjD,MAAO,aAA+C;AAAA,EAC3C,YACgB,QACA,QACrB;AAFqB;AACA;AAAA,EACpB;AAAA,EAFoB;AAAA,EACA;AAAA,EAGvB,MAAa,UAAsC;AAC/C,UAAM,UAA6B,oBAAI,IAAI;AAE3C,eAAW,CAAC,MAAM,IAAI,KAAK,MAAM,KAAK,OAAO,MAAM,GAAG;AAClD,cAAQ,IAAI,MAAM,oBAAI,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;AAAA,IAC1C;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,MAAa,OAA2C;AACpD,UAAM,OAAkC,CAAC;AAEzC,eAAW,CAAC,MAAM,EAAC,MAAM,UAAU,QAAO,CAAC,KAAK,MAAM,KAAK,OAAO,MAAM,GAAG;AACvE,YAAM,EAAC,UAAU,MAAK,IAAI;AAE1B,WAAK,KAAK;AAAA,QACN;AAAA,QACA,OAAO,SAAS,EAAE,UAAU,KAAK,OAAO,GAAG;AAAA,QAC3C,UAAU,WAAW,KAAK,QAAQ,KAAK,QAAQ,KAAK,IAAI,GAAG,QAAQ,IAAI;AAAA,QACvE,QAAQ,CAAC,IAAI;AAAA,QACb,QAAQ;AAAA,QACR,QAAQ;AAAA,MACZ,CAAC;AAAA,IACL;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,MAAa,OAA+C;AACxD,UAAM,OAAsC,CAAC;AAE7C,UAAM,QAAQ,MAAM,KAAK,OAAO,MAAM;AAEtC,eAAW,EAAC,UAAU,QAAO,KAAK,MAAM,OAAO,GAAG;AAE9C,YAAM,aAAa,EAAE,KAAK,SAAS,cAAc;AAEjD,UAAI,CAAC,EAAE,QAAQ,UAAU,GAAG;AACxB,aAAK,KAAK;AAAA,UACN,GAAG;AAAA,UACH,OAAO,CAAC,QAAQ;AAAA,QACpB,CAAC;AAAA,MACL;AAAA,IACJ;AAEA,WAAO;AAAA,EACX;AACJ;","names":[]}

package/dist/cli/plugins/view/index.js

@@ -6,7 +6,16 @@ var view_default = definePlugin(() => {
   return {
     name: "adnbn:view",
     bundler: ({ config }) => {
-      const entryTypeFilter = onlyViaTopLevelEntry(["page", "popup", "sidebar", "offscreen", "options"]);
+      const entryTypeFilter = onlyViaTopLevelEntry([
+        "page",
+        "popup",
+        "sidebar",
+        "offscreen",
+        "options",
+        "newtab",
+        "bookmarks",
+        "history"
+      ]);
       return {
         optimization: {
           splitChunks: {

package/dist/cli/plugins/view/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/view/index.ts"],"sourcesContent":["import {NormalModule} from \"@rspack/core\";\n\nimport {definePlugin} from \"@main/plugin\";\n\nimport {onlyViaTopLevelEntry} from \"@cli/bundler\";\nimport {getResolvePath, getSourcePath} from \"@cli/resolvers/path\";\n\nexport {default as View} from \"./View\";\n\nexport default definePlugin(() => {\n    return {\n        name: \"adnbn:view\",\n        bundler: ({config}) => {\n            const entryTypeFilter = onlyViaTopLevelEntry([\"page\", \"popup\", \"sidebar\", \"offscreen\", \"options\"]);\n\n            return {\n                optimization: {\n                    splitChunks: {\n                        cacheGroups: {\n                            adnbnView: {\n                                minChunks: 2,\n                                minSize: 0,\n                                name: \"common.view\",\n                                test: (module, context) => {\n                                    const nm = module as NormalModule;\n\n                                    if (!nm.resource) {\n                                        return false;\n                                    }\n\n                                    if (nm.resource.startsWith(getResolvePath(getSourcePath(config)))) {\n                                        return false;\n                                    }\n\n                                    return entryTypeFilter(module, context);\n                                },\n                                enforce: false,\n                                reuseExistingChunk: true,\n                                priority: 50,\n                            },\n                        },\n                    },\n                },\n            };\n        },\n    };\n});\n"],"mappings":"AAEA,SAAQ,oBAAmB;AAE3B,SAAQ,4BAA2B;AACnC,SAAQ,gBAAgB,qBAAoB;AAE5C,SAAmB,WAAXA,gBAAsB;AAE9B,IAAO,eAAQ,aAAa,MAAM;AAC9B,SAAO;AAAA,IACH,MAAM;AAAA,IACN,SAAS,CAAC,EAAC,OAAM,MAAM;AACnB,YAAM,kBAAkB,qBAAqB,CAAC,QAAQ,SAAS,WAAW,aAAa,SAAS,CAAC;AAEjG,aAAO;AAAA,QACH,cAAc;AAAA,UACV,aAAa;AAAA,YACT,aAAa;AAAA,cACT,WAAW;AAAA,gBACP,WAAW;AAAA,gBACX,SAAS;AAAA,gBACT,MAAM;AAAA,gBACN,MAAM,CAAC,QAAQ,YAAY;AACvB,wBAAM,KAAK;AAEX,sBAAI,CAAC,GAAG,UAAU;AACd,2BAAO;AAAA,kBACX;AAEA,sBAAI,GAAG,SAAS,WAAW,eAAe,cAAc,MAAM,CAAC,CAAC,GAAG;AAC/D,2BAAO;AAAA,kBACX;AAEA,yBAAO,gBAAgB,QAAQ,OAAO;AAAA,gBAC1C;AAAA,gBACA,SAAS;AAAA,gBACT,oBAAoB;AAAA,gBACpB,UAAU;AAAA,cACd;AAAA,YACJ;AAAA,UACJ;AAAA,QACJ;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AACJ,CAAC;","names":["default"]}
+{"version":3,"sources":["../../../../src/cli/plugins/view/index.ts"],"sourcesContent":["import {NormalModule} from \"@rspack/core\";\n\nimport {definePlugin} from \"@main/plugin\";\n\nimport {onlyViaTopLevelEntry} from \"@cli/bundler\";\nimport {getResolvePath, getSourcePath} from \"@cli/resolvers/path\";\n\nexport {default as View} from \"./View\";\n\nexport default definePlugin(() => {\n    return {\n        name: \"adnbn:view\",\n        bundler: ({config}) => {\n            const entryTypeFilter = onlyViaTopLevelEntry([\n                \"page\",\n                \"popup\",\n                \"sidebar\",\n                \"offscreen\",\n                \"options\",\n                \"newtab\",\n                \"bookmarks\",\n                \"history\",\n            ]);\n\n            return {\n                optimization: {\n                    splitChunks: {\n                        cacheGroups: {\n                            adnbnView: {\n                                minChunks: 2,\n                                minSize: 0,\n                                name: \"common.view\",\n                                test: (module, context) => {\n                                    const nm = module as NormalModule;\n\n                                    if (!nm.resource) {\n                                        return false;\n                                    }\n\n                                    if (nm.resource.startsWith(getResolvePath(getSourcePath(config)))) {\n                                        return false;\n                                    }\n\n                                    return entryTypeFilter(module, context);\n                                },\n                                enforce: false,\n                                reuseExistingChunk: true,\n                                priority: 50,\n                            },\n                        },\n                    },\n                },\n            };\n        },\n    };\n});\n"],"mappings":"AAEA,SAAQ,oBAAmB;AAE3B,SAAQ,4BAA2B;AACnC,SAAQ,gBAAgB,qBAAoB;AAE5C,SAAmB,WAAXA,gBAAsB;AAE9B,IAAO,eAAQ,aAAa,MAAM;AAC9B,SAAO;AAAA,IACH,MAAM;AAAA,IACN,SAAS,CAAC,EAAC,OAAM,MAAM;AACnB,YAAM,kBAAkB,qBAAqB;AAAA,QACzC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACJ,CAAC;AAED,aAAO;AAAA,QACH,cAAc;AAAA,UACV,aAAa;AAAA,YACT,aAAa;AAAA,cACT,WAAW;AAAA,gBACP,WAAW;AAAA,gBACX,SAAS;AAAA,gBACT,MAAM;AAAA,gBACN,MAAM,CAAC,QAAQ,YAAY;AACvB,wBAAM,KAAK;AAEX,sBAAI,CAAC,GAAG,UAAU;AACd,2BAAO;AAAA,kBACX;AAEA,sBAAI,GAAG,SAAS,WAAW,eAAe,cAAc,MAAM,CAAC,CAAC,GAAG;AAC/D,2BAAO;AAAA,kBACX;AAEA,yBAAO,gBAAgB,QAAQ,OAAO;AAAA,gBAC1C;AAAA,gBACA,SAAS;AAAA,gBACT,oBAAoB;AAAA,gBACpB,UAAU;AAAA,cACd;AAAA,YACJ;AAAA,UACJ;AAAA,QACJ;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AACJ,CAAC;","names":["default"]}

package/dist/cli/resolvers/config.js

@@ -17,6 +17,7 @@ import {
   pluginOptimization,
   pluginOptions,
   pluginOutput,
+  pluginOverride,
   pluginPage,
   pluginPopup,
   pluginPublic,
@@ -29,7 +30,6 @@ import {
   pluginView
 } from "../plugins/index.js";
 import { fromRootPath, getAppPath, getAppSourcePath, getConfigFile } from "../resolvers/path.js";
-import { isContentLayer } from "./../../cli/bundler/layers.js";
 import { Command, Mode, Workspace } from "./../../types/app.js";
 import { Browser } from "./../../types/browser.js";
 import { Language, LanguageCodes } from "./../../types/locale.js";
@@ -303,12 +303,13 @@ var config_default = async (config) => {
     pluginReact(),
     pluginIcon(),
     pluginAsset(),
-    pluginStyle({ isolationIssuerLayer: isContentLayer }),
+    pluginStyle(),
     pluginLocale(),
     pluginMeta(),
     pluginContent(),
     pluginBackground(),
     pluginOptions(),
+    pluginOverride(),
     pluginPopup(),
     pluginPublic(),
     pluginSidebar(),

package/dist/cli/resolvers/config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/cli/resolvers/config.ts"],"sourcesContent":["import {existsSync} from \"fs\";\nimport dotenv, {type DotenvParseOutput} from \"dotenv\";\nimport {loadConfig} from \"c12\";\nimport _ from \"lodash\";\n\nimport {\n    pluginAsset,\n    pluginBackground,\n    pluginBundler,\n    pluginContent,\n    pluginDotenv,\n    pluginHtml,\n    pluginIcon,\n    pluginLocale,\n    pluginMeta,\n    pluginOffscreen,\n    pluginManifest,\n    pluginOptimization,\n    pluginOptions,\n    pluginOutput,\n    pluginPage,\n    pluginPopup,\n    pluginPublic,\n    pluginReact,\n    pluginSandbox,\n    pluginSidebar,\n    pluginStyle,\n    pluginTypescript,\n    pluginVersion,\n    pluginView,\n} from \"../plugins\";\n\nimport {fromRootPath, getAppPath, getAppSourcePath, getConfigFile} from \"../resolvers/path\";\nimport {isContentLayer} from \"@cli/bundler/layers\";\n\nimport type {Config, OptionalConfig, ReadonlyConfig, UserConfig} from \"@typing/config\";\nimport {Command, Mode, Workspace} from \"@typing/app\";\nimport {Browser} from \"@typing/browser\";\nimport {Plugin} from \"@typing/plugin\";\nimport {ManifestVersion} from \"@typing/manifest\";\nimport {Language, LanguageCodes} from \"@typing/locale\";\nimport {DefaultIconGroupName} from \"@typing/icon\";\n\nconst resolveLanguage = (lang?: `${Language}` | Language): Language => {\n    if (!lang) {\n        return Language.English;\n    }\n\n    if (LanguageCodes.has(lang)) {\n        return lang as Language;\n    }\n\n    throw new Error(`Invalid language \"${lang}\" provided by config`);\n};\n\nconst resolveWorkspace = (workspace?: Workspace | `${Workspace}`): Workspace => {\n    if (!workspace) {\n        return Workspace.Single;\n    }\n\n    if (Object.values(Workspace).includes(workspace as Workspace)) {\n        return workspace as Workspace;\n    }\n\n    throw new Error(`Invalid workspace \"${workspace}\" provided by config`);\n};\n\nconst resolveSharedDir = (workspace: Workspace, sharedDir: string): string => {\n    return workspace === Workspace.Multi ? sharedDir : \".\";\n};\n\nconst getUserConfig = async (config: ReadonlyConfig): Promise<UserConfig> => {\n    const configFilePath = getConfigFile(config);\n\n    if (existsSync(configFilePath)) {\n        const {config: userConfig} = await loadConfig<UserConfig>({\n            configFile: configFilePath,\n            dotenv: true,\n        });\n\n        if (config.debug) {\n            console.log(\"Loaded user config:\", configFilePath);\n        }\n\n        return userConfig || {};\n    } else if (config.debug) {\n        console.warn(\"Config file not found:\", configFilePath);\n    }\n\n    return {};\n};\n\nconst validateConfig = (config: ReadonlyConfig): ReadonlyConfig => {\n    const {\n        outDir,\n        srcDir,\n        sharedDir,\n        appsDir,\n        appSrcDir,\n        jsDir,\n        cssDir,\n        assetsDir,\n        htmlDir,\n        publicDir,\n        localeDir,\n        iconSrcDir,\n        iconOutDir,\n    } = config;\n\n    if (\n        [\n            outDir,\n            srcDir,\n            sharedDir,\n            appsDir,\n            appSrcDir,\n            jsDir,\n            cssDir,\n            assetsDir,\n            htmlDir,\n            publicDir,\n            localeDir,\n            iconSrcDir,\n            iconOutDir,\n        ]\n            .filter(dir => _.isString(dir))\n            .some(dir => dir.includes(\"..\"))\n    ) {\n        throw new Error('Directory paths cannot contain relative paths (\"..\") for security reasons.');\n    }\n\n    if (appsDir === sharedDir) {\n        throw new Error(\"Apps directory (appsDir) and shared directory (sharedDir) cannot be the same.\");\n    }\n\n    if (srcDir === outDir) {\n        throw new Error(\"Source directory (srcDir) and destination directory (outputDir) cannot be the same.\");\n    }\n\n    if (srcDir === \".\") {\n        throw new Error('Source directory cannot be the root directory (\".\") for security reasons.');\n    }\n\n    if (publicDir === \".\" || [srcDir, outDir, appSrcDir].includes(publicDir)) {\n        throw new Error(\n            'Public directory cannot be the root directory (\".\") or intersect with other root directories for security reasons.'\n        );\n    }\n\n    return config;\n};\n\nconst updateLocalDotenv = (config: ReadonlyConfig): DotenvParseOutput => {\n    const {mode, app, browser, manifestVersion} = config;\n\n    const localVars: DotenvParseOutput = {\n        APP: app,\n        BROWSER: browser,\n        MODE: mode,\n        MANIFEST_VERSION: String(manifestVersion),\n    };\n\n    Object.assign(process.env, localVars);\n\n    return localVars;\n};\n\nconst loadDotenv = (config: ReadonlyConfig): DotenvParseOutput => {\n    const {mode, browser, debug} = config;\n\n    const preset = [\n        `.env.${mode}.${browser}.local`,\n        `.env.${mode}.${browser}`,\n        `.env.${browser}.local`,\n        `.env.${browser}`,\n        `.env.${mode}.local`,\n        `.env.${mode}`,\n        `.env.local`,\n        `.env`,\n    ];\n\n    const appSourcePaths = preset.map(file => getAppSourcePath(config, file));\n    const appPaths = preset.map(file => getAppPath(config, file));\n    const rootPaths = preset.map(file => fromRootPath(config, file));\n\n    const paths = [...appSourcePaths, ...appPaths, ...rootPaths];\n\n    const {parsed: fileVars = {}} = dotenv.config({path: paths, quiet: !debug});\n\n    return {...fileVars, ...updateLocalDotenv(config)};\n};\n\nexport default async (config: OptionalConfig): Promise<Config> => {\n    let {\n        command = Command.Build,\n        debug = false,\n        configFile = \"adnbn.config.ts\",\n        browser = Browser.Chrome,\n        app = \"myapp\",\n        name = app,\n        description,\n        shortName,\n        version = \"VERSION\",\n        minimumVersion = \"MINIMUM_VERSION\",\n        author = undefined,\n        homepage = \"HOMEPAGE\",\n        icon = DefaultIconGroupName,\n        lang = Language.English,\n        incognito,\n        specific,\n        workspace = Workspace.Single,\n        rootDir = \".\",\n        outDir = \"dist\",\n        srcDir = \"src\",\n        sharedDir = \"shared\",\n        appsDir = \"apps\",\n        appSrcDir = \".\",\n        localeDir = \"locales\",\n        iconSrcDir = \"icons\",\n        iconOutDir = \"icons\",\n        jsDir = \"js\",\n        cssDir = \"css\",\n        assetsDir = \"assets\",\n        publicDir = \"public\",\n        htmlDir = \".\",\n        html = [],\n        bundler = {},\n        env = {},\n        manifest,\n        manifestVersion = (new Set<Browser>([Browser.Safari]).has(browser) ? 2 : 3) as ManifestVersion,\n        mode = Mode.Development,\n        analyze = false,\n        plugins = [],\n        mergeBackground = false,\n        mergeCommands = false,\n        mergeContentScripts = false,\n        concatContentScripts = true,\n        mergeStyles = true,\n        mergeIcons = false,\n        mergeLocales = true,\n        mergePages = false,\n        mergePopup = false,\n        mergePublic = false,\n        multiplePopup = false,\n        mergeSidebar = false,\n        multipleSidebar = false,\n        mergeRelay = false,\n        mergeService = false,\n        mergeOffscreen = false,\n        mergeSandbox = false,\n        commonChunks = true,\n        artifactName = \"[name]-[browser]-[mv]\",\n        assetsFilename = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[contenthash:4][ext]\"\n            : \"[name]-[contenthash:4][ext]\",\n        jsFilename = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[contenthash:5].js\"\n            : \"[name].js\",\n        cssFilename = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[contenthash:5].css\"\n            : \"[name].css\",\n        cssIdentName = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[app]-[hash:base64:5]\"\n            : \"[local]-[hash:base64:5]\",\n    } = config;\n\n    let resolvedConfig: Config = {\n        command,\n        debug,\n        mode,\n        browser,\n        app,\n        name,\n        description,\n        shortName,\n        version,\n        minimumVersion,\n        author,\n        homepage,\n        lang: resolveLanguage(lang),\n        icon,\n        incognito,\n        specific,\n        manifest,\n        manifestVersion,\n        workspace: resolveWorkspace(workspace),\n        rootDir,\n        outDir,\n        srcDir,\n        sharedDir,\n        appsDir,\n        appSrcDir,\n        jsDir,\n        cssDir,\n        assetsDir,\n        publicDir,\n        htmlDir,\n        localeDir,\n        iconSrcDir,\n        iconOutDir,\n        html,\n        bundler,\n        env,\n        plugins,\n        analyze,\n        configFile,\n        mergeBackground,\n        mergeCommands,\n        mergeContentScripts,\n        concatContentScripts,\n        mergeStyles,\n        mergeIcons,\n        mergeLocales,\n        mergePages,\n        mergePopup,\n        mergePublic,\n        multiplePopup,\n        mergeSidebar,\n        multipleSidebar,\n        mergeRelay,\n        mergeService,\n        mergeOffscreen,\n        mergeSandbox,\n        commonChunks,\n        artifactName,\n        assetsFilename,\n        jsFilename,\n        cssFilename,\n        cssIdentName,\n    };\n\n    let vars = loadDotenv(resolvedConfig);\n\n    const {\n        plugins: userPlugins = [],\n        lang: userLang,\n        workspace: userWorkspace,\n        ...userConfig\n    } = await getUserConfig(resolvedConfig);\n\n    resolvedConfig = {\n        ...resolvedConfig,\n        ...userConfig,\n        lang: resolveLanguage(userLang ?? resolvedConfig.lang),\n        workspace: resolveWorkspace(userWorkspace ?? resolvedConfig.workspace),\n    };\n\n    resolvedConfig.sharedDir = resolveSharedDir(resolvedConfig.workspace, resolvedConfig.sharedDir);\n\n    resolvedConfig = validateConfig(resolvedConfig);\n\n    vars = {...vars, ...loadDotenv(resolvedConfig)};\n\n    /**\n     * IMPORTANT: the order of plugins matters. Early plugins prepare the environment and artifacts for the following ones\n     * (e.g., environment variables/output/transpilation/assets → page/version generation → bundling).\n     * Reordering may result in missing artifacts, incorrect configuration, or build failures.\n     */\n    const corePlugins: Plugin[] = [\n        pluginDotenv(vars),\n        pluginOutput(),\n        pluginOptimization(),\n        pluginTypescript(),\n        pluginReact(),\n        pluginIcon(),\n        pluginAsset(),\n        pluginStyle({isolationIssuerLayer: isContentLayer}),\n        pluginLocale(),\n        pluginMeta(),\n        pluginContent(),\n        pluginBackground(),\n        pluginOptions(),\n        pluginPopup(),\n        pluginPublic(),\n        pluginSidebar(),\n        pluginOffscreen(),\n        pluginSandbox(),\n        pluginPage(),\n        pluginView(),\n        pluginHtml(),\n        pluginVersion(),\n        pluginBundler(),\n        pluginManifest(),\n    ];\n\n    return {\n        ...resolvedConfig,\n        plugins: [...plugins, ...userPlugins, ...corePlugins],\n    };\n};\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../src/cli/resolvers/config.ts"],"sourcesContent":["import {existsSync} from \"fs\";\nimport dotenv, {type DotenvParseOutput} from \"dotenv\";\nimport {loadConfig} from \"c12\";\nimport _ from \"lodash\";\n\nimport {\n    pluginAsset,\n    pluginBackground,\n    pluginBundler,\n    pluginContent,\n    pluginDotenv,\n    pluginHtml,\n    pluginIcon,\n    pluginLocale,\n    pluginMeta,\n    pluginOffscreen,\n    pluginManifest,\n    pluginOptimization,\n    pluginOptions,\n    pluginOutput,\n    pluginOverride,\n    pluginPage,\n    pluginPopup,\n    pluginPublic,\n    pluginReact,\n    pluginSandbox,\n    pluginSidebar,\n    pluginStyle,\n    pluginTypescript,\n    pluginVersion,\n    pluginView,\n} from \"../plugins\";\n\nimport {fromRootPath, getAppPath, getAppSourcePath, getConfigFile} from \"../resolvers/path\";\n\nimport type {Config, OptionalConfig, ReadonlyConfig, UserConfig} from \"@typing/config\";\nimport {Command, Mode, Workspace} from \"@typing/app\";\nimport {Browser} from \"@typing/browser\";\nimport {Plugin} from \"@typing/plugin\";\nimport {ManifestVersion} from \"@typing/manifest\";\nimport {Language, LanguageCodes} from \"@typing/locale\";\nimport {DefaultIconGroupName} from \"@typing/icon\";\n\nconst resolveLanguage = (lang?: `${Language}` | Language): Language => {\n    if (!lang) {\n        return Language.English;\n    }\n\n    if (LanguageCodes.has(lang)) {\n        return lang as Language;\n    }\n\n    throw new Error(`Invalid language \"${lang}\" provided by config`);\n};\n\nconst resolveWorkspace = (workspace?: Workspace | `${Workspace}`): Workspace => {\n    if (!workspace) {\n        return Workspace.Single;\n    }\n\n    if (Object.values(Workspace).includes(workspace as Workspace)) {\n        return workspace as Workspace;\n    }\n\n    throw new Error(`Invalid workspace \"${workspace}\" provided by config`);\n};\n\nconst resolveSharedDir = (workspace: Workspace, sharedDir: string): string => {\n    return workspace === Workspace.Multi ? sharedDir : \".\";\n};\n\nconst getUserConfig = async (config: ReadonlyConfig): Promise<UserConfig> => {\n    const configFilePath = getConfigFile(config);\n\n    if (existsSync(configFilePath)) {\n        const {config: userConfig} = await loadConfig<UserConfig>({\n            configFile: configFilePath,\n            dotenv: true,\n        });\n\n        if (config.debug) {\n            console.log(\"Loaded user config:\", configFilePath);\n        }\n\n        return userConfig || {};\n    } else if (config.debug) {\n        console.warn(\"Config file not found:\", configFilePath);\n    }\n\n    return {};\n};\n\nconst validateConfig = (config: ReadonlyConfig): ReadonlyConfig => {\n    const {\n        outDir,\n        srcDir,\n        sharedDir,\n        appsDir,\n        appSrcDir,\n        jsDir,\n        cssDir,\n        assetsDir,\n        htmlDir,\n        publicDir,\n        localeDir,\n        iconSrcDir,\n        iconOutDir,\n    } = config;\n\n    if (\n        [\n            outDir,\n            srcDir,\n            sharedDir,\n            appsDir,\n            appSrcDir,\n            jsDir,\n            cssDir,\n            assetsDir,\n            htmlDir,\n            publicDir,\n            localeDir,\n            iconSrcDir,\n            iconOutDir,\n        ]\n            .filter(dir => _.isString(dir))\n            .some(dir => dir.includes(\"..\"))\n    ) {\n        throw new Error('Directory paths cannot contain relative paths (\"..\") for security reasons.');\n    }\n\n    if (appsDir === sharedDir) {\n        throw new Error(\"Apps directory (appsDir) and shared directory (sharedDir) cannot be the same.\");\n    }\n\n    if (srcDir === outDir) {\n        throw new Error(\"Source directory (srcDir) and destination directory (outputDir) cannot be the same.\");\n    }\n\n    if (srcDir === \".\") {\n        throw new Error('Source directory cannot be the root directory (\".\") for security reasons.');\n    }\n\n    if (publicDir === \".\" || [srcDir, outDir, appSrcDir].includes(publicDir)) {\n        throw new Error(\n            'Public directory cannot be the root directory (\".\") or intersect with other root directories for security reasons.'\n        );\n    }\n\n    return config;\n};\n\nconst updateLocalDotenv = (config: ReadonlyConfig): DotenvParseOutput => {\n    const {mode, app, browser, manifestVersion} = config;\n\n    const localVars: DotenvParseOutput = {\n        APP: app,\n        BROWSER: browser,\n        MODE: mode,\n        MANIFEST_VERSION: String(manifestVersion),\n    };\n\n    Object.assign(process.env, localVars);\n\n    return localVars;\n};\n\nconst loadDotenv = (config: ReadonlyConfig): DotenvParseOutput => {\n    const {mode, browser, debug} = config;\n\n    const preset = [\n        `.env.${mode}.${browser}.local`,\n        `.env.${mode}.${browser}`,\n        `.env.${browser}.local`,\n        `.env.${browser}`,\n        `.env.${mode}.local`,\n        `.env.${mode}`,\n        `.env.local`,\n        `.env`,\n    ];\n\n    const appSourcePaths = preset.map(file => getAppSourcePath(config, file));\n    const appPaths = preset.map(file => getAppPath(config, file));\n    const rootPaths = preset.map(file => fromRootPath(config, file));\n\n    const paths = [...appSourcePaths, ...appPaths, ...rootPaths];\n\n    const {parsed: fileVars = {}} = dotenv.config({path: paths, quiet: !debug});\n\n    return {...fileVars, ...updateLocalDotenv(config)};\n};\n\nexport default async (config: OptionalConfig): Promise<Config> => {\n    let {\n        command = Command.Build,\n        debug = false,\n        configFile = \"adnbn.config.ts\",\n        browser = Browser.Chrome,\n        app = \"myapp\",\n        name = app,\n        description,\n        shortName,\n        version = \"VERSION\",\n        minimumVersion = \"MINIMUM_VERSION\",\n        author = undefined,\n        homepage = \"HOMEPAGE\",\n        icon = DefaultIconGroupName,\n        lang = Language.English,\n        incognito,\n        specific,\n        workspace = Workspace.Single,\n        rootDir = \".\",\n        outDir = \"dist\",\n        srcDir = \"src\",\n        sharedDir = \"shared\",\n        appsDir = \"apps\",\n        appSrcDir = \".\",\n        localeDir = \"locales\",\n        iconSrcDir = \"icons\",\n        iconOutDir = \"icons\",\n        jsDir = \"js\",\n        cssDir = \"css\",\n        assetsDir = \"assets\",\n        publicDir = \"public\",\n        htmlDir = \".\",\n        html = [],\n        bundler = {},\n        env = {},\n        manifest,\n        manifestVersion = (new Set<Browser>([Browser.Safari]).has(browser) ? 2 : 3) as ManifestVersion,\n        mode = Mode.Development,\n        analyze = false,\n        plugins = [],\n        mergeBackground = false,\n        mergeCommands = false,\n        mergeContentScripts = false,\n        concatContentScripts = true,\n        mergeStyles = true,\n        mergeIcons = false,\n        mergeLocales = true,\n        mergePages = false,\n        mergePopup = false,\n        mergePublic = false,\n        multiplePopup = false,\n        mergeSidebar = false,\n        multipleSidebar = false,\n        mergeRelay = false,\n        mergeService = false,\n        mergeOffscreen = false,\n        mergeSandbox = false,\n        commonChunks = true,\n        artifactName = \"[name]-[browser]-[mv]\",\n        assetsFilename = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[contenthash:4][ext]\"\n            : \"[name]-[contenthash:4][ext]\",\n        jsFilename = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[contenthash:5].js\"\n            : \"[name].js\",\n        cssFilename = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[contenthash:5].css\"\n            : \"[name].css\",\n        cssIdentName = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[app]-[hash:base64:5]\"\n            : \"[local]-[hash:base64:5]\",\n    } = config;\n\n    let resolvedConfig: Config = {\n        command,\n        debug,\n        mode,\n        browser,\n        app,\n        name,\n        description,\n        shortName,\n        version,\n        minimumVersion,\n        author,\n        homepage,\n        lang: resolveLanguage(lang),\n        icon,\n        incognito,\n        specific,\n        manifest,\n        manifestVersion,\n        workspace: resolveWorkspace(workspace),\n        rootDir,\n        outDir,\n        srcDir,\n        sharedDir,\n        appsDir,\n        appSrcDir,\n        jsDir,\n        cssDir,\n        assetsDir,\n        publicDir,\n        htmlDir,\n        localeDir,\n        iconSrcDir,\n        iconOutDir,\n        html,\n        bundler,\n        env,\n        plugins,\n        analyze,\n        configFile,\n        mergeBackground,\n        mergeCommands,\n        mergeContentScripts,\n        concatContentScripts,\n        mergeStyles,\n        mergeIcons,\n        mergeLocales,\n        mergePages,\n        mergePopup,\n        mergePublic,\n        multiplePopup,\n        mergeSidebar,\n        multipleSidebar,\n        mergeRelay,\n        mergeService,\n        mergeOffscreen,\n        mergeSandbox,\n        commonChunks,\n        artifactName,\n        assetsFilename,\n        jsFilename,\n        cssFilename,\n        cssIdentName,\n    };\n\n    let vars = loadDotenv(resolvedConfig);\n\n    const {\n        plugins: userPlugins = [],\n        lang: userLang,\n        workspace: userWorkspace,\n        ...userConfig\n    } = await getUserConfig(resolvedConfig);\n\n    resolvedConfig = {\n        ...resolvedConfig,\n        ...userConfig,\n        lang: resolveLanguage(userLang ?? resolvedConfig.lang),\n        workspace: resolveWorkspace(userWorkspace ?? resolvedConfig.workspace),\n    };\n\n    resolvedConfig.sharedDir = resolveSharedDir(resolvedConfig.workspace, resolvedConfig.sharedDir);\n\n    resolvedConfig = validateConfig(resolvedConfig);\n\n    vars = {...vars, ...loadDotenv(resolvedConfig)};\n\n    /**\n     * IMPORTANT: the order of plugins matters. Early plugins prepare the environment and artifacts for the following ones\n     * (e.g., environment variables/output/transpilation/assets → page/version generation → bundling).\n     * Reordering may result in missing artifacts, incorrect configuration, or build failures.\n     */\n    const corePlugins: Plugin[] = [\n        pluginDotenv(vars),\n        pluginOutput(),\n        pluginOptimization(),\n        pluginTypescript(),\n        pluginReact(),\n        pluginIcon(),\n        pluginAsset(),\n        pluginStyle(),\n        pluginLocale(),\n        pluginMeta(),\n        pluginContent(),\n        pluginBackground(),\n        pluginOptions(),\n        pluginOverride(),\n        pluginPopup(),\n        pluginPublic(),\n        pluginSidebar(),\n        pluginOffscreen(),\n        pluginSandbox(),\n        pluginPage(),\n        pluginView(),\n        pluginHtml(),\n        pluginVersion(),\n        pluginBundler(),\n        pluginManifest(),\n    ];\n\n    return {\n        ...resolvedConfig,\n        plugins: [...plugins, ...userPlugins, ...corePlugins],\n    };\n};\n"],"mappings":"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","names":[]}

package/dist/cli/virtual/index.js

@@ -1,17 +1,14 @@
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/background.ts?raw
-var background_default = 'import type {BackgroundDefinition} from "adnbn";\nimport background, {isValidBackgroundDefinition, isValidBackgroundMainHandler} from "adnbn/entry/background";\n\nimport * as module from "virtual:background-entrypoint";\n\ntry {\n    const {default: defaultDefinition, ...otherDefinition} = module;\n\n    let definition: BackgroundDefinition = otherDefinition;\n\n    if (isValidBackgroundDefinition(defaultDefinition)) {\n        definition = {...definition, ...defaultDefinition};\n    } else if (isValidBackgroundMainHandler(defaultDefinition)) {\n        definition = {...definition, main: defaultDefinition};\n    }\n\n    const {main, ...options} = definition;\n\n    background({main, ...options});\n} catch (e) {\n    console.error("The background crashed on startup:", e);\n}\n';
+var background_default = 'import background, {resolveDefinition} from "adnbn/entry/background";\n\nimport * as module from "virtual:background-entrypoint";\n\ntry {\n    background(resolveDefinition(module));\n} catch (e) {\n    console.error("The background crashed on startup:", e);\n}\n';
 
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/command.ts?raw
-var command_default = 'import type {CommandUnresolvedDefinition} from "adnbn";\nimport command, {isValidCommandDefinition, isValidCommandExecuteFunction} from "adnbn/entry/command";\n\nimport * as module from "virtual:command-entrypoint";\n\ntry {\n    const commandName = "virtual:command-name";\n\n    const {default: defaultDefinition, ...otherDefinition} = module;\n\n    let definition: CommandUnresolvedDefinition = otherDefinition;\n\n    if (isValidCommandDefinition(defaultDefinition)) {\n        definition = {...definition, ...defaultDefinition};\n    } else if (isValidCommandExecuteFunction(defaultDefinition)) {\n        definition = {...definition, execute: defaultDefinition};\n    }\n\n    const {execute, name = commandName, ...options} = definition;\n\n    command({\n        name,\n        execute,\n        ...options,\n    });\n} catch (e) {\n    console.error("The command crashed on startup:", e);\n}\n';
+var command_default = 'import command, {resolveDefinition} from "adnbn/entry/command";\n\nimport * as module from "virtual:command-entrypoint";\n\ntry {\n    command(resolveDefinition(module, "virtual:command-name"));\n} catch (e) {\n    console.error("The command crashed on startup:", e);\n}\n';
 
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/content.ts?raw
 var content_default = 'import contentScript, {resolveDefinition} from "virtual:content-builder";\n\nimport * as module from "virtual:content-entrypoint";\n\ntry {\n    contentScript(resolveDefinition(module));\n} catch (e) {\n    console.error("The content script crashed on startup:", e);\n}\n';
 
-// raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/transport.ts?raw
-var transport_default = 'import type {TransportOptions, TransportType, TransportUnresolvedDefinition} from "adnbn/transport";\nimport {isValidTransportDefinition, isValidTransportInitFunction} from "adnbn/entry/transport";\n\n//@ts-ignore\nimport transport from "adnbn/entry/:entry";\n\nimport * as module from "virtual:transport-entrypoint";\n\ntry {\n    const transportName = "virtual:transport-name";\n\n    const {default: defaultDefinition, ...otherDefinition} = module;\n\n    let definition: TransportUnresolvedDefinition<TransportOptions, TransportType> = otherDefinition;\n\n    if (isValidTransportDefinition(defaultDefinition)) {\n        definition = {...definition, ...defaultDefinition};\n    } else if (isValidTransportInitFunction(defaultDefinition)) {\n        definition = {...definition, init: defaultDefinition};\n    }\n\n    const {init, name, ...options} = definition;\n\n    transport({name: transportName, init, ...options});\n} catch (e) {\n    console.error("The :entry crashed on startup:", e);\n}\n';
-
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/offscreen.ts?raw
-var offscreen_default = 'import type {OffscreenUnresolvedDefinition} from "adnbn";\nimport type {TransportType} from "adnbn/transport";\nimport {isValidTransportDefinition, isValidTransportInitFunction} from "adnbn/entry/transport";\nimport {Builder as OffscreenBuilder} from "adnbn/entry/offscreen";\n\nimport {Builder as ViewBuilder} from "virtual:view-framework";\n\nimport * as module from "virtual:offscreen-entrypoint";\n\ntry {\n    const offscreenName = "virtual:offscreen-name";\n\n    const {default: defaultDefinition, ...otherDefinition} = module;\n\n    let definition: OffscreenUnresolvedDefinition<TransportType> = otherDefinition;\n\n    if (isValidTransportDefinition(defaultDefinition)) {\n        definition = {...definition, ...defaultDefinition};\n    } else if (isValidTransportInitFunction(defaultDefinition)) {\n        definition = {...definition, init: defaultDefinition};\n    }\n\n    const {init, main, name, ...options} = definition;\n\n    new OffscreenBuilder({\n        name: offscreenName,\n        init,\n        main,\n        ...options,\n    })\n        .view(new ViewBuilder(options))\n        .build()\n        .catch(e => {\n            console.error("Failed to build offscreen: ", e);\n        });\n} catch (e) {\n    console.error("The offscreen crashed on startup:", e);\n}\n';
+var offscreen_default = 'import offscreen, {resolveDefinition} from "adnbn/entry/offscreen";\n\nimport {Builder as ViewBuilder} from "virtual:view-builder";\n\nimport * as module from "virtual:offscreen-entrypoint";\n\ntry {\n    offscreen(resolveDefinition(module, "virtual:offscreen-name"), ViewBuilder);\n} catch (e) {\n    console.error("The offscreen crashed on startup:", e);\n}\n';
 
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/offscreen.background.ts?raw
 var offscreen_background_default = 'import {OffscreenBackground} from "adnbn/offscreen";\n\ntry {\n    new OffscreenBackground().build();\n} catch (e) {\n    console.error("Failed to build offscreen layer on background:", e);\n}\n';
@@ -20,10 +17,13 @@ var offscreen_background_default = 'import {OffscreenBackground} from "adnbn/off
 var relay_default = 'import relay, {resolveDefinition} from "adnbn/entry/relay";\n\nimport {Builder as ContentBuilder} from "virtual:content-builder";\n\nimport * as module from "virtual:relay-entrypoint";\n\ntry {\n    relay(resolveDefinition(module, "virtual:relay-name"), ContentBuilder);\n} catch (error) {\n    console.error("The relay crashed on startup:", error);\n}\n';
 
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/sandbox.ts?raw
-var sandbox_default = 'import type {SandboxUnresolvedDefinition} from "adnbn";\nimport type {TransportType} from "adnbn/transport";\nimport {isValidTransportDefinition, isValidTransportInitFunction} from "adnbn/entry/transport";\nimport {Builder as SandboxBuilder} from "adnbn/entry/sandbox";\n\nimport {Builder as ViewBuilder} from "virtual:view-framework";\n\nimport * as module from "virtual:sandbox-entrypoint";\n\ntry {\n    const sandboxName = "virtual:sandbox-name";\n\n    const {default: defaultDefinition, ...otherDefinition} = module;\n\n    let definition: SandboxUnresolvedDefinition<TransportType> = otherDefinition;\n\n    if (isValidTransportDefinition(defaultDefinition)) {\n        definition = {...definition, ...defaultDefinition};\n    } else if (isValidTransportInitFunction(defaultDefinition)) {\n        definition = {...definition, init: defaultDefinition};\n    }\n\n    const {init, main, name, ...options} = definition;\n\n    new SandboxBuilder({\n        name: sandboxName,\n        init,\n        main,\n        ...options,\n    })\n        .view(new ViewBuilder(options))\n        .build()\n        .catch(e => {\n            console.error("Failed to build sandbox: ", e);\n        });\n} catch (e) {\n    console.error("The sandbox crashed on startup:", e);\n}\n';
+var sandbox_default = 'import sandbox, {resolveDefinition} from "adnbn/entry/sandbox";\n\nimport {Builder as ViewBuilder} from "virtual:view-builder";\n\nimport * as module from "virtual:sandbox-entrypoint";\n\ntry {\n    sandbox(resolveDefinition(module, "virtual:sandbox-name"), ViewBuilder);\n} catch (e) {\n    console.error("The sandbox crashed on startup:", e);\n}\n';
+
+// raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/service.ts?raw
+var service_default = 'import service, {resolveDefinition} from "adnbn/entry/service";\n\nimport * as module from "virtual:service-entrypoint";\n\ntry {\n    service(resolveDefinition(module, "virtual:service-name"));\n} catch (e) {\n    console.error("The service crashed on startup:", e);\n}\n';
 
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/view.ts?raw
-var view_default = 'import type {ViewDefinition, ViewOptions} from "adnbn";\nimport {isViewDefinition, isValidViewDefinitionRenderValue} from "adnbn/entry/view";\n\nimport view from "virtual:view-framework";\n\nimport * as module from "virtual:view-entrypoint";\n\ntry {\n    const {default: defaultDefinition, ...otherDefinition} = module;\n\n    let definition: ViewDefinition<ViewOptions> = otherDefinition;\n\n    if (isViewDefinition(defaultDefinition)) {\n        definition = {...definition, ...defaultDefinition};\n    } else if (isValidViewDefinitionRenderValue(defaultDefinition)) {\n        definition = {...definition, render: defaultDefinition};\n    }\n\n    view(definition);\n} catch (e) {\n    console.error("The view crashed on startup:", e);\n}\n';
+var view_default = 'import view, {resolveDefinition} from "virtual:view-builder";\n\nimport * as module from "virtual:view-entrypoint";\n\ntry {\n    view(resolveDefinition(module));\n} catch (e) {\n    console.error("The view crashed on startup:", e);\n}\n';
 
 // src/cli/virtual/index.ts
 import { inferEntrypointFramework } from "../entrypoint/index.js";
@@ -32,15 +32,12 @@ import { inferEntrypointFramework } from "../entrypoint/index.js";
 var PackageName = "adnbn";
 
 // src/cli/virtual/index.ts
-var templates = { background: background_default, command: command_default, content: content_default, offscreen: offscreen_default, relay: relay_default, sandbox: sandbox_default, view: view_default, transport: transport_default };
+var templates = { background: background_default, command: command_default, content: content_default, offscreen: offscreen_default, relay: relay_default, sandbox: sandbox_default, service: service_default, view: view_default };
 var getEntryFramework = (file, entry) => {
   return `${PackageName}/entry/${entry}/${inferEntrypointFramework(file)}`;
 };
 var getVirtualModule = (file, template) => {
-  return templates[template].replaceAll("//@ts-ignore", "").replace(`virtual:${template}-entrypoint`, file.import);
-};
-var getTransportModule = (file, name, layer) => {
-  return getVirtualModule(file, "transport").replace("virtual:transport-name", name).replaceAll(":entry", layer);
+  return templates[template].replace(`virtual:${template}-entrypoint`, file.import);
 };
 var virtualBackgroundModule = (file) => {
   return getVirtualModule(file, "background");
@@ -52,7 +49,7 @@ var virtualContentScriptModule = (file, navigation = false) => {
   return getVirtualModule(file, "content").replace(`virtual:content-builder`, navigation ? `${PackageName}/entry/content` : getEntryFramework(file, "content"));
 };
 var virtualOffscreenModule = (file, name) => {
-  return getVirtualModule(file, "offscreen").replace("virtual:offscreen-name", name).replace(`virtual:view-framework`, getEntryFramework(file, "view"));
+  return getVirtualModule(file, "offscreen").replace("virtual:offscreen-name", name).replace(`virtual:view-builder`, getEntryFramework(file, "view"));
 };
 var virtualOffscreenBackgroundModule = () => {
   return offscreen_background_default;
@@ -64,13 +61,13 @@ var virtualRelayModule = (file, name, navigation = false) => {
   );
 };
 var virtualSandboxModule = (file, name) => {
-  return getVirtualModule(file, "sandbox").replace("virtual:sandbox-name", name).replace(`virtual:view-framework`, getEntryFramework(file, "view"));
+  return getVirtualModule(file, "sandbox").replace("virtual:sandbox-name", name).replace(`virtual:view-builder`, getEntryFramework(file, "view"));
 };
 var virtualServiceModule = (file, name) => {
-  return getTransportModule(file, name, "service");
+  return getVirtualModule(file, "service").replace("virtual:service-name", name);
 };
 var virtualViewModule = (file) => {
-  return getVirtualModule(file, "view").replace(`virtual:view-framework`, getEntryFramework(file, "view"));
+  return getVirtualModule(file, "view").replace(`virtual:view-builder`, getEntryFramework(file, "view"));
 };
 export {
   virtualBackgroundModule,