adnbn 0.0.15 → 0.0.17

package/dist/cli/index.cjs

@@ -2,7 +2,7 @@
 
 var cac = require('cac');
 var webpack = require('webpack');
-var path = require('path');
+var path2 = require('path');
 var fs = require('fs');
 var c12 = require('c12');
 var VirtualModulesPlugin = require('webpack-virtual-modules');
@@ -15,7 +15,7 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var cac__default = /*#__PURE__*/_interopDefault(cac);
 var webpack__default = /*#__PURE__*/_interopDefault(webpack);
-var path__default = /*#__PURE__*/_interopDefault(path);
+var path2__default = /*#__PURE__*/_interopDefault(path2);
 var VirtualModulesPlugin__default = /*#__PURE__*/_interopDefault(VirtualModulesPlugin);
 var ___default = /*#__PURE__*/_interopDefault(_);
 var TsconfigPathsPlugin__default = /*#__PURE__*/_interopDefault(TsconfigPathsPlugin);
@@ -1364,6 +1364,55 @@ var require_dist = __commonJS({
   }
 });
 
+// src/cli/builders/app/command.ts
+var build = (compiler) => {
+  compiler.run((err, stats) => {
+    if (err) {
+      console.error("Webpack compilation error:", err);
+      process.exit(1);
+    }
+    if (stats == null ? void 0 : stats.hasErrors()) {
+      console.error(stats.toString({
+        colors: true,
+        errors: true
+      }));
+      process.exit(1);
+    }
+    console.log(stats == null ? void 0 : stats.toString({ colors: true }));
+    compiler.close((closeErr) => {
+      if (closeErr) {
+        console.error("Webpack close error:", closeErr);
+        process.exit(1);
+      }
+    });
+  });
+};
+var watch = (compiler) => {
+  const watching = compiler.watch({
+    aggregateTimeout: 300,
+    ignored: /node_modules/
+  }, (err, stats) => {
+    if (err) {
+      console.error("Webpack watch error:", err);
+      process.exit(1);
+    }
+    if (stats == null ? void 0 : stats.hasErrors()) {
+      console.error(stats.toString({
+        colors: true,
+        errors: true
+      }));
+      return;
+    }
+    console.log(stats == null ? void 0 : stats.toString({ colors: true }));
+  });
+  process.on("SIGINT", () => {
+    watching.close(() => {
+      console.log("Webpack watch mode stopped");
+      process.exit(0);
+    });
+  });
+};
+
 // src/cli/resolvers/config.ts
 var import_dotenv = __toESM(require_main());
 
@@ -1385,51 +1434,86 @@ var dotenv_default = definePlugin((options) => {
     }
   };
 });
-var getRootPath = (to) => {
-  return path__default.default.resolve(process.cwd(), to);
-};
-var getConfigFile = (config) => {
-  return path__default.default.resolve(config.inputDir, config.configFile);
-};
-var getSharedPath = (config) => {
-  return path__default.default.resolve(config.inputDir, config.srcDir, config.sharedDir);
-};
-var getAppsPath = (config) => {
-  return path__default.default.resolve(config.inputDir, config.srcDir, config.appsDir, config.app);
+
+// src/cli/webpack/plugins/WatchPlugin.ts
+var WatchPlugin = class {
+  key;
+  entry;
+  callback;
+  constructor({ key, entry = {}, callback }) {
+    this.entry = entry;
+    this.callback = callback;
+    this.key = "watch-plugin:" + (key || Object.keys(this.entry).join(","));
+  }
+  apply(compiler) {
+    compiler.hooks.watchRun.tapAsync("WatchPlugin", async (compiler2, callback) => {
+      try {
+        const { modifiedFiles = /* @__PURE__ */ new Set() } = compiler2;
+        const has = this.files.size === 0 || Array.from(modifiedFiles).some((file) => this.files.has(file));
+        if (has) {
+          const entry = await this.callback(modifiedFiles);
+          if (entry) {
+            for (const name in this.entry) {
+              delete compiler2.options.entry[name];
+            }
+            for (const name in entry) {
+              compiler2.options.entry[name] = entry[name];
+            }
+            this.entry = entry;
+          }
+        }
+        callback();
+      } catch (e) {
+        callback(e);
+      }
+    });
+  }
+  get files() {
+    return new Set(Object.values(this.entry).flatMap((value) => Array.isArray(value) ? value : [value]));
+  }
 };
+var WatchPlugin_default = WatchPlugin;
 
-// src/cli/plugins/content.ts
-var content_default = definePlugin(() => {
-  const contentScripts = [];
-  return {
-    webpack: async ({ config }) => {
-      const p = path__default.default.resolve(getAppsPath(config), "src/some.ts");
-      return {
-        entry: {
-          some: p
-        },
-        plugins: [
-          new VirtualModulesPlugin__default.default({
-            [p]: 'console.log("Hello, World!")'
-          })
-        ]
-      };
-    },
-    manifest: ({ manifest }) => {
-      manifest.pushContentScript(...contentScripts);
+// src/cli/webpack/merge.ts
+var import_webpack_merge = __toESM(require_dist());
+var merge_default = (0, import_webpack_merge.mergeWithCustomize)({
+  customizeArray: (a, b, key) => {
+    if (key === "plugins") {
+      const names = /* @__PURE__ */ new Set();
+      return [...a, ...b].filter((plugin) => {
+        var _a;
+        let name = (_a = plugin == null ? void 0 : plugin.constructor) == null ? void 0 : _a.name;
+        if (plugin instanceof WatchPlugin_default) {
+          name = plugin.key;
+        }
+        if (names.has(name)) return false;
+        names.add(name);
+        return true;
+      });
     }
-  };
-});
-
-// src/cli/utils/option.ts
-var isValidEntrypointOptions = (options, config) => {
-  var _a, _b, _c, _d;
-  const { browser, app } = config;
-  if (((_a = options.includeBrowser) == null ? void 0 : _a.includes(browser)) || ((_b = options.includeApp) == null ? void 0 : _b.includes(app))) {
-    return true;
+    if (key === "resolve.plugins") {
+      const names = /* @__PURE__ */ new Set();
+      return [...a, ...b].filter((plugin) => {
+        var _a;
+        const name = (_a = plugin == null ? void 0 : plugin.constructor) == null ? void 0 : _a.name;
+        if (names.has(name)) return false;
+        names.add(name);
+        return true;
+      });
+    }
+    if (key === "module.rules") {
+      const tests = /* @__PURE__ */ new Set();
+      return [...a, ...b].filter((rule) => {
+        var _a;
+        const test = (_a = rule == null ? void 0 : rule.test) == null ? void 0 : _a.toString();
+        if (tests.has(test)) return false;
+        tests.add(test);
+        return true;
+      });
+    }
+    return void 0;
   }
-  return !(((_c = options.excludeBrowser) == null ? void 0 : _c.includes(browser)) || ((_d = options.excludeApp) == null ? void 0 : _d.includes(app)));
-};
+});
 var EntryFile = class _EntryFile {
   constructor(file) {
     this.file = file;
@@ -1464,7 +1548,7 @@ var EntryFile = class _EntryFile {
         if (node.importClause && node.importClause.namedBindings && typescript.isNamedImports(node.importClause.namedBindings)) {
           node.importClause.namedBindings.elements.forEach((el) => {
             var _a;
-            (_a = this.imports) == null ? void 0 : _a.set(el.name.text, path__default.default.resolve(path__default.default.dirname(this.file), importPath + ".ts"));
+            (_a = this.imports) == null ? void 0 : _a.set(el.name.text, path2__default.default.resolve(path2__default.default.dirname(this.file), importPath + ".ts"));
           });
         }
       }
@@ -1665,6 +1749,21 @@ var commonProperties = [
 var getBackgroundOptions = (file) => {
   return OptionFile_default.make(file).setDefinition("defineBackground").setProperties([...commonProperties, "persistent"]).getOptions();
 };
+var getRootPath = (to) => {
+  return path2__default.default.resolve(process.cwd(), to);
+};
+var getConfigFile = (config) => {
+  return path2__default.default.join(config.inputDir, config.configFile);
+};
+var getSharedPath = (config) => {
+  return path2__default.default.join(config.inputDir, config.srcDir, config.sharedDir);
+};
+var getAppsPath = (config) => {
+  return path2__default.default.join(config.inputDir, config.srcDir, config.appsDir, config.app);
+};
+var getOutputPath = (config) => {
+  return path2__default.default.join(config.outputDir, `${config.app}-${config.browser}-mv${config.manifestVersion}`);
+};
 var escapeRegExp = (text) => text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 var findEntrypointFiles = (directory, entrypoint) => {
   const files = [];
@@ -1680,12 +1779,12 @@ var findEntrypointFiles = (directory, entrypoint) => {
       return;
     }
     for (const entry of entries) {
-      const fullPath = path__default.default.join(dir, entry.name);
+      const fullPath = path2__default.default.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name === entrypoint || entry.name.endsWith(`.${entrypoint}`)) {
           const possibleIndexFiles = ["index.ts", "index.tsx", "index.js"];
           for (const indexFile of possibleIndexFiles) {
-            const indexPath = path__default.default.join(fullPath, indexFile);
+            const indexPath = path2__default.default.join(fullPath, indexFile);
             try {
               const stat = fs.statSync(indexPath);
               if (stat.isFile()) {
@@ -1725,11 +1824,21 @@ var processPluginHandler = async function* (config, key, options) {
     const handler = plugin[key];
     const result = await resolvePluginHandler(handler, options);
     if (result !== void 0) {
-      yield result;
+      yield { name: plugin.name, result };
     }
   }
 };
 
+// src/cli/utils/option.ts
+var isValidEntrypointOptions = (options, config) => {
+  var _a, _b, _c, _d;
+  const { browser, app } = config;
+  if (((_a = options.includeBrowser) == null ? void 0 : _a.includes(browser)) || ((_b = options.includeApp) == null ? void 0 : _b.includes(app))) {
+    return true;
+  }
+  return !(((_c = options.excludeBrowser) == null ? void 0 : _c.includes(browser)) || ((_d = options.excludeApp) == null ? void 0 : _d.includes(app)));
+};
+
 // src/cli/plugins/background/background.ts
 var backgroundFilesToEntries = (files) => {
   const entries = /* @__PURE__ */ new Map();
@@ -1759,11 +1868,17 @@ var getBackgroundEntries = async (config) => {
       }
     }
   }
-  const pluginBackgroundFiles = await Array.fromAsync(processPluginHandler(config, "background", {
+  const pluginBackgroundResult = await Array.fromAsync(processPluginHandler(config, "background", {
     config,
     entries
   }));
-  if (pluginBackgroundFiles.length > 0) {
+  if (pluginBackgroundResult.length > 0) {
+    const pluginBackgroundFiles = pluginBackgroundResult.map(({ name, result: endpoint }) => {
+      if (___default.default.isBoolean(endpoint)) {
+        endpoint = "background";
+      }
+      return `${name}/${endpoint}`;
+    });
     const pluginBackgroundEntries = backgroundFilesToEntries(pluginBackgroundFiles);
     entries = new Map([...entries, ...pluginBackgroundEntries]);
     if (config.debug) {
@@ -1772,16 +1887,61 @@ var getBackgroundEntries = async (config) => {
   }
   return entries;
 };
+var background_default = async (config) => {
+  const entries = Array.from(await getBackgroundEntries(config)).filter(([_4, options]) => isValidEntrypointOptions(options, config));
+  const files = entries.map(([file]) => file);
+  const persistent = entries.some(([_4, { persistent: persistent2 }]) => persistent2);
+  return { files, persistent };
+};
+
+// raw-loader:./background.ts?raw
+var background_default2 = `import {BackgroundDefinition} from "adnbn";
+
+import * as module from "virtual:background-entrypoint";
+
+import _isFunction from "lodash/isFunction";
+import _isPlainObject from "lodash/isPlainObject";
+
+try {
+    const {default: defaultDefinition, ...otherDefinition} = module;
+
+    let definition: BackgroundDefinition = otherDefinition;
+
+    if (_isPlainObject(defaultDefinition)) {
+        definition = {...definition, ...defaultDefinition};
+    } else if (_isFunction(defaultDefinition)) {
+        definition = {...definition, main: defaultDefinition};
+    }
+
+    const {main, ...options} = definition;
 
-// src/cli/plugins/background/index.ts
-var background_default = definePlugin((options) => {
+    if (_isFunction(main)) {
+        Promise.resolve(main(options)).catch((e) => {
+            console.error('The background main function crashed:', e);
+        });
+    }
+} catch (e) {
+    console.error('The background crashed on startup:', e);
+}
+`;
+
+// src/cli/virtual/index.ts
+console.log(background_default2);
+var getVirtualModule = (file, template) => {
+  return background_default2.replace(`virtual:${template}-entrypoint`, file.replace(".ts", ""));
+};
+var virtualBackgroundModule = (file) => {
+  return getVirtualModule(file, "background");
+};
+var background_default3 = definePlugin((options) => {
   const { name = "background" } = options || {};
   let hasBackground = false;
   let persistent;
   return {
+    name: undefined,
     webpack: async ({ config, webpack: webpack4 }) => {
-      const backgroundEntries = Array.from(await getBackgroundEntries(config)).filter(([_3, options2]) => isValidEntrypointOptions(options2, config));
-      const files = backgroundEntries.map(([file]) => file);
+      const { files: backgroundFiles, persistent: backgroundPersistent } = await background_default(config);
+      const files = backgroundFiles;
       if (files.length === 0) {
         if (config.debug) {
           console.warn("Background entries not found");
@@ -1789,16 +1949,14 @@ var background_default = definePlugin((options) => {
         return {};
       }
       hasBackground = true;
-      if (backgroundEntries.some(([_3, { persistent: isPersistent }]) => isPersistent)) {
-        persistent = true;
-      }
-      if (config.debug) {
-        console.info("Background entries:", new Map(backgroundEntries));
-      }
-      return {
-        entry: {
-          [name]: files
-        },
+      persistent = backgroundPersistent;
+      const m = files.reduce((m2, file) => ({ ...m2, [path2__default.default.join("virtual", file)]: virtualBackgroundModule(file) }), {});
+      console.log("m", m);
+      const virtualModules = new VirtualModulesPlugin__default.default(m);
+      const entry = { [name]: Object.keys(m) };
+      let resolvedWebpack = {
+        entry,
+        plugins: [virtualModules],
         optimization: {
           splitChunks: {
             chunks(chunk) {
@@ -1812,6 +1970,28 @@ var background_default = definePlugin((options) => {
           }
         }
       };
+      if (config.mode === "development" /* Development */) {
+        resolvedWebpack = merge_default(resolvedWebpack, {
+          plugins: [
+            new WatchPlugin_default({
+              key: name,
+              entry,
+              callback: async () => {
+                const {
+                  files: backgroundFiles2,
+                  persistent: backgroundPersistent2
+                } = await background_default(config);
+                persistent = backgroundPersistent2;
+                for (const file of files) {
+                  virtualModules.writeModule(file, `console.log("${file}")`);
+                }
+                return { [name]: backgroundFiles2 };
+              }
+            })
+          ]
+        });
+      }
+      return resolvedWebpack;
     },
     manifest: ({ manifest }) => {
       if (hasBackground) {
@@ -1868,7 +2048,7 @@ var loadDotenv = (config) => {
     `.env.${mode}`,
     `.env.local`,
     `.env`
-  ].map((file) => path__default.default.join(getRootPath(config.inputDir), file));
+  ].map((file) => path2__default.default.join(getRootPath(config.inputDir), file));
   const { parsed: fileVars = {} } = import_dotenv.default.config({ path: paths });
   return { ...fileVars, ...updateLocalDotenv(config) };
 };
@@ -1923,8 +2103,8 @@ var config_default = async (config) => {
   vars = { ...vars, ...loadDotenv(resolvedConfig) };
   const corePlugins = [
     dotenv_default({ vars }),
-    content_default(),
-    background_default()
+    // contentPlugin(),
+    background_default3()
   ];
   return {
     ...resolvedConfig,
@@ -2025,12 +2205,12 @@ var ManifestV2_default = class extends ManifestBase_default {
         throw new ManifestError(`Background entry "${entry}" has no dependencies`);
       }
       const scripts = Array.from(dependencies.js);
-      return { background: { scripts, persistent } };
+      return { background: { scripts, persistent: persistent || void 0 } };
     }
   }
   buildContentScripts() {
     if (this.contentScripts.size > 0) {
-      const contentScripts = Array.from(this.contentScripts, ([_3, contentScript]) => ({
+      const contentScripts = Array.from(this.contentScripts, ([_4, contentScript]) => ({
         matches: contentScript.matches,
         exclude_matches: contentScript.excludeMatches,
         all_frames: contentScript.allFrames,
@@ -2070,7 +2250,7 @@ var ManifestV3_default = class extends ManifestBase_default {
   }
   buildContentScripts() {
     if (this.contentScripts.size > 0) {
-      const contentScripts = Array.from(this.contentScripts, ([_3, contentScript]) => ({
+      const contentScripts = Array.from(this.contentScripts, ([_4, contentScript]) => ({
         matches: contentScript.matches,
         exclude_matches: contentScript.excludeMatches,
         all_frames: contentScript.allFrames,
@@ -2150,67 +2330,38 @@ var ManifestPlugin = class {
 };
 var ManifestPlugin_default = ManifestPlugin;
 
-// src/cli/webpack/merge.ts
-var import_webpack_merge = __toESM(require_dist());
-var merge_default = (0, import_webpack_merge.mergeWithCustomize)({
-  customizeArray: (a, b, key) => {
-    if (key === "plugins") {
-      const names = /* @__PURE__ */ new Set();
-      return [...a, ...b].filter((plugin) => {
-        var _a;
-        const name = (_a = plugin == null ? void 0 : plugin.constructor) == null ? void 0 : _a.name;
-        if (names.has(name)) return false;
-        names.add(name);
-        return true;
-      });
-    }
-    if (key === "resolve.plugins") {
-      const names = /* @__PURE__ */ new Set();
-      return [...a, ...b].filter((plugin) => {
-        var _a;
-        const name = (_a = plugin == null ? void 0 : plugin.constructor) == null ? void 0 : _a.name;
-        if (names.has(name)) return false;
-        names.add(name);
-        return true;
-      });
-    }
-    if (key === "module.rules") {
-      const tests = /* @__PURE__ */ new Set();
-      return [...a, ...b].filter((rule) => {
-        var _a;
-        const test = (_a = rule == null ? void 0 : rule.test) == null ? void 0 : _a.toString();
-        if (tests.has(test)) return false;
-        tests.add(test);
-        return true;
-      });
-    }
-    return void 0;
-  }
-});
-
 // src/cli/resolvers/webpack.ts
 var getConfigFromPlugins = async (webpack4, config) => {
   let mergedConfig = {};
-  for await (const webpackFromPlugin of processPluginHandler(config, "webpack", { webpack: webpack4, config })) {
-    mergedConfig = merge_default(mergedConfig, webpackFromPlugin);
+  for await (const { result: pluginConfig } of processPluginHandler(config, "webpack", { webpack: webpack4, config })) {
+    mergedConfig = merge_default(mergedConfig, pluginConfig);
   }
   return mergedConfig;
 };
-var getConfigForManifest = async (webpack4, config) => {
+var getConfigForManifest = async (config) => {
   const manifest = manifest_default(config.browser, config.manifestVersion);
-  await Array.fromAsync(processPluginHandler(config, "manifest", { manifest, config }));
-  return {
-    plugins: [new ManifestPlugin_default(manifest)]
-  };
+  const update = async () => await Array.fromAsync(processPluginHandler(config, "manifest", { manifest, config }));
+  await update();
+  const plugins = [];
+  if (config.mode === "development" /* Development */) {
+    plugins.push(new WatchPlugin_default({
+      key: "manifest",
+      callback: async () => {
+        await update();
+      }
+    }));
+  }
+  plugins.push(new ManifestPlugin_default(manifest));
+  return { plugins };
 };
-var webpack_default = async (config) => {
+var webpack_default = async (command, config) => {
   let webpack4 = {
     mode: config.mode,
     cache: false,
     output: {
-      path: getRootPath(path__default.default.join(config.outputDir, `${config.app}-${config.browser}-mv${config.manifestVersion}`)),
-      filename: path__default.default.join(config.jsDir, "[name].js"),
-      assetModuleFilename: path__default.default.join(config.assetsDir, "[name]-[hash:4][ext]")
+      path: getRootPath(getOutputPath(config)),
+      filename: path2__default.default.join(config.jsDir, "[name].js"),
+      assetModuleFilename: path2__default.default.join(config.assetsDir, "[name]-[hash:4][ext]")
     },
     resolve: {
       extensions: [".ts", ".tsx", ".js", ".scss"],
@@ -2253,27 +2404,36 @@ var webpack_default = async (config) => {
   webpack4 = merge_default(
     webpack4,
     await getConfigFromPlugins(webpack4, config),
-    await getConfigForManifest(webpack4, config)
+    await getConfigForManifest(config)
   );
+  if (command == "watch" /* Watch */) {
+    webpack4 = merge_default(webpack4, {
+      devtool: "inline-source-map"
+    });
+  }
   return webpack4;
 };
 
-// src/cli/builders/app.ts
-var app_default = async (config) => {
+// src/cli/builders/app/index.ts
+var app_default = async (command, config) => {
   const resolverConfig = await config_default(config);
-  const webpackConfig = await webpack_default(resolverConfig);
+  const webpackConfig = await webpack_default(command, resolverConfig);
   const compiler = webpack__default.default(webpackConfig);
-  compiler.run((err, stats) => {
-    if (err) {
-      console.error("Webpack compilation error");
+  switch (command) {
+    case "build" /* Build */:
+      build(compiler);
+      break;
+    case "watch" /* Watch */:
+      watch(compiler);
+      break;
+    default:
+      console.error("Unknown command");
       process.exit(1);
-    }
-    console.log(stats == null ? void 0 : stats.toString({ colors: true }));
-  });
+  }
 };
 
 // package.json
-var version = "0.0.14";
+var version = "0.0.16";
 
 // src/cli/index.ts
 var cli = cac__default.default("adnbn");
@@ -2281,18 +2441,27 @@ cli.option("--debug", "Enable debug mode");
 cli.command("init", "Initialize a new project").action(() => {
   console.log("init is good in cli");
 });
-cli.command("dev [root]", "Start dev server").option("-m, --mode <mode>", "Set env mode", { default: "development" }).option("-c, --config <config>", "Path to config file").option("-a, --app <app>", "Specify an app to run", { default: "myapp" }).option("-b, --browser <browser>", "Specify a browser").option("-p, --port <port>", "Specify a port for the dev server").option("--mv2", "Target manifest v2").action((root, options) => {
-  console.log(options);
+cli.command("watch [root]", "Start watch mode").option("-m, --mode <mode>", "Set env mode", { default: "development" }).option("-c, --config <config>", "Path to config file").option("-a, --app <app>", "Specify an app to run", { default: "myapp" }).option("-b, --browser <browser>", "Specify a browser").option("--mv2", "Target manifest v2").action(async (root, options) => {
+  await app_default("watch" /* Watch */, {
+    mode: options.mode,
+    debug: options.debug,
+    app: options.app,
+    browser: options.browser,
+    manifestVersion: options.mv2 ? 2 : 3,
+    inputDir: root,
+    configFile: options.config
+  });
 });
 cli.command("build [root]", "Build for production").option("-m, --mode <mode>", "Set env mode", { default: "production" }).option("-c, --config <config>", "Path to config file").option("-a, --app <app>", "Specify an app to run", { default: "myapp" }).option("-b, --browser <browser>", "Specify a browser", { default: "chrome" /* Chrome */ }).option("--mv2", "Target manifest v2").option("--analyze", "Visualize extension bundle").action(async (root, options) => {
-  await app_default({
+  await app_default("build" /* Build */, {
     mode: options.mode,
     debug: options.debug,
     app: options.app,
     browser: options.browser,
     manifestVersion: options.mv2 ? 2 : 3,
     inputDir: root,
-    configFile: options.config
+    configFile: options.config,
+    analyze: options.analyze
   });
 });
 cli.version(version);