expo-modules-autolinking 56.0.14 → 56.0.16
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 +12 -0
- package/build/autolinking/generatePackageList.d.ts +4 -0
- package/build/autolinking/generatePackageList.js.map +1 -1
- package/build/commands/generateModulesProviderCommand.js +2 -0
- package/build/commands/generateModulesProviderCommand.js.map +1 -1
- package/build/inlineModules/iosInlineModules.d.ts +7 -0
- package/build/inlineModules/iosInlineModules.js +16 -0
- package/build/inlineModules/iosInlineModules.js.map +1 -1
- package/build/platforms/apple/apple.d.ts +5 -0
- package/build/platforms/apple/apple.js +3 -1
- package/build/platforms/apple/apple.js.map +1 -1
- package/package.json +3 -3
- package/scripts/ios/precompiled_modules.rb +1 -1
- package/scripts/ios/project_integrator.rb +25 -6
- package/src/autolinking/generatePackageList.ts +1 -0
- package/src/commands/generateModulesProviderCommand.ts +6 -0
- package/src/inlineModules/iosInlineModules.ts +22 -0
- package/src/platforms/apple/apple.ts +11 -4
package/CHANGELOG.md
CHANGED
|
@@ -10,6 +10,18 @@
|
|
|
10
10
|
|
|
11
11
|
### 💡 Others
|
|
12
12
|
|
|
13
|
+
## 56.0.16 — 2026-06-15
|
|
14
|
+
|
|
15
|
+
### 🎉 New features
|
|
16
|
+
|
|
17
|
+
- Add option to specify targets to use with inline modules ([#46698](https://github.com/expo/expo/pull/46698) by [@HubertBer](https://github.com/HubertBer))
|
|
18
|
+
|
|
19
|
+
## 56.0.15 — 2026-06-05
|
|
20
|
+
|
|
21
|
+
### 🐛 Bug fixes
|
|
22
|
+
|
|
23
|
+
- Fixed the macro plugin flag not being applied to test targets, so macros couldn't be used in unit tests. ([#46595](https://github.com/expo/expo/pull/46595) by [@tsapeta](https://github.com/tsapeta))
|
|
24
|
+
|
|
13
25
|
## 56.0.14 — 2026-05-28
|
|
14
26
|
|
|
15
27
|
### 🐛 Bug fixes
|
|
@@ -4,6 +4,10 @@ interface GenerateModulesProviderParams {
|
|
|
4
4
|
targetPath: string;
|
|
5
5
|
entitlementPath: string | null;
|
|
6
6
|
watchedDirectories: string[];
|
|
7
|
+
inlineModulesTargets: {
|
|
8
|
+
mainTarget?: string;
|
|
9
|
+
targets: string[];
|
|
10
|
+
};
|
|
7
11
|
appRoot: string;
|
|
8
12
|
}
|
|
9
13
|
/** Generates ExpoModulesProvider file listing all packages to link (Apple-only)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatePackageList.js","sourceRoot":"","sources":["../../src/autolinking/generatePackageList.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generatePackageList.js","sourceRoot":"","sources":["../../src/autolinking/generatePackageList.ts"],"names":[],"mappings":";;AAcA,oEAgBC;AA9BD,4CAAmE;AAYnE;GACG;AACI,KAAK,UAAU,4BAA4B,CAChD,OAA2B,EAC3B,MAAqC;IAErC,MAAM,eAAe,GAAG,IAAA,+CAAmC,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC7E,IAAI,CAAC,CAAC,8BAA8B,IAAI,eAAe,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CACb,8DAA8D,MAAM,CAAC,QAAQ,GAAG,CACjF,CAAC;IACJ,CAAC;IACD,MAAM,eAAe,CAAC,4BAA4B,CAChD,OAAgC,EAChC,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,eAAe,EACtB,MAAM,CACP,CAAC;AACJ,CAAC"}
|
|
@@ -39,11 +39,13 @@ function generateModulesProviderCommand(cli) {
|
|
|
39
39
|
.then((file) => JSON.parse(file))
|
|
40
40
|
.catch(() => ({}));
|
|
41
41
|
const watchedDirectories = JSON.parse(podfileProperties['expo.inlineModules.watchedDirectories'] ?? '[]');
|
|
42
|
+
const inlineModulesTargets = JSON.parse(podfileProperties['expo.inlineModules.xcodeProjectTargets'] ?? '{"targets":[]}');
|
|
42
43
|
await (0, generatePackageList_1.generateModulesProviderAsync)(filteredModules, {
|
|
43
44
|
platform,
|
|
44
45
|
targetPath: commandArguments.target,
|
|
45
46
|
entitlementPath: commandArguments.entitlement ?? null,
|
|
46
47
|
watchedDirectories,
|
|
48
|
+
inlineModulesTargets,
|
|
47
49
|
appRoot,
|
|
48
50
|
});
|
|
49
51
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateModulesProviderCommand.js","sourceRoot":"","sources":["../../src/commands/generateModulesProviderCommand.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"generateModulesProviderCommand.js","sourceRoot":"","sources":["../../src/commands/generateModulesProviderCommand.ts"],"names":[],"mappings":";;;;;AAuBA,wEA8DC;AApFD,4CAAoB;AAGpB,6DAAoG;AACpG,4DAA8D;AAC9D,4EAAkF;AAClF,kEAAoE;AAepE,0EAA0E;AAC1E,SAAgB,8BAA8B,CAAC,GAA8B;IAC3E,OAAO,IAAA,iDAA4B,EAAC,GAAG,CAAC,OAAO,CAAC,4CAA4C,CAAC,CAAC;SAC3F,MAAM,CACL,qBAAqB,EACrB,uEAAuE,CACxE;SACA,MAAM,CAAC,sBAAsB,EAAE,mDAAmD,CAAC;SACnF,MAAM,CACL,8BAA8B,EAC9B,qEAAqE,CACtE;SACA,MAAM,CAAC,mBAAmB,EAAE,iCAAiC,CAAC;SAC9D,MAAM,CAAC,uCAAuC,EAAE,sCAAsC,CAAC;SACvF,MAAM,CACL,KAAK,EAAE,WAA4B,EAAE,gBAAkD,EAAE,EAAE;QACzF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,IAAI,OAAO,CAAC;QACtD,MAAM,wBAAwB,GAAG,IAAA,mDAA8B,EAAC;YAC9D,GAAG,gBAAgB;YACnB,WAAW;SACZ,CAAC,CAAC;QACH,MAAM,kBAAkB,GAAG,MAAM,wBAAwB,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAEvF,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,IAAI,CAAC,MAAM,wBAAwB,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1F,MAAM,wBAAwB,GAAG,MAAM,IAAA,8BAAgB,EAAC;YACtD,kBAAkB,EAAE,MAAM,wBAAwB,CAAC,kBAAkB,CAAC,QAAQ,CAAC;YAC/E,OAAO;SACR,CAAC,CAAC;QACH,MAAM,yBAAyB,GAAG,MAAM,IAAA,oCAAmB,EACzD,wBAAwB,EACxB,kBAAkB,CACnB,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QAChE,MAAM,eAAe,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAClE,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CACvC,CAAC;QAEF,MAAM,iBAAiB,GAA6B,MAAM,YAAE,CAAC,QAAQ;aAClE,QAAQ,CAAC,gBAAgB,CAAC,yBAAyB,EAAE;YACpD,QAAQ,EAAE,MAAM;SACjB,CAAC;aACD,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAChC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAErB,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CACnC,iBAAiB,CAAC,uCAAuC,CAAC,IAAI,IAAI,CACnE,CAAC;QAEF,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,CACrC,iBAAiB,CAAC,wCAAwC,CAAC,IAAI,gBAAgB,CAChF,CAAC;QAEF,MAAM,IAAA,kDAA4B,EAAC,eAAe,EAAE;YAClD,QAAQ;YACR,UAAU,EAAE,gBAAgB,CAAC,MAAM;YACnC,eAAe,EAAE,gBAAgB,CAAC,WAAW,IAAI,IAAI;YACrD,kBAAkB;YAClB,oBAAoB;YACpB,OAAO;SACR,CAAC,CAAC;IACL,CAAC,CACF,CAAC;AACN,CAAC"}
|
|
@@ -1,2 +1,9 @@
|
|
|
1
1
|
import type { ModuleIosConfig } from '../types';
|
|
2
2
|
export declare function getIosInlineModulesClassNames(watchedDirectories: string[], appRoot: string): Promise<ModuleIosConfig[]>;
|
|
3
|
+
export declare function isTargetInInlineModulesTargets({ targetPath, inlineModulesTargets, }: {
|
|
4
|
+
targetPath: string;
|
|
5
|
+
inlineModulesTargets: {
|
|
6
|
+
mainTarget?: string;
|
|
7
|
+
targets: string[];
|
|
8
|
+
};
|
|
9
|
+
}): boolean;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getIosInlineModulesClassNames = getIosInlineModulesClassNames;
|
|
4
|
+
exports.isTargetInInlineModulesTargets = isTargetInInlineModulesTargets;
|
|
4
5
|
const inlineModules_1 = require("./inlineModules");
|
|
5
6
|
async function getIosInlineModulesClassNames(watchedDirectories, appRoot) {
|
|
6
7
|
return (await (0, inlineModules_1.getMirrorStateObject)(watchedDirectories, appRoot)).swiftModuleClassNames.map((className) => {
|
|
@@ -10,4 +11,19 @@ async function getIosInlineModulesClassNames(watchedDirectories, appRoot) {
|
|
|
10
11
|
};
|
|
11
12
|
});
|
|
12
13
|
}
|
|
14
|
+
function isTargetInInlineModulesTargets({ targetPath, inlineModulesTargets, }) {
|
|
15
|
+
const targetRegex = /\/Pods-(.+?)\/ExpoModulesProvider\.swift$/;
|
|
16
|
+
const match = targetPath.match(targetRegex);
|
|
17
|
+
if (!match) {
|
|
18
|
+
return false;
|
|
19
|
+
}
|
|
20
|
+
const targetName = match[1];
|
|
21
|
+
if (targetName === undefined) {
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
if (inlineModulesTargets.mainTarget) {
|
|
25
|
+
return targetName === inlineModulesTargets.mainTarget;
|
|
26
|
+
}
|
|
27
|
+
return inlineModulesTargets.targets.includes(targetName);
|
|
28
|
+
}
|
|
13
29
|
//# sourceMappingURL=iosInlineModules.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iosInlineModules.js","sourceRoot":"","sources":["../../src/inlineModules/iosInlineModules.ts"],"names":[],"mappings":";;AAGA,sEAYC;
|
|
1
|
+
{"version":3,"file":"iosInlineModules.js","sourceRoot":"","sources":["../../src/inlineModules/iosInlineModules.ts"],"names":[],"mappings":";;AAGA,sEAYC;AAED,wEAoBC;AApCD,mDAAuD;AAEhD,KAAK,UAAU,6BAA6B,CACjD,kBAA4B,EAC5B,OAAe;IAEf,OAAO,CAAC,MAAM,IAAA,oCAAoB,EAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CACxF,CAAC,SAAiB,EAAE,EAAE;QACpB,OAAO;YACL,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,IAAI;SACX,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC;AAED,SAAgB,8BAA8B,CAAC,EAC7C,UAAU,EACV,oBAAoB,GAIrB;IACC,MAAM,WAAW,GAAG,2CAA2C,CAAC;IAChE,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC5C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,oBAAoB,CAAC,UAAU,EAAE,CAAC;QACpC,OAAO,UAAU,KAAK,oBAAoB,CAAC,UAAU,CAAC;IACxD,CAAC;IACD,OAAO,oBAAoB,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAC3D,CAAC"}
|
|
@@ -12,6 +12,11 @@ export declare function resolveModuleAsync(packageName: string, revision: Packag
|
|
|
12
12
|
export declare function resolveExtraBuildDependenciesAsync(projectNativeRoot: string): Promise<ExtraDependencies | null>;
|
|
13
13
|
interface GenerateModulesProviderParams {
|
|
14
14
|
watchedDirectories: string[];
|
|
15
|
+
inlineModulesTargets: {
|
|
16
|
+
mainTarget?: string;
|
|
17
|
+
targets: string[];
|
|
18
|
+
};
|
|
19
|
+
targetPath: string;
|
|
15
20
|
appRoot: string;
|
|
16
21
|
}
|
|
17
22
|
/**
|
|
@@ -115,7 +115,9 @@ async function generatePackageListFileContentAsync(modules, className, entitleme
|
|
|
115
115
|
let modulesClassNames = []
|
|
116
116
|
.concat(...modulesToImport.map((module) => module.modules))
|
|
117
117
|
.filter(Boolean);
|
|
118
|
-
|
|
118
|
+
if ((0, iosInlineModules_1.isTargetInInlineModulesTargets)(params)) {
|
|
119
|
+
modulesClassNames = modulesClassNames.concat(await (0, iosInlineModules_1.getIosInlineModulesClassNames)(params.watchedDirectories, params.appRoot));
|
|
120
|
+
}
|
|
119
121
|
const debugOnlyModulesClassNames = []
|
|
120
122
|
.concat(...debugOnlyModules.map((module) => module.modules))
|
|
121
123
|
.filter(Boolean);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apple.js","sourceRoot":"","sources":["../../../src/platforms/apple/apple.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"apple.js","sourceRoot":"","sources":["../../../src/platforms/apple/apple.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "expo-modules-autolinking",
|
|
3
|
-
"version": "56.0.
|
|
3
|
+
"version": "56.0.16",
|
|
4
4
|
"description": "Scripts that autolink Expo modules.",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"types": "build/index.d.ts",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"homepage": "https://github.com/expo/expo/tree/main/packages/expo-modules-autolinking#readme",
|
|
42
42
|
"devDependencies": {
|
|
43
43
|
"memfs": "^3.2.0",
|
|
44
|
-
"expo-module-scripts": "56.0.
|
|
44
|
+
"expo-module-scripts": "56.0.3"
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"@expo/require-utils": "^56.1.3",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"chalk": "^4.1.0",
|
|
50
50
|
"commander": "^7.2.0"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "812dc007aefed0c432c0439fdfe05ee2f4f21da2",
|
|
53
53
|
"scripts": {
|
|
54
54
|
"build": "expo-module build",
|
|
55
55
|
"clean": "expo-module clean",
|
|
@@ -1823,7 +1823,7 @@ module Expo
|
|
|
1823
1823
|
end
|
|
1824
1824
|
end
|
|
1825
1825
|
|
|
1826
|
-
# Returns the Hermes version
|
|
1826
|
+
# Returns the Hermes version. Hermes v1 is the default; classic Hermes is opt-out.
|
|
1827
1827
|
# Mirrors the TypeScript resolution logic in tools/src/prebuilds/Utils.ts.
|
|
1828
1828
|
def hermes_version
|
|
1829
1829
|
@hermes_version ||= begin
|
|
@@ -150,19 +150,38 @@ module Expo
|
|
|
150
150
|
is_core = pod_target.name == 'ExpoModulesCore'
|
|
151
151
|
has_core_dependency = pod_target.dependencies.find { |dependency| dependency == 'ExpoModulesCore' }
|
|
152
152
|
next unless is_core || has_core_dependency
|
|
153
|
+
|
|
153
154
|
pod_target.build_settings.each do |build_configuration_name, build_settings|
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
155
|
+
xcconfig_path = pod_target.xcconfig_path(build_configuration_name)
|
|
156
|
+
append_macro_flags(build_settings, xcconfig_path, macro_flags)
|
|
157
|
+
end
|
|
158
|
+
|
|
159
|
+
# Test specs are compiled into their own native targets with their own xcconfigs, so the flag
|
|
160
|
+
# set on the library target above doesn't reach them. Apply it to each test spec's build
|
|
161
|
+
# settings as well, so macros can be used from unit tests.
|
|
162
|
+
pod_target.test_specs.each do |test_spec|
|
|
163
|
+
test_type = test_spec.consumer(pod_target.platform).test_type
|
|
164
|
+
pod_target.test_spec_build_settings_by_config[test_spec.name].each do |build_configuration_name, build_settings|
|
|
165
|
+
xcconfig_variant = "#{test_type.capitalize}-#{pod_target.subspec_label(test_spec)}.#{build_configuration_name}"
|
|
166
|
+
xcconfig_path = pod_target.xcconfig_path(xcconfig_variant)
|
|
167
|
+
append_macro_flags(build_settings, xcconfig_path, macro_flags)
|
|
160
168
|
end
|
|
161
169
|
end
|
|
162
170
|
end
|
|
163
171
|
end
|
|
164
172
|
end
|
|
165
173
|
|
|
174
|
+
# Appends the macro plugin flags to the target's `OTHER_SWIFT_FLAGS` and saves the xcconfig,
|
|
175
|
+
# skipping it when the flags are already present.
|
|
176
|
+
def self.append_macro_flags(build_settings, xcconfig_path, macro_flags)
|
|
177
|
+
xcconfig = build_settings.xcconfig
|
|
178
|
+
swift_flags = xcconfig.attributes[SWIFT_FLAGS] || '$(inherited)'
|
|
179
|
+
return if swift_flags.include?(macro_flags)
|
|
180
|
+
|
|
181
|
+
xcconfig.attributes[SWIFT_FLAGS] = "#{swift_flags} #{macro_flags}"
|
|
182
|
+
xcconfig.save_as(xcconfig_path)
|
|
183
|
+
end
|
|
184
|
+
|
|
166
185
|
def self.resolve_macros_plugin_dir(core_src_root)
|
|
167
186
|
js = "require.resolve('@expo/expo-modules-macros-plugin/package.json', { paths: #{[core_src_root].to_json} })"
|
|
168
187
|
stdout, stderr, status = Open3.capture3('node', '--print', js)
|
|
@@ -17,6 +17,7 @@ interface GenerateModulesProviderArguments extends AutolinkingCommonArguments {
|
|
|
17
17
|
|
|
18
18
|
type PartialPodfileProperties = {
|
|
19
19
|
'expo.inlineModules.watchedDirectories'?: string;
|
|
20
|
+
'expo.inlineModules.xcodeProjectTargets'?: string;
|
|
20
21
|
};
|
|
21
22
|
|
|
22
23
|
/** Generates a source file listing all packages to link in the runtime */
|
|
@@ -68,11 +69,16 @@ export function generateModulesProviderCommand(cli: commander.CommanderStatic) {
|
|
|
68
69
|
podfileProperties['expo.inlineModules.watchedDirectories'] ?? '[]'
|
|
69
70
|
);
|
|
70
71
|
|
|
72
|
+
const inlineModulesTargets = JSON.parse(
|
|
73
|
+
podfileProperties['expo.inlineModules.xcodeProjectTargets'] ?? '{"targets":[]}'
|
|
74
|
+
);
|
|
75
|
+
|
|
71
76
|
await generateModulesProviderAsync(filteredModules, {
|
|
72
77
|
platform,
|
|
73
78
|
targetPath: commandArguments.target,
|
|
74
79
|
entitlementPath: commandArguments.entitlement ?? null,
|
|
75
80
|
watchedDirectories,
|
|
81
|
+
inlineModulesTargets,
|
|
76
82
|
appRoot,
|
|
77
83
|
});
|
|
78
84
|
}
|
|
@@ -14,3 +14,25 @@ export async function getIosInlineModulesClassNames(
|
|
|
14
14
|
}
|
|
15
15
|
);
|
|
16
16
|
}
|
|
17
|
+
|
|
18
|
+
export function isTargetInInlineModulesTargets({
|
|
19
|
+
targetPath,
|
|
20
|
+
inlineModulesTargets,
|
|
21
|
+
}: {
|
|
22
|
+
targetPath: string;
|
|
23
|
+
inlineModulesTargets: { mainTarget?: string; targets: string[] };
|
|
24
|
+
}): boolean {
|
|
25
|
+
const targetRegex = /\/Pods-(.+?)\/ExpoModulesProvider\.swift$/;
|
|
26
|
+
const match = targetPath.match(targetRegex);
|
|
27
|
+
if (!match) {
|
|
28
|
+
return false;
|
|
29
|
+
}
|
|
30
|
+
const targetName = match[1];
|
|
31
|
+
if (targetName === undefined) {
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
34
|
+
if (inlineModulesTargets.mainTarget) {
|
|
35
|
+
return targetName === inlineModulesTargets.mainTarget;
|
|
36
|
+
}
|
|
37
|
+
return inlineModulesTargets.targets.includes(targetName);
|
|
38
|
+
}
|
|
@@ -3,7 +3,10 @@ import fs from 'fs';
|
|
|
3
3
|
import path from 'path';
|
|
4
4
|
|
|
5
5
|
import type { AutolinkingOptions } from '../../commands/autolinkingOptions';
|
|
6
|
-
import {
|
|
6
|
+
import {
|
|
7
|
+
getIosInlineModulesClassNames,
|
|
8
|
+
isTargetInInlineModulesTargets,
|
|
9
|
+
} from '../../inlineModules/iosInlineModules';
|
|
7
10
|
import type {
|
|
8
11
|
AppleCodeSignEntitlements,
|
|
9
12
|
ExtraDependencies,
|
|
@@ -104,6 +107,8 @@ export async function resolveExtraBuildDependenciesAsync(
|
|
|
104
107
|
|
|
105
108
|
interface GenerateModulesProviderParams {
|
|
106
109
|
watchedDirectories: string[];
|
|
110
|
+
inlineModulesTargets: { mainTarget?: string; targets: string[] };
|
|
111
|
+
targetPath: string;
|
|
107
112
|
appRoot: string;
|
|
108
113
|
}
|
|
109
114
|
/**
|
|
@@ -168,9 +173,11 @@ async function generatePackageListFileContentAsync(
|
|
|
168
173
|
.concat(...modulesToImport.map((module) => module.modules))
|
|
169
174
|
.filter(Boolean);
|
|
170
175
|
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
176
|
+
if (isTargetInInlineModulesTargets(params)) {
|
|
177
|
+
modulesClassNames = modulesClassNames.concat(
|
|
178
|
+
await getIosInlineModulesClassNames(params.watchedDirectories, params.appRoot)
|
|
179
|
+
);
|
|
180
|
+
}
|
|
174
181
|
|
|
175
182
|
const debugOnlyModulesClassNames = ([] as ModuleIosConfig[])
|
|
176
183
|
.concat(...debugOnlyModules.map((module) => module.modules))
|