expo-brownfield 56.0.25 → 56.0.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/android/build.gradle +2 -2
- package/cli/build/commands/build-android.js +2 -1
- package/cli/build/commands/build-android.js.map +1 -1
- package/cli/build/commands/build-ios.js +3 -2
- package/cli/build/commands/build-ios.js.map +1 -1
- package/cli/build/index.js +1 -0
- package/cli/build/index.js.map +1 -1
- package/cli/build/utils/android.d.ts +5 -2
- package/cli/build/utils/android.js +25 -6
- package/cli/build/utils/android.js.map +1 -1
- package/cli/build/utils/config.js +44 -4
- package/cli/build/utils/config.js.map +1 -1
- package/cli/build/utils/error.d.ts +1 -1
- package/cli/build/utils/error.js +4 -1
- package/cli/build/utils/error.js.map +1 -1
- package/cli/build/utils/ios.d.ts +6 -0
- package/cli/build/utils/ios.js +47 -5
- package/cli/build/utils/ios.js.map +1 -1
- package/cli/build/utils/prebuild.js +18 -7
- package/cli/build/utils/prebuild.js.map +1 -1
- package/cli/build/utils/precompiled.d.ts +20 -0
- package/cli/build/utils/precompiled.js +91 -4
- package/cli/build/utils/precompiled.js.map +1 -1
- package/cli/build/utils/types.d.ts +1 -0
- package/cli/src/commands/build-ios.ts +4 -2
- package/cli/src/utils/error.ts +9 -0
- package/cli/src/utils/ios.ts +53 -4
- package/cli/src/utils/precompiled.ts +124 -2
- package/jest.config.js +1 -0
- package/package.json +3 -3
- package/plugin/build/android/plugins/withGradlePropertiesPlugin.js +36 -0
- package/plugin/build/android/plugins/withProjectBuildGradlePlugin.js +38 -6
- package/plugin/build/android/plugins/withProjectFilesPlugin.js +24 -0
- package/plugin/build/android/plugins/withSettingsGradlePlugin.js +22 -4
- package/plugin/build/common/filesystem.js +3 -0
- package/prebuilds/output/debug/xcframeworks/ExpoBrownfield.tar.gz +0 -0
- package/prebuilds/output/release/xcframeworks/ExpoBrownfield.tar.gz +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -10,6 +10,12 @@
|
|
|
10
10
|
|
|
11
11
|
### 💡 Others
|
|
12
12
|
|
|
13
|
+
## 56.0.26 — 2026-07-29
|
|
14
|
+
|
|
15
|
+
### 🐛 Bug fixes
|
|
16
|
+
|
|
17
|
+
- [iOS] Fix `build:ios` with precompiled modules: locate frameworks under `XCFrameworkIntermediates/`, bundle `ExpoModulesJSI`, copy SPM deps as real flavor-matched directories instead of symlinks, and fail fast on duplicate or colliding target names. ([#48065](https://github.com/expo/expo/pull/48065) by [@gabrieldonadel](https://github.com/gabrieldonadel))
|
|
18
|
+
|
|
13
19
|
## 56.0.25 — 2026-07-23
|
|
14
20
|
|
|
15
21
|
### 🎉 New features
|
package/android/build.gradle
CHANGED
|
@@ -4,7 +4,7 @@ plugins {
|
|
|
4
4
|
}
|
|
5
5
|
|
|
6
6
|
group = 'expo.modules.brownfield'
|
|
7
|
-
version = '56.0.
|
|
7
|
+
version = '56.0.26'
|
|
8
8
|
|
|
9
9
|
expoModule {
|
|
10
10
|
canBePublished false
|
|
@@ -14,7 +14,7 @@ android {
|
|
|
14
14
|
namespace "expo.modules.brownfield"
|
|
15
15
|
defaultConfig {
|
|
16
16
|
versionCode 1
|
|
17
|
-
versionName '56.0.
|
|
17
|
+
versionName '56.0.26'
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
|
|
@@ -8,8 +8,9 @@ const buildAndroid = async (command) => {
|
|
|
8
8
|
utils_1.CLIError.handle('android-task-repo');
|
|
9
9
|
}
|
|
10
10
|
(0, utils_1.printAndroidConfig)(config);
|
|
11
|
+
const extraGradleArgs = config.fused ? ['-Pbrownfield.fused=true'] : [];
|
|
11
12
|
for (const task of config.tasks) {
|
|
12
|
-
await (0, utils_1.runTask)(task, config.verbose, config.dryRun);
|
|
13
|
+
await (0, utils_1.runTask)(task, config.verbose, config.dryRun, extraGradleArgs);
|
|
13
14
|
}
|
|
14
15
|
};
|
|
15
16
|
exports.default = buildAndroid;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-android.js","sourceRoot":"","sources":["../../src/commands/build-android.ts"],"names":[],"mappings":";;AAEA,oCAMkB;AAElB,MAAM,YAAY,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;IAC9C,MAAM,IAAA,wBAAgB,EAAC,SAAS,CAAC,CAAC;IAElC,MAAM,MAAM,GAAG,IAAA,iCAAyB,EAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACzB,gBAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IACD,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IAE3B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAChC,MAAM,IAAA,eAAO,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"build-android.js","sourceRoot":"","sources":["../../src/commands/build-android.ts"],"names":[],"mappings":";;AAEA,oCAMkB;AAElB,MAAM,YAAY,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;IAC9C,MAAM,IAAA,wBAAgB,EAAC,SAAS,CAAC,CAAC;IAElC,MAAM,MAAM,GAAG,IAAA,iCAAyB,EAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACzB,gBAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IACD,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IAE3B,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACxE,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAChC,MAAM,IAAA,eAAO,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACtE,CAAC;AACH,CAAC,CAAC;AAEF,kBAAe,YAAY,CAAC"}
|
|
@@ -7,14 +7,15 @@ const buildIos = async (command) => {
|
|
|
7
7
|
const config = (0, utils_1.resolveBuildConfigIos)(opts);
|
|
8
8
|
(0, utils_1.printIosConfig)(config);
|
|
9
9
|
(0, utils_1.validateHostProvided)(config);
|
|
10
|
+
(0, utils_1.validateSchemeCollision)(config);
|
|
10
11
|
await (0, utils_1.buildFramework)(config);
|
|
11
12
|
if (config.output !== 'frameworks') {
|
|
12
13
|
// Ship frameworks as swift package
|
|
13
|
-
(0, utils_1.shipSwiftPackage)(config);
|
|
14
|
+
await (0, utils_1.shipSwiftPackage)(config);
|
|
14
15
|
}
|
|
15
16
|
else {
|
|
16
17
|
// Ship frameworks as standalone XCFrameworks
|
|
17
|
-
(0, utils_1.shipFrameworks)(config);
|
|
18
|
+
await (0, utils_1.shipFrameworks)(config);
|
|
18
19
|
}
|
|
19
20
|
};
|
|
20
21
|
exports.default = buildIos;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-ios.js","sourceRoot":"","sources":["../../src/commands/build-ios.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"build-ios.js","sourceRoot":"","sources":["../../src/commands/build-ios.ts"],"names":[],"mappings":";;AAEA,oCASkB;AAElB,MAAM,QAAQ,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;IAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC5B,MAAM,IAAA,wBAAgB,EAAC,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,IAAA,6BAAqB,EAAC,IAAI,CAAC,CAAC;IAC3C,IAAA,sBAAc,EAAC,MAAM,CAAC,CAAC;IACvB,IAAA,4BAAoB,EAAC,MAAM,CAAC,CAAC;IAC7B,IAAA,+BAAuB,EAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,IAAA,sBAAc,EAAC,MAAM,CAAC,CAAC;IAE7B,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;QACnC,mCAAmC;QACnC,MAAM,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;IACjC,CAAC;SAAM,CAAC;QACN,6CAA6C;QAC7C,MAAM,IAAA,sBAAc,EAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC,CAAC;AAEF,kBAAe,QAAQ,CAAC"}
|
package/cli/build/index.js
CHANGED
|
@@ -17,6 +17,7 @@ program
|
|
|
17
17
|
.option('-d, --debug', 'build debug variant')
|
|
18
18
|
.option('-r, --release', 'build release variant')
|
|
19
19
|
.option('-a, --all', 'build both debug and release variants')
|
|
20
|
+
.option('--fused', 'publish a single fat AAR per variant via AGP Fused Library')
|
|
20
21
|
.option('--verbose', 'forward all output to the terminal')
|
|
21
22
|
.option('-l, --library <library>', 'name of the brownfield library')
|
|
22
23
|
.option('-t, --task <task...>', 'publishing task to be run (multiple can be passed)')
|
package/cli/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AACA,yCAAoC;AAEpC,yCAA0E;AAC1E,sEAA6C;AAE7C,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B,eAAe;AACf,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,sBAAW,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;AAE9E,gBAAgB;AAChB,OAAO;KACJ,OAAO,CAAC,eAAe,CAAC;KACxB,WAAW,CAAC,gDAAgD,CAAC;KAC7D,MAAM,CAAC,aAAa,EAAE,qBAAqB,CAAC;KAC5C,MAAM,CAAC,eAAe,EAAE,uBAAuB,CAAC;KAChD,MAAM,CAAC,WAAW,EAAE,uCAAuC,CAAC;KAC5D,MAAM,CAAC,WAAW,EAAE,oCAAoC,CAAC;KACzD,MAAM,CAAC,yBAAyB,EAAE,gCAAgC,CAAC;KACnE,MAAM,CAAC,sBAAsB,EAAE,oDAAoD,CAAC;KACpF,MAAM,CACL,sCAAsC,EACtC,mDAAmD,CACpD;KACA,MAAM,CAAC,WAAW,EAAE,gDAAgD,CAAC;KACrE,MAAM,CAAC,KAAK;IACX,MAAM,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAEL,YAAY;AACZ,OAAO;KACJ,OAAO,CAAC,WAAW,CAAC;KACpB,WAAW,CAAC,4CAA4C,CAAC;KACzD,MAAM,CAAC,aAAa,EAAE,2BAA2B,CAAC;KAClD,MAAM,CAAC,eAAe,EAAE,6BAA6B,CAAC;KACtD,MAAM,CAAC,WAAW,EAAE,oCAAoC,CAAC;KACzD,MAAM,CAAC,uBAAuB,EAAE,wBAAwB,CAAC;KACzD,MAAM,CAAC,iCAAiC,EAAE,4CAA4C,CAAC;KACvF,MAAM,CAAC,6BAA6B,EAAE,iCAAiC,CAAC;KACxE,MAAM,CAAC,WAAW,EAAE,gDAAgD,CAAC;KACrE,MAAM,CACL,yBAAyB,EACzB,0EAA0E,CAC3E;KACA,MAAM,CACL,iCAAiC,EACjC,mIAAmI,CACpI;KACA,MAAM,CAAC,KAAK;IACX,MAAM,IAAA,mBAAQ,EAAC,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEL,yEAAyE;AACzE,OAAO;KACJ,OAAO,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;KACnC,WAAW,CAAC,mDAAmD,CAAC;KAChE,MAAM,CAAC,uBAAuB,EAAE,6CAA6C,CAAC;KAC9E,MAAM,CAAC,uBAAuB,EAAE,qDAAqD,CAAC;KACtF,MAAM,CAAC,WAAW,EAAE,oCAAoC,CAAC;KACzD,MAAM,CAAC,KAAK;IACX,MAAM,IAAA,iBAAM,EAAC,IAAI,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC;AAEL,gBAAgB;AAChB,OAAO;KACJ,OAAO,CAAC,eAAe,CAAC;KACxB,WAAW,CAAC,8DAA8D,CAAC;KAC3E,MAAM,CAAC,WAAW,EAAE,oCAAoC,CAAC;KACzD,MAAM,CAAC,yBAAyB,EAAE,gCAAgC,CAAC;KACnE,MAAM,CAAC,WAAW,EAAE,gDAAgD,CAAC;KACrE,MAAM,CAAC,KAAK;IACX,MAAM,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAEL,OAAO,CAAC,KAAK,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AACA,yCAAoC;AAEpC,yCAA0E;AAC1E,sEAA6C;AAE7C,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B,eAAe;AACf,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,sBAAW,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;AAE9E,gBAAgB;AAChB,OAAO;KACJ,OAAO,CAAC,eAAe,CAAC;KACxB,WAAW,CAAC,gDAAgD,CAAC;KAC7D,MAAM,CAAC,aAAa,EAAE,qBAAqB,CAAC;KAC5C,MAAM,CAAC,eAAe,EAAE,uBAAuB,CAAC;KAChD,MAAM,CAAC,WAAW,EAAE,uCAAuC,CAAC;KAC5D,MAAM,CAAC,SAAS,EAAE,4DAA4D,CAAC;KAC/E,MAAM,CAAC,WAAW,EAAE,oCAAoC,CAAC;KACzD,MAAM,CAAC,yBAAyB,EAAE,gCAAgC,CAAC;KACnE,MAAM,CAAC,sBAAsB,EAAE,oDAAoD,CAAC;KACpF,MAAM,CACL,sCAAsC,EACtC,mDAAmD,CACpD;KACA,MAAM,CAAC,WAAW,EAAE,gDAAgD,CAAC;KACrE,MAAM,CAAC,KAAK;IACX,MAAM,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAEL,YAAY;AACZ,OAAO;KACJ,OAAO,CAAC,WAAW,CAAC;KACpB,WAAW,CAAC,4CAA4C,CAAC;KACzD,MAAM,CAAC,aAAa,EAAE,2BAA2B,CAAC;KAClD,MAAM,CAAC,eAAe,EAAE,6BAA6B,CAAC;KACtD,MAAM,CAAC,WAAW,EAAE,oCAAoC,CAAC;KACzD,MAAM,CAAC,uBAAuB,EAAE,wBAAwB,CAAC;KACzD,MAAM,CAAC,iCAAiC,EAAE,4CAA4C,CAAC;KACvF,MAAM,CAAC,6BAA6B,EAAE,iCAAiC,CAAC;KACxE,MAAM,CAAC,WAAW,EAAE,gDAAgD,CAAC;KACrE,MAAM,CACL,yBAAyB,EACzB,0EAA0E,CAC3E;KACA,MAAM,CACL,iCAAiC,EACjC,mIAAmI,CACpI;KACA,MAAM,CAAC,KAAK;IACX,MAAM,IAAA,mBAAQ,EAAC,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEL,yEAAyE;AACzE,OAAO;KACJ,OAAO,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;KACnC,WAAW,CAAC,mDAAmD,CAAC;KAChE,MAAM,CAAC,uBAAuB,EAAE,6CAA6C,CAAC;KAC9E,MAAM,CAAC,uBAAuB,EAAE,qDAAqD,CAAC;KACtF,MAAM,CAAC,WAAW,EAAE,oCAAoC,CAAC;KACzD,MAAM,CAAC,KAAK;IACX,MAAM,IAAA,iBAAM,EAAC,IAAI,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC;AAEL,gBAAgB;AAChB,OAAO;KACJ,OAAO,CAAC,eAAe,CAAC;KACxB,WAAW,CAAC,8DAA8D,CAAC;KAC3E,MAAM,CAAC,WAAW,EAAE,oCAAoC,CAAC;KACzD,MAAM,CAAC,yBAAyB,EAAE,gCAAgC,CAAC;KACnE,MAAM,CAAC,WAAW,EAAE,gDAAgD,CAAC;KACrE,MAAM,CAAC,KAAK;IACX,MAAM,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAEL,OAAO,CAAC,KAAK,EAAE,CAAC"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import spawnAsync from '@expo/spawn-async';
|
|
2
2
|
import type { AndroidConfig, BuildVariant } from './types';
|
|
3
|
-
export declare const buildPublishingTask: (variant: BuildVariant, repository: string
|
|
3
|
+
export declare const buildPublishingTask: (variant: BuildVariant, repository: string, fusedOpts?: {
|
|
4
|
+
fused: boolean;
|
|
5
|
+
library: string;
|
|
6
|
+
}) => string;
|
|
4
7
|
export declare const findBrownfieldLibrary: () => string | undefined;
|
|
5
8
|
export declare const printAndroidConfig: (config: AndroidConfig) => void;
|
|
6
9
|
export declare const processRepositories: (tasks: string[]) => string[];
|
|
7
10
|
export declare const processTasks: (stdout: string) => string[];
|
|
8
|
-
export declare const runTask: (task: string, verbose: boolean, dryRun: boolean) => Promise<spawnAsync.SpawnResult | undefined>;
|
|
11
|
+
export declare const runTask: (task: string, verbose: boolean, dryRun: boolean, extraGradleArgs?: string[]) => Promise<spawnAsync.SpawnResult | undefined>;
|
|
@@ -10,9 +10,16 @@ const node_fs_1 = __importDefault(require("node:fs"));
|
|
|
10
10
|
const node_path_1 = __importDefault(require("node:path"));
|
|
11
11
|
const error_1 = __importDefault(require("./error"));
|
|
12
12
|
const spinner_1 = require("./spinner");
|
|
13
|
-
const buildPublishingTask = (variant, repository) => {
|
|
14
|
-
const repositoryName = repository === '
|
|
15
|
-
|
|
13
|
+
const buildPublishingTask = (variant, repository, fusedOpts = { fused: false, library: '' }) => {
|
|
14
|
+
const repositoryName = repository.toLowerCase() === 'mavenlocal' ? 'MavenLocal' : `${repository}Repository`;
|
|
15
|
+
const task = `publishBrownfield${variant}PublicationTo${repositoryName}`;
|
|
16
|
+
// In `--fused` mode, route the task to the matching sibling subproject:
|
|
17
|
+
// `:<lib>-fused-release` for Release, `:<lib>-fused-debug` for Debug.
|
|
18
|
+
if (fusedOpts.fused) {
|
|
19
|
+
const siblingSuffix = variant === 'Debug' ? 'debug' : 'release';
|
|
20
|
+
return `:${fusedOpts.library}-fused-${siblingSuffix}:${task}`;
|
|
21
|
+
}
|
|
22
|
+
return task;
|
|
16
23
|
};
|
|
17
24
|
exports.buildPublishingTask = buildPublishingTask;
|
|
18
25
|
const findBrownfieldLibrary = () => {
|
|
@@ -59,6 +66,7 @@ const printAndroidConfig = (config) => {
|
|
|
59
66
|
console.log(chalk_1.default.bold('Resolved build configuration'));
|
|
60
67
|
console.log(` - Build variant: ${chalk_1.default.blue(config.variant)}`);
|
|
61
68
|
console.log(` - Library: ${chalk_1.default.blue(config.library)}`);
|
|
69
|
+
console.log(` - Fused: ${chalk_1.default.blue(config.fused)}`);
|
|
62
70
|
console.log(` - Verbose: ${chalk_1.default.blue(config.verbose)}`);
|
|
63
71
|
console.log(` - Dry run: ${chalk_1.default.blue(config.dryRun)}`);
|
|
64
72
|
console.log(` - Tasks:`);
|
|
@@ -87,13 +95,24 @@ const processTasks = (stdout) => {
|
|
|
87
95
|
.filter((task) => !task.includes('MavenLocalRepository')));
|
|
88
96
|
};
|
|
89
97
|
exports.processTasks = processTasks;
|
|
90
|
-
const runTask = async (task, verbose, dryRun) => {
|
|
98
|
+
const runTask = async (task, verbose, dryRun, extraGradleArgs = []) => {
|
|
99
|
+
// Fused-shaped tasks (e.g. passed manually via -t without --fused) must still
|
|
100
|
+
// activate fused mode in Gradle: without `-Pbrownfield.fused=true` the fused
|
|
101
|
+
// sibling subprojects are inert (no publications) and the conditional AGP
|
|
102
|
+
// force-bump in the root build.gradle never applies, so the build would fail
|
|
103
|
+
// mid-execution under the version catalog's AGP.
|
|
104
|
+
const fusedProperty = '-Pbrownfield.fused=true';
|
|
105
|
+
const isFusedTask = /(?:^|:)[^:\s]+-fused-(?:release|debug):/.test(task);
|
|
106
|
+
const perTaskArgs = isFusedTask && !extraGradleArgs.includes(fusedProperty)
|
|
107
|
+
? [...extraGradleArgs, fusedProperty]
|
|
108
|
+
: extraGradleArgs;
|
|
109
|
+
const args = [task, ...perTaskArgs];
|
|
91
110
|
if (dryRun) {
|
|
92
|
-
console.log(`./gradlew ${
|
|
111
|
+
console.log(`./gradlew ${args.join(' ')}`);
|
|
93
112
|
return;
|
|
94
113
|
}
|
|
95
114
|
return (0, spinner_1.withSpinner)({
|
|
96
|
-
operation: () => (0, spawn_async_1.default)('./gradlew',
|
|
115
|
+
operation: () => (0, spawn_async_1.default)('./gradlew', args, {
|
|
97
116
|
cwd: node_path_1.default.join(process.cwd(), 'android'),
|
|
98
117
|
stdio: verbose ? 'inherit' : 'pipe',
|
|
99
118
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"android.js","sourceRoot":"","sources":["../../src/utils/android.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA2C;AAC3C,kDAA0B;AAC1B,sDAAyB;AACzB,0DAA6B;AAE7B,oDAA+B;AAC/B,uCAAwC;AAGjC,MAAM,mBAAmB,GAAG,
|
|
1
|
+
{"version":3,"file":"android.js","sourceRoot":"","sources":["../../src/utils/android.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA2C;AAC3C,kDAA0B;AAC1B,sDAAyB;AACzB,0DAA6B;AAE7B,oDAA+B;AAC/B,uCAAwC;AAGjC,MAAM,mBAAmB,GAAG,CACjC,OAAqB,EACrB,UAAkB,EAClB,YAAiD,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,EACtE,EAAE;IACV,MAAM,cAAc,GAClB,UAAU,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,UAAU,YAAY,CAAC;IACvF,MAAM,IAAI,GAAG,oBAAoB,OAAO,gBAAgB,cAAc,EAAE,CAAC;IACzE,wEAAwE;IACxE,sEAAsE;IACtE,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACpB,MAAM,aAAa,GAAG,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QAChE,OAAO,IAAI,SAAS,CAAC,OAAO,UAAU,aAAa,IAAI,IAAI,EAAE,CAAC;IAChE,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAfW,QAAA,mBAAmB,uBAe9B;AAEK,MAAM,qBAAqB,GAAG,GAAuB,EAAE;IAC5D,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,mBAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;QACxD,IAAI,CAAC,iBAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAChC,eAAQ,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,cAAc,GAAG,iBAAE;aACtB,WAAW,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;aACjD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACxC,MAAM,iBAAiB,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;YAC1D,MAAM,aAAa,GAAG,mBAAI,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;YAChE,MAAM,WAAW,GAAG,CAAC,aAAa,CAAC,CAAC;YAEpC,IAAI,MAA0B,CAAC;YAC/B,OAAO,CAAC,MAAM,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;gBAC9C,MAAM,OAAO,GAAG,iBAAE,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;oBAC5B,MAAM,SAAS,GAAG,mBAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;oBAChD,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;wBACxB,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC9B,CAAC;yBAAM,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;wBAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,2BAA2B;4BAAE,OAAO,IAAI,CAAC;oBAC9D,CAAC;gBACH,CAAC;YACH,CAAC;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,IAAI,iBAAiB,EAAE,CAAC;YACtB,OAAO,iBAAiB,CAAC,IAAI,CAAC;QAChC,CAAC;QAED,eAAQ,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,eAAQ,CAAC,MAAM,CAAC,+BAA+B,EAAE,YAAY,CAAC,CAAC;IACjE,CAAC;IAED,OAAO;AACT,CAAC,CAAC;AAzCW,QAAA,qBAAqB,yBAyChC;AAEK,MAAM,kBAAkB,GAAG,CAAC,MAAqB,EAAE,EAAE;IAC1D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,qBAAqB,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,eAAe,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,aAAa,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,eAAe,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,eAAe,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACzB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5B,OAAO,CAAC,GAAG,CAAC,QAAQ,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,EAAE,CAAC;AAChB,CAAC,CAAC;AAZW,QAAA,kBAAkB,sBAY7B;AAEK,MAAM,mBAAmB,GAAG,CAAC,KAAe,EAAY,EAAE;IAC/D,MAAM,UAAU,GAAG,2EAA2E,CAAC;IAC/F,OAAO,KAAK,CAAC,IAAI,CACf,IAAI,GAAG,CACL,KAAK;SACF,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CACxC,CACF,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,mBAAmB,uBAW9B;AAEK,MAAM,YAAY,GAAG,CAAC,MAAc,EAAY,EAAE;IACvD,MAAM,KAAK,GAAG,mCAAmC,CAAC;IAClD,OAAO,CACL,MAAM;SACH,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACrC,qCAAqC;SACpC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC;SACpC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAC5D,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,YAAY,gBAUvB;AAEK,MAAM,OAAO,GAAG,KAAK,EAC1B,IAAY,EACZ,OAAgB,EAChB,MAAe,EACf,kBAA4B,EAAE,EAC9B,EAAE;IACF,8EAA8E;IAC9E,6EAA6E;IAC7E,0EAA0E;IAC1E,6EAA6E;IAC7E,iDAAiD;IACjD,MAAM,aAAa,GAAG,yBAAyB,CAAC;IAChD,MAAM,WAAW,GAAG,yCAAyC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,WAAW,GACf,WAAW,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,aAAa,CAAC;QACrD,CAAC,CAAC,CAAC,GAAG,eAAe,EAAE,aAAa,CAAC;QACrC,CAAC,CAAC,eAAe,CAAC;IAEtB,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,GAAG,WAAW,CAAC,CAAC;IACpC,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3C,OAAO;IACT,CAAC;IAED,OAAO,IAAA,qBAAW,EAAC;QACjB,SAAS,EAAE,GAAG,EAAE,CACd,IAAA,qBAAU,EAAC,WAAW,EAAE,IAAI,EAAE;YAC5B,GAAG,EAAE,mBAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC;YACxC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;SACpC,CAAC;QACJ,aAAa,EAAE,gBAAgB,GAAG,IAAI;QACtC,cAAc,EAAE,gBAAgB,GAAG,IAAI,GAAG,YAAY;QACtD,YAAY,EAAE,gBAAgB,GAAG,IAAI,GAAG,SAAS;QACjD,OAAO;KACR,CAAC,CAAC;AACL,CAAC,CAAC;AAnCW,QAAA,OAAO,WAmClB"}
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.resolveTasksConfigAndroid = exports.resolveBuildConfigIos = exports.resolveBuildConfigAndroid = void 0;
|
|
7
|
+
const config_1 = require("expo/config");
|
|
7
8
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
8
9
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
10
|
const android_1 = require("./android");
|
|
@@ -11,12 +12,15 @@ const ios_1 = require("./ios");
|
|
|
11
12
|
const precompiled_1 = require("./precompiled");
|
|
12
13
|
const build_1 = require("../../../shared/build");
|
|
13
14
|
const resolveBuildConfigAndroid = (options) => {
|
|
15
|
+
const fused = !!options.fused;
|
|
14
16
|
const variant = resolveVariant(options);
|
|
17
|
+
const library = resolveLibrary(options);
|
|
15
18
|
return {
|
|
16
19
|
...resolveCommonConfig(options),
|
|
17
|
-
library
|
|
18
|
-
tasks: resolveTaskArray(options, variant),
|
|
20
|
+
library,
|
|
21
|
+
tasks: resolveTaskArray(options, variant, { fused, library }),
|
|
19
22
|
variant,
|
|
23
|
+
fused,
|
|
20
24
|
};
|
|
21
25
|
};
|
|
22
26
|
exports.resolveBuildConfigAndroid = resolveBuildConfigAndroid;
|
|
@@ -136,11 +140,47 @@ const resolveCommonConfig = (options) => {
|
|
|
136
140
|
const resolveLibrary = (options) => {
|
|
137
141
|
return options.library || (0, android_1.findBrownfieldLibrary)();
|
|
138
142
|
};
|
|
139
|
-
const resolveTaskArray = (options, variant) => {
|
|
143
|
+
const resolveTaskArray = (options, variant, fusedOpts) => {
|
|
140
144
|
const tasks = options.task ?? [];
|
|
141
|
-
|
|
145
|
+
let repositories = options.repository ?? [];
|
|
146
|
+
if (tasks.length === 0 && repositories.length === 0) {
|
|
147
|
+
repositories = resolveLocalRepositoriesFromAppConfig(!!options.verbose);
|
|
148
|
+
if (repositories.length > 0) {
|
|
149
|
+
console.info(`No --repo or --task specified; defaulting to local repositories from the app config: ${repositories.join(', ')}`);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
// In `--fused` mode, `--all` expands to separate Debug + Release task
|
|
153
|
+
// invocations against the matching sibling subprojects.
|
|
154
|
+
const variantsForRepoTasks = fusedOpts.fused && variant === 'All' ? ['Debug', 'Release'] : [variant];
|
|
155
|
+
const repoTasks = repositories.flatMap((repo) => variantsForRepoTasks.map((v) => (0, android_1.buildPublishingTask)(v, repo, fusedOpts)));
|
|
142
156
|
return Array.from(new Set([...tasks, ...repoTasks]));
|
|
143
157
|
};
|
|
158
|
+
const resolveLocalRepositoriesFromAppConfig = (verbose) => {
|
|
159
|
+
let publishing;
|
|
160
|
+
try {
|
|
161
|
+
const { exp } = (0, config_1.getConfig)(process.cwd(), { skipSDKVersionRequirement: true });
|
|
162
|
+
const plugin = exp.plugins?.find((entry) => Array.isArray(entry) && entry[0] === 'expo-brownfield');
|
|
163
|
+
publishing = plugin?.[1]?.android?.publishing;
|
|
164
|
+
}
|
|
165
|
+
catch (error) {
|
|
166
|
+
// App config could not be evaluated here — fall through to the plugin's
|
|
167
|
+
// default publishing target below.
|
|
168
|
+
if (verbose) {
|
|
169
|
+
console.warn(`Could not read \`android.publishing\` from the app config, falling back to MavenLocal: ${error instanceof Error ? error.message : String(error)}`);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
const entries = Array.isArray(publishing) && publishing.length > 0 ? publishing : [{ type: 'localMaven' }];
|
|
173
|
+
const repositories = entries.flatMap((entry) => {
|
|
174
|
+
if (entry?.type === 'localMaven') {
|
|
175
|
+
return ['MavenLocal'];
|
|
176
|
+
}
|
|
177
|
+
if (entry?.type === 'localDirectory' && typeof entry?.name === 'string') {
|
|
178
|
+
return [entry.name];
|
|
179
|
+
}
|
|
180
|
+
return [];
|
|
181
|
+
});
|
|
182
|
+
return Array.from(new Set(repositories));
|
|
183
|
+
};
|
|
144
184
|
const resolveVariant = (options) => {
|
|
145
185
|
let variant = 'All';
|
|
146
186
|
if (options.release && !options.debug) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":";;;;;;AACA,sDAAyB;AACzB,0DAA6B;AAE7B,uCAAuE;AACvE,+BAAkD;AAClD,+CAA4D;AAS5D,iDAAqE;AAE9D,MAAM,yBAAyB,GAAG,CAAC,OAAqB,EAAiB,EAAE;IAChF,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACxC,OAAO;QACL,GAAG,mBAAmB,CAAC,OAAO,CAAC;QAC/B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
type ErrorType = 'android-task-repo' | 'android-directory-not-found' | 'android-library-unknown-error' | 'android-library-not-found' | 'ios-artifacts-directory-unknown-error' | 'ios-directory-not-found' | 'ios-directory-unknown-error' | 'ios-hermes-framework-not-found' | 'ios-host-provided-without-prebuilds' | 'ios-pod-install-cancelled' | 'ios-prebuilds-spm-dep-missing' | 'ios-scheme-not-found' | 'ios-workspace-not-found' | 'ios-workspace-unknown-error' | 'package-not-installed' | 'plugin-not-configured' | 'prebuild-cancelled';
|
|
1
|
+
type ErrorType = 'android-task-repo' | 'android-directory-not-found' | 'android-library-unknown-error' | 'android-library-not-found' | 'ios-artifacts-directory-unknown-error' | 'ios-directory-not-found' | 'ios-directory-unknown-error' | 'ios-framework-not-found' | 'ios-hermes-framework-not-found' | 'ios-host-provided-without-prebuilds' | 'ios-pod-install-cancelled' | 'ios-prebuilds-spm-dep-flavor-mismatch' | 'ios-prebuilds-spm-dep-missing' | 'ios-scheme-name-collision' | 'ios-scheme-not-found' | 'ios-workspace-not-found' | 'ios-workspace-unknown-error' | 'package-not-installed' | 'plugin-not-configured' | 'prebuild-cancelled';
|
|
2
2
|
declare class CLIError {
|
|
3
3
|
private static readonly errorSymbol;
|
|
4
4
|
private static readonly errorMessages;
|
package/cli/build/utils/error.js
CHANGED
|
@@ -3,17 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
class CLIError {
|
|
4
4
|
static errorSymbol = '✖';
|
|
5
5
|
static errorMessages = {
|
|
6
|
-
'android-task-repo': 'At least one task or repository must be specified',
|
|
6
|
+
'android-task-repo': 'At least one task or repository must be specified. The app config declares no local Maven repositories to default to, and remote repositories are never published to implicitly — pass `--repo <name>` or `-t <gradle task>` explicitly.',
|
|
7
7
|
'android-directory-not-found': 'Cannot find `android` directory in the project',
|
|
8
8
|
'android-library-unknown-error': 'Unknown error occurred while finding brownfield library',
|
|
9
9
|
'android-library-not-found': 'Could not find brownfield library in the project',
|
|
10
10
|
'ios-artifacts-directory-unknown-error': 'Unknown error occurred while creating artifacts directory',
|
|
11
11
|
'ios-directory-not-found': 'Cannot find `ios` directory in the project',
|
|
12
12
|
'ios-directory-unknown-error': 'Unknown error occurred while finding brownfield iOS scheme',
|
|
13
|
+
'ios-framework-not-found': 'Could not find the compiled brownfield framework in the Xcode build products directory (checked the products root and XCFrameworkIntermediates/). This usually means the xcodebuild step failed or built a different scheme than expected. Re-run with --verbose to inspect the build log, and confirm the scheme name matches `ios.targetName` in your expo-brownfield plugin config. Missing framework',
|
|
13
14
|
'ios-hermes-framework-not-found': 'Could not find hermes framework in the project at path',
|
|
14
15
|
'ios-host-provided-without-prebuilds': 'ios.hostProvidedFrameworks is set but precompiled modules are not enabled. Without precompiled modules, third-party pods (like SDWebImage) are statically linked into the brownfield framework itself, so there is no separate xcframework to strip. Enable `ios.usePrecompiledModules: true` in expo-build-properties (run `pod install` afterwards), or remove ios.hostProvidedFrameworks from the expo-brownfield plugin config.',
|
|
15
16
|
'ios-pod-install-cancelled': 'Brownfield cannot be built without installing CocoaPods. Run `pod install` in the `ios/` and try again.',
|
|
17
|
+
'ios-prebuilds-spm-dep-flavor-mismatch': 'A shared SPM dependency xcframework is only available in a different build flavor than the requested one. Bundling it would mix debug and release binaries in the brownfield package. Re-run `pod install` with `EXPO_PRECOMPILED_FLAVOR` set to the requested flavor, run the precompile prebuild pipeline for that flavor, or ensure the consuming npm package ships `prebuilds/spm-deps/<dep>/<flavor>/<dep>.xcframework`. Mismatched dependency',
|
|
16
18
|
'ios-prebuilds-spm-dep-missing': "Could not find a prebuilt xcframework for an SPM dependency declared by an Expo module. The brownfield Swift Package would ship without it, causing `Library not loaded: @rpath/...` at runtime in the host app. Either re-install the affected Expo module from a release published with bundled SPM deps (`bundleSharedDeps: true`), populate the monorepo's `packages/precompile/.build/.spm-deps/` cache, or set `EXPO_PRECOMPILED_MODULES_PATH` to a directory that contains `.spm-deps/<dep>/<flavor>/<dep>.xcframework`.",
|
|
19
|
+
'ios-scheme-name-collision': 'The brownfield target name collides with the name of a framework bundled into the package. The bundled module xcframework would overwrite the brownfield wrapper framework of the same name, producing a package that is missing the wrapper classes (e.g. `ReactNativeHostManager`). Rename `ios.targetName` in the expo-brownfield plugin config to a unique name (e.g. `MyAppKit`), run `npx expo prebuild --clean`, and build again. Colliding name',
|
|
17
20
|
'ios-scheme-not-found': 'Could not find brownfield iOS scheme',
|
|
18
21
|
'ios-workspace-not-found': 'Could not find a brownfield iOS workspace (`.xcworkspace`) in the `ios/` directory. This usually means `pod install` has not been run yet. Run `pod install` and try again.',
|
|
19
22
|
'ios-workspace-unknown-error': 'Unknown error occurred while finding brownfield iOS workspace',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/utils/error.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/utils/error.ts"],"names":[],"mappings":";;AAsBA,MAAM,QAAQ;IACJ,MAAM,CAAU,WAAW,GAAW,GAAG,CAAC;IAC1C,MAAM,CAAU,aAAa,GAA8B;QACjE,mBAAmB,EACjB,0OAA0O;QAC5O,6BAA6B,EAAE,gDAAgD;QAC/E,+BAA+B,EAAE,yDAAyD;QAC1F,2BAA2B,EAAE,kDAAkD;QAC/E,uCAAuC,EACrC,2DAA2D;QAC7D,yBAAyB,EAAE,4CAA4C;QACvE,6BAA6B,EAAE,4DAA4D;QAC3F,yBAAyB,EACvB,0YAA0Y;QAC5Y,gCAAgC,EAAE,wDAAwD;QAC1F,qCAAqC,EACnC,qaAAqa;QACva,2BAA2B,EACzB,yGAAyG;QAC3G,uCAAuC,EACrC,qbAAqb;QACvb,+BAA+B,EAC7B,igBAAigB;QACngB,2BAA2B,EACzB,ybAAyb;QAC3b,sBAAsB,EAAE,sCAAsC;QAC9D,yBAAyB,EACvB,6KAA6K;QAC/K,6BAA6B,EAAE,+DAA+D;QAC9F,uBAAuB,EACrB,qGAAqG;QACvG,uBAAuB,EACrB,iGAAiG;QACnG,oBAAoB,EAAE,mEAAmE;KAC1F,CAAC;IAEK,MAAM,CAAC,MAAM,CAAC,KAAgB,EAAE,eAAuB,EAAE,EAAE,QAAiB,IAAI;QACrF,MAAM,OAAO,GAAG,YAAY;YAC1B,CAAC,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,YAAY,EAAE;YACjD,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,OAAe,EAAE,QAAiB,IAAI;QAClE,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,WAAW,OAAO,EAAE,CAAC,CAAC;QACvD,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;;AAGH,kBAAe,QAAQ,CAAC"}
|
package/cli/build/utils/ios.d.ts
CHANGED
|
@@ -26,6 +26,12 @@ export declare const libraryProduct: (name: string, targets: string[]) => string
|
|
|
26
26
|
export declare const binaryTarget: (name: string) => string;
|
|
27
27
|
export declare const makeArtifactsDirectory: (config: IosConfig) => void;
|
|
28
28
|
export declare const printIosConfig: (config: IosConfig) => void;
|
|
29
|
+
/**
|
|
30
|
+
* Fails fast when the brownfield scheme shares its name with a bundled framework — the bundled
|
|
31
|
+
* xcframework would silently overwrite the wrapper framework in the output, and Package.swift
|
|
32
|
+
* would declare the same target twice.
|
|
33
|
+
*/
|
|
34
|
+
export declare const validateSchemeCollision: (config: IosConfig) => void;
|
|
29
35
|
export declare const validateHostProvided: (config: IosConfig) => void;
|
|
30
36
|
export declare const shipFrameworks: (config: IosConfig) => Promise<void>;
|
|
31
37
|
export declare const shipSwiftPackage: (config: IosConfig) => Promise<void>;
|
package/cli/build/utils/ios.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.shipSwiftPackage = exports.shipFrameworks = exports.validateHostProvided = exports.printIosConfig = exports.makeArtifactsDirectory = exports.binaryTarget = exports.libraryProduct = exports.getSupportedPlatforms = exports.generatePackageMetadataFile = exports.findWorkspace = exports.findScheme = exports.createXCframework = exports.createSwiftPackage = exports.copyXCFrameworks = exports.buildFramework = exports.cleanUpArtifacts = exports.enumerateSourceBuiltDeps = void 0;
|
|
6
|
+
exports.shipSwiftPackage = exports.shipFrameworks = exports.validateHostProvided = exports.validateSchemeCollision = exports.printIosConfig = exports.makeArtifactsDirectory = exports.binaryTarget = exports.libraryProduct = exports.getSupportedPlatforms = exports.generatePackageMetadataFile = exports.findWorkspace = exports.findScheme = exports.createXCframework = exports.createSwiftPackage = exports.copyXCFrameworks = exports.buildFramework = exports.cleanUpArtifacts = exports.enumerateSourceBuiltDeps = void 0;
|
|
7
7
|
const spawn_async_1 = __importDefault(require("@expo/spawn-async"));
|
|
8
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
9
9
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
@@ -25,7 +25,11 @@ const spinner_1 = require("./spinner");
|
|
|
25
25
|
* Returns names without the `.framework` suffix, deduped, in `otool -L` order.
|
|
26
26
|
*/
|
|
27
27
|
const enumerateSourceBuiltDeps = async (config, alreadyCovered) => {
|
|
28
|
-
const
|
|
28
|
+
const frameworkDir = findSourceBuiltFramework(config.simulator, config.scheme);
|
|
29
|
+
if (!frameworkDir) {
|
|
30
|
+
return [];
|
|
31
|
+
}
|
|
32
|
+
const frameworkBinary = node_path_1.default.join(frameworkDir, config.scheme);
|
|
29
33
|
if (!node_fs_1.default.existsSync(frameworkBinary)) {
|
|
30
34
|
return [];
|
|
31
35
|
}
|
|
@@ -282,10 +286,24 @@ exports.createSwiftPackage = createSwiftPackage;
|
|
|
282
286
|
const createXCframework = async (config, at) => {
|
|
283
287
|
const frameworkName = `${config.scheme}.xcframework`;
|
|
284
288
|
const outputPath = node_path_1.default.join(at, frameworkName);
|
|
289
|
+
// Precompiled-module builds can place the scheme's framework under
|
|
290
|
+
// `XCFrameworkIntermediates/<scheme>/` instead of the products-dir root. In dry-run mode
|
|
291
|
+
// nothing has been built, so fall back to the root path to print the command.
|
|
292
|
+
const resolveSlice = (slicePath) => {
|
|
293
|
+
const framework = findSourceBuiltFramework(slicePath, config.scheme);
|
|
294
|
+
if (framework) {
|
|
295
|
+
return framework;
|
|
296
|
+
}
|
|
297
|
+
const fallback = node_path_1.default.join(slicePath, `${config.scheme}.framework`);
|
|
298
|
+
if (!config.dryRun) {
|
|
299
|
+
error_1.default.handle('ios-framework-not-found', fallback);
|
|
300
|
+
}
|
|
301
|
+
return fallback;
|
|
302
|
+
};
|
|
285
303
|
const args = [
|
|
286
304
|
'-create-xcframework',
|
|
287
|
-
...xcframeworkSliceArgs(
|
|
288
|
-
...xcframeworkSliceArgs(
|
|
305
|
+
...xcframeworkSliceArgs(resolveSlice(config.device)),
|
|
306
|
+
...xcframeworkSliceArgs(resolveSlice(config.simulator)),
|
|
289
307
|
'-output',
|
|
290
308
|
outputPath,
|
|
291
309
|
];
|
|
@@ -395,7 +413,14 @@ const generatePackageMetadataFile = async (config, packagePath) => {
|
|
|
395
413
|
...precompiledModules.map(({ name }) => name),
|
|
396
414
|
]));
|
|
397
415
|
const sourceBuiltDeps = sourceBuiltDepNames.map((name) => ({ name, targets: [name] }));
|
|
398
|
-
const
|
|
416
|
+
const seenNames = new Set();
|
|
417
|
+
const xcframeworks = [...baseFrameworks, ...precompiledModules, ...sourceBuiltDeps].filter(({ name }) => {
|
|
418
|
+
if (seenNames.has(name)) {
|
|
419
|
+
return false;
|
|
420
|
+
}
|
|
421
|
+
seenNames.add(name);
|
|
422
|
+
return true;
|
|
423
|
+
});
|
|
399
424
|
// With prebuilds the module graph is large; expose a single aggregate library so consumers
|
|
400
425
|
// `import <PackageName>` once and Xcode links every underlying binary target automatically.
|
|
401
426
|
// Without prebuilds keep one `.library` per framework for backwards compatibility.
|
|
@@ -486,6 +511,23 @@ const printIosConfig = (config) => {
|
|
|
486
511
|
console.log();
|
|
487
512
|
};
|
|
488
513
|
exports.printIosConfig = printIosConfig;
|
|
514
|
+
/**
|
|
515
|
+
* Fails fast when the brownfield scheme shares its name with a bundled framework — the bundled
|
|
516
|
+
* xcframework would silently overwrite the wrapper framework in the output, and Package.swift
|
|
517
|
+
* would declare the same target twice.
|
|
518
|
+
*/
|
|
519
|
+
const validateSchemeCollision = (config) => {
|
|
520
|
+
const bundled = new Set((0, precompiled_1.resolvedFixedXCFrameworks)());
|
|
521
|
+
if (config.usePrebuilds) {
|
|
522
|
+
for (const module of (0, precompiled_1.enumerateAllPrebuildModules)(process.cwd(), config.buildConfiguration, config.hostProvidedFrameworks)) {
|
|
523
|
+
bundled.add(module.name);
|
|
524
|
+
}
|
|
525
|
+
}
|
|
526
|
+
if (bundled.has(config.scheme)) {
|
|
527
|
+
error_1.default.handle('ios-scheme-name-collision', config.scheme);
|
|
528
|
+
}
|
|
529
|
+
};
|
|
530
|
+
exports.validateSchemeCollision = validateSchemeCollision;
|
|
489
531
|
const validateHostProvided = (config) => {
|
|
490
532
|
if (config.hostProvidedFrameworks.length === 0) {
|
|
491
533
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ios.js","sourceRoot":"","sources":["../../src/utils/ios.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ios.js","sourceRoot":"","sources":["../../src/utils/ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,13 +16,21 @@ const validatePrebuild = async (platform, options = {}) => {
|
|
|
16
16
|
(0, exports.validatePackageInstalled)();
|
|
17
17
|
if (!checkPrebuild(platform)) {
|
|
18
18
|
console.info(`${chalk_1.default.yellow(`⚠ Prebuild for platform: ${platform} is missing`)}`);
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
19
|
+
let shouldRunPrebuild;
|
|
20
|
+
if (isInteractive()) {
|
|
21
|
+
const response = await (0, prompts_1.default)({
|
|
22
|
+
type: 'confirm',
|
|
23
|
+
name: 'shouldRunPrebuild',
|
|
24
|
+
message: 'Do you want to run the prebuild now?',
|
|
25
|
+
initial: false,
|
|
26
|
+
});
|
|
27
|
+
shouldRunPrebuild = !!response.shouldRunPrebuild;
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
console.info(`Non-interactive shell detected; running \`npx expo prebuild --platform ${platform}\` automatically`);
|
|
31
|
+
shouldRunPrebuild = true;
|
|
32
|
+
}
|
|
33
|
+
if (shouldRunPrebuild) {
|
|
26
34
|
await (0, spinner_1.withSpinner)({
|
|
27
35
|
operation: () => (0, spawn_async_1.default)('npx', ['expo', 'prebuild', '--platform', platform]),
|
|
28
36
|
loaderMessage: `Running 'npx expo prebuild' for platform: ${platform}...`,
|
|
@@ -96,4 +104,7 @@ const checkPrebuild = (platform) => {
|
|
|
96
104
|
const nativeDirectory = node_path_1.default.join(process.cwd(), platform);
|
|
97
105
|
return node_fs_1.default.existsSync(nativeDirectory);
|
|
98
106
|
};
|
|
107
|
+
const isInteractive = () => {
|
|
108
|
+
return !!process.stdin.isTTY && !!process.stdout.isTTY;
|
|
109
|
+
};
|
|
99
110
|
//# sourceMappingURL=prebuild.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prebuild.js","sourceRoot":"","sources":["../../src/utils/prebuild.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA2C;AAC3C,kDAA0B;AAC1B,wCAAwD;AACxD,sDAAyB;AACzB,0DAA6B;AAC7B,sDAA8B;AAE9B,oDAA+B;AAC/B,uCAAwC;AAGjC,MAAM,gBAAgB,GAAG,KAAK,EACnC,QAAkB,EAClB,UAAgC,EAAE,EACnB,EAAE;IACjB,IAAA,gCAAwB,GAAE,CAAC;IAE3B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,GAAG,eAAK,CAAC,MAAM,CAAC,4BAA4B,QAAQ,aAAa,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"prebuild.js","sourceRoot":"","sources":["../../src/utils/prebuild.ts"],"names":[],"mappings":"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"}
|