@expo/cli 58.1.0 → 58.1.1
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/README.md +1 -1
- package/build/src/api/rest/wrapFetchWithUserAgent.js +1 -1
- package/build/src/expoUpdatesExports.d.ts +0 -1
- package/build/src/expoUpdatesExports.js +0 -5
- package/build/src/expoUpdatesExports.js.map +1 -1
- package/build/src/export/metroAssetLocalPath.d.ts +0 -1
- package/build/src/export/metroAssetLocalPath.js +9 -58
- package/build/src/export/metroAssetLocalPath.js.map +1 -1
- package/build/src/export/persistMetroAssets.js +10 -16
- package/build/src/export/persistMetroAssets.js.map +1 -1
- package/build/src/index.js +2 -2
- package/build/src/start/server/metro/withMetroMultiPlatform.d.ts +1 -1
- package/build/src/start/server/metro/withMetroMultiPlatform.js +3 -2
- package/build/src/start/server/metro/withMetroMultiPlatform.js.map +1 -1
- package/build/src/start/server/middleware/CorsMiddleware.js +1 -1
- package/build/src/start/server/middleware/CorsMiddleware.js.map +1 -1
- package/build/src/utils/expoUpdatesCli.js +10 -3
- package/build/src/utils/expoUpdatesCli.js.map +1 -1
- package/build/src/utils/telemetry/clients/FetchClient.js +1 -1
- package/build/src/utils/telemetry/utils/context.js +1 -1
- package/internal/unstable-expo-updates-exports.d.ts +0 -2
- package/package.json +8 -7
package/README.md
CHANGED
|
@@ -129,7 +129,7 @@ There are three testing scripts:
|
|
|
129
129
|
- When testing a function, pass the function to the `describe` block instead of a stringified function name:
|
|
130
130
|
- `describe(foobar, () => {})` instead of `describe('foobar', () => {})`
|
|
131
131
|
- Use virtual `fs` via `memfs` whenever possible.
|
|
132
|
-
- We have a lot of global module [**mocks**](./
|
|
132
|
+
- We have a lot of global module [**mocks**](./jest.setup.ts) already in place, consider them when writing tests.
|
|
133
133
|
- GitHub Copilot can make writing tests a little less tedious.
|
|
134
134
|
|
|
135
135
|
### E2E Testing Guidelines
|
|
@@ -25,7 +25,7 @@ function wrapFetchWithUserAgent(fetch) {
|
|
|
25
25
|
return (url, init = {})=>{
|
|
26
26
|
const headers = new _fetch.Headers(init.headers);
|
|
27
27
|
// Version is added in the build script
|
|
28
|
-
headers.append('User-Agent', `expo-cli/${"58.1.
|
|
28
|
+
headers.append('User-Agent', `expo-cli/${"58.1.1"}`);
|
|
29
29
|
init.headers = headers;
|
|
30
30
|
return fetch(url, init);
|
|
31
31
|
};
|
|
@@ -1,4 +1,3 @@
|
|
|
1
1
|
import { createMetroServerAndBundleRequestAsync as internal_createMetroServerAndBundleRequestAsync } from './export/embed/exportEmbedAsync';
|
|
2
|
-
export { drawableFileTypes } from './export/metroAssetLocalPath';
|
|
3
2
|
export { exportEmbedAssetsAsync } from './export/embed/exportEmbedAsync';
|
|
4
3
|
export declare const createMetroServerAndBundleRequestAsync: typeof internal_createMetroServerAndBundleRequestAsync;
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
0 && (module.exports = {
|
|
8
8
|
createMetroServerAndBundleRequestAsync: null,
|
|
9
|
-
drawableFileTypes: null,
|
|
10
9
|
exportEmbedAssetsAsync: null
|
|
11
10
|
});
|
|
12
11
|
function _export(target, all) {
|
|
@@ -19,9 +18,6 @@ _export(exports, {
|
|
|
19
18
|
get createMetroServerAndBundleRequestAsync () {
|
|
20
19
|
return createMetroServerAndBundleRequestAsync;
|
|
21
20
|
},
|
|
22
|
-
get drawableFileTypes () {
|
|
23
|
-
return _metroAssetLocalPath.drawableFileTypes;
|
|
24
|
-
},
|
|
25
21
|
get exportEmbedAssetsAsync () {
|
|
26
22
|
return _exportEmbedAsync.exportEmbedAssetsAsync;
|
|
27
23
|
}
|
|
@@ -48,7 +44,6 @@ function _nodepath() {
|
|
|
48
44
|
return data;
|
|
49
45
|
}
|
|
50
46
|
const _exportEmbedAsync = require("./export/embed/exportEmbedAsync");
|
|
51
|
-
const _metroAssetLocalPath = require("./export/metroAssetLocalPath");
|
|
52
47
|
function _interop_require_default(obj) {
|
|
53
48
|
return obj && obj.__esModule ? obj : {
|
|
54
49
|
default: obj
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["expoUpdatesExports.ts"],"sourcesContent":[null],"names":["createMetroServerAndBundleRequestAsync","
|
|
1
|
+
{"version":3,"sources":["expoUpdatesExports.ts"],"sourcesContent":[null],"names":["createMetroServerAndBundleRequestAsync","exportEmbedAssetsAsync","fixupServerRelativePath","projectRoot","entryFile","serverRoot","getMetroServerRoot","path","isAbsolute","candidate","fs","existsSync","resolve","endsWith","options","internal_createMetroServerAndBundleRequestAsync"],"mappings":"AAAA,oHAAoH;AACpH,kHAAkH;;;;;;;;;;;;;;;;QA4BrGA;eAAAA;;QAnBJC;eAAAA,wCAAsB;;;;yBAPI;;;;;;;gEACpB;;;;;;;gEACE;;;;;;kCAEyF;;;;;;AAK1G,qLAAqL,GACrL,SAASC,wBAAwBC,WAAmB,EAAEC,SAAiB;IACrE,MAAMC,aAAaC,IAAAA,2BAAkB,EAACH;IACtC,IAAI,CAACI,mBAAI,CAACC,UAAU,CAACJ,YAAY;QAC/B,IAAIK;QACJ,IAAIC,iBAAE,CAACC,UAAU,CAAEF,YAAYF,mBAAI,CAACK,OAAO,CAACP,YAAYD,aAAc;YACpEA,YAAYK;QACd,OAAO,IACL,CAACL,UAAUS,QAAQ,CAAC,UACpBH,iBAAE,CAACC,UAAU,CAAEF,YAAYF,mBAAI,CAACK,OAAO,CAACP,YAAYD,YAAY,SAChE;YACAA,YAAYK;QACd;IACF;IACA,OAAOL;AACT;AAEO,MAAMJ,yCACX,OAAOG,aAAaW;IAClB,OAAO,MAAMC,IAAAA,wDAA+C,EAACZ,aAAa;QACxE,GAAGW,OAAO;QACVV,WAAWF,wBAAwBC,aAAaW,QAAQV,SAAS;IACnE;AACF"}
|
|
@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
12
12
|
value: true
|
|
13
13
|
});
|
|
14
14
|
0 && (module.exports = {
|
|
15
|
-
drawableFileTypes: null,
|
|
16
15
|
getAssetLocalPath: null,
|
|
17
16
|
stripAssetPrefix: null
|
|
18
17
|
});
|
|
@@ -23,9 +22,6 @@ function _export(target, all) {
|
|
|
23
22
|
});
|
|
24
23
|
}
|
|
25
24
|
_export(exports, {
|
|
26
|
-
get drawableFileTypes () {
|
|
27
|
-
return drawableFileTypes;
|
|
28
|
-
},
|
|
29
25
|
get getAssetLocalPath () {
|
|
30
26
|
return getAssetLocalPath;
|
|
31
27
|
},
|
|
@@ -33,6 +29,13 @@ _export(exports, {
|
|
|
33
29
|
return stripAssetPrefix;
|
|
34
30
|
}
|
|
35
31
|
});
|
|
32
|
+
function _assetutils() {
|
|
33
|
+
const data = require("@react-native/asset-utils");
|
|
34
|
+
_assetutils = function() {
|
|
35
|
+
return data;
|
|
36
|
+
};
|
|
37
|
+
return data;
|
|
38
|
+
}
|
|
36
39
|
function _path() {
|
|
37
40
|
const data = /*#__PURE__*/ _interop_require_default(require("path"));
|
|
38
41
|
_path = function() {
|
|
@@ -58,8 +61,8 @@ function getAssetLocalPath(asset, { baseUrl, scale, platform }) {
|
|
|
58
61
|
});
|
|
59
62
|
}
|
|
60
63
|
function getAssetLocalPathAndroid(asset, { baseUrl, scale }) {
|
|
61
|
-
const androidFolder = getAndroidResourceFolderName(asset, scale);
|
|
62
|
-
const fileName =
|
|
64
|
+
const androidFolder = (0, _assetutils().getAndroidResourceFolderName)(asset, scale);
|
|
65
|
+
const fileName = (0, _assetutils().getAndroidResourceIdentifier)(asset);
|
|
63
66
|
return _path().default.join(androidFolder, `${fileName}.${asset.type}`);
|
|
64
67
|
}
|
|
65
68
|
function getAssetLocalPathDefault(asset, { baseUrl, scale }) {
|
|
@@ -79,57 +82,5 @@ function stripAssetPrefix(path, baseUrl) {
|
|
|
79
82
|
}
|
|
80
83
|
return path;
|
|
81
84
|
}
|
|
82
|
-
/**
|
|
83
|
-
* FIXME: using number to represent discrete scale numbers is fragile in essence because of
|
|
84
|
-
* floating point numbers imprecision.
|
|
85
|
-
*/ function getAndroidAssetSuffix(scale) {
|
|
86
|
-
switch(scale){
|
|
87
|
-
case 0.75:
|
|
88
|
-
return 'ldpi';
|
|
89
|
-
case 1:
|
|
90
|
-
return 'mdpi';
|
|
91
|
-
case 1.5:
|
|
92
|
-
return 'hdpi';
|
|
93
|
-
case 2:
|
|
94
|
-
return 'xhdpi';
|
|
95
|
-
case 3:
|
|
96
|
-
return 'xxhdpi';
|
|
97
|
-
case 4:
|
|
98
|
-
return 'xxxhdpi';
|
|
99
|
-
default:
|
|
100
|
-
return null;
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
const drawableFileTypes = new Set([
|
|
104
|
-
'gif',
|
|
105
|
-
'jpeg',
|
|
106
|
-
'jpg',
|
|
107
|
-
'png',
|
|
108
|
-
'webp',
|
|
109
|
-
'xml'
|
|
110
|
-
]);
|
|
111
|
-
function getAndroidResourceFolderName(asset, scale) {
|
|
112
|
-
if (!drawableFileTypes.has(asset.type)) {
|
|
113
|
-
return 'raw';
|
|
114
|
-
}
|
|
115
|
-
const suffix = getAndroidAssetSuffix(scale);
|
|
116
|
-
if (!suffix) {
|
|
117
|
-
throw new Error(`Asset "${JSON.stringify(asset)}" does not use a supported Android resolution suffix`);
|
|
118
|
-
}
|
|
119
|
-
return `drawable-${suffix}`;
|
|
120
|
-
}
|
|
121
|
-
function getResourceIdentifier(asset) {
|
|
122
|
-
const folderPath = getBaseUrl(asset);
|
|
123
|
-
return `${folderPath}/${asset.name}`.toLowerCase().replace(/\//g, '_') // Encode folder structure in file name
|
|
124
|
-
.replace(/([^a-z0-9_])/g, '') // Remove illegal chars
|
|
125
|
-
.replace(/^assets_/, ''); // Remove "assets_" prefix
|
|
126
|
-
}
|
|
127
|
-
function getBaseUrl(asset) {
|
|
128
|
-
let baseUrl = asset.httpServerLocation;
|
|
129
|
-
if (baseUrl[0] === '/') {
|
|
130
|
-
baseUrl = baseUrl.substring(1);
|
|
131
|
-
}
|
|
132
|
-
return baseUrl;
|
|
133
|
-
}
|
|
134
85
|
|
|
135
86
|
//# sourceMappingURL=metroAssetLocalPath.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["export/metroAssetLocalPath.ts"],"sourcesContent":[null],"names":["
|
|
1
|
+
{"version":3,"sources":["export/metroAssetLocalPath.ts"],"sourcesContent":[null],"names":["getAssetLocalPath","stripAssetPrefix","asset","baseUrl","scale","platform","getAssetLocalPathAndroid","getAssetLocalPathDefault","androidFolder","getAndroidResourceFolderName","fileName","getAndroidResourceIdentifier","path","join","type","suffix","name","adjustedHttpServerLocation","httpServerLocation","replace","RegExp"],"mappings":"AAAA;;;;;;;;;CASC;;;;;;;;;;;;;;;QAQeA;eAAAA;;QA4CAC;eAAAA;;;;yBA/CT;;;;;;;gEACU;;;;;;;;;;;AAEV,SAASD,kBACdE,KAA8D,EAC9D,EAAEC,OAAO,EAAEC,KAAK,EAAEC,QAAQ,EAAyD;IAEnF,IAAIA,aAAa,WAAW;QAC1B,OAAOC,yBAAyBJ,OAAO;YAAEC;YAASC;QAAM;IAC1D;IACA,OAAOG,yBAAyBL,OAAO;QAAEC;QAASC;IAAM;AAC1D;AAEA,SAASE,yBACPJ,KAA8D,EAC9D,EACEC,OAAO,EACPC,KAAK,EAKN;IAED,MAAMI,gBAAgBC,IAAAA,0CAA4B,EAACP,OAAOE;IAC1D,MAAMM,WAAWC,IAAAA,0CAA4B,EAACT;IAC9C,OAAOU,eAAI,CAACC,IAAI,CAACL,eAAe,GAAGE,SAAS,CAAC,EAAER,MAAMY,IAAI,EAAE;AAC7D;AAEA,SAASP,yBACPL,KAA8D,EAC9D,EAAEC,OAAO,EAAEC,KAAK,EAAuC;IAEvD,MAAMW,SAASX,UAAU,IAAI,KAAK,CAAC,CAAC,EAAEA,MAAM,CAAC,CAAC;IAC9C,MAAMM,WAAW,GAAGR,MAAMc,IAAI,GAAGD,OAAO,CAAC,EAAEb,MAAMY,IAAI,EAAE;IAEvD,MAAMG,6BAA6BhB,iBAAiBC,MAAMgB,kBAAkB,EAAEf;IAE9E,OAAOS,eAAI,CAACC,IAAI,CACd,8DAA8D;IAC9D,mEAAmE;IACnE,iCAAiC;IACjCI,2BAA2BE,OAAO,CAAC,SAAS,IAAIA,OAAO,CAAC,WAAW,MACnET;AAEJ;AAEO,SAAST,iBAAiBW,IAAY,EAAET,OAAgB;IAC7DS,OAAOA,KAAKO,OAAO,CAAC,8BAA8B;IAElD,iBAAiB;IACjB,IAAIhB,SAAS;QACX,OAAOS,KAAKO,OAAO,CAAC,SAAS,IAAIA,OAAO,CACtC,IAAIC,OACF,CAAC,CAAC,EAAEjB,QACDgB,OAAO,CAAC,SAAS,IACjBA,OAAO,CAAC,uBAAuB,QAC/BA,OAAO,CAAC,MAAM,UAAU,EAC3B,MAEF;IAEJ;IACA,OAAOP;AACT"}
|
|
@@ -45,6 +45,13 @@ _export(exports, {
|
|
|
45
45
|
return persistMetroAssetsAsync;
|
|
46
46
|
}
|
|
47
47
|
});
|
|
48
|
+
function _assetutils() {
|
|
49
|
+
const data = require("@react-native/asset-utils");
|
|
50
|
+
_assetutils = function() {
|
|
51
|
+
return data;
|
|
52
|
+
};
|
|
53
|
+
return data;
|
|
54
|
+
}
|
|
48
55
|
function _fs() {
|
|
49
56
|
const data = /*#__PURE__*/ _interop_require_default(require("fs"));
|
|
50
57
|
_fs = function() {
|
|
@@ -147,8 +154,8 @@ async function createKeepFileAsync(assets, outputDirectory) {
|
|
|
147
154
|
}
|
|
148
155
|
const assetsList = [];
|
|
149
156
|
for (const asset of assets){
|
|
150
|
-
const prefix =
|
|
151
|
-
assetsList.push(`@${prefix}/${
|
|
157
|
+
const prefix = _assetutils().drawableFileTypes.has(asset.type) ? 'drawable' : 'raw';
|
|
158
|
+
assetsList.push(`@${prefix}/${(0, _assetutils().getAndroidResourceIdentifier)(asset)}`);
|
|
152
159
|
}
|
|
153
160
|
const keepPath = _path().default.join(outputDirectory, 'raw/keep.xml');
|
|
154
161
|
const content = `<resources xmlns:tools="http://schemas.android.com/tools" tools:keep="${assetsList.join(',')}" />`;
|
|
@@ -215,7 +222,7 @@ function getCatalogImages(asset) {
|
|
|
215
222
|
return images;
|
|
216
223
|
}
|
|
217
224
|
function getImageSet(catalogDir, asset) {
|
|
218
|
-
const fileName =
|
|
225
|
+
const fileName = (0, _assetutils().getAndroidResourceIdentifier)(asset);
|
|
219
226
|
return {
|
|
220
227
|
baseUrl: _path().default.join(catalogDir, `${fileName}.imageset`),
|
|
221
228
|
files: getCatalogImages(asset).map(({ scale, src })=>{
|
|
@@ -297,18 +304,5 @@ function filterPlatformAssetScales(platform, scales) {
|
|
|
297
304
|
}
|
|
298
305
|
return result;
|
|
299
306
|
}
|
|
300
|
-
function getResourceIdentifier(asset) {
|
|
301
|
-
const folderPath = getBaseUrl(asset);
|
|
302
|
-
return `${folderPath}/${asset.name}`.toLowerCase().replace(/\//g, '_') // Encode folder structure in file name
|
|
303
|
-
.replace(/([^a-z0-9_])/g, '') // Remove illegal chars
|
|
304
|
-
.replace(/^assets_/, ''); // Remove "assets_" prefix
|
|
305
|
-
}
|
|
306
|
-
function getBaseUrl(asset) {
|
|
307
|
-
let baseUrl = asset.httpServerLocation;
|
|
308
|
-
if (baseUrl[0] === '/') {
|
|
309
|
-
baseUrl = baseUrl.substring(1);
|
|
310
|
-
}
|
|
311
|
-
return baseUrl;
|
|
312
|
-
}
|
|
313
307
|
|
|
314
308
|
//# sourceMappingURL=persistMetroAssets.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["export/persistMetroAssets.ts"],"sourcesContent":[null],"names":["copyInBatchesAsync","createKeepFileAsync","filterPlatformAssetScales","getAssetIdForLogGrouping","getCatalogImages","persistMetroAssetsAsync","cleanAssetCatalog","catalogDir","files","fs","readdirSync","filter","file","endsWith","rmSync","path","join","projectRoot","assets","platform","outputDirectory","baseUrl","iosAssetCatalogDirectory","Log","warn","existsSync","mkdirSync","recursive","assetsToCopy","error","log","asset","isCatalogAsset","writeImageSet","getImageSet","push","batches","validScales","Set","scales","idx","length","scale","has","src","dest","getAssetLocalPath","data","promises","readFile","set","contents","assetId","targetDomain","undefined","assetsList","prefix","drawableFileTypes","type","
|
|
1
|
+
{"version":3,"sources":["export/persistMetroAssets.ts"],"sourcesContent":[null],"names":["copyInBatchesAsync","createKeepFileAsync","filterPlatformAssetScales","getAssetIdForLogGrouping","getCatalogImages","persistMetroAssetsAsync","cleanAssetCatalog","catalogDir","files","fs","readdirSync","filter","file","endsWith","rmSync","path","join","projectRoot","assets","platform","outputDirectory","baseUrl","iosAssetCatalogDirectory","Log","warn","existsSync","mkdirSync","recursive","assetsToCopy","error","log","asset","isCatalogAsset","writeImageSet","getImageSet","push","batches","validScales","Set","scales","idx","length","scale","has","src","dest","getAssetLocalPath","data","promises","readFile","set","contents","assetId","targetDomain","undefined","assetsList","prefix","drawableFileTypes","type","getAndroidResourceIdentifier","keepPath","content","mkdir","dirname","writeFile","fileSystemLocation","name","relative","imageSet","copyFileSync","writeFileSync","JSON","stringify","images","map","filename","idiom","info","author","version","forEach","CATALOG_SCALES","includes","findIndex","MAX_CATALOG_SCALE","assetScale","Math","min","max","ceil","fileName","suffix","filesToCopy","queue","Object","keys","Promise","resolve","reject","copyNext","shift","copy","callback","err","createReadStream","pipe","createWriteStream","on","ALLOWED_SCALES","ios","whitelist","result","maxScale"],"mappings":"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"}
|
package/build/src/index.js
CHANGED
|
@@ -89,11 +89,11 @@ const commandArgs = isSubcommand ? args._.slice(1) : args._;
|
|
|
89
89
|
// LOG_EVENTS targets, parent IPC, and bounded command sessions in 2g's precedence order.
|
|
90
90
|
(0, _2g().installEventLogger)({
|
|
91
91
|
command: args['--version'] ? 'expo --version' : args['--help'] && !isSubcommand ? 'expo --help' : `expo ${command}`,
|
|
92
|
-
version: "58.1.
|
|
92
|
+
version: "58.1.1"
|
|
93
93
|
});
|
|
94
94
|
if (args['--version']) {
|
|
95
95
|
// Version is added in the build script.
|
|
96
|
-
console.log("58.1.
|
|
96
|
+
console.log("58.1.1");
|
|
97
97
|
process.exit(0);
|
|
98
98
|
}
|
|
99
99
|
if (args['--non-interactive']) {
|
|
@@ -18,7 +18,7 @@ export declare function getNodejsExtensions(srcExts: readonly string[]): string[
|
|
|
18
18
|
* Apply custom resolvers to do the following:
|
|
19
19
|
* - Disable `.native.js` extensions on web.
|
|
20
20
|
* - Alias `react-native` to `react-native-web` on web.
|
|
21
|
-
* - Redirect `react-native-web/dist/modules/AssetRegistry/index.js` to
|
|
21
|
+
* - Redirect `react-native-web/dist/modules/AssetRegistry/index.js` to the shared virtual asset registry module on web.
|
|
22
22
|
* - Add support for `tsconfig.json`/`jsconfig.json` aliases via `compilerOptions.paths`.
|
|
23
23
|
*/
|
|
24
24
|
export declare function withExtendedResolver(config: ConfigT, { autolinkingModuleResolverInput, isTsconfigPathsEnabled, isExporting, isReactServerComponentsEnabled, getMetroBundler, }: {
|
|
@@ -531,8 +531,9 @@ function withExtendedResolver(config, { autolinkingModuleResolverInput, isTsconf
|
|
|
531
531
|
// Redirect every asset registry request to the virtual registry module so all consumers
|
|
532
532
|
// share one instance: Metro's generated asset modules (`assetRegistryPath`), imports of
|
|
533
533
|
// `react-native/asset-registry`, and imports of the legacy `@react-native/assets-registry`
|
|
534
|
-
// package, which no longer
|
|
535
|
-
|
|
534
|
+
// package and `react-native/Libraries/Image/AssetRegistry` module, which no longer ship
|
|
535
|
+
// with react-native 0.87.
|
|
536
|
+
if (moduleName === config.transformer.assetRegistryPath || moduleName === 'react-native/asset-registry' || /^@react-native\/assets-registry\/registry(\.js)?$/.test(moduleName) || /^react-native\/Libraries\/Image\/AssetRegistry(\.js)?$/.test(moduleName)) {
|
|
536
537
|
return getAssetRegistryModule();
|
|
537
538
|
}
|
|
538
539
|
// react-native core imports its registry singleton through relative paths (e.g.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["start/server/metro/withMetroMultiPlatform.ts"],"sourcesContent":[null],"names":["getNodejsExtensions","shouldAliasModule","withExtendedResolver","withMetroMultiPlatformAsync","ASSET_REGISTRY_SRC","constructPlatformExtensions","config","platformExtensions","Object","create","unstable_platformExtensions","resolver","platform","platforms","customPlatformExtensions","sourceExts","getPlatformExtensions","unstable_conditionNames","unstable_conditionsByPlatform","resolveWithPlatformExtensions","context","moduleName","platformContext","asWritable","preferNativePlatform","input","_reactNativeHostPackages","Map","_reactNativeHostPathPatterns","getReactNativeHostPackage","supportPackage","get","undefined","getSupportPackageForPlatform","require","set","getReactNativeHostPathPattern","pattern","RegExp","withWebPolyfills","getMetroBundler","originalGetPolyfills","serializer","getPolyfills","bind","ctx","virtualEnvVarId","getMetroBundlerWithVirtualModules","setVirtualModule","virtualModuleId","virtualModulesPolyfills","rnGetPolyfills","filter","x","includes","error","code","polyfills","resolve","normalizeSlashes","p","replace","srcExts","mjsExts","ext","test","nodejsSourceExtensions","jsIndex","reduce","index","i","splice","autolinkingModuleResolverInput","isTsconfigPathsEnabled","isExporting","isReactServerComponentsEnabled","Log","warn","aliases","web","_universalAliases","getUniversalAliases","resolveFrom","projectRoot","push","projectRootOriginPath","path","join","preferredMainFields","getStrictResolver","resolveRequest","doResolve","getOptionalResolver","optionalResolve","isResolutionError","isFailedToResolveNameError","isFailedToResolvePathError","isFailedToResolveUnsupportedError","idFactory","createModuleIdFactory","id","_asyncRequireModuleResolvedPath","getAsyncRequireModule","transformer","asyncRequireModulePath","type","filePath","getAssetRegistryModule","externals","match","customResolverOptions","exporting","isServerEnvironment","environment","process","clientboundary","endsWith","isExternal","skipMetroMainFieldOverride","env","EXPO_METRO_NO_MAIN_FIELD_OVERRIDE","useExpoUnstableLogBox","EXPO_UNSTABLE_LOG_BOX","metroConfigWithCustomResolver","withMetroResolvers","requestDevMockProdReact","dev","originModulePath","createTypescriptResolver","watch","CI","requestNodeExternals","isServer","moduleId","isNodeExternal","result","contents","requestCustomExternals","external","realModule","realPath","opaqueId","JSON","stringify","projectRootContext","nodeModulesPaths","disableHierarchicalLookup","externModule","requestAlias","redirectedModuleName","matcher","alias","aliasedModule","_","parseInt","requestStableConfigModules","assetRegistryPath","startsWith","createAutolinkingModuleResolver","requestPostRewrites","normalizedPath","doReplace","from","to","options","doReplaceHelper","doReplaceStrict","throws","some","FailedToResolveNativeOnlyModuleError","relative","normalName","shimFile","shouldCreateVirtualShim","virtualId","bundler","hasVirtualModule","fs","readFileSync","hostPackage","emptyModule","hmrModule","logBoxModule","logBoxParserModule","createFallbackModuleResolver","originModuleNames","metroConfigWithCustomContext","withMetroMutatedResolverContext","immutableContext","unstable_enablePackageExports","isReactServerComponents","mainFields","withMetroErrorReportingResolver","withMetroSupervisingTransformWorker","resolutionError","Error","cause","output","exp","platformBundlers","serverRoot","isAutolinkingResolverEnabled","watchFolders","unstable_onDemandFilesystem","internalRoot","externalWatchFolders","dir","isPathInside","length","metroDefaults","metroRequirePolyfill","moduleSystem","dirname","EXPO_PUBLIC_PROJECT_ROOT","configPlatforms","getPlatformsFromConfig","expoConfigPlatforms","entries","map","Array","isArray","Set","concat","createAutolinkingModuleResolverInput"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["start/server/metro/withMetroMultiPlatform.ts"],"sourcesContent":[null],"names":["getNodejsExtensions","shouldAliasModule","withExtendedResolver","withMetroMultiPlatformAsync","ASSET_REGISTRY_SRC","constructPlatformExtensions","config","platformExtensions","Object","create","unstable_platformExtensions","resolver","platform","platforms","customPlatformExtensions","sourceExts","getPlatformExtensions","unstable_conditionNames","unstable_conditionsByPlatform","resolveWithPlatformExtensions","context","moduleName","platformContext","asWritable","preferNativePlatform","input","_reactNativeHostPackages","Map","_reactNativeHostPathPatterns","getReactNativeHostPackage","supportPackage","get","undefined","getSupportPackageForPlatform","require","set","getReactNativeHostPathPattern","pattern","RegExp","withWebPolyfills","getMetroBundler","originalGetPolyfills","serializer","getPolyfills","bind","ctx","virtualEnvVarId","getMetroBundlerWithVirtualModules","setVirtualModule","virtualModuleId","virtualModulesPolyfills","rnGetPolyfills","filter","x","includes","error","code","polyfills","resolve","normalizeSlashes","p","replace","srcExts","mjsExts","ext","test","nodejsSourceExtensions","jsIndex","reduce","index","i","splice","autolinkingModuleResolverInput","isTsconfigPathsEnabled","isExporting","isReactServerComponentsEnabled","Log","warn","aliases","web","_universalAliases","getUniversalAliases","resolveFrom","projectRoot","push","projectRootOriginPath","path","join","preferredMainFields","getStrictResolver","resolveRequest","doResolve","getOptionalResolver","optionalResolve","isResolutionError","isFailedToResolveNameError","isFailedToResolvePathError","isFailedToResolveUnsupportedError","idFactory","createModuleIdFactory","id","_asyncRequireModuleResolvedPath","getAsyncRequireModule","transformer","asyncRequireModulePath","type","filePath","getAssetRegistryModule","externals","match","customResolverOptions","exporting","isServerEnvironment","environment","process","clientboundary","endsWith","isExternal","skipMetroMainFieldOverride","env","EXPO_METRO_NO_MAIN_FIELD_OVERRIDE","useExpoUnstableLogBox","EXPO_UNSTABLE_LOG_BOX","metroConfigWithCustomResolver","withMetroResolvers","requestDevMockProdReact","dev","originModulePath","createTypescriptResolver","watch","CI","requestNodeExternals","isServer","moduleId","isNodeExternal","result","contents","requestCustomExternals","external","realModule","realPath","opaqueId","JSON","stringify","projectRootContext","nodeModulesPaths","disableHierarchicalLookup","externModule","requestAlias","redirectedModuleName","matcher","alias","aliasedModule","_","parseInt","requestStableConfigModules","assetRegistryPath","startsWith","createAutolinkingModuleResolver","requestPostRewrites","normalizedPath","doReplace","from","to","options","doReplaceHelper","doReplaceStrict","throws","some","FailedToResolveNativeOnlyModuleError","relative","normalName","shimFile","shouldCreateVirtualShim","virtualId","bundler","hasVirtualModule","fs","readFileSync","hostPackage","emptyModule","hmrModule","logBoxModule","logBoxParserModule","createFallbackModuleResolver","originModuleNames","metroConfigWithCustomContext","withMetroMutatedResolverContext","immutableContext","unstable_enablePackageExports","isReactServerComponents","mainFields","withMetroErrorReportingResolver","withMetroSupervisingTransformWorker","resolutionError","Error","cause","output","exp","platformBundlers","serverRoot","isAutolinkingResolverEnabled","watchFolders","unstable_onDemandFilesystem","internalRoot","externalWatchFolders","dir","isPathInside","length","metroDefaults","metroRequirePolyfill","moduleSystem","dirname","EXPO_PUBLIC_PROJECT_ROOT","configPlatforms","getPlatformsFromConfig","expoConfigPlatforms","entries","map","Array","isArray","Set","concat","createAutolinkingModuleResolverInput"],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ const _isLocalHostname = (hostname)=>{
|
|
|
49
49
|
}
|
|
50
50
|
if (maybeIp === '::1') {
|
|
51
51
|
return true;
|
|
52
|
-
} else if (/^127(
|
|
52
|
+
} else if (/^127(?:\.\d+){3}$/.test(maybeIp)) {
|
|
53
53
|
return maybeIp.split('.').every((part)=>{
|
|
54
54
|
const num = parseInt(part, 10);
|
|
55
55
|
return num >= 0 && num <= 255;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["start/server/middleware/CorsMiddleware.ts"],"sourcesContent":[null],"names":["_isLocalHostname","createCorsMiddleware","getForwardedHost","req","forwarded","parseForwardedRequestInfo","authority","URL","protocol","host","DEFAULT_ALLOWED_CORS_HOSTS","hostname","maybeIp","ipv6To4Prefix","startsWith","slice","length","test","split","every","part","num","parseInt","exp","allowedHosts","extra","router","headOrigin","push","origin","res","next","headers","isSameOrigin","isLocalhost","isAllowedHost","includes","Error","setHeader","maybePreventMetroResetCorsHeader","pathname","url","endsWith","bind","key","args"],"mappings":";;;;;;;;;;;;;;;QA4BaA;eAAAA;;QAqBGC;eAAAA;;;kCA/C0B;AAG1C;;;CAGC,GACD,SAASC,iBAAiBC,GAAkB;IAC1C,MAAMC,YAAYC,IAAAA,2CAAyB,EAACF;IAC5C,IAAI,CAACC,WAAWE,WAAW;QACzB,OAAO;IACT;IACA,IAAI;QACF,OAAO,IAAIC,IAAI,GAAGH,UAAUI,QAAQ,IAAI,OAAO,GAAG,EAAEJ,UAAUE,SAAS,EAAE,EAAEG,IAAI;IACjF,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEA,MAAMC,6BAA6B;IACjC;CACD;AAKM,MAAMV,mBAAmB,CAACW;IAC/B,IAAIA,aAAa,aAAa;QAC5B,OAAO;IACT;IACA,IAAIC,UAAUD;IACd,MAAME,gBAAgB;IACtB,IAAID,QAAQE,UAAU,CAACD,gBAAgB;QACrCD,UAAUA,QAAQG,KAAK,CAACF,cAAcG,MAAM;IAC9C;IACA,IAAIJ,YAAY,OAAO;QACrB,OAAO;IACT,OAAO,IAAI,
|
|
1
|
+
{"version":3,"sources":["start/server/middleware/CorsMiddleware.ts"],"sourcesContent":[null],"names":["_isLocalHostname","createCorsMiddleware","getForwardedHost","req","forwarded","parseForwardedRequestInfo","authority","URL","protocol","host","DEFAULT_ALLOWED_CORS_HOSTS","hostname","maybeIp","ipv6To4Prefix","startsWith","slice","length","test","split","every","part","num","parseInt","exp","allowedHosts","extra","router","headOrigin","push","origin","res","next","headers","isSameOrigin","isLocalhost","isAllowedHost","includes","Error","setHeader","maybePreventMetroResetCorsHeader","pathname","url","endsWith","bind","key","args"],"mappings":"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"}
|
|
@@ -28,6 +28,13 @@ _export(exports, {
|
|
|
28
28
|
return expoUpdatesCommandAsync;
|
|
29
29
|
}
|
|
30
30
|
});
|
|
31
|
+
function _env() {
|
|
32
|
+
const data = require("@expo/env");
|
|
33
|
+
_env = function() {
|
|
34
|
+
return data;
|
|
35
|
+
};
|
|
36
|
+
return data;
|
|
37
|
+
}
|
|
31
38
|
function _spawnasync() {
|
|
32
39
|
const data = /*#__PURE__*/ _interop_require_default(require("@expo/spawn-async"));
|
|
33
40
|
_spawnasync = function() {
|
|
@@ -105,11 +112,11 @@ async function expoUpdatesCommandAsync(projectDir, args) {
|
|
|
105
112
|
throw e;
|
|
106
113
|
}
|
|
107
114
|
try {
|
|
115
|
+
const commandEnv = (0, _env().getOriginalEnv)();
|
|
116
|
+
commandEnv.__EXPO_CONFIG_MODE = 'development';
|
|
108
117
|
return (await (0, _spawnasync().default)(expoUpdatesCli, args, {
|
|
109
118
|
stdio: 'pipe',
|
|
110
|
-
env:
|
|
111
|
-
...process.env
|
|
112
|
-
}
|
|
119
|
+
env: commandEnv
|
|
113
120
|
})).stdout;
|
|
114
121
|
} catch (e) {
|
|
115
122
|
if (e.stderr && typeof e.stderr === 'string') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["utils/expoUpdatesCli.ts"],"sourcesContent":[null],"names":["ExpoUpdatesCLICommandFailedError","ExpoUpdatesCLIInvalidCommandError","ExpoUpdatesCLIModuleNotFoundError","expoUpdatesCommandAsync","Error","projectDir","args","expoUpdatesCli","silentResolveFrom","resolveFrom","e","code","spawnAsync","stdio","env","
|
|
1
|
+
{"version":3,"sources":["utils/expoUpdatesCli.ts"],"sourcesContent":[null],"names":["ExpoUpdatesCLICommandFailedError","ExpoUpdatesCLIInvalidCommandError","ExpoUpdatesCLIModuleNotFoundError","expoUpdatesCommandAsync","Error","projectDir","args","expoUpdatesCli","silentResolveFrom","resolveFrom","e","code","commandEnv","getOriginalEnv","__EXPO_CONFIG_MODE","spawnAsync","stdio","env","stdout","stderr","includes"],"mappings":";;;;;;;;;;;;;;;;;QAMaA;eAAAA;;QADAC;eAAAA;;QADAC;eAAAA;;QAISC;eAAAA;;;;yBARS;;;;;;;gEACR;;;;;;;iEACkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElD,MAAMD,0CAA0CE;AAAO;AACvD,MAAMH,0CAA0CG;AAAO;AACvD,MAAMJ,yCAAyCI;AAAO;AAEtD,eAAeD,wBAAwBE,UAAkB,EAAEC,IAAc;IAC9E,IAAIC;IACJ,IAAI;QACFA,iBACEC,IAAAA,qBAAiB,EAACH,YAAY,2BAC9BI,IAAAA,sBAAW,EAACJ,YAAY;IAC5B,EAAE,OAAOK,GAAQ;QACf,IAAIA,EAAEC,IAAI,KAAK,oBAAoB;YACjC,MAAM,IAAIT,kCAAkC,CAAC,4CAA4C,CAAC;QAC5F;QACA,MAAMQ;IACR;IAEA,IAAI;QACF,MAAME,aAAaC,IAAAA,qBAAc;QACjCD,WAAWE,kBAAkB,GAAG;QAEhC,OAAO,AACL,CAAA,MAAMC,IAAAA,qBAAU,EAACR,gBAAgBD,MAAM;YACrCU,OAAO;YACPC,KAAKL;QACP,EAAC,EACDM,MAAM;IACV,EAAE,OAAOR,GAAQ;QACf,IAAIA,EAAES,MAAM,IAAI,OAAOT,EAAES,MAAM,KAAK,UAAU;YAC5C,IAAIT,EAAES,MAAM,CAACC,QAAQ,CAAC,oBAAoB;gBACxC,MAAM,IAAInB,kCACR,CAAC,yBAAyB,EAAEK,KAAK,2CAA2C,CAAC;YAEjF,OAAO;gBACL,MAAM,IAAIN,iCAAiCU,EAAES,MAAM;YACrD;QACF;QAEA,MAAMT;IACR;AACF"}
|
|
@@ -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.1"}`,
|
|
33
33
|
authorization: 'Basic ' + _nodebuffer().Buffer.from(`${target}:`).toString('base64')
|
|
34
34
|
};
|
|
35
35
|
}
|
|
@@ -5,8 +5,6 @@ import type { HashedAssetData } from '@expo/metro-config/build/transform-worker/
|
|
|
5
5
|
import type Server from '@expo/metro/metro/Server';
|
|
6
6
|
import type { BundleOptions } from '@expo/metro/metro/shared/types';
|
|
7
7
|
|
|
8
|
-
export const drawableFileTypes: Set<string>;
|
|
9
|
-
|
|
10
8
|
export function createMetroServerAndBundleRequestAsync(
|
|
11
9
|
projectRoot: string,
|
|
12
10
|
options: {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@expo/cli",
|
|
3
|
-
"version": "58.1.
|
|
3
|
+
"version": "58.1.1",
|
|
4
4
|
"description": "The Expo CLI",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cli",
|
|
@@ -52,18 +52,19 @@
|
|
|
52
52
|
"@expo/log-box": "^58.0.8",
|
|
53
53
|
"@expo/log-box-utils": "^58.0.1",
|
|
54
54
|
"@expo/metro": "~58.0.0-rc.0",
|
|
55
|
-
"@expo/metro-config": "58.0.
|
|
55
|
+
"@expo/metro-config": "58.0.7",
|
|
56
56
|
"@expo/metro-file-map": "^58.0.3",
|
|
57
57
|
"@expo/osascript": "^2.8.1",
|
|
58
58
|
"@expo/package-manager": "^1.14.1",
|
|
59
59
|
"@expo/plist": "^0.10.1",
|
|
60
|
-
"@expo/prebuild-config": "^58.0.
|
|
60
|
+
"@expo/prebuild-config": "^58.0.7",
|
|
61
61
|
"@expo/require-utils": "^58.0.2",
|
|
62
|
-
"@expo/router-server": "^58.0.
|
|
62
|
+
"@expo/router-server": "^58.0.6",
|
|
63
63
|
"@expo/schema-utils": "^58.0.1",
|
|
64
64
|
"@expo/spawn-async": "^1.8.0",
|
|
65
65
|
"@expo/ws-tunnel": "^2.0.0",
|
|
66
66
|
"@expo/xcpretty": "^4.4.4",
|
|
67
|
+
"@react-native/asset-utils": "0.88.0-rc.3",
|
|
67
68
|
"@react-native/dev-middleware": "0.88.0-rc.3",
|
|
68
69
|
"@react-native/js-polyfills": "0.88.0-rc.3",
|
|
69
70
|
"accepts": "^1.3.8",
|
|
@@ -136,9 +137,9 @@
|
|
|
136
137
|
"eslint": "^9.18.0",
|
|
137
138
|
"expect": "^29.7.0",
|
|
138
139
|
"expo-atlas": "^0.4.1",
|
|
139
|
-
"expo-module-scripts": "56.0.
|
|
140
|
-
"expo-modules-autolinking": "58.0.
|
|
141
|
-
"expo-router": "58.0.
|
|
140
|
+
"expo-module-scripts": "56.0.5",
|
|
141
|
+
"expo-modules-autolinking": "58.0.7",
|
|
142
|
+
"expo-router": "58.0.12",
|
|
142
143
|
"find-process": "^1.4.7",
|
|
143
144
|
"jest-matcher-utils": "^29.7.0",
|
|
144
145
|
"klaw-sync": "^6.0.0",
|