extension 4.1.22 → 4.1.23

package/dist/cli.cjs

@@ -6735,6 +6735,10 @@ var __webpack_modules__ = {
             if ('debug' === type) return pintor__rspack_import_0_default().dim(pintor__rspack_import_0_default().gray(DEBUG_GLYPH));
             return pintor__rspack_import_0_default().gray(GLYPH);
         }
+        const ANSI_PATTERN = /\[[0-9;]*m/g;
+        function hasChannelPrefix(text) {
+            return String(text || '').replace(ANSI_PATTERN, '').trimStart().startsWith(GLYPH);
+        }
         const MACHINE_OUTPUT_VALUES = new Set([
             'json',
             'ndjson'
@@ -6767,7 +6771,8 @@ var __webpack_modules__ = {
             truncate (input, max = 800) {
                 const s = (()=>{
                     try {
-                        return 'string' == typeof input ? input : JSON.stringify(input);
+                        if ('string' == typeof input) return input;
+                        return JSON.stringify(input) ?? String(input);
                     } catch  {
                         return String(input);
                     }
@@ -6993,6 +6998,7 @@ var __webpack_modules__ = {
             Gg: ()=>humanError,
             Nr: ()=>card,
             Pl: ()=>prefix,
+            Qi: ()=>hasChannelPrefix,
             T_: ()=>artifactNoun,
             VR: ()=>isCardKeyClaimed,
             _o: ()=>isDebug,
@@ -8338,8 +8344,13 @@ var __webpack_modules__ = {
         function availableCommandsBlock() {
             return COMMANDS.map(commandHelpEntry).join('\n\n');
         }
+        function projectCliVersionMismatch(running, declared, range, installCommand) {
+            return `${getLoggingPrefix('warn')} Running ${messages_code(`extension ${running}`)}, this project declares ${messages_code(`${declared}@${range}`)}.\nRun ${messages_code(installCommand)} so the project's own version runs.`;
+        }
         function unhandledError(err) {
-            const message = err instanceof Error ? err.stack || err.message : 'string' == typeof err ? err : messaging.Sc.truncate(err);
+            const rendered = err instanceof Error ? err.message : '';
+            if ((0, messaging.Qi)(rendered)) return rendered;
+            const message = err instanceof Error ? err.stack || err.message : 'string' == typeof err ? err : null == err ? '' : messaging.Sc.truncate(err);
             return `${getLoggingPrefix('error')} ${external_pintor_default().red(String(message || 'Unknown error'))}`;
         }
         function updateFailed(err) {
@@ -9665,6 +9676,102 @@ Cross-browser compatibility
             const values = String(raw).split(',').map((value)=>value.trim()).filter((value)=>value.length > 0);
             return values.length > 0 ? values : void 0;
         }
+        const external_semver_namespaceObject = require("semver");
+        var external_semver_default = /*#__PURE__*/ __webpack_require__.n(external_semver_namespaceObject);
+        const CLI_PACKAGES = [
+            'extension',
+            'extension-develop'
+        ];
+        const LOCKFILE_COMMANDS = [
+            [
+                'pnpm-lock.yaml',
+                'pnpm install'
+            ],
+            [
+                'yarn.lock',
+                'yarn install'
+            ],
+            [
+                'bun.lock',
+                'bun install'
+            ],
+            [
+                'bun.lockb',
+                'bun install'
+            ],
+            [
+                'deno.lock',
+                'deno install'
+            ],
+            [
+                'package-lock.json',
+                'npm install'
+            ]
+        ];
+        function installCommandFor(files) {
+            for (const [lockfile, command] of LOCKFILE_COMMANDS)if (files.includes(lockfile)) return command;
+            return 'npm install';
+        }
+        function declaredCliDependency(manifest) {
+            for (const field of [
+                manifest?.dependencies,
+                manifest?.devDependencies
+            ])for (const name of CLI_PACKAGES){
+                const range = field?.[name];
+                if ('string' == typeof range && range.length > 0) return {
+                    name,
+                    range
+                };
+            }
+            return null;
+        }
+        function isComparableRange(range) {
+            const trimmed = range.trim();
+            if (!trimmed || '*' === trimmed || 'latest' === trimmed) return false;
+            if (/^(workspace|file|link|git|github|npm):/i.test(trimmed)) return false;
+            if (/^[./]/.test(trimmed)) return false;
+            return null !== external_semver_default().validRange(trimmed);
+        }
+        function versionMismatch(input) {
+            const declared = declaredCliDependency(input.manifest);
+            if (!declared) return null;
+            if (!isComparableRange(declared.range)) return null;
+            if (!external_semver_default().valid(input.running)) return null;
+            const comparable = external_semver_default().prerelease(input.running) ? external_semver_default().coerce(input.running)?.version ?? input.running : input.running;
+            if (external_semver_default().satisfies(comparable, declared.range, {
+                includePrerelease: true
+            })) return null;
+            return {
+                declared: declared.name,
+                range: declared.range,
+                running: input.running
+            };
+        }
+        function readProjectManifest(projectPath) {
+            try {
+                return JSON.parse(external_node_fs_.readFileSync(external_node_path_.join(projectPath, 'package.json'), 'utf-8'));
+            } catch  {
+                return null;
+            }
+        }
+        function checkProjectCliVersion(projectPath, running) {
+            let files = [];
+            try {
+                files = external_node_fs_.readdirSync(projectPath);
+            } catch  {
+                return null;
+            }
+            if (!files.includes('package.json')) return null;
+            const mismatch = versionMismatch({
+                manifest: readProjectManifest(projectPath),
+                running
+            });
+            if (!mismatch) return null;
+            return {
+                ...mismatch,
+                command: installCommandFor(files)
+            };
+        }
         function registerBuildCommand(program) {
             program.command('build').arguments('[project-name]').usage('[path-to-remote-extension] [options]').description(commandDescriptions.build).option(`--browser <${BROWSER_TARGETS_HELP}>`, 'specify a browser/engine to run. Defaults to `chromium`. `safari` builds a Safari app via Xcode (macOS only)').option('--polyfill [boolean]', 'whether or not to apply the cross-browser polyfill. Defaults to `false`', parseOptionalBoolean).option('--no-polyfill', 'disable the cross-browser polyfill').option('--zip [boolean]', 'whether or not to compress the extension into a ZIP file. Defaults to `false`', parseOptionalBoolean).option('--zip-source [boolean]', 'whether or not to include the source files in the ZIP file. Defaults to `false`', parseOptionalBoolean).option('--zip-filename <string>', 'specify the name of the ZIP file. Defaults to the extension name and version').option('--silent [boolean]', 'suppress the build summary output. Defaults to `false`', parseOptionalBoolean).option('--addon-lint [boolean]', 'check Firefox builds against addons.mozilla.org rules with addons-linter when it is installed. Findings print as warnings. Defaults to `true`', parseOptionalBoolean).option('--no-addon-lint', 'skip the addons.mozilla.org lint of Firefox builds').option('--install [boolean]', '[internal] install project dependencies when missing', parseOptionalBoolean).option('--extensions <list>', 'comma-separated list of companion extensions or store URLs to load').option('--mode <development|production|none>', 'bundler mode override (also sets NODE_ENV). Defaults to `production`').option('--open [boolean]', 'open the built Safari app after packaging (safari targets only). Defaults to `false`', parseOptionalBoolean).option('--app-name <name>', 'override the Safari app name (safari targets only). Defaults to the manifest `name`').option('--bundle-id <reverse.dns>', 'set a user-owned Safari bundle identifier (safari targets only). Defaults to a generated dev.extensionjs.* id shared by every build of the same source, so set your own before the first submission').option('--development-team <id>', 'sign the Safari app with an Apple Developer team id (safari targets only). Without it the build is ad-hoc signed, which Safari loads locally with no per-launch toggle. Use a team id for a stable identity you can distribute').option('--macos-only [boolean]', 'generate a macOS-only Safari Xcode project (safari targets only). Pass `false` for a universal macOS + iOS project. Defaults to `true`', parseOptionalBoolean).option('--force-regenerate', 'regenerate the Safari Xcode project even when up to date (safari targets only)').option('--output <pretty|json>', 'result format. Use json for a schema-1 envelope on stdout').addOption(new external_commander_namespaceObject.Option('--debug', 'print maintainer diagnostics alongside normal output')).addOption(new external_commander_namespaceObject.Option('--author, --author-mode', 'deprecated alias for --debug').hideHelp()).action(async (pathOrRemoteUrl, { browser: cliBrowser, ...buildOptions })=>{
                 const browser = cliBrowser ?? await resolveConfigBrowser(pathOrRemoteUrl || process.cwd(), 'build') ?? 'chromium';
@@ -9732,6 +9839,8 @@ Cross-browser compatibility
                 }
                 const { extensionBuild } = await loadExtensionDevelopModule();
                 const asJson = isJsonOutput(buildOptions);
+                const cliVersion = checkProjectCliVersion(external_node_path_.resolve(pathOrRemoteUrl || process.cwd()), getCliPackageJson().version);
+                if (cliVersion) console.warn(projectCliVersionMismatch(cliVersion.running, cliVersion.declared, cliVersion.range, cliVersion.command));
                 if (asJson) process.env.EXTENSION_OUTPUT = 'json';
                 const built = [];
                 const summaries = [];
@@ -10319,6 +10428,8 @@ Cross-browser compatibility
                     if (!process.env.EXTENSION_VERBOSE) process.env.EXTENSION_VERBOSE = '1';
                 }
                 const asJson = 'json' === resolveOutputFormat(devOptions);
+                const cliVersion = checkProjectCliVersion(external_node_path_.resolve(pathOrRemoteUrl || process.cwd()), getCliPackageJson().version);
+                if (cliVersion) console.warn(projectCliVersionMismatch(cliVersion.running, cliVersion.declared, cliVersion.range, cliVersion.command));
                 if (void 0 !== devOptions.parentPid) {
                     const parentPid = parseParentPid(devOptions.parentPid);
                     if (void 0 === parentPid) {
@@ -11259,6 +11370,8 @@ Cross-browser compatibility
                     if (!process.env.EXTENSION_VERBOSE) process.env.EXTENSION_VERBOSE = '1';
                 }
                 const asJson = 'json' === resolveOutputFormat(startOptions);
+                const cliVersion = checkProjectCliVersion(external_node_path_.resolve(pathOrRemoteUrl || process.cwd()), getCliPackageJson().version);
+                if (cliVersion) console.warn(projectCliVersionMismatch(cliVersion.running, cliVersion.declared, cliVersion.range, cliVersion.command));
                 if (asJson) process.env.EXTENSION_OUTPUT = 'json';
                 const list = vendors(browser);
                 let unsupportedBrowser = '';
@@ -11432,7 +11545,6 @@ Cross-browser compatibility
                 await exitAfterDrain(1);
             });
         }
-        const external_semver_namespaceObject = require("semver");
         const external_update_check_namespaceObject = require("update-check");
         var external_update_check_default = /*#__PURE__*/ __webpack_require__.n(external_update_check_namespaceObject);
         function isStableVersion(version) {

package/dist/extension/helpers/messages.d.ts

@@ -195,6 +195,7 @@ export declare const COMMANDS: readonly CommandSpec[];
 export declare function commandSpec(name: CommandName): CommandSpec;
 export declare const commandDescriptions: Record<CommandName, string>;
 export declare function availableCommandsBlock(): string;
+export declare function projectCliVersionMismatch(running: string, declared: string, range: string, installCommand: string): string;
 export declare function unhandledError(err: unknown): string;
 export declare function updateFailed(err: unknown): string;
 export declare function checkUpdates(packageJson: Record<string, unknown>, update: {

package/dist/extension/helpers/project-cli-version.d.ts

@@ -0,0 +1,26 @@
+export declare const CLI_PACKAGES: readonly ['extension', 'extension-develop'];
+export declare function installCommandFor(files: string[]): string;
+export interface ProjectManifest {
+    dependencies?: Record<string, string>;
+    devDependencies?: Record<string, string>;
+}
+export interface DeclaredCli {
+    name: string;
+    range: string;
+}
+export interface VersionMismatch {
+    declared: string;
+    range: string;
+    running: string;
+}
+export declare function declaredCliDependency(manifest: ProjectManifest | null): DeclaredCli | null;
+export declare function isComparableRange(range: string): boolean;
+export declare function versionMismatch(input: {
+    manifest: ProjectManifest | null;
+    running: string;
+}): VersionMismatch | null;
+export declare function readProjectManifest(projectPath: string): ProjectManifest | null;
+export interface ProjectCliVersionCheck extends VersionMismatch {
+    command: string;
+}
+export declare function checkProjectCliVersion(projectPath: string, running: string): ProjectCliVersionCheck | null;

package/package.json

@@ -38,7 +38,7 @@
     "extension": "./bin/extension.cjs"
   },
   "name": "extension",
-  "version": "4.1.22",
+  "version": "4.1.23",
   "description": "The cross-browser extension framework. Build Chrome, Edge, Firefox, and Safari extensions with no build configuration.",
   "homepage": "https://extension.js.org/",
   "bugs": {
@@ -105,9 +105,9 @@
     "vivaldi-location2": "2.1.1",
     "waterfox-location": "2.1.1",
     "yandex-location": "2.1.1",
-    "extension-create": "4.1.22",
-    "extension-develop": "4.1.22",
-    "extension-install": "4.1.22",
+    "extension-create": "4.1.23",
+    "extension-develop": "4.1.23",
+    "extension-install": "4.1.23",
     "commander": "^15.0.0",
     "pintor": "0.3.0",
     "semver": "^7.7.3",