@expo/cli 58.1.6 → 58.1.8
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/build/src/api/rest/wrapFetchWithUserAgent.js +1 -1
- package/build/src/command/events/eventsAsync.d.ts +2 -0
- package/build/src/command/events/eventsAsync.js +31 -0
- package/build/src/command/events/eventsAsync.js.map +1 -0
- package/build/src/command/events/help.d.ts +2 -0
- package/build/src/command/events/help.js +69 -0
- package/build/src/command/events/help.js.map +1 -0
- package/build/src/command/events/index.d.ts +2 -0
- package/build/src/command/events/index.js +59 -0
- package/build/src/command/events/index.js.map +1 -0
- package/build/src/command/events/resolveOptions.d.ts +10 -0
- package/build/src/command/events/resolveOptions.js +23 -0
- package/build/src/command/events/resolveOptions.js.map +1 -0
- package/build/src/command/index.d.ts +2 -0
- package/build/src/command/index.js +65 -0
- package/build/src/command/index.js.map +1 -0
- package/build/src/command/ps/help.d.ts +2 -0
- package/build/src/command/ps/help.js +52 -0
- package/build/src/command/ps/help.js.map +1 -0
- package/build/src/command/ps/index.d.ts +2 -0
- package/build/src/command/ps/index.js +53 -0
- package/build/src/command/ps/index.js.map +1 -0
- package/build/src/command/ps/psAsync.d.ts +2 -0
- package/build/src/command/ps/psAsync.js +49 -0
- package/build/src/command/ps/psAsync.js.map +1 -0
- package/build/src/command/ps/resolveOptions.d.ts +9 -0
- package/build/src/command/ps/resolveOptions.js +20 -0
- package/build/src/command/ps/resolveOptions.js.map +1 -0
- package/build/src/command/sessions.d.ts +4 -0
- package/build/src/command/sessions.js +80 -0
- package/build/src/command/sessions.js.map +1 -0
- package/build/src/command/utils.d.ts +5 -0
- package/build/src/command/utils.js +62 -0
- package/build/src/command/utils.js.map +1 -0
- package/build/src/export/exportStaticAsync.js +26 -6
- package/build/src/export/exportStaticAsync.js.map +1 -1
- package/build/src/index.js +28 -7
- package/build/src/index.js.map +1 -1
- package/build/src/prebuild/prebuildAsync.d.ts +1 -1
- package/build/src/prebuild/prebuildAsync.js +17 -3
- package/build/src/prebuild/prebuildAsync.js.map +1 -1
- package/build/src/prebuild/setupSwiftPM.d.ts +20 -0
- package/build/src/prebuild/setupSwiftPM.js +171 -0
- package/build/src/prebuild/setupSwiftPM.js.map +1 -0
- package/build/src/run/index.js +1 -1
- package/build/src/run/index.js.map +1 -1
- package/build/src/start/index.js +5 -2
- package/build/src/start/index.js.map +1 -1
- package/build/src/start/server/BundlerDevServer.d.ts +1 -0
- package/build/src/start/server/BundlerDevServer.js +9 -4
- package/build/src/start/server/BundlerDevServer.js.map +1 -1
- package/build/src/start/server/DevServerManager.d.ts +1 -0
- package/build/src/start/server/DevServerManager.js +21 -0
- package/build/src/start/server/DevServerManager.js.map +1 -1
- package/build/src/start/server/getStaticRenderFunctions.js +13 -0
- package/build/src/start/server/getStaticRenderFunctions.js.map +1 -1
- package/build/src/start/server/metro/MetroBundlerDevServer.js +100 -45
- package/build/src/start/server/metro/MetroBundlerDevServer.js.map +1 -1
- package/build/src/start/server/metro/MetroTerminalReporter.d.ts +16 -5
- package/build/src/start/server/metro/MetroTerminalReporter.js +61 -28
- package/build/src/start/server/metro/MetroTerminalReporter.js.map +1 -1
- package/build/src/start/server/metro/TerminalReporter.types.d.ts +2 -0
- package/build/src/start/server/metro/createServerRouteMiddleware.js +2 -2
- package/build/src/start/server/metro/createServerRouteMiddleware.js.map +1 -1
- package/build/src/start/server/metro/debugging/AtlasPrerequisite.js +1 -1
- package/build/src/start/server/metro/instantiateMetro.js +7 -3
- package/build/src/start/server/metro/instantiateMetro.js.map +1 -1
- package/build/src/start/server/metro/metroErrorInterface.d.ts +19 -3
- package/build/src/start/server/metro/metroErrorInterface.js +18 -2
- package/build/src/start/server/metro/metroErrorInterface.js.map +1 -1
- package/build/src/start/server/metro/serializeHtml.d.ts +2 -1
- package/build/src/start/server/metro/serializeHtml.js +51 -2
- package/build/src/start/server/metro/serializeHtml.js.map +1 -1
- package/build/src/start/server/middleware/metroOptions.d.ts +6 -0
- package/build/src/start/server/middleware/metroOptions.js +12 -2
- package/build/src/start/server/middleware/metroOptions.js.map +1 -1
- package/build/src/start/server/type-generation/routes.js +1 -1
- package/build/src/utils/cocoapods.js +10 -0
- package/build/src/utils/cocoapods.js.map +1 -1
- package/build/src/utils/errors.d.ts +9 -1
- package/build/src/utils/errors.js +16 -2
- package/build/src/utils/errors.js.map +1 -1
- package/build/src/utils/metadata.d.ts +15 -0
- package/build/src/utils/metadata.js +39 -0
- package/build/src/utils/metadata.js.map +1 -0
- package/build/src/utils/nodeEnv.js +2 -0
- package/build/src/utils/nodeEnv.js.map +1 -1
- package/build/src/utils/telemetry/clients/FetchClient.js +1 -1
- package/build/src/utils/telemetry/clients/FetchClient.js.map +1 -1
- package/build/src/utils/telemetry/utils/context.js +1 -1
- package/build/src/utils/telemetry/utils/context.js.map +1 -1
- package/package.json +19 -19
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
});
|
|
5
5
|
0 && (module.exports = {
|
|
6
6
|
assetsRequiresSort: null,
|
|
7
|
+
getGranularAssetsForRoute: null,
|
|
7
8
|
serialAssetsToStaticContentAssets: null,
|
|
8
9
|
serializeHtmlWithAssets: null,
|
|
9
10
|
sortMatchedAssetsByEntryPoints: null
|
|
@@ -18,6 +19,9 @@ _export(exports, {
|
|
|
18
19
|
get assetsRequiresSort () {
|
|
19
20
|
return assetsRequiresSort;
|
|
20
21
|
},
|
|
22
|
+
get getGranularAssetsForRoute () {
|
|
23
|
+
return getGranularAssetsForRoute;
|
|
24
|
+
},
|
|
21
25
|
get serialAssetsToStaticContentAssets () {
|
|
22
26
|
return serialAssetsToStaticContentAssets;
|
|
23
27
|
},
|
|
@@ -28,6 +32,13 @@ _export(exports, {
|
|
|
28
32
|
return sortMatchedAssetsByEntryPoints;
|
|
29
33
|
}
|
|
30
34
|
});
|
|
35
|
+
function _exportPath() {
|
|
36
|
+
const data = require("@expo/metro-config/build/serializer/exportPath");
|
|
37
|
+
_exportPath = function() {
|
|
38
|
+
return data;
|
|
39
|
+
};
|
|
40
|
+
return data;
|
|
41
|
+
}
|
|
31
42
|
function _html() {
|
|
32
43
|
const data = require("@expo/router-server/build/utils/html");
|
|
33
44
|
_html = function() {
|
|
@@ -100,6 +111,13 @@ function serialAssetsToStaticContentAssets(assets, { isExporting, baseUrl, bundl
|
|
|
100
111
|
favicon
|
|
101
112
|
};
|
|
102
113
|
}
|
|
114
|
+
if (assets.some((asset)=>asset.type === 'js' && asset.metadata.chunkingStrategy === 'granular')) {
|
|
115
|
+
return {
|
|
116
|
+
css,
|
|
117
|
+
js: getGranularAssetsForRoute(assets, route?.entryPoints).map((asset)=>(0, _exportPath().getChunkUrl)(baseUrl, asset.filename)),
|
|
118
|
+
favicon
|
|
119
|
+
};
|
|
120
|
+
}
|
|
103
121
|
let orderedJsAssets = assetsRequiresSort(assets.filter((asset)=>asset.type === 'js'));
|
|
104
122
|
if (route?.entryPoints && Array.isArray(route.entryPoints)) {
|
|
105
123
|
const syncAssets = orderedJsAssets.filter((a)=>!a.metadata.isAsync);
|
|
@@ -144,7 +162,38 @@ function sortMatchedAssetsByEntryPoints(matchedAssets, entryPoints) {
|
|
|
144
162
|
const getEntryPointIndex = (modulePaths)=>modulePaths ? entryPoints.findIndex((ep)=>modulePaths.includes(ep)) : -1;
|
|
145
163
|
return matchedAssets.sort((a, b)=>getEntryPointIndex(a.metadata.modulePaths) - getEntryPointIndex(b.metadata.modulePaths));
|
|
146
164
|
}
|
|
147
|
-
function
|
|
165
|
+
function getGranularAssetsForRoute(assets, entryPoints = []) {
|
|
166
|
+
const jsAssets = assets.filter((asset)=>asset.type === 'js');
|
|
167
|
+
for (const asset of jsAssets){
|
|
168
|
+
if (asset.metadata.chunkingStrategy !== 'granular') {
|
|
169
|
+
throw new Error(`Mixed chunking strategy for ${asset.filename}. Serialize the page with one strategy.`);
|
|
170
|
+
}
|
|
171
|
+
if (!Array.isArray(asset.metadata.entryPaths) || !Array.isArray(asset.metadata.requires)) {
|
|
172
|
+
throw new Error(`Missing entryPaths or requires for Granular asset ${asset.filename}. Regenerate the export with canonical chunk metadata.`);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
const entryAssets = jsAssets.filter((asset)=>asset.metadata.entryChunks !== undefined);
|
|
176
|
+
if (entryAssets.length !== 1) {
|
|
177
|
+
throw new Error('Expected one Granular entry-to-chunks mapping.');
|
|
178
|
+
}
|
|
179
|
+
const entryChunks = entryAssets[0].metadata.entryChunks;
|
|
180
|
+
const assetsByFilename = new Map(jsAssets.map((asset)=>[
|
|
181
|
+
asset.filename,
|
|
182
|
+
asset
|
|
183
|
+
]));
|
|
184
|
+
const rootAssets = entryPoints.flatMap((entryPath)=>(entryChunks[entryPath] ?? []).map((filename)=>{
|
|
185
|
+
const asset = assetsByFilename.get(filename);
|
|
186
|
+
if (!asset) {
|
|
187
|
+
throw new Error(`Asset not found for entry ${entryPath}: ${filename}`);
|
|
188
|
+
}
|
|
189
|
+
return asset;
|
|
190
|
+
}));
|
|
191
|
+
return assetsRequiresSort(jsAssets, [
|
|
192
|
+
...rootAssets,
|
|
193
|
+
...jsAssets.filter((asset)=>!asset.metadata.isAsync)
|
|
194
|
+
]);
|
|
195
|
+
}
|
|
196
|
+
function assetsRequiresSort(assets, roots = assets) {
|
|
148
197
|
const lookup = new Map();
|
|
149
198
|
const visited = new Set();
|
|
150
199
|
const visiting = new Set();
|
|
@@ -168,7 +217,7 @@ function assetsRequiresSort(assets) {
|
|
|
168
217
|
visited.add(name);
|
|
169
218
|
result.push(module1);
|
|
170
219
|
}
|
|
171
|
-
|
|
220
|
+
roots.forEach((a)=>{
|
|
172
221
|
if (!visited.has(a.filename)) {
|
|
173
222
|
visit(a.filename);
|
|
174
223
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["start/server/metro/serializeHtml.ts"],"sourcesContent":[null],"names":["assetsRequiresSort","serialAssetsToStaticContentAssets","serializeHtmlWithAssets","sortMatchedAssetsByEntryPoints","resources","template","devBundleUrl","baseUrl","route","isExporting","hydrate","assets","bundleUrl","undefined","injectAssetsIntoHtml","combineUrlPath","segments","filter","Boolean","map","segment","index","segmentIsBaseUrl","replace","join","favicon","css","asset","type","href","filename","media","metadata","source","hmrId","js","
|
|
1
|
+
{"version":3,"sources":["start/server/metro/serializeHtml.ts"],"sourcesContent":[null],"names":["assetsRequiresSort","getGranularAssetsForRoute","serialAssetsToStaticContentAssets","serializeHtmlWithAssets","sortMatchedAssetsByEntryPoints","resources","template","devBundleUrl","baseUrl","route","isExporting","hydrate","assets","bundleUrl","undefined","injectAssetsIntoHtml","combineUrlPath","segments","filter","Boolean","map","segment","index","segmentIsBaseUrl","replace","join","favicon","css","asset","type","href","filename","media","metadata","source","hmrId","js","some","chunkingStrategy","entryPoints","getChunkUrl","orderedJsAssets","Array","isArray","syncAssets","a","isAsync","sortedAsync","runtimeAssets","requires","length","entryAssets","modulePaths","matches","entryPoint","includes","event","contextKey","matchedAssets","getEntryPointIndex","findIndex","ep","sort","b","jsAssets","Error","entryPaths","entryChunks","assetsByFilename","Map","rootAssets","flatMap","entryPath","get","roots","lookup","visited","Set","visiting","result","forEach","set","visit","name","has","add","module","dependency","delete","push"],"mappings":"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"}
|
|
@@ -16,6 +16,8 @@ export type ExpoMetroOptions = {
|
|
|
16
16
|
bytecode?: boolean;
|
|
17
17
|
/** Enable async routes (route-based bundle splitting) in Expo Router. */
|
|
18
18
|
asyncRoutes?: boolean;
|
|
19
|
+
/** The chunking strategy to use when `splitChunks` is enabled. */
|
|
20
|
+
chunkingStrategy?: 'granular' | 'legacy';
|
|
19
21
|
/** Module ID relative to the projectRoot for the Expo Router app directory. */
|
|
20
22
|
routerRoot?: string;
|
|
21
23
|
/** Enable React compiler support in Babel. */
|
|
@@ -47,6 +49,7 @@ export type SerializerOptions = {
|
|
|
47
49
|
includeSourceMaps?: boolean;
|
|
48
50
|
output?: 'static';
|
|
49
51
|
splitChunks?: boolean;
|
|
52
|
+
chunkingStrategy?: 'granular' | 'legacy';
|
|
50
53
|
usedExports?: boolean;
|
|
51
54
|
exporting?: boolean;
|
|
52
55
|
};
|
|
@@ -76,6 +79,7 @@ export declare function getMetroDirectBundleOptionsForExpoConfig(projectRoot: st
|
|
|
76
79
|
readonly sourceUrl: string | undefined;
|
|
77
80
|
readonly serializerOptions: {
|
|
78
81
|
readonly splitChunks: boolean | undefined;
|
|
82
|
+
readonly chunkingStrategy: "granular" | "legacy" | undefined;
|
|
79
83
|
readonly usedExports: true | undefined;
|
|
80
84
|
readonly output: "static" | undefined;
|
|
81
85
|
readonly includeSourceMaps: boolean | undefined;
|
|
@@ -84,6 +88,7 @@ export declare function getMetroDirectBundleOptionsForExpoConfig(projectRoot: st
|
|
|
84
88
|
};
|
|
85
89
|
readonly shallow: false;
|
|
86
90
|
};
|
|
91
|
+
export declare function getChunkingStrategyFromExpoConfig(exp: ExpoConfig): 'granular' | 'legacy';
|
|
87
92
|
export declare function getMetroDirectBundleOptions(options: ExpoMetroOptions): {
|
|
88
93
|
readonly platform: string;
|
|
89
94
|
readonly entryFile: string;
|
|
@@ -104,6 +109,7 @@ export declare function getMetroDirectBundleOptions(options: ExpoMetroOptions):
|
|
|
104
109
|
readonly sourceUrl: string | undefined;
|
|
105
110
|
readonly serializerOptions: {
|
|
106
111
|
readonly splitChunks: boolean | undefined;
|
|
112
|
+
readonly chunkingStrategy: "granular" | "legacy" | undefined;
|
|
107
113
|
readonly usedExports: true | undefined;
|
|
108
114
|
readonly output: "static" | undefined;
|
|
109
115
|
readonly includeSourceMaps: boolean | undefined;
|
|
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
10
10
|
createBundleUrlSearchParams: null,
|
|
11
11
|
getAsyncRoutesFromExpoConfig: null,
|
|
12
12
|
getBaseUrlFromExpoConfig: null,
|
|
13
|
+
getChunkingStrategyFromExpoConfig: null,
|
|
13
14
|
getMetroDirectBundleOptions: null,
|
|
14
15
|
getMetroDirectBundleOptionsForExpoConfig: null,
|
|
15
16
|
getMetroOptionsFromUrl: null,
|
|
@@ -43,6 +44,9 @@ _export(exports, {
|
|
|
43
44
|
get getBaseUrlFromExpoConfig () {
|
|
44
45
|
return getBaseUrlFromExpoConfig;
|
|
45
46
|
},
|
|
47
|
+
get getChunkingStrategyFromExpoConfig () {
|
|
48
|
+
return getChunkingStrategyFromExpoConfig;
|
|
49
|
+
},
|
|
46
50
|
get getMetroDirectBundleOptions () {
|
|
47
51
|
return getMetroDirectBundleOptions;
|
|
48
52
|
},
|
|
@@ -129,11 +133,16 @@ function getMetroDirectBundleOptionsForExpoConfig(projectRoot, exp, options) {
|
|
|
129
133
|
reactCompiler: !!exp.experiments?.reactCompiler,
|
|
130
134
|
baseUrl: getBaseUrlFromExpoConfig(exp),
|
|
131
135
|
routerRoot: (0, _router.getRouterDirectoryModuleIdWithManifest)(projectRoot, exp),
|
|
132
|
-
asyncRoutes: getAsyncRoutesFromExpoConfig(exp, options.mode, options.platform)
|
|
136
|
+
asyncRoutes: getAsyncRoutesFromExpoConfig(exp, options.mode, options.platform),
|
|
137
|
+
chunkingStrategy: getChunkingStrategyFromExpoConfig(exp)
|
|
133
138
|
});
|
|
134
139
|
}
|
|
140
|
+
function getChunkingStrategyFromExpoConfig(exp) {
|
|
141
|
+
const experiments = exp.experiments;
|
|
142
|
+
return experiments?.chunking?.mode === 'granular' && !exp.experiments?.reactServerComponentRoutes && !exp.experiments?.reactServerFunctions ? 'granular' : 'legacy';
|
|
143
|
+
}
|
|
135
144
|
function getMetroDirectBundleOptions(options) {
|
|
136
|
-
const { mainModuleName, platform, mode, minify, environment, serializerOutput, serializerIncludeMaps, bytecode, lazy, engine, preserveEnvVars, asyncRoutes, baseUrl, routerRoot, isExporting, inlineSourceMap, splitChunks, usedExports, reactCompiler, optimize, domRoot, clientBoundaries, runModule, modulesOnly, useMd5Filename, hosted, liveBindings, isLoaderBundle, excludeSource } = withDefaults(options);
|
|
145
|
+
const { mainModuleName, platform, mode, minify, environment, serializerOutput, serializerIncludeMaps, bytecode, lazy, engine, preserveEnvVars, asyncRoutes, baseUrl, routerRoot, isExporting, inlineSourceMap, splitChunks, chunkingStrategy, usedExports, reactCompiler, optimize, domRoot, clientBoundaries, runModule, modulesOnly, useMd5Filename, hosted, liveBindings, isLoaderBundle, excludeSource } = withDefaults(options);
|
|
137
146
|
const dev = mode !== 'production';
|
|
138
147
|
const isHermes = engine === 'hermes';
|
|
139
148
|
if (isExporting) {
|
|
@@ -194,6 +203,7 @@ function getMetroDirectBundleOptions(options) {
|
|
|
194
203
|
sourceUrl: fakeSourceUrl,
|
|
195
204
|
serializerOptions: {
|
|
196
205
|
splitChunks,
|
|
206
|
+
chunkingStrategy,
|
|
197
207
|
usedExports: usedExports || undefined,
|
|
198
208
|
output: serializerOutput,
|
|
199
209
|
includeSourceMaps: serializerIncludeMaps,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["start/server/middleware/metroOptions.ts"],"sourcesContent":[null],"names":["convertPathToModuleSpecifier","createBundleOsPath","createBundleUrlPath","createBundleUrlPathFromExpoConfig","createBundleUrlSearchParams","getAsyncRoutesFromExpoConfig","getBaseUrlFromExpoConfig","getMetroDirectBundleOptions","getMetroDirectBundleOptionsForExpoConfig","getMetroOptionsFromUrl","isServerEnvironment","toBoolStr","x","environment","withDefaults","mode","minify","preserveEnvVars","env","EXPO_NO_CLIENT_ENV_VARS","lazy","props","bytecode","platform","CommandError","engine","optimize","EXPO_UNSTABLE_METRO_OPTIMIZE_GRAPH","usedExports","EXPO_UNSTABLE_TREE_SHAKING","isExporting","undefined","liveBindings","EXPO_UNSTABLE_LIVE_BINDINGS","excludeSource","exp","experiments","baseUrl","trim","replace","asyncRoutesSetting","extra","router","asyncRoutes","includes","default","projectRoot","options","reactCompiler","routerRoot","getRouterDirectoryModuleIdWithManifest","mainModuleName","serializerOutput","serializerIncludeMaps","inlineSourceMap","splitChunks","domRoot","clientBoundaries","runModule","modulesOnly","useMd5Filename","hosted","isLoaderBundle","dev","isHermes","debugEvent","fakeSourceUrl","fakeSourceMapUrl","URL","toString","customTransformOptions","__proto__","dom","key","entryFile","unstable_transformProfile","customResolverOptions","exporting","sourceMapUrl","sourceUrl","serializerOptions","output","includeSourceMaps","Server","DEFAULT_BUNDLE_OPTIONS","shallow","queryParams","encodeURI","toPosixPath","String","URLSearchParams","encodeURIComponent","hot","append","length","JSON","stringify","set","pathLike","urlFragment","url","getStringParam","param","searchParams","get","Array","isArray","Error","pathname","endsWith","slice","isTruthy","assertEnvironment","assertEngine","value"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["start/server/middleware/metroOptions.ts"],"sourcesContent":[null],"names":["convertPathToModuleSpecifier","createBundleOsPath","createBundleUrlPath","createBundleUrlPathFromExpoConfig","createBundleUrlSearchParams","getAsyncRoutesFromExpoConfig","getBaseUrlFromExpoConfig","getChunkingStrategyFromExpoConfig","getMetroDirectBundleOptions","getMetroDirectBundleOptionsForExpoConfig","getMetroOptionsFromUrl","isServerEnvironment","toBoolStr","x","environment","withDefaults","mode","minify","preserveEnvVars","env","EXPO_NO_CLIENT_ENV_VARS","lazy","props","bytecode","platform","CommandError","engine","optimize","EXPO_UNSTABLE_METRO_OPTIMIZE_GRAPH","usedExports","EXPO_UNSTABLE_TREE_SHAKING","isExporting","undefined","liveBindings","EXPO_UNSTABLE_LIVE_BINDINGS","excludeSource","exp","experiments","baseUrl","trim","replace","asyncRoutesSetting","extra","router","asyncRoutes","includes","default","projectRoot","options","reactCompiler","routerRoot","getRouterDirectoryModuleIdWithManifest","chunkingStrategy","chunking","reactServerComponentRoutes","reactServerFunctions","mainModuleName","serializerOutput","serializerIncludeMaps","inlineSourceMap","splitChunks","domRoot","clientBoundaries","runModule","modulesOnly","useMd5Filename","hosted","isLoaderBundle","dev","isHermes","debugEvent","fakeSourceUrl","fakeSourceMapUrl","URL","toString","customTransformOptions","__proto__","dom","key","entryFile","unstable_transformProfile","customResolverOptions","exporting","sourceMapUrl","sourceUrl","serializerOptions","output","includeSourceMaps","Server","DEFAULT_BUNDLE_OPTIONS","shallow","queryParams","encodeURI","toPosixPath","String","URLSearchParams","encodeURIComponent","hot","append","length","JSON","stringify","set","pathLike","urlFragment","url","getStringParam","param","searchParams","get","Array","isArray","Error","pathname","endsWith","slice","isTruthy","assertEnvironment","assertEngine","value"],"mappings":"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"}
|
|
@@ -263,7 +263,7 @@ declare module "expo-router" {
|
|
|
263
263
|
|
|
264
264
|
type SearchOrHash = \`?\${string}\` | \`#\${string}\`;
|
|
265
265
|
type UnknownInputParams = Record<string, string | number | (string | number)[]>;
|
|
266
|
-
type UnknownOutputParams = Record<string, string | string[]>;
|
|
266
|
+
type UnknownOutputParams = Record<string, string | string[] | undefined>;
|
|
267
267
|
|
|
268
268
|
/**
|
|
269
269
|
* Return only the RoutePart of a string. If the string has multiple parts return never
|
|
@@ -67,6 +67,7 @@ function _path() {
|
|
|
67
67
|
return data;
|
|
68
68
|
}
|
|
69
69
|
const _log = /*#__PURE__*/ _interop_require_wildcard(require("../log"));
|
|
70
|
+
const _setupSwiftPM = require("../prebuild/setupSwiftPM");
|
|
70
71
|
const _updatePackageJson = require("../prebuild/updatePackageJson");
|
|
71
72
|
const _dir = require("./dir");
|
|
72
73
|
const _env = require("./env");
|
|
@@ -227,6 +228,15 @@ function isPodFolderCreated(projectRoot) {
|
|
|
227
228
|
return _fs().default.existsSync(podFolderPath);
|
|
228
229
|
}
|
|
229
230
|
async function maybePromptToSyncPodsAsync(projectRoot) {
|
|
231
|
+
const { exp } = (0, _config().getConfig)(projectRoot, {
|
|
232
|
+
skipSDKVersionRequirement: true
|
|
233
|
+
});
|
|
234
|
+
if ((0, _setupSwiftPM.isSwiftPMEnabled)(exp)) {
|
|
235
|
+
const skipping = (0, _chalk().default)`Skipping CocoaPods because {bold experiments.swiftPackageManager} is enabled in the app config.`;
|
|
236
|
+
_log.log((0, _setupSwiftPM.getSwiftPMMarkerPath)(projectRoot) ? skipping : (0, _chalk().default)`${skipping} The iOS project still uses CocoaPods. Run {bold npx expo prebuild} to switch it to Swift Package Manager.`);
|
|
237
|
+
return;
|
|
238
|
+
}
|
|
239
|
+
(0, _setupSwiftPM.assertNoSwiftPMMarker)(projectRoot);
|
|
230
240
|
if (!doesProjectUseCocoaPods(projectRoot)) {
|
|
231
241
|
// Project does not use CocoaPods
|
|
232
242
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["utils/cocoapods.ts"],"sourcesContent":[null],"names":["hasPackageJsonDependencyListChangedAsync","installCocoaPodsAsync","maybePromptToSyncPodsAsync","PROJECT_PREBUILD_SETTINGS","CACHED_PACKAGE_JSON","getTempPrebuildFolder","projectRoot","path","join","hasNewDependenciesSinceLastBuild","packageChecksums","templateDirectory","tempPkgJsonPath","fs","existsSync","dependencies","devDependencies","JsonFile","read","hasNewDependencies","hasNewDevDependencies","createPackageChecksums","pkg","hashForDependencyMap","getPackageJson","packages","ensureDirectoryAsync","writeAsync","step","logNewSection","process","platform","succeed","packageManager","PackageManager","CocoaPodsPackageManager","cwd","silent","env","EXPO_DEBUG","CI","isCLIInstalledAsync","text","stopAndPersist","installCLIAsync","nonInteractive","spawnOptions","options","stdio","error","symbol","chalk","red","CocoaPodsError","Log","log","message","installAsync","spinner","catch","doesProjectUseCocoaPods","isLockfileCreated","podfileLockPath","isPodFolderCreated","podFolderPath","AbortCommandError","promptToInstallPodsAsync","missingPods","length","map","pod","bold","promises","rm","recursive","force"],"mappings":";;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["utils/cocoapods.ts"],"sourcesContent":[null],"names":["hasPackageJsonDependencyListChangedAsync","installCocoaPodsAsync","maybePromptToSyncPodsAsync","PROJECT_PREBUILD_SETTINGS","CACHED_PACKAGE_JSON","getTempPrebuildFolder","projectRoot","path","join","hasNewDependenciesSinceLastBuild","packageChecksums","templateDirectory","tempPkgJsonPath","fs","existsSync","dependencies","devDependencies","JsonFile","read","hasNewDependencies","hasNewDevDependencies","createPackageChecksums","pkg","hashForDependencyMap","getPackageJson","packages","ensureDirectoryAsync","writeAsync","step","logNewSection","process","platform","succeed","packageManager","PackageManager","CocoaPodsPackageManager","cwd","silent","env","EXPO_DEBUG","CI","isCLIInstalledAsync","text","stopAndPersist","installCLIAsync","nonInteractive","spawnOptions","options","stdio","error","symbol","chalk","red","CocoaPodsError","Log","log","message","installAsync","spinner","catch","doesProjectUseCocoaPods","isLockfileCreated","podfileLockPath","isPodFolderCreated","podFolderPath","exp","getConfig","skipSDKVersionRequirement","isSwiftPMEnabled","skipping","getSwiftPMMarkerPath","assertNoSwiftPMMarker","AbortCommandError","promptToInstallPodsAsync","missingPods","length","map","pod","bold","promises","rm","recursive","force"],"mappings":"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"}
|
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
import { type SerializedError } from '2g';
|
|
2
|
+
declare module '2g' {
|
|
3
|
+
interface EventRegistry {
|
|
4
|
+
'cli:error': {
|
|
5
|
+
error: SerializedError;
|
|
6
|
+
};
|
|
7
|
+
}
|
|
8
|
+
}
|
|
1
9
|
/**
|
|
2
10
|
* General error, formatted as a message in red text when caught by expo-cli (no stack trace is printed). Should be used in favor of `log.error()` in most cases.
|
|
3
11
|
*/
|
|
@@ -17,7 +25,7 @@ export declare class AbortCommandError extends CommandError {
|
|
|
17
25
|
export declare class SilentError extends CommandError {
|
|
18
26
|
constructor(messageOrError?: string | Error);
|
|
19
27
|
}
|
|
20
|
-
export declare function logCmdError(error: any): never
|
|
28
|
+
export declare function logCmdError(error: any): Promise<never>;
|
|
21
29
|
/** This should never be thrown in production. */
|
|
22
30
|
export declare class UnimplementedError extends Error {
|
|
23
31
|
constructor();
|
|
@@ -32,6 +32,13 @@ _export(exports, {
|
|
|
32
32
|
return logCmdError;
|
|
33
33
|
}
|
|
34
34
|
});
|
|
35
|
+
function _2g() {
|
|
36
|
+
const data = require("2g");
|
|
37
|
+
_2g = function() {
|
|
38
|
+
return data;
|
|
39
|
+
};
|
|
40
|
+
return data;
|
|
41
|
+
}
|
|
35
42
|
function _assert() {
|
|
36
43
|
const data = require("assert");
|
|
37
44
|
_assert = function() {
|
|
@@ -60,6 +67,7 @@ function _interop_require_default(obj) {
|
|
|
60
67
|
};
|
|
61
68
|
}
|
|
62
69
|
const ERROR_PREFIX = 'Error: ';
|
|
70
|
+
const event = (0, _2g().events)('cli');
|
|
63
71
|
class CommandError extends Error {
|
|
64
72
|
code;
|
|
65
73
|
name = 'CommandError';
|
|
@@ -90,14 +98,20 @@ class SilentError extends CommandError {
|
|
|
90
98
|
}
|
|
91
99
|
}
|
|
92
100
|
}
|
|
93
|
-
function logCmdError(error) {
|
|
101
|
+
async function logCmdError(error) {
|
|
94
102
|
if (!(error instanceof Error)) {
|
|
95
103
|
throw error;
|
|
96
104
|
}
|
|
97
105
|
if (error instanceof AbortCommandError || error instanceof SilentError) {
|
|
98
106
|
// Do nothing, this is used for prompts or other cases that were custom logged.
|
|
107
|
+
await (0, _2g().flushEventLogger)();
|
|
99
108
|
process.exit(1);
|
|
100
|
-
}
|
|
109
|
+
}
|
|
110
|
+
event('error', {
|
|
111
|
+
error: event.error(error)
|
|
112
|
+
});
|
|
113
|
+
await (0, _2g().flushEventLogger)();
|
|
114
|
+
if (error instanceof CommandError || error instanceof _assert().AssertionError || error.name === 'ApiV2Error' || error.name === 'ConfigError') {
|
|
101
115
|
// Print the stack trace in debug mode only.
|
|
102
116
|
(0, _log.exit)(error);
|
|
103
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["utils/errors.ts"],"sourcesContent":[null],"names":["AbortCommandError","CommandError","SilentError","UnimplementedError","logCmdError","ERROR_PREFIX","Error","name","isCommandError","code","message","startsWith","substring","length","messageOrError","stack","error","process","exit","AssertionError","errorDetails","chalk","gray","red","toString","handleTooManyOpenFileErrors","platform","execSync","stdio","warn","exception","on"],"mappings":";;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["utils/errors.ts"],"sourcesContent":[null],"names":["AbortCommandError","CommandError","SilentError","UnimplementedError","logCmdError","ERROR_PREFIX","event","events","Error","name","isCommandError","code","message","startsWith","substring","length","messageOrError","stack","error","flushEventLogger","process","exit","AssertionError","errorDetails","chalk","gray","red","toString","handleTooManyOpenFileErrors","platform","execSync","stdio","warn","exception","on"],"mappings":";;;;;;;;;;;;;;;;;;QAwCaA;eAAAA;;QApBAC;eAAAA;;QA6BAC;eAAAA;;QAyCAC;eAAAA;;QA3BSC;eAAAA;;;;yBA/DyC;;;;;;;yBAChC;;;;;;;gEACb;;;;;;;yBACO;;;;;;qBAEa;;;;;;AAEtC,MAAMC,eAAe;AAQrB,MAAMC,QAAQC,IAAAA,YAAM,EAAC;AAKd,MAAMN,qBAAqBO;;IAChCC,OAAO,eAAe;IACbC,iBAAiB,KAAK;IAG/B,YACE,AAAOC,IAAY,EACnBC,UAAkB,EAAE,CACpB;QACA,KAAK,CAAC,UAHCD,OAAAA;QAIP,uEAAuE;QACvE,wBAAwB;QACxB,IAAIC,QAAQC,UAAU,CAACR,eAAe;YACpCO,UAAUA,QAAQE,SAAS,CAACT,aAAaU,MAAM;QACjD;QAEA,IAAI,CAACH,OAAO,GAAGA,WAAWD;IAC5B;AACF;AAEO,MAAMX,0BAA0BC;IACrC,aAAc;QACZ,KAAK,CAAC,WAAW;IACnB;AACF;AAKO,MAAMC,oBAAoBD;IAC/B,YAAYe,cAA+B,CAAE;QAC3C,MAAMJ,UACJ,AAAC,CAAA,OAAOI,mBAAmB,WAAWA,iBAAiBA,gBAAgBJ,OAAM,KAC7E;QACF,KAAK,CAAC,UAAUA;QAChB,IAAI,OAAOI,mBAAmB,UAAU;YACtC,kHAAkH;YAClH,IAAI,CAACC,KAAK,GAAGD,gBAAgBC,SAAS,IAAI,CAACA,KAAK;YAChD,IAAI,CAACR,IAAI,GAAGO,gBAAgBP,QAAQ,IAAI,CAACA,IAAI;QAC/C;IACF;AACF;AAEO,eAAeL,YAAYc,KAAU;IAC1C,IAAI,CAAEA,CAAAA,iBAAiBV,KAAI,GAAI;QAC7B,MAAMU;IACR;IACA,IAAIA,iBAAiBlB,qBAAqBkB,iBAAiBhB,aAAa;QACtE,+EAA+E;QAC/E,MAAMiB,IAAAA,sBAAgB;QACtBC,QAAQC,IAAI,CAAC;IACf;IACAf,MAAM,SAAS;QAAEY,OAAOZ,MAAMY,KAAK,CAACA;IAAO;IAC3C,MAAMC,IAAAA,sBAAgB;IACtB,IACED,iBAAiBjB,gBACjBiB,iBAAiBI,wBAAc,IAC/BJ,MAAMT,IAAI,KAAK,gBACfS,MAAMT,IAAI,KAAK,eACf;QACA,4CAA4C;QAC5CY,IAAAA,SAAI,EAACH;IACP;IAEA,MAAMK,eAAeL,MAAMD,KAAK,GAAG,OAAOO,gBAAK,CAACC,IAAI,CAACP,MAAMD,KAAK,IAAI;IAEpEI,IAAAA,SAAI,EAACG,gBAAK,CAACE,GAAG,CAACR,MAAMS,QAAQ,MAAMJ;AACrC;AAGO,MAAMpB,2BAA2BK;IACtC,aAAc;QACZ,KAAK,CAAC;QACN,IAAI,CAACC,IAAI,GAAG;IACd;AACF;AAEA;;;;;;;;CAQC,GACD,SAASmB,4BAA4BV,KAAU;IAC7C,4FAA4F;IAC5F,IAAI,UAAUA,SAASA,MAAMP,IAAI,KAAK,YAAYS,QAAQS,QAAQ,KAAK,UAAU;QAC/E,IAAI;YACF,iEAAiE;YACjEC,IAAAA,yBAAQ,EAAC,4BAA4B;gBAAEC,OAAO;YAAS;YACvD,6EAA6E;YAC7ED,IAAAA,yBAAQ,EAAC,0BAA0B;gBAAEC,OAAO;YAAS;YAErDC,IAAAA,SAAI,EACF;QAEJ,EAAE,OAAM;YACNA,IAAAA,SAAI,EACF,CAAC,wJAAwJ,CAAC;QAE9J;QAEAC,IAAAA,cAAS,EAACf;QACVE,QAAQC,IAAI,CAAC;IACf;IAEA,MAAMH;AACR;AAEAE,QAAQc,EAAE,CAAC,qBAAqBN"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
declare module '2g' {
|
|
2
|
+
interface MetadataRegistry {
|
|
3
|
+
/** Absolute project root when it differs from the session working directory. */
|
|
4
|
+
projectRoot: string;
|
|
5
|
+
/** Default dev server is available. Consumers must also check session.alive. */
|
|
6
|
+
ready: boolean;
|
|
7
|
+
/** Default dev server URL, as shown by the non-interactive CLI. */
|
|
8
|
+
devServerUrl: string | null;
|
|
9
|
+
/** Actual local listening port, which may differ from the advertised URL. */
|
|
10
|
+
port: number | null;
|
|
11
|
+
/** Native launch URL; null for servers targeting only web. */
|
|
12
|
+
runtimeUrl: string | null;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
export declare function updateProjectRootMetadata(projectRoot: string): void;
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "updateProjectRootMetadata", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return updateProjectRootMetadata;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
function _2g() {
|
|
12
|
+
const data = require("2g");
|
|
13
|
+
_2g = function() {
|
|
14
|
+
return data;
|
|
15
|
+
};
|
|
16
|
+
return data;
|
|
17
|
+
}
|
|
18
|
+
function _path() {
|
|
19
|
+
const data = /*#__PURE__*/ _interop_require_default(require("path"));
|
|
20
|
+
_path = function() {
|
|
21
|
+
return data;
|
|
22
|
+
};
|
|
23
|
+
return data;
|
|
24
|
+
}
|
|
25
|
+
function _interop_require_default(obj) {
|
|
26
|
+
return obj && obj.__esModule ? obj : {
|
|
27
|
+
default: obj
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
function updateProjectRootMetadata(projectRoot) {
|
|
31
|
+
const resolvedRoot = _path().default.resolve(projectRoot);
|
|
32
|
+
if (resolvedRoot !== process.cwd()) {
|
|
33
|
+
(0, _2g().updateEventLoggerMetadata)({
|
|
34
|
+
projectRoot: resolvedRoot
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
//# sourceMappingURL=metadata.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["utils/metadata.ts"],"sourcesContent":[null],"names":["updateProjectRootMetadata","projectRoot","resolvedRoot","path","resolve","process","cwd","updateEventLoggerMetadata"],"mappings":";;;;+BAkBgBA;;;eAAAA;;;;yBAlB0B;;;;;;;gEACzB;;;;;;;;;;;AAiBV,SAASA,0BAA0BC,WAAmB;IAC3D,MAAMC,eAAeC,eAAI,CAACC,OAAO,CAACH;IAClC,IAAIC,iBAAiBG,QAAQC,GAAG,IAAI;QAClCC,IAAAA,+BAAyB,EAAC;YAAEN,aAAaC;QAAa;IACxD;AACF"}
|
|
@@ -60,6 +60,7 @@ function _nodepath() {
|
|
|
60
60
|
const _env1 = require("./env");
|
|
61
61
|
const _errors = require("./errors");
|
|
62
62
|
const _interactive = require("./interactive");
|
|
63
|
+
const _metadata = require("./metadata");
|
|
63
64
|
function _interop_require_default(obj) {
|
|
64
65
|
return obj && obj.__esModule ? obj : {
|
|
65
66
|
default: obj
|
|
@@ -132,6 +133,7 @@ function getConfigEnvMode() {
|
|
|
132
133
|
}
|
|
133
134
|
let prevEnvKeys;
|
|
134
135
|
function loadEnvFiles(projectRoot, options) {
|
|
136
|
+
(0, _metadata.updateProjectRootMetadata)(projectRoot);
|
|
135
137
|
setNodeEnv(options.mode);
|
|
136
138
|
const params = {
|
|
137
139
|
...options,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["utils/nodeEnv.ts"],"sourcesContent":[null],"names":["event","getConfigEnvMode","getEnvFiles","loadEnvFiles","reloadEnvFiles","setNodeEnv","events","relativeFiles","files","toJSON","map","file","path","mode","env","process","BABEL_ENV","globalThis","__DEV__","nodeEnv","babelEnv","consumeConfigEnvMode","cliEnv","EAS_BUILD","error","CommandError","Error","message","prevEnvKeys","projectRoot","options","params","silent","shouldReduceLogs","force","systemEnv","envInfo","loadProjectEnv","envOutput","result","Set","key","loaded","undefined","add","keys","Object","logLoadedEnv","fileName","join","isEnabled","parseProjectEnv","value","has"],"mappings":";;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["utils/nodeEnv.ts"],"sourcesContent":[null],"names":["event","getConfigEnvMode","getEnvFiles","loadEnvFiles","reloadEnvFiles","setNodeEnv","events","relativeFiles","files","toJSON","map","file","path","mode","env","process","BABEL_ENV","globalThis","__DEV__","nodeEnv","babelEnv","consumeConfigEnvMode","cliEnv","EAS_BUILD","error","CommandError","Error","message","prevEnvKeys","projectRoot","options","updateProjectRootMetadata","params","silent","shouldReduceLogs","force","systemEnv","envInfo","loadProjectEnv","envOutput","result","Set","key","loaded","undefined","add","keys","Object","logLoadedEnv","fileName","join","isEnabled","parseProjectEnv","value","has"],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ class FetchClient {
|
|
|
29
29
|
this.headers = {
|
|
30
30
|
accept: 'application/json',
|
|
31
31
|
'content-type': 'application/json',
|
|
32
|
-
'user-agent': `expo-cli/${"58.1.
|
|
32
|
+
'user-agent': `expo-cli/${"58.1.8"}`,
|
|
33
33
|
authorization: 'Basic ' + _nodebuffer().Buffer.from(`${target}:`).toString('base64')
|
|
34
34
|
};
|
|
35
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["utils/telemetry/clients/FetchClient.ts"],"sourcesContent":[null],"names":["FetchClient","strategy","fetch","url","headers","entries","Set","createTelemetryFetch","TELEMETRY_ENDPOINT","target","TELEMETRY_TARGET","accept","authorization","Buffer","from","toString","queue","records","controller","request","entry","mutePromise","finally","delete","add","record","Array","isArray","length","AbortController","body","JSON","stringify","sentAt","Date","batch","method","signal","flush","Promise","all","abort","forEach","push","telemetryFetch","info","init","error","attemptCount","_error","promise","then"],"mappings":";;;;+BAuBaA;;;eAAAA;;;;yBAtBU;;;;;;uBAED;2BAE+B;AAkB9C,MAAMA;IACX,yDAAyD,GACzD,AAASC,WAAoC,UAAU;IACvD,kEAAkE,GAClE,AAAQC,MAAa;IACrB,mCAAmC,GACnC,AAAQC,IAAY;IACpB,gDAAgD,GAChD,AAAQC,QAAgC;IACxC,+CAA+C,GAC/C,AAAQC,UAAiC,IAAIC,MAAM;IAEnD,YAAY,EACVJ,QAAQK,sBAAsB,EAC9BJ,MAAMK,6BAAkB,EACxBC,SAASC,2BAAgB,EACN,GAAG,CAAC,CAAC,CAAE;QAC1B,IAAI,CAACR,KAAK,GAAGA;QACb,IAAI,CAACC,GAAG,GAAGA;QACX,IAAI,CAACC,OAAO,GAAG;YACbO,QAAQ;YACR,gBAAgB;YAChB,cAAc,CAAC,SAAS,
|
|
1
|
+
{"version":3,"sources":["utils/telemetry/clients/FetchClient.ts"],"sourcesContent":[null],"names":["FetchClient","strategy","fetch","url","headers","entries","Set","createTelemetryFetch","TELEMETRY_ENDPOINT","target","TELEMETRY_TARGET","accept","authorization","Buffer","from","toString","queue","records","controller","request","entry","mutePromise","finally","delete","add","record","Array","isArray","length","AbortController","body","JSON","stringify","sentAt","Date","batch","method","signal","flush","Promise","all","abort","forEach","push","telemetryFetch","info","init","error","attemptCount","_error","promise","then"],"mappings":";;;;+BAuBaA;;;eAAAA;;;;yBAtBU;;;;;;uBAED;2BAE+B;AAkB9C,MAAMA;IACX,yDAAyD,GACzD,AAASC,WAAoC,UAAU;IACvD,kEAAkE,GAClE,AAAQC,MAAa;IACrB,mCAAmC,GACnC,AAAQC,IAAY;IACpB,gDAAgD,GAChD,AAAQC,QAAgC;IACxC,+CAA+C,GAC/C,AAAQC,UAAiC,IAAIC,MAAM;IAEnD,YAAY,EACVJ,QAAQK,sBAAsB,EAC9BJ,MAAMK,6BAAkB,EACxBC,SAASC,2BAAgB,EACN,GAAG,CAAC,CAAC,CAAE;QAC1B,IAAI,CAACR,KAAK,GAAGA;QACb,IAAI,CAACC,GAAG,GAAGA;QACX,IAAI,CAACC,OAAO,GAAG;YACbO,QAAQ;YACR,gBAAgB;YAChB,cAAc,CAAC,SAAS,EA/BO,UA+BuB;YACtDC,eAAe,WAAWC,oBAAM,CAACC,IAAI,CAAC,GAAGL,OAAO,CAAC,CAAC,EAAEM,QAAQ,CAAC;QAC/D;IACF;IAEQC,MACNC,OAAkC,EAClCC,UAA2B,EAC3BC,OAAiC,EACjC;QACA,MAAMC,QAA0BC,YAAYF;QAC5CC,MAAME,OAAO,CAAC,IAAM,IAAI,CAACjB,OAAO,CAACkB,MAAM,CAACH;QACxCA,MAAMF,UAAU,GAAGA;QACnBE,MAAMH,OAAO,GAAGA;QAEhB,IAAI,CAACZ,OAAO,CAACmB,GAAG,CAACJ;QAEjB,OAAOA;IACT;IAEAK,OAAOA,MAAiC,EAAE;QACxC,MAAMR,UAAUS,MAAMC,OAAO,CAACF,UAAUA,SAAS;YAACA;SAAO;QAEzD,IAAI,CAACR,QAAQW,MAAM,EAAE;QAErB,MAAMV,aAAa,IAAIW;QACvB,MAAMC,OAAOC,KAAKC,SAAS,CAAC;YAC1BC,QAAQ,IAAIC;YACZC,OAAOlB;QACT;QAEA,OAAO,IAAI,CAACD,KAAK,CACfC,SACAC,YACA,IAAI,CAAChB,KAAK,CAAC,IAAI,CAACC,GAAG,EAAE;YACnB2B;YACAM,QAAQ;YACRC,QAAQnB,WAAWmB,MAAM;YACzBjC,SAAS,IAAI,CAACA,OAAO;QACvB;IAEJ;IAEAkC,QAAQ;QACN,OAAOjB,YAAYkB,QAAQC,GAAG,CAAC,IAAI,CAACnC,OAAO;IAC7C;IAEAoC,QAAQ;QACN,MAAMxB,UAAqC,EAAE;QAE7C,IAAI,CAACZ,OAAO,CAACqC,OAAO,CAAC,CAACtB;YACpB,IAAI;gBACFA,MAAMF,UAAU,CAACuB,KAAK;gBACtBxB,QAAQ0B,IAAI,IAAIvB,MAAMH,OAAO;YAC/B,EAAE,OAAM;YACN,sBAAsB;YACxB;QACF;QAEA,OAAOA;IACT;AACF;AAEA,SAASV;IACP,OAAO,eAAeqC,eAAeC,IAAI,EAAEC,IAAI;QAC7C,IAAIC;QACJ,IAAK,IAAIC,eAAe,GAAGA,eAAe,GAAGA,eAAgB;YAC3D,IAAI;gBACF,OAAO,MAAM9C,IAAAA,YAAK,EAAC2C,MAAMC;YAC3B,EAAE,OAAOG,QAAa;gBACpBF,QAAQE;YACV;QACF;QACA,MAAMF;IACR;AACF;AAEA,wEAAwE,GACxE,SAAS1B,YAAY6B,OAAqB;IACxC,OAAOA,QAAQC,IAAI,CACjB,KAAO,GACP,KAAO;AAEX"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["utils/telemetry/utils/context.ts"],"sourcesContent":[null],"names":["createContext","os","name","platform","version","release","node","process","versions","device","arch","memory","summarizeMemory","cpu","summarizeCpuInfo","app","ci","ciInfo","isCI","isPr","isPR","undefined","gb","totalmem","Math","round","cpus","groupBy","item","model","summary","speed","count","key","length"],"mappings":";;;;+BAKgBA;;;eAAAA;;;;iEALQ;;;;;;;gEACT;;;;;;uBAES;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEjB,SAASA;IACd,OAAO;QACLC,IAAI;YAAEC,MAAMD,aAAE,CAACE,QAAQ;YAAIC,SAASH,aAAE,CAACI,OAAO;YAAIC,MAAMC,QAAQC,QAAQ,CAACF,IAAI;QAAC;QAC9EG,QAAQ;YAAEC,MAAMT,aAAE,CAACS,IAAI;YAAIC,QAAQC;QAAkB;QACrDC,KAAKC;QACLC,KAAK;YAAEb,MAAM;YAAYE,
|
|
1
|
+
{"version":3,"sources":["utils/telemetry/utils/context.ts"],"sourcesContent":[null],"names":["createContext","os","name","platform","version","release","node","process","versions","device","arch","memory","summarizeMemory","cpu","summarizeCpuInfo","app","ci","ciInfo","isCI","isPr","isPR","undefined","gb","totalmem","Math","round","cpus","groupBy","item","model","summary","speed","count","key","length"],"mappings":";;;;+BAKgBA;;;eAAAA;;;;iEALQ;;;;;;;gEACT;;;;;;uBAES;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEjB,SAASA;IACd,OAAO;QACLC,IAAI;YAAEC,MAAMD,aAAE,CAACE,QAAQ;YAAIC,SAASH,aAAE,CAACI,OAAO;YAAIC,MAAMC,QAAQC,QAAQ,CAACF,IAAI;QAAC;QAC9EG,QAAQ;YAAEC,MAAMT,aAAE,CAACS,IAAI;YAAIC,QAAQC;QAAkB;QACrDC,KAAKC;QACLC,KAAK;YAAEb,MAAM;YAAYE,SAOxB;QAP4D;QAC7DY,IAAIC,UAAOC,IAAI,GAAG;YAAEhB,MAAMe,UAAOf,IAAI;YAAEiB,MAAMF,UAAOG,IAAI;QAAC,IAAIC;IAC/D;AACF;AAEA,SAAST;IACP,MAAMU,KAAKrB,aAAE,CAACsB,QAAQ,KAAK,OAAO,OAAO;IACzC,OAAOC,KAAKC,KAAK,CAACH,KAAK,OAAO;AAChC;AAEA,SAASR;IACP,MAAMY,OAAOC,IAAAA,cAAO,EAAC1B,aAAE,CAACyB,IAAI,MAAM,EAAE,EAAE,CAACE,OAASA,KAAKC,KAAK;IAC1D,MAAMC,UAAU;QAAED,OAAO;QAAIE,OAAO;QAAGC,OAAO;IAAE;IAEhD,IAAK,MAAMC,OAAOP,KAAM;QACtB,IAAIA,IAAI,CAACO,IAAI,CAAEC,MAAM,GAAGJ,QAAQE,KAAK,EAAE;YACrCF,QAAQD,KAAK,GAAGI;YAChBH,QAAQC,KAAK,GAAGL,IAAI,CAACO,IAAI,AAAC,CAAC,EAAE,EAAEF,SAAS;YACxCD,QAAQE,KAAK,GAAGN,IAAI,CAACO,IAAI,CAAEC,MAAM;QACnC;IACF;IAEA,OAAO,CAACJ,QAAQD,KAAK,IAAI,CAACC,QAAQE,KAAK,GAAGX,YAAYS;AACxD"}
|