@capacitor/cli 9.0.0-alpha.8 → 9.0.0-beta.0

package/dist/util/capacitor-package.js

@@ -1,68 +1,77 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.patchPackageSwiftDeploymentTarget = exports.findCapacitorDependencyVersion = exports.rewriteCapacitorDependency = exports.renderCapacitorPackage = exports.resolveCapacitorPackage = void 0;
+exports.patchPackageSwiftDeploymentTarget = exports.findCapacitorDependencyVersion = exports.rewriteCapacitorDependency = exports.renderCapacitorPackage = exports.resolveCapacitorPackagePath = exports.CORDOVA_PRODUCT = exports.SOURCE_PACKAGE_IDENTITY = void 0;
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
-const semver_1 = require("semver");
-const common_1 = require("../common");
 const errors_1 = require("../errors");
 const fs_1 = require("./fs");
-/** Capacitor 9 and up builds the iOS platform from source out of the main repo. */
-const SOURCE_PACKAGE_MAJOR = 9;
+const node_1 = require("./node");
 const SOURCE_PACKAGE_URL = 'https://github.com/ionic-team/capacitor';
-const SOURCE_PACKAGE_IDENTITY = 'capacitor';
-/** Before Capacitor 9 the platform was consumed as a prebuilt xcframework from a separate repo. */
-const BINARY_PACKAGE_URL = 'https://github.com/ionic-team/capacitor-swift-pm.git';
+exports.SOURCE_PACKAGE_IDENTITY = 'capacitor';
+const SOURCE_PACKAGE_NAME = new RegExp(`name:\\s*"${exports.SOURCE_PACKAGE_IDENTITY}"`);
+/** Product providing the Cordova compatibility layer. */
+exports.CORDOVA_PRODUCT = 'CapacitorCordova';
+/** The npm package the Swift package ships inside. */
+const PLATFORM_PACKAGE = '@capacitor/ios';
+/** Plugins published before Capacitor 9 depend on the platform as a prebuilt xcframework. */
 const BINARY_PACKAGE_IDENTITY = 'capacitor-swift-pm';
-const ENV_OVERRIDE = 'CAPACITOR_IOS_PACKAGE';
-const REQUIREMENT_KEYS = ['path', 'branch', 'revision', 'exact', 'from'];
 /**
- * Resolves which Capacitor Swift package generated `Package.swift` files should depend on.
+ * Resolves the Capacitor Swift package generated `Package.swift` files should depend on: the
+ * `@capacitor/ios` npm already installed in the app, which ships the package alongside the sources.
  *
- * Precedence, most specific first:
- *   1. the `CAPACITOR_IOS_PACKAGE` environment variable
- *   2. `experimental.ios.spm.capacitorPackage` in the Capacitor config
- *   3. the git tag matching the installed `@capacitor/ios` version
- *
- * The environment variable deliberately outranks the config file so a checkout can be pointed at a
- * local or branch build without editing (and risking committing) the app's configuration.
+ * Resolving from `node_modules` keeps the native runtime and the `@capacitor/core` bridge it is
+ * versioned against on the same release, with no git tag to line up against the npm version. It
+ * also carries no version for the app package and any generated plugin packages to disagree about.
+ */
+async function resolveCapacitorPackagePath(config) {
+    const packageJsonPath = (0, node_1.resolveNode)(config.app.rootDir, PLATFORM_PACKAGE, 'package.json');
+    if (!packageJsonPath) {
+        (0, errors_1.fatal)(`Unable to find node_modules/${PLATFORM_PACKAGE}.\nAre you sure ${PLATFORM_PACKAGE} is installed?`);
+    }
+    const absolutePath = installDirectory((0, path_1.dirname)(packageJsonPath), config.app.rootDir);
+    if (!(0, fs_extra_1.existsSync)((0, path_1.resolve)(absolutePath, 'Package.swift'))) {
+        (0, errors_1.fatal)(`The installed ${PLATFORM_PACKAGE} has no Package.swift (looked in ${absolutePath}).\n` +
+            `Early 9.0.0 alphas did not ship one; update ${PLATFORM_PACKAGE} to build with SPM.`);
+    }
+    return absolutePath;
+}
+exports.resolveCapacitorPackagePath = resolveCapacitorPackagePath;
+/**
+ * Trades the resolved location for the `node_modules` entry that leads to it, when there is one.
  *
- * `legacyRequirement` only applies to pre-9 projects, where it preserves each caller's existing
- * requirement style. Source-based projects always pin `exact`, because the app package and any
- * generated plugin packages must agree: a prerelease such as `9.0.0-alpha.6` does not satisfy a
- * `from:` range, so mixing the two styles fails to resolve.
+ * Node resolves symlinks away, so a linked or `file:`-installed package resolves to wherever it
+ * actually lives — an absolute path outside the app, which the generated `Package.swift` is
+ * committed with. The entry inside the project stays valid on every machine.
  */
-async function resolveCapacitorPackage(config, legacyRequirement = 'exact') {
-    var _a, _b;
-    const version = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
-    if ((0, semver_1.major)(version) < SOURCE_PACKAGE_MAJOR) {
-        return {
-            identity: BINARY_PACKAGE_IDENTITY,
-            cordovaProduct: 'Cordova',
-            sourceBased: false,
-            url: BINARY_PACKAGE_URL,
-            requirement: { kind: legacyRequirement, version },
-        };
+function installDirectory(resolved, rootDir) {
+    const real = realPath(resolved);
+    if (!real) {
+        return resolved;
+    }
+    for (let dir = (0, path_1.resolve)(rootDir);; dir = (0, path_1.dirname)(dir)) {
+        const candidate = (0, path_1.resolve)(dir, 'node_modules', PLATFORM_PACKAGE);
+        if (realPath(candidate) === real) {
+            return candidate;
+        }
+        if ((0, path_1.dirname)(dir) === dir) {
+            return resolved;
+        }
     }
-    const override = resolveOverride(config);
-    return {
-        identity: SOURCE_PACKAGE_IDENTITY,
-        cordovaProduct: 'CapacitorCordova',
-        sourceBased: true,
-        url: (_a = override === null || override === void 0 ? void 0 : override.url) !== null && _a !== void 0 ? _a : SOURCE_PACKAGE_URL,
-        requirement: (_b = override === null || override === void 0 ? void 0 : override.requirement) !== null && _b !== void 0 ? _b : { kind: 'exact', version },
-    };
 }
-exports.resolveCapacitorPackage = resolveCapacitorPackage;
-/** Renders the `.package(...)` entry, with any path made relative to the file being written. */
-function renderCapacitorPackage(pkg, fromDir) {
-    if (pkg.requirement.kind === 'path') {
-        const relPath = (0, fs_1.convertToUnixPath)((0, path_1.relative)(fromDir, pkg.requirement.absolutePath));
-        // Pin the identity: for a path dependency SPM would otherwise derive it from the directory
-        // name, which breaks `.product(package:)` when the checkout is not named "capacitor".
-        return `.package(name: "${pkg.identity}", path: "${relPath}")`;
+function realPath(path) {
+    try {
+        return (0, fs_extra_1.realpathSync)(path);
     }
-    return `.package(url: "${pkg.url}", ${renderRequirement(pkg.requirement)})`;
+    catch {
+        return undefined;
+    }
+}
+/** Renders the `.package(...)` entry, with the path made relative to the file being written. */
+function renderCapacitorPackage(absolutePath, fromDir) {
+    const relPath = (0, fs_1.convertToUnixPath)((0, path_1.relative)(fromDir, absolutePath));
+    // Pin the identity: for a path dependency SPM would otherwise derive it from the directory
+    // name, which breaks `.product(package:)` when the checkout is not named "capacitor".
+    return `.package(name: "${exports.SOURCE_PACKAGE_IDENTITY}", path: "${relPath}")`;
 }
 exports.renderCapacitorPackage = renderCapacitorPackage;
 /**
@@ -73,12 +82,9 @@ exports.renderCapacitorPackage = renderCapacitorPackage;
  * `Capacitor` product — so a plugin left untouched would either fail to resolve or link a second
  * copy of the framework. Rewriting keeps the whole graph on one identity.
  */
-function rewriteCapacitorDependency(content, pkg, fromDir) {
-    let rewritten = replacePackageCalls(content, renderCapacitorPackage(pkg, fromDir));
-    for (const identity of [BINARY_PACKAGE_IDENTITY, SOURCE_PACKAGE_IDENTITY]) {
-        rewritten = rewritten.split(`package: "${identity}"`).join(`package: "${pkg.identity}"`);
-    }
-    return rewritten;
+function rewriteCapacitorDependency(content, absolutePath, fromDir) {
+    const rewritten = replacePackageCalls(content, renderCapacitorPackage(absolutePath, fromDir));
+    return rewritten.split(`package: "${BINARY_PACKAGE_IDENTITY}"`).join(`package: "${exports.SOURCE_PACKAGE_IDENTITY}"`);
 }
 exports.rewriteCapacitorDependency = rewriteCapacitorDependency;
 /** Reads the version an existing `Package.swift` pins Capacitor to, if it pins one. */
@@ -122,8 +128,13 @@ function patchPackageSwiftDeploymentTarget(content, requiredIosVersion) {
     return { content: patchedContent, changed: true, previousVersion };
 }
 exports.patchPackageSwiftDeploymentTarget = patchPackageSwiftDeploymentTarget;
+/**
+ * A path dependency carries no URL to match on, so it is matched on its pinned identity — without
+ * that, a manifest rewritten by an earlier sync keeps a relative path that no longer resolves once
+ * the app, or the package it points at, has moved.
+ */
 function referencesCapacitor(call) {
-    return call.includes(BINARY_PACKAGE_IDENTITY) || call.includes(`${SOURCE_PACKAGE_URL}`);
+    return call.includes(BINARY_PACKAGE_IDENTITY) || call.includes(SOURCE_PACKAGE_URL) || SOURCE_PACKAGE_NAME.test(call);
 }
 /**
  * Locates `.package(...)` calls in code, skipping any inside a comment or string literal.
@@ -233,92 +244,3 @@ function startOfEntry(content, start) {
     }
     return content[cursor] === ',' ? cursor : start;
 }
-function renderRequirement(requirement) {
-    switch (requirement.kind) {
-        case 'branch':
-            return `branch: "${requirement.branch}"`;
-        case 'revision':
-            return `revision: "${requirement.revision}"`;
-        case 'exact':
-            return `exact: "${requirement.version}"`;
-        case 'from':
-            return `from: "${requirement.version}"`;
-        case 'path':
-            throw new Error('path requirements are rendered by renderCapacitorPackage');
-    }
-}
-function resolveOverride(config) {
-    var _a, _b, _c, _d;
-    const baseDir = config.app.rootDir;
-    const fromEnv = (_a = process.env[ENV_OVERRIDE]) === null || _a === void 0 ? void 0 : _a.trim();
-    if (fromEnv) {
-        return { requirement: parseRequirementSpec(fromEnv, baseDir) };
-    }
-    const fromConfig = (_d = (_c = (_b = config.app.extConfig.experimental) === null || _b === void 0 ? void 0 : _b.ios) === null || _c === void 0 ? void 0 : _c.spm) === null || _d === void 0 ? void 0 : _d.capacitorPackage;
-    if (!fromConfig) {
-        return undefined;
-    }
-    const provided = REQUIREMENT_KEYS.filter((key) => fromConfig[key] !== undefined);
-    if (provided.length === 0) {
-        (0, errors_1.fatal)(`experimental.ios.spm.capacitorPackage must set one of: ${REQUIREMENT_KEYS.join(', ')}.\n` +
-            `Remove the entry to use the version matching the installed @capacitor/ios.`);
-    }
-    if (provided.length > 1) {
-        (0, errors_1.fatal)(`experimental.ios.spm.capacitorPackage sets more than one of: ${provided.join(', ')}.\n` + `Only one may be set.`);
-    }
-    const key = provided[0];
-    const value = String(fromConfig[key]);
-    if (key === 'path') {
-        if (fromConfig.url !== undefined) {
-            (0, errors_1.fatal)(`experimental.ios.spm.capacitorPackage cannot set both "url" and "path".`);
-        }
-        return { requirement: pathRequirement(value, baseDir) };
-    }
-    return { url: fromConfig.url, requirement: { kind: key, ...requirementValue(key, value) } };
-}
-function requirementValue(key, value) {
-    switch (key) {
-        case 'branch':
-            return { branch: value };
-        case 'revision':
-            return { revision: value };
-        default:
-            return { version: value };
-    }
-}
-/**
- * Parses a `CAPACITOR_IOS_PACKAGE` value. Accepts an explicit `kind:value` form, or infers `path`
- * for anything path-shaped and `exact` for a bare version.
- */
-function parseRequirementSpec(spec, baseDir) {
-    const separator = spec.indexOf(':');
-    if (separator > 0) {
-        const key = spec.slice(0, separator);
-        const value = spec.slice(separator + 1);
-        if (REQUIREMENT_KEYS.includes(key)) {
-            if (key === 'path') {
-                return pathRequirement(value, baseDir);
-            }
-            return {
-                kind: key,
-                ...requirementValue(key, value),
-            };
-        }
-    }
-    if (spec.startsWith('.') || (0, path_1.isAbsolute)(spec)) {
-        return pathRequirement(spec, baseDir);
-    }
-    if ((0, semver_1.valid)(spec)) {
-        return { kind: 'exact', version: spec };
-    }
-    return (0, errors_1.fatal)(`Could not understand ${ENV_OVERRIDE}="${spec}".\n` +
-        `Expected one of ${REQUIREMENT_KEYS.map((k) => `${k}:<value>`).join(', ')}, a path, or a version.`);
-}
-function pathRequirement(value, baseDir) {
-    const absolutePath = (0, path_1.resolve)(baseDir, value);
-    if (!(0, fs_extra_1.existsSync)((0, path_1.resolve)(absolutePath, 'Package.swift'))) {
-        (0, errors_1.fatal)(`No Package.swift found at ${absolutePath}.\n` +
-            `A local Capacitor package must point at the repository root, not the ios directory.`);
-    }
-    return { kind: 'path', absolutePath };
-}

package/dist/util/cordova-ios.js

@@ -320,9 +320,9 @@ function filterResources(plugin) {
     return resources.length > 0;
 }
 async function generateCordovaPackageFiles(cordovaPlugins, config) {
-    cordovaPlugins.map((plugin) => {
-        generateCordovaPackageFile(plugin, config);
-    });
+    await Promise.all(cordovaPlugins.map(async (plugin) => {
+        await generateCordovaPackageFile(plugin, config);
+    }));
 }
 exports.generateCordovaPackageFiles = generateCordovaPackageFiles;
 function buildBinaryTargetEntries(p, frameworks) {
@@ -439,7 +439,7 @@ ${entries.join(',\n')}
 }
 async function generateCordovaPackageFile(p, config) {
     var _a;
-    const capacitorPackage = await (0, capacitor_package_1.resolveCapacitorPackage)(config, 'from');
+    const capacitorPackagePath = await (0, capacitor_package_1.resolveCapacitorPackagePath)(config);
     const iosVersion = (0, common_1.getMajoriOSVersion)(config);
     const headerFiles = (0, plugin_1.getPlatformElement)(p, platform, 'header-file');
     let headersText = '';
@@ -451,11 +451,9 @@ async function generateCordovaPackageFile(p, config) {
     if ((_a = platformTag.$) === null || _a === void 0 ? void 0 : _a.package) {
         const packageSwiftPath = (0, path_1.join)(p.rootPath, 'Package.swift');
         let content = await (0, fs_extra_1.readFile)(packageSwiftPath, { encoding: 'utf-8' });
-        content = content.replace(`apache`, `ionic-team`).replaceAll(`cordova-ios`, capacitorPackage.identity);
-        content = (0, capacitor_package_1.rewriteCapacitorDependency)(content, capacitorPackage, p.rootPath);
-        if (capacitorPackage.sourceBased) {
-            content = (0, capacitor_package_1.patchPackageSwiftDeploymentTarget)(content, iosVersion).content;
-        }
+        content = content.replace(`apache`, `ionic-team`).replaceAll(`cordova-ios`, capacitor_package_1.SOURCE_PACKAGE_IDENTITY);
+        content = (0, capacitor_package_1.rewriteCapacitorDependency)(content, capacitorPackagePath, p.rootPath);
+        content = (0, capacitor_package_1.patchPackageSwiftDeploymentTarget)(content, iosVersion).content;
         await (0, fs_extra_1.writeFile)(packageSwiftPath, content);
     }
     else {
@@ -493,13 +491,13 @@ let package = Package(
         )
     ],
     dependencies: [
-        ${(0, capacitor_package_1.renderCapacitorPackage)(capacitorPackage, (0, path_1.join)(config.ios.cordovaPluginsDirAbs, 'sources', p.name))}${packageText}
+        ${(0, capacitor_package_1.renderCapacitorPackage)(capacitorPackagePath, (0, path_1.join)(config.ios.cordovaPluginsDirAbs, 'sources', p.name))}${packageText}
     ],
     targets: [
         .target(
             name: "${p.name}",
             dependencies: [
-                .product(name: "Cordova", package: "${capacitorPackage.identity}")${binaryDepsText}${productText}
+                .product(name: "Cordova", package: "${capacitor_package_1.SOURCE_PACKAGE_IDENTITY}")${binaryDepsText}${productText}
             ],
             path: "."${resourcesText}${headersText}${cSettingsText}${linkerSettingsText}
         )${binaryTargetsText}

package/dist/util/npm.js

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logBlockedInstallScripts = exports.hasBlockedCapacitorScripts = exports.parseBlockedInstallScripts = exports.getBlockedInstallScripts = exports.isNpmProject = void 0;
+const tslib_1 = require("tslib");
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const colors_1 = tslib_1.__importDefault(require("../colors"));
+const log_1 = require("../log");
+const subprocess_1 = require("./subprocess");
+const LOCKFILE_MANAGERS = [
+    ['package-lock.json', 'npm'],
+    ['npm-shrinkwrap.json', 'npm'],
+    ['pnpm-lock.yaml', 'pnpm'],
+    ['yarn.lock', 'yarn'],
+    ['bun.lock', 'bun'],
+    ['bun.lockb', 'bun'],
+];
+/**
+ * `npm install-scripts ls` compares the tree against npm's own `allowScripts` map, which yarn and
+ * pnpm never write. It therefore reports every install script in a yarn or pnpm project as
+ * blocked, even when that package manager ran it, so the check has to know who did the install.
+ *
+ * Only a positive signal counts. `rootDir` is the app package, which in a workspace holds neither
+ * a lockfile nor a `packageManager` field, and guessing npm there reports blocked scripts for an
+ * install npm never performed.
+ */
+async function isNpmProject(rootDir) {
+    try {
+        const { packageManager } = await (0, fs_extra_1.readJSON)((0, path_1.join)(rootDir, 'package.json'));
+        if (typeof packageManager === 'string') {
+            return packageManager.split('@')[0] === 'npm';
+        }
+    }
+    catch {
+        // no package.json, or an unreadable one: fall through to the lockfiles
+    }
+    for (const [lockfile, manager] of LOCKFILE_MANAGERS) {
+        if ((0, fs_extra_1.existsSync)((0, path_1.join)(rootDir, lockfile))) {
+            return manager === 'npm';
+        }
+    }
+    return false;
+}
+exports.isNpmProject = isNpmProject;
+/**
+ * npm 12 blocks dependency install scripts by default and still exits 0, so the only reliable
+ * signal is to ask npm directly. `npm install-scripts ls` lists every package whose scripts are
+ * still awaiting a decision, and does not exist before npm 12, where the command exits non-zero
+ * and `getCommandOutput` hands back null.
+ *
+ * Pass `packageManager` when the caller already knows which one ran the install; otherwise it is
+ * inferred from the project.
+ */
+async function getBlockedInstallScripts(rootDir, packageManager) {
+    const isNpm = packageManager === undefined ? await isNpmProject(rootDir) : packageManager.toLowerCase() === 'npm';
+    if (!isNpm) {
+        return [];
+    }
+    return parseBlockedInstallScripts(await (0, subprocess_1.getCommandOutput)('npm', ['install-scripts', 'ls', '--json'], { cwd: rootDir }));
+}
+exports.getBlockedInstallScripts = getBlockedInstallScripts;
+function parseBlockedInstallScripts(commandOutput) {
+    if (!commandOutput) {
+        return [];
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(commandOutput);
+    }
+    catch {
+        return [];
+    }
+    if (!Array.isArray(parsed === null || parsed === void 0 ? void 0 : parsed.allowScripts)) {
+        return [];
+    }
+    const blocked = [];
+    for (const entry of parsed.allowScripts) {
+        const name = entry === null || entry === void 0 ? void 0 : entry.name;
+        if (typeof name !== 'string' || !Array.isArray(entry.changes)) {
+            continue;
+        }
+        for (const change of entry.changes) {
+            if ((change === null || change === void 0 ? void 0 : change.change) !== 'pending' || typeof change.key !== 'string') {
+                continue;
+            }
+            blocked.push({
+                name,
+                version: change.key.startsWith(`${name}@`) ? change.key.slice(name.length + 1) : change.key,
+            });
+        }
+    }
+    return blocked;
+}
+exports.parseBlockedInstallScripts = parseBlockedInstallScripts;
+/**
+ * npm 12 denies install scripts by default, so a typical project has pending entries for packages
+ * like esbuild or sharp that a Capacitor migration has no bearing on. Only Capacitor's own blocked
+ * scripts say anything about whether the migration finished.
+ */
+function hasBlockedCapacitorScripts(blocked) {
+    return blocked.some(({ name }) => name.startsWith('@capacitor/'));
+}
+exports.hasBlockedCapacitorScripts = hasBlockedCapacitorScripts;
+function logBlockedInstallScripts(blocked) {
+    if (blocked.length === 0) {
+        return;
+    }
+    const names = [...new Set(blocked.map(({ name }) => name))];
+    const packages = blocked.map(({ name, version }) => `    ${colors_1.default.strong(`${name}@${version}`)}\n`).join('');
+    const approvals = names.map((name) => `    ${colors_1.default.input(`npm install-scripts approve ${name}`)}\n`).join('');
+    log_1.output.write(`${colors_1.default.strong('Blocked Install Scripts:')}\n\n` +
+        `  npm blocked install scripts for ${names.length === 1 ? '1 package' : `${names.length} packages`}. ` +
+        `Features that rely on them may not work.\n\n` +
+        packages +
+        `\n  To allow them, run:\n\n` +
+        approvals +
+        `    ${colors_1.default.input('npm rebuild')}\n\n` +
+        `  ${colors_1.default.weak('Approvals are pinned to an exact version, so repeat this after upgrading the package.')}\n\n`);
+}
+exports.logBlockedInstallScripts = logBlockedInstallScripts;

package/dist/util/spm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkPackageTraitsRequirements = exports.checkSwiftToolsVersion = exports.setSwiftUISceneManifest = exports.hasSwiftUISceneManifest = exports.hasSceneManifest = exports.addInfoPlistDebugIfNeeded = exports.runCocoapodsDeintegrate = exports.generatePackageText = exports.removeCocoapodsFiles = exports.extractSPMPackageDirectory = exports.checkPluginsForPackageSwift = exports.generatePackageFile = exports.findPackageSwiftFile = exports.checkPackageManager = void 0;
+exports.checkPackageTraitsRequirements = exports.checkSwiftToolsVersion = exports.ensureSPMGitignoreEntry = exports.setSwiftUISceneManifest = exports.hasSwiftUISceneManifest = exports.hasSceneManifest = exports.removeInfoPlistDebug = exports.runCocoapodsDeintegrate = exports.generatePackageText = exports.removeCocoapodsFiles = exports.extractSPMPackageDirectory = exports.checkPluginsForPackageSwift = exports.generatePackageFile = exports.findPackageSwiftFile = exports.checkPackageManager = void 0;
 const fs_extra_1 = require("fs-extra");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -60,15 +60,12 @@ exports.checkPluginsForPackageSwift = checkPluginsForPackageSwift;
 async function extractSPMPackageDirectory(config) {
     const spmDirectory = (0, path_1.join)(config.ios.nativeProjectDirAbs, 'CapApp-SPM');
     const spmTemplate = (0, path_1.join)(config.cli.assetsDirAbs, 'ios-spm-template.tar.gz');
-    const debugConfig = (0, path_1.join)(config.ios.platformDirAbs, 'debug.xcconfig');
     log_1.logger.info('Extracting ' + spmTemplate + ' to ' + spmDirectory);
     try {
         const tempCapDir = await (0, fs_extra_1.mkdtemp)((0, path_1.join)((0, os_1.tmpdir)(), 'cap-'));
         const tempCapSPM = (0, path_1.join)(tempCapDir, 'App', 'CapApp-SPM');
-        const tempDebugXCConfig = (0, path_1.join)(tempCapDir, 'debug.xcconfig');
         await (0, tar_1.extract)({ file: spmTemplate, cwd: tempCapDir });
         await (0, fs_extra_1.move)(tempCapSPM, spmDirectory);
-        await (0, fs_extra_1.move)(tempDebugXCConfig, debugConfig);
     }
     catch (err) {
         (0, errors_1.fatal)('Failed to create ' + spmDirectory + ' with error: ' + err);
@@ -92,7 +89,7 @@ async function generatePackageText(config, plugins) {
     const enableCordova = cordovaPlugins.length > 0 || config.app.forceCordova;
     const packageTraits = (_d = (_c = (_b = (_a = config.app.extConfig.experimental) === null || _a === void 0 ? void 0 : _a.ios) === null || _b === void 0 ? void 0 : _b.spm) === null || _c === void 0 ? void 0 : _c.packageTraits) !== null && _d !== void 0 ? _d : {};
     const packageOptions = (_h = (_g = (_f = (_e = config.app.extConfig.experimental) === null || _e === void 0 ? void 0 : _e.ios) === null || _f === void 0 ? void 0 : _f.spm) === null || _g === void 0 ? void 0 : _g.packageOptions) !== null && _h !== void 0 ? _h : {};
-    const capacitorPackage = await (0, capacitor_package_1.resolveCapacitorPackage)(config);
+    const capacitorPackagePath = await (0, capacitor_package_1.resolveCapacitorPackagePath)(config);
     const spmDirectory = (0, path_1.join)(config.ios.nativeProjectDirAbs, 'CapApp-SPM');
     const swiftToolsVersion = (_m = (_l = (_k = (_j = config.app.extConfig.experimental) === null || _j === void 0 ? void 0 : _j.ios) === null || _k === void 0 ? void 0 : _k.spm) === null || _l === void 0 ? void 0 : _l.swiftToolsVersion) !== null && _m !== void 0 ? _m : '5.9';
     let packageSwiftText = `// swift-tools-version: ${swiftToolsVersion}
@@ -108,7 +105,7 @@ let package = Package(
             targets: ["CapApp-SPM"])
     ],
     dependencies: [
-        ${(0, capacitor_package_1.renderCapacitorPackage)(capacitorPackage, spmDirectory)}`;
+        ${(0, capacitor_package_1.renderCapacitorPackage)(capacitorPackagePath, spmDirectory)}`;
     for (const plugin of plugins) {
         if ((0, plugin_1.getPluginType)(plugin, config.ios.name) === 1 /* PluginType.Cordova */) {
             const platformTag = (0, plugin_1.getPluginPlatform)(plugin, config.ios.name);
@@ -153,9 +150,9 @@ let package = Package(
         .target(
             name: "CapApp-SPM",
             dependencies: [
-                .product(name: "Capacitor", package: "${capacitorPackage.identity}")`;
+                .product(name: "Capacitor", package: "${capacitor_package_1.SOURCE_PACKAGE_IDENTITY}")`;
     if (enableCordova) {
-        packageSwiftText += `,\n                .product(name: "${capacitorPackage.cordovaProduct}", package: "${capacitorPackage.identity}")`;
+        packageSwiftText += `,\n                .product(name: "${capacitor_package_1.CORDOVA_PRODUCT}", package: "${capacitor_package_1.SOURCE_PACKAGE_IDENTITY}")`;
     }
     for (const plugin of plugins) {
         const aliases = Object.entries((_r = (_q = packageOptions[plugin.id]) === null || _q === void 0 ? void 0 : _q.moduleAliases) !== null && _r !== void 0 ? _r : {});
@@ -209,27 +206,24 @@ async function runCocoapodsDeintegrate(config) {
     }
 }
 exports.runCocoapodsDeintegrate = runCocoapodsDeintegrate;
-async function addInfoPlistDebugIfNeeded(config) {
+/**
+ * Drop the CAPACITOR_DEBUG key from Info.plist. Capacitor 9 no longer reads it, and the
+ * debug.xcconfig that supplied its $(CAPACITOR_DEBUG) value is gone from the template.
+ */
+function removeInfoPlistDebug(config) {
     const infoPlist = (0, path_1.resolve)(config.ios.nativeTargetDirAbs, 'Info.plist');
-    log_1.logger.info('Checking ' + infoPlist + ' for CAPACITOR_DEBUG');
-    if ((0, fs_extra_1.existsSync)(infoPlist)) {
-        const infoPlistContents = (0, fs_extra_1.readFileSync)(infoPlist, 'utf-8');
-        const plistEntries = (0, plist_1.parse)(infoPlistContents);
-        if (plistEntries['CAPACITOR_DEBUG'] === undefined) {
-            log_1.logger.info('Writing CAPACITOR_DEBUG to ' + infoPlist);
-            plistEntries['CAPACITOR_DEBUG'] = '$(CAPACITOR_DEBUG)';
-            const plistToWrite = (0, plist_1.build)(plistEntries);
-            (0, fs_extra_1.writeFileSync)(infoPlist, plistToWrite);
-        }
-        else {
-            log_1.logger.warn('Found CAPACITOR_DEBUG set to ' + plistEntries['CAPACITOR_DEBUG'] + ', skipping.');
-        }
+    if (!(0, fs_extra_1.existsSync)(infoPlist)) {
+        return { status: 'skipped', reason: `${infoPlist} not found.` };
     }
-    else {
-        log_1.logger.warn(infoPlist + ' not found.');
+    const entries = (0, plist_1.parse)((0, fs_extra_1.readFileSync)(infoPlist, 'utf-8'));
+    if (entries['CAPACITOR_DEBUG'] === undefined) {
+        return { status: 'unchanged' };
     }
+    delete entries['CAPACITOR_DEBUG'];
+    (0, fs_extra_1.writeFileSync)(infoPlist, (0, plist_1.build)(entries));
+    return { status: 'removed' };
 }
-exports.addInfoPlistDebugIfNeeded = addInfoPlistDebugIfNeeded;
+exports.removeInfoPlistDebug = removeInfoPlistDebug;
 function hasSceneManifest(config) {
     const infoPlist = (0, path_1.resolve)(config.ios.nativeTargetDirAbs, 'Info.plist');
     if (!(0, fs_extra_1.existsSync)(infoPlist)) {
@@ -297,6 +291,22 @@ function customSceneDelegateClassNames(manifest) {
         .filter((className) => typeof className === 'string')
         .filter((className) => className.split('.').pop() !== 'SceneDelegate');
 }
+async function ensureSPMGitignoreEntry(config) {
+    const gitignorePath = (0, path_1.join)(config.ios.nativeProjectDirAbs, 'CapApp-SPM', '.gitignore');
+    const entry = '/Package.resolved';
+    if (!(0, fs_extra_1.existsSync)(gitignorePath)) {
+        log_1.logger.warn(gitignorePath + ' not found, skipping.');
+        return;
+    }
+    const contents = (0, fs_extra_1.readFileSync)(gitignorePath, 'utf-8');
+    if (contents.split('\n').some((line) => line.trim() === entry)) {
+        log_1.logger.warn('Found ' + entry + ' in ' + gitignorePath + ', skipping.');
+        return;
+    }
+    const updated = contents.endsWith('\n') ? contents + entry + '\n' : contents + '\n' + entry + '\n';
+    (0, fs_extra_1.writeFileSync)(gitignorePath, updated);
+}
+exports.ensureSPMGitignoreEntry = ensureSPMGitignoreEntry;
 async function checkSwiftToolsVersion(config, version) {
     if (!version) {
         return null;