extension-develop 3.2.0-next.7 → 3.2.0-next.9

package/dist/547.js

@@ -6527,7 +6527,6 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                 this.browser = options.browser || 'chrome';
             }
         }
-        var external_chokidar_ = __webpack_require__("chokidar");
         function serverRestartRequiredFromSpecialFolderMessageOnly(addingOrRemoving, folder, typeOfAsset) {
             return `${external_pintor_default().red('ERROR')} in ${external_pintor_default().yellow('manifest.json')} entrypoint: ${addingOrRemoving} ${external_pintor_default().yellow(typeOfAsset)} in ${external_pintor_default().underline(folder + '/')} requires a dev server restart to apply changes.`;
         }
@@ -6537,6 +6536,16 @@ Set background.noDynamicEntryWarning to true to disable this warning.
         function specialFolderChangeDetected(action, folder, relativePath) {
             return `Special folders change — ${action} in ${folder}/: ${relativePath}`;
         }
+        function warn_upon_folder_changes_define_property(obj, key, value) {
+            if (key in obj) Object.defineProperty(obj, key, {
+                value: value,
+                enumerable: true,
+                configurable: true,
+                writable: true
+            });
+            else obj[key] = value;
+            return obj;
+        }
         class WarnUponFolderChanges {
             throwCompilationError(compilation, folder, filePath, isAddition) {
                 const addingOrRemoving = isAddition ? 'Adding' : 'Removing';
@@ -6556,58 +6565,57 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                 err.details = `Removing from ${folder}/ breaks current build. Restart the dev server to recompile.`;
                 compilation.errors?.push(err);
             }
+            trackChange(projectPath, folder, change, filePath) {
+                if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(specialFolderChangeDetected('add' === change ? 'add' : 'remove', folder, external_path_.relative(projectPath, filePath)));
+                this.pendingChanges.push({
+                    type: change,
+                    folder,
+                    filePath
+                });
+            }
+            collectChanges(compiler) {
+                const projectPath = compiler.options.context || process.cwd();
+                const pagesPath = external_path_.join(projectPath, 'pages') + external_path_.sep;
+                const scriptsPath = external_path_.join(projectPath, "scripts") + external_path_.sep;
+                const extensionsSupported = compiler.options.resolve?.extensions;
+                const supportedScripts = new Set((extensionsSupported || []).map((e)=>e.toLowerCase()));
+                const modifiedFiles = compiler.modifiedFiles || new Set();
+                const removedFiles = compiler.removedFiles || new Set();
+                for (const filePath of modifiedFiles){
+                    if (filePath.startsWith(pagesPath) && filePath.endsWith('.html')) this.trackChange(projectPath, 'pages', 'add', filePath);
+                    if (filePath.startsWith(scriptsPath)) {
+                        const ext = external_path_.extname(filePath).toLowerCase();
+                        if (supportedScripts.has(ext)) this.trackChange(projectPath, "scripts", 'add', filePath);
+                    }
+                }
+                for (const filePath of removedFiles){
+                    if (filePath.startsWith(pagesPath) && filePath.endsWith('.html')) this.trackChange(projectPath, 'pages', 'remove', filePath);
+                    if (filePath.startsWith(scriptsPath)) {
+                        const ext = external_path_.extname(filePath).toLowerCase();
+                        if (supportedScripts.has(ext)) this.trackChange(projectPath, "scripts", 'remove', filePath);
+                    }
+                }
+            }
+            applyPendingChanges(compilation) {
+                for (const change of this.pendingChanges)this.throwCompilationError(compilation, change.folder, change.filePath, 'add' === change.type);
+                this.pendingChanges = [];
+            }
             apply(compiler) {
+                compiler.hooks.watchRun.tap('special-folders:warn-upon-folder-changes', ()=>{
+                    this.collectChanges(compiler);
+                });
                 compiler.hooks.thisCompilation.tap('special-folders:warn-upon-folder-changes', (compilation)=>{
                     const projectPath = compiler.options.context || process.cwd();
                     const pagesPath = external_path_.join(projectPath, 'pages');
                     const scriptsPath = external_path_.join(projectPath, "scripts");
-                    const pagesWatcher = external_chokidar_.watch(pagesPath, {
-                        ignoreInitial: true
-                    });
-                    const scriptsWatcher = external_chokidar_.watch(scriptsPath, {
-                        ignoreInitial: true
-                    });
-                    const extensionsSupported = compiler.options.resolve?.extensions;
-                    pagesWatcher.on('add', (filePath)=>{
-                        const ext = external_path_.extname(filePath).toLowerCase();
-                        const isHtml = '.html' === ext;
-                        if (isHtml) {
-                            if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(specialFolderChangeDetected('add', 'pages', external_path_.relative(projectPath, filePath)));
-                            this.throwCompilationError(compilation, 'pages', filePath, true);
-                        }
-                    });
-                    pagesWatcher.on('unlink', (filePath)=>{
-                        const ext = external_path_.extname(filePath).toLowerCase();
-                        const isHtml = '.html' === ext;
-                        if (isHtml) {
-                            if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(specialFolderChangeDetected('remove', 'pages', external_path_.relative(projectPath, filePath)));
-                            this.throwCompilationError(compilation, 'pages', filePath);
-                        }
-                    });
-                    scriptsWatcher.on('add', (filePath)=>{
-                        const ext = external_path_.extname(filePath).toLowerCase();
-                        const supported = new Set((extensionsSupported || []).map((e)=>e.toLowerCase()));
-                        const isScript = supported.has(ext);
-                        if (isScript) {
-                            if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(specialFolderChangeDetected('add', "scripts", external_path_.relative(projectPath, filePath)));
-                            this.throwCompilationError(compilation, "scripts", filePath, true);
-                        }
-                    });
-                    scriptsWatcher.on('unlink', (filePath)=>{
-                        const ext = external_path_.extname(filePath).toLowerCase();
-                        const supported = new Set((extensionsSupported || []).map((e)=>e.toLowerCase()));
-                        const isScript = supported.has(ext);
-                        if (isScript) {
-                            if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(specialFolderChangeDetected('remove', "scripts", external_path_.relative(projectPath, filePath)));
-                            this.throwCompilationError(compilation, "scripts", filePath);
-                        }
-                    });
-                    compiler.hooks.watchClose.tap('WarnUponFolderChanges', ()=>{
-                        pagesWatcher.close().catch(()=>{});
-                        scriptsWatcher.close().catch(()=>{});
-                    });
+                    compilation.contextDependencies?.add(pagesPath);
+                    compilation.contextDependencies?.add(scriptsPath);
+                    this.applyPendingChanges(compilation);
                 });
             }
+            constructor(){
+                warn_upon_folder_changes_define_property(this, "pendingChanges", []);
+            }
         }
         function checkManifestInPublic(compilation, publicDir) {
             try {

package/dist/module.js

@@ -132090,6 +132090,7 @@ var __webpack_modules__ = {
     "./webpack/webpack-lib/messages.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         "use strict";
         __webpack_require__.d(__webpack_exports__, {
+            $3: ()=>buildCommandFailed,
             AC: ()=>debugOutputPath,
             Al: ()=>runningInProduction,
             BT: ()=>treeWithSourceFiles,
@@ -132365,6 +132366,13 @@ var __webpack_modules__ = {
         function configLoadingError(configPath, error) {
             return `${pintor__rspack_import_2_default().red('ERROR')} ${pintor__rspack_import_2_default().brightBlue('config load failed')}\n${fmt.label('PATH')} ${fmt.val(configPath)}\n` + pintor__rspack_import_2_default().red(fmt.truncate(error, 1200));
         }
+        function buildCommandFailed(error) {
+            const message = (()=>{
+                if (error instanceof Error && error.message) return error.message;
+                return String(error || 'Unknown error');
+            })();
+            return `${getLoggingPrefix('error')} Build failed.\n${pintor__rspack_import_2_default().red(fmt.truncate(message, 1200))}`;
+        }
         function managedDependencyConflict(duplicates, userPackageJsonPath) {
             const list = duplicates.map((d)=>`- ${pintor__rspack_import_2_default().yellow(d)}`).join('\n');
             return `${getLoggingPrefix('error')} Your project declares dependencies that are managed by ${pintor__rspack_import_2_default().blue('Extension.js')} and referenced in ${pintor__rspack_import_2_default().underline('extension.config.js')}\n${pintor__rspack_import_2_default().red('This can cause version conflicts and break the development/build process.')}\n\n${pintor__rspack_import_2_default().gray('Managed dependencies (remove these from your package.json):')}\n${list}\n\n${pintor__rspack_import_2_default().gray('PATH')} ${pintor__rspack_import_2_default().underline(userPackageJsonPath)}\nIf you need a different version, open an issue so we can consider bundling it safely.\nOperation aborted.`;
@@ -132506,10 +132514,6 @@ var __webpack_modules__ = {
         "use strict";
         module.exports = require("child_process");
     },
-    chokidar (module) {
-        "use strict";
-        module.exports = require("chokidar");
-    },
     "chrome-location2" (module) {
         "use strict";
         module.exports = require("chrome-location2");
@@ -132612,7 +132616,7 @@ var __webpack_modules__ = {
     },
     "./package.json" (module) {
         "use strict";
-        module.exports = JSON.parse('{"rE":"3.2.0-next.7","El":{"@rspack/core":"^1.7.2","@rspack/dev-server":"^1.1.5","@swc/core":"^1.15.8","@swc/helpers":"^0.5.18","adm-zip":"^0.5.16","browser-extension-manifest-fields":"^2.2.1","case-sensitive-paths-webpack-plugin":"^2.4.0","chokidar":"^5.0.0","chrome-location2":"4.0.0","chromium-location":"2.0.0","content-security-policy-parser":"^0.6.0","cross-spawn":"^7.0.6","dotenv":"^17.2.3","edge-location":"2.2.0","firefox-location2":"3.0.0","go-git-it":"^5.0.3","ignore":"^7.0.5","loader-utils":"^3.3.1","magic-string":"^0.30.21","parse5":"^8.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","schema-utils":"^4.3.3","tiny-glob":"^0.2.9","unique-names-generator":"^4.7.1","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.19.0"}}');
+        module.exports = JSON.parse('{"rE":"3.2.0-next.9","El":{"@rspack/core":"^1.7.2","@rspack/dev-server":"^1.1.5","@swc/core":"^1.15.8","@swc/helpers":"^0.5.18","adm-zip":"^0.5.16","browser-extension-manifest-fields":"^2.2.1","case-sensitive-paths-webpack-plugin":"^2.4.0","chrome-location2":"4.0.0","chromium-location":"2.0.0","content-security-policy-parser":"^0.6.0","cross-spawn":"^7.0.6","dotenv":"^17.2.3","edge-location":"2.2.0","firefox-location2":"3.0.0","go-git-it":"^5.0.3","ignore":"^7.0.5","loader-utils":"^3.3.1","magic-string":"^0.30.21","parse5":"^8.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","schema-utils":"^4.3.3","tiny-glob":"^0.2.9","unique-names-generator":"^4.7.1","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.19.0"}}');
     }
 };
 var __webpack_module_cache__ = {};
@@ -133402,7 +133406,9 @@ var __webpack_exports__ = {};
             });
             return summary;
         } catch (error) {
-            if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.error(error);
+            const isAuthor = 'true' === process.env.EXTENSION_AUTHOR_MODE;
+            if (isAuthor) console.error(error);
+            else console.error(messages.$3(error));
             if (!shouldExitOnError) throw error;
             process.exit(1);
         }

package/package.json

@@ -22,7 +22,7 @@
     "dist"
   ],
   "name": "extension-develop",
-  "version": "3.2.0-next.7",
+  "version": "3.2.0-next.9",
   "description": "Develop, build, preview, and package Extension.js projects.",
   "author": {
     "name": "Cezar Augusto",
@@ -77,7 +77,6 @@
     "adm-zip": "^0.5.16",
     "browser-extension-manifest-fields": "^2.2.1",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
-    "chokidar": "^5.0.0",
     "chrome-location2": "4.0.0",
     "chromium-location": "2.0.0",
     "content-security-policy-parser": "^0.6.0",