extension-develop 3.6.2 → 3.7.0-canary.169.5b5db8b

package/dist/323.cjs

@@ -471,6 +471,32 @@ exports.modules = {
             };
             await retryAsync(()=>cdpExtensionController.connect());
             if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.M3V('127.0.0.1', chromeRemoteDebugPort));
+            const mode = compilation?.options?.mode || 'development';
+            let earlyBannerPrinted = false;
+            if ('development' === mode) try {
+                earlyBannerPrinted = await (0, banner.a)({
+                    outPath: extensionOutputPath,
+                    browser: plugin.browser,
+                    hostPort: {
+                        host: '127.0.0.1',
+                        port: chromeRemoteDebugPort
+                    },
+                    getInfo: async ()=>null,
+                    browserVersionLine: plugin.browserVersionLine
+                });
+            } catch  {}
+            if ('development' === mode) try {
+                earlyBannerPrinted = await (0, banner.a)({
+                    outPath: extensionOutputPath,
+                    browser: plugin.browser,
+                    hostPort: {
+                        host: '127.0.0.1',
+                        port: chromeRemoteDebugPort
+                    },
+                    getInfo: async ()=>cdpExtensionController.getInfoBestEffort(),
+                    browserVersionLine: plugin.browserVersionLine
+                });
+            } catch  {}
             let extensionControllerInfo = null;
             try {
                 const ensureLoadedTimeoutMs = 10000;
@@ -484,28 +510,29 @@ exports.modules = {
                 if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.warn(`[CDP] ensureLoaded failed: ${String(error?.message || error)}`);
             }
             try {
-                const mode = compilation?.options?.mode || 'development';
                 if ('development' === mode) {
-                    const bannerPrinted = await (0, banner.a)({
-                        outPath: extensionOutputPath,
-                        browser: plugin.browser,
-                        hostPort: {
-                            host: '127.0.0.1',
-                            port: chromeRemoteDebugPort
-                        },
-                        getInfo: async ()=>extensionControllerInfo,
-                        browserVersionLine: plugin.browserVersionLine
-                    });
-                    if (!bannerPrinted) await (0, banner.a)({
-                        outPath: extensionOutputPath,
-                        browser: plugin.browser,
-                        hostPort: {
-                            host: '127.0.0.1',
-                            port: chromeRemoteDebugPort
-                        },
-                        getInfo: async ()=>cdpExtensionController.getInfoBestEffort(),
-                        browserVersionLine: plugin.browserVersionLine
-                    });
+                    if (!earlyBannerPrinted) {
+                        const bannerPrinted = await (0, banner.a)({
+                            outPath: extensionOutputPath,
+                            browser: plugin.browser,
+                            hostPort: {
+                                host: '127.0.0.1',
+                                port: chromeRemoteDebugPort
+                            },
+                            getInfo: async ()=>extensionControllerInfo,
+                            browserVersionLine: plugin.browserVersionLine
+                        });
+                        if (!bannerPrinted) await (0, banner.a)({
+                            outPath: extensionOutputPath,
+                            browser: plugin.browser,
+                            hostPort: {
+                                host: '127.0.0.1',
+                                port: chromeRemoteDebugPort
+                            },
+                            getInfo: async ()=>cdpExtensionController.getInfoBestEffort(),
+                            browserVersionLine: plugin.browserVersionLine
+                        });
+                    }
                 } else if ('production' === mode) {
                     const runtime = extensionControllerInfo ? {
                         extensionId: extensionControllerInfo.extensionId,

package/dist/535.cjs

@@ -664,6 +664,7 @@ exports.modules = {
                 this.zipData = this.options.zipData ?? {};
             }
         }
+        var shared_state = __webpack_require__("./webpack/plugin-compilation/compilation-lib/shared-state.ts");
         function boring_define_property(obj, key, value) {
             if (key in obj) Object.defineProperty(obj, key, {
                 value: value,
@@ -681,12 +682,38 @@ exports.modules = {
         }
         class BoringPlugin {
             apply(compiler) {
+                compiler.hooks.watchClose.tap('develop:brand:watch-close', ()=>{
+                    this.sawUserInvalidation = false;
+                    this.printedPostBannerStartupSuccess = false;
+                });
                 compiler.hooks.done.tap('develop:brand', (stats)=>{
+                    const hasErrors = Boolean(stats?.hasErrors?.());
+                    const hasWarnings = Boolean(stats?.hasWarnings?.());
+                    const runnerEnabled = '0' !== String(process.env.EXTENSION_BROWSER_RUNNER_ENABLED || '1');
                     stats.compilation.name = void 0;
                     const duration = stats.compilation.endTime - stats.compilation.startTime;
                     const manifestName = boring_readJsonFileSafe(this.manifestPath).name;
                     const line = boring(manifestName, duration, stats);
                     try {
+                        const modifiedFiles = Array.from(stats?.compilation?.modifiedFiles || []).map((file)=>String(file).replace(/\\/g, '/'));
+                        if (!this.sawUserInvalidation && modifiedFiles.length > 0) {
+                            const context = String(compiler?.options?.context || '').replace(/\\/g, '/');
+                            const hasUserFileChange = modifiedFiles.some((file)=>{
+                                const inProject = !context || file.startsWith(`${context}/`);
+                                const isGenerated = file.includes('/dist/') || file.includes('/extension-js/profiles/');
+                                return inProject && !isGenerated;
+                            });
+                            if (hasUserFileChange) this.sawUserInvalidation = true;
+                        }
+                        if (runnerEnabled && !(0, shared_state.TC)() && !hasErrors && !hasWarnings) {
+                            this.printedPostBannerStartupSuccess = true;
+                            (0, shared_state.FF)(line);
+                            return;
+                        }
+                        if (runnerEnabled && !hasErrors && !hasWarnings) {
+                            if (!this.sawUserInvalidation) if (this.printedPostBannerStartupSuccess) return;
+                            else this.printedPostBannerStartupSuccess = true;
+                        }
                         console.log(line);
                     } catch  {}
                 });
@@ -694,6 +721,8 @@ exports.modules = {
             constructor(options){
                 boring_define_property(this, "manifestPath", void 0);
                 boring_define_property(this, "browser", void 0);
+                boring_define_property(this, "sawUserInvalidation", false);
+                boring_define_property(this, "printedPostBannerStartupSuccess", false);
                 this.manifestPath = options.manifestPath;
                 this.browser = options.browser || 'chrome';
             }
@@ -847,18 +876,27 @@ exports.modules = {
             const { useSass = true, useLess = true } = usage;
             const isContentScript = (issuer)=>(0, is_content_script.z)(issuer, manifestPath, projectPath);
             const fileTypes = [
+                {
+                    test: /\.module\.css$/,
+                    type: 'css/module',
+                    loader: null
+                },
                 {
                     test: /\.css$/,
+                    exclude: /\.module\.css$/,
+                    type: 'asset',
                     loader: null
                 },
                 ...useSass ? [
                     {
                         test: /\.(sass|scss)$/,
                         exclude: /\.module\.(sass|scss)$/,
+                        type: 'asset',
                         loader: 'sass-loader'
                     },
                     {
                         test: /\.module\.(sass|scss)$/,
+                        type: 'css/module',
                         loader: 'sass-loader'
                     }
                 ] : [],
@@ -866,24 +904,26 @@ exports.modules = {
                     {
                         test: /\.less$/,
                         exclude: /\.module\.less$/,
+                        type: 'asset',
                         loader: 'less-loader'
                     },
                     {
                         test: /\.module\.less$/,
+                        type: 'css/module',
                         loader: 'less-loader'
                     }
                 ] : []
             ];
-            const rules = await Promise.all(fileTypes.map(async ({ test, exclude, loader })=>{
+            const rules = await Promise.all(fileTypes.map(async ({ test, exclude, type = 'asset', loader })=>{
                 const baseConfig = {
                     test,
                     exclude,
-                    type: 'asset',
-                    generator: {
-                        filename: "content_scripts/[name].[contenthash:8].css"
-                    },
+                    type,
                     issuer: isContentScript
                 };
+                if ('asset' === type) baseConfig.generator = {
+                    filename: "content_scripts/[name].[contenthash:8].css"
+                };
                 if (!loader) return {
                     ...baseConfig,
                     use: await commonStyleLoaders(projectPath, {
@@ -908,8 +948,14 @@ exports.modules = {
             const { useSass = true, useLess = true } = usage;
             const isNotContentScript = (issuer)=>!(0, is_content_script.z)(issuer, manifestPath, projectPath);
             const fileTypes = [
+                {
+                    test: /\.module\.css$/,
+                    type: 'css/module',
+                    loader: null
+                },
                 {
                     test: /\.css$/,
+                    exclude: /\.module\.css$/,
                     type: 'css',
                     loader: null
                 },
@@ -7906,15 +7952,26 @@ Set background.noDynamicEntryWarning to true to disable this warning.
             if ('json' === raw || 'ndjson' === raw) return raw;
             return 'pretty';
         }
+        function formatPrettyClockTime(date) {
+            const hh = String(date.getHours()).padStart(2, '0');
+            const mm = String(date.getMinutes()).padStart(2, '0');
+            const ss = String(date.getSeconds()).padStart(2, '0');
+            return `${hh}:${mm}:${ss}`;
+        }
         function emitActionEvent(action, payload = {}, format = resolveActionFormat()) {
+            const eventDate = new Date();
             const base = {
                 type: 'action_event',
                 schema_version: '1.0',
-                timestamp: new Date().toISOString(),
+                timestamp: eventDate.toISOString(),
                 action,
                 ...payload
             };
-            if ('pretty' === format) return void console.log(`${base.timestamp} [action] ${action} ${JSON.stringify(payload)}`);
+            if ('pretty' === format) {
+                const prettyTime = formatPrettyClockTime(eventDate);
+                console.log(`►►► [${prettyTime}] [action] ${action} ${JSON.stringify(payload)}`);
+                return;
+            }
             console.log(JSON.stringify(base));
         }
         function buildHtmlSummary(html) {
@@ -8038,7 +8095,7 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                     const ctrl = this.ctx.getController();
                     if (!ctrl) return;
                     this.logger?.info?.(`[reload] reloading extension (reason:${reason})`);
-                    emitActionEvent('extension_reload', {
+                    if (this.shouldEmitReloadActionEvent()) emitActionEvent('extension_reload', {
                         reason: reason || 'unknown',
                         browser: this.options?.browser
                     });
@@ -8125,6 +8182,9 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                 }
                 return collectedResourcePaths;
             }
+            shouldEmitReloadActionEvent() {
+                return Boolean(this.options?.source || this.options?.watchSource);
+            }
             constructor(options, ctx){
                 chromium_hard_reload_define_property(this, "options", void 0);
                 chromium_hard_reload_define_property(this, "ctx", void 0);
@@ -9135,7 +9195,7 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                         const controller = this.host?.rdpController;
                         if (controller && 'function' == typeof controller.hardReload) {
                             const reason = this.ctx.getPendingReloadReason?.();
-                            emitActionEvent('extension_reload', {
+                            if (this.shouldEmitReloadActionEvent()) emitActionEvent('extension_reload', {
                                 reason: reason || 'unknown',
                                 browser: this.host.browser
                             });
@@ -9145,6 +9205,9 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                     done();
                 });
             }
+            shouldEmitReloadActionEvent() {
+                return Boolean(this.host.source || this.host.watchSource);
+            }
             constructor(host, ctx){
                 firefox_hard_reload_define_property(this, "host", void 0);
                 firefox_hard_reload_define_property(this, "ctx", void 0);

package/dist/928.cjs

@@ -325,6 +325,7 @@ exports.modules = {
         }
         var webpack_config = __webpack_require__("./webpack/webpack-config.ts");
         async function dev_server_devServer(projectStructure, devOptions) {
+            process.env.EXTENSION_BROWSER_RUNNER_ENABLED = devOptions.noRunner ? '0' : '1';
             const { manifestPath, packageJsonPath } = projectStructure;
             const manifestDir = external_path_.dirname(manifestPath);
             const packageJsonDir = external_path_.dirname(packageJsonPath);
@@ -388,9 +389,8 @@ exports.modules = {
                 host: devServerHost,
                 allowedHosts: 'all',
                 static: {
-                    watch: {
-                        ignored: /\bnode_modules\b/
-                    }
+                    directory: external_path_.join(packageJsonDir, 'public'),
+                    watch: false
                 },
                 compress: false,
                 devMiddleware: {
@@ -405,6 +405,10 @@ exports.modules = {
                         ]
                     ],
                     options: {
+                        ignored: [
+                            external_path_.join(packageJsonDir, 'dist', '**/*')
+                        ],
+                        ignoreInitial: true,
                         usePolling: true,
                         interval: 1000
                     }