@expo/cli 58.0.9 → 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.
Files changed (51) hide show
  1. package/README.md +1 -1
  2. package/build/src/api/rest/wrapFetchWithUserAgent.js +1 -1
  3. package/build/src/expoUpdatesExports.d.ts +0 -1
  4. package/build/src/expoUpdatesExports.js +0 -5
  5. package/build/src/expoUpdatesExports.js.map +1 -1
  6. package/build/src/export/metroAssetLocalPath.d.ts +0 -1
  7. package/build/src/export/metroAssetLocalPath.js +9 -58
  8. package/build/src/export/metroAssetLocalPath.js.map +1 -1
  9. package/build/src/export/persistMetroAssets.js +10 -16
  10. package/build/src/export/persistMetroAssets.js.map +1 -1
  11. package/build/src/index.js +2 -2
  12. package/build/src/index.js.map +1 -1
  13. package/build/src/run/android/runAndroidAsync.js +4 -1
  14. package/build/src/run/android/runAndroidAsync.js.map +1 -1
  15. package/build/src/run/ios/runIosAsync.js +1 -1
  16. package/build/src/run/ios/runIosAsync.js.map +1 -1
  17. package/build/src/start/index.js +36 -5
  18. package/build/src/start/index.js.map +1 -1
  19. package/build/src/start/resolveOptions.d.ts +1 -0
  20. package/build/src/start/resolveOptions.js +19 -2
  21. package/build/src/start/resolveOptions.js.map +1 -1
  22. package/build/src/start/server/AsyncWsTunnel.js +2 -2
  23. package/build/src/start/server/AsyncWsTunnel.js.map +1 -1
  24. package/build/src/start/server/BundlerDevServer.d.ts +3 -1
  25. package/build/src/start/server/BundlerDevServer.js +12 -19
  26. package/build/src/start/server/BundlerDevServer.js.map +1 -1
  27. package/build/src/start/server/UrlCreator.d.ts +2 -0
  28. package/build/src/start/server/UrlCreator.js +19 -1
  29. package/build/src/start/server/UrlCreator.js.map +1 -1
  30. package/build/src/start/server/metro/MetroBundlerDevServer.js +3 -4
  31. package/build/src/start/server/metro/MetroBundlerDevServer.js.map +1 -1
  32. package/build/src/start/server/metro/withMetroMultiPlatform.d.ts +1 -1
  33. package/build/src/start/server/metro/withMetroMultiPlatform.js +3 -2
  34. package/build/src/start/server/metro/withMetroMultiPlatform.js.map +1 -1
  35. package/build/src/start/server/middleware/CorsMiddleware.js +1 -1
  36. package/build/src/start/server/middleware/CorsMiddleware.js.map +1 -1
  37. package/build/src/start/server/middleware/openHandlers.js +2 -6
  38. package/build/src/start/server/middleware/openHandlers.js.map +1 -1
  39. package/build/src/start/startAsync.js +1 -0
  40. package/build/src/start/startAsync.js.map +1 -1
  41. package/build/src/utils/env.d.ts +2 -1
  42. package/build/src/utils/env.js +3 -3
  43. package/build/src/utils/env.js.map +1 -1
  44. package/build/src/utils/expoUpdatesCli.js +10 -3
  45. package/build/src/utils/expoUpdatesCli.js.map +1 -1
  46. package/build/src/utils/telemetry/clients/FetchClient.js +1 -1
  47. package/build/src/utils/telemetry/clients/FetchClient.js.map +1 -1
  48. package/build/src/utils/telemetry/utils/context.js +1 -1
  49. package/build/src/utils/telemetry/utils/context.js.map +1 -1
  50. package/internal/unstable-expo-updates-exports.d.ts +0 -2
  51. package/package.json +9 -8
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**](./e2e/setup.ts) already in place, consider them when writing tests.
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.0.9"}`);
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","drawableFileTypes","exportEmbedAssetsAsync","fixupServerRelativePath","projectRoot","entryFile","serverRoot","getMetroServerRoot","path","isAbsolute","candidate","fs","existsSync","resolve","endsWith","options","internal_createMetroServerAndBundleRequestAsync"],"mappings":"AAAA,oHAAoH;AACpH,kHAAkH;;;;;;;;;;;;;;;;;QA6BrGA;eAAAA;;QApBJC;eAAAA,sCAAiB;;QACjBC;eAAAA,wCAAsB;;;;yBARI;;;;;;;gEACpB;;;;;;;gEACE;;;;;;kCAEyF;qCAGxE;;;;;;AAGlC,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,MAAML,yCACX,OAAOI,aAAaW;IAClB,OAAO,MAAMC,IAAAA,wDAA+C,EAACZ,aAAa;QACxE,GAAGW,OAAO;QACVV,WAAWF,wBAAwBC,aAAaW,QAAQV,SAAS;IACnE;AACF"}
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"}
@@ -15,4 +15,3 @@ export declare function getAssetLocalPath(asset: Pick<AssetData, 'type' | 'httpS
15
15
  platform: string;
16
16
  }): string;
17
17
  export declare function stripAssetPrefix(path: string, baseUrl?: string): string;
18
- export declare const drawableFileTypes: Set<string>;
@@ -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 = getResourceIdentifier(asset);
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":["drawableFileTypes","getAssetLocalPath","stripAssetPrefix","asset","baseUrl","scale","platform","getAssetLocalPathAndroid","getAssetLocalPathDefault","androidFolder","getAndroidResourceFolderName","fileName","getResourceIdentifier","path","join","type","suffix","name","adjustedHttpServerLocation","httpServerLocation","replace","RegExp","getAndroidAssetSuffix","Set","has","Error","JSON","stringify","folderPath","getBaseUrl","toLowerCase","substring"],"mappings":"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"}
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 = _metroAssetLocalPath.drawableFileTypes.has(asset.type) ? 'drawable' : 'raw';
151
- assetsList.push(`@${prefix}/${getResourceIdentifier(asset)}`);
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 = getResourceIdentifier(asset);
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","getResourceIdentifier","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","folderPath","getBaseUrl","toLowerCase","replace","httpServerLocation","substring"],"mappings":"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"}
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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"}
@@ -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.0.9"
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.0.9");
96
+ console.log("58.1.1");
97
97
  process.exit(0);
98
98
  }
99
99
  if (args['--non-interactive']) {
@@ -1 +1 @@
1
- {"version":3,"sources":["index.ts"],"sourcesContent":[null],"names":["boolish","test","process","env","DEBUG","EXPO_DEBUG","LOG_DEBUG","defaultCmd","commands","run","then","i","expoRun","expoRunIos","expoRunAndroid","start","expoStart","prebuild","expoPrebuild","config","expoConfig","export","expoExport","expoExportWeb","expoExportEmbed","serve","expoServe","install","expoInstall","add","customize","expoCustomize","lint","expoLint","login","expoLogin","logout","expoLogout","register","expoRegister","whoami","expoWhoami","args","arg","Boolean","permissive","isSubcommand","_","command","commandArgs","slice","installEventLogger","version","console","log","exit","warn","chalk","yellow","NODE_MIN","nodeVersion","split","map","Number","error","red","join","_export","runIos","runAndroid","exportEmbed_unused","exportWeb_unused","_run","_lint","others","Object","keys","migrationMap","init","eject","web","doctor","upgrade","publish","url","webhooks","subcommand","replacement","instruction","deprecated","includes","push","on","exec","recordCommand","require"],"mappings":"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"}
1
+ {"version":3,"sources":["index.ts"],"sourcesContent":[null],"names":["boolish","test","process","env","DEBUG","EXPO_DEBUG","LOG_DEBUG","defaultCmd","commands","run","then","i","expoRun","expoRunIos","expoRunAndroid","start","expoStart","prebuild","expoPrebuild","config","expoConfig","export","expoExport","expoExportWeb","expoExportEmbed","serve","expoServe","install","expoInstall","add","customize","expoCustomize","lint","expoLint","login","expoLogin","logout","expoLogout","register","expoRegister","whoami","expoWhoami","args","arg","Boolean","permissive","isSubcommand","_","command","commandArgs","slice","installEventLogger","version","console","log","exit","warn","chalk","yellow","NODE_MIN","nodeVersion","split","map","Number","error","red","join","_export","runIos","runAndroid","exportEmbed_unused","exportWeb_unused","_run","_lint","others","Object","keys","migrationMap","init","eject","web","doctor","upgrade","publish","url","webhooks","subcommand","replacement","instruction","deprecated","includes","push","on","exec","recordCommand","require"],"mappings":"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"}
@@ -50,7 +50,10 @@ function _interop_require_default(obj) {
50
50
  }
51
51
  async function runAndroidAsync(projectRoot, { install, ...options }) {
52
52
  // Guess the mode from the selected native build variant.
53
- const isProduction = options.variant?.toLowerCase().endsWith('release');
53
+ const isProduction = ![
54
+ 'debug',
55
+ 'debugoptimized'
56
+ ].includes((options.variant ?? 'debug').toLowerCase());
54
57
  const mode = isProduction ? 'production' : 'development';
55
58
  (0, _nodeEnv.loadEnvFiles)(projectRoot, {
56
59
  mode
@@ -1 +1 @@
1
- {"version":3,"sources":["run/android/runAndroidAsync.ts"],"sourcesContent":[null],"names":["runAndroidAsync","projectRoot","install","options","isProduction","variant","toLowerCase","endsWith","mode","loadEnvFiles","ensureNativeProjectAsync","platform","props","resolveOptionsAsync","event","name","device","id","pid","os","type","binary","buildCacheProvider","localPath","resolveBuildCache","provider","runOptions","debugEvent","packageName","Log","log","androidProjectRoot","path","join","shouldUpdateBuildCache","eagerBundleOptions","JSON","stringify","exportEagerAsync","dev","done","span","assembleAsync","port","appName","buildCache","architectures","error","scheme","configuration","deviceId","shouldStartBundler","ensurePortAvailabilityAsync","manager","startBundlerAsync","getSchemesForAndroidAsync","headless","apkFile","resolveInstallApkNameAsync","apkVariantDirectory","doneInstall","binaryPath","fs","existsSync","CommandError","chalk","gray","installAppAsync","appId","getDefaultDevServer","openCustomRuntimeAsync","applicationId","customAppId","launchActivity","logProjectLogsLocation","stopAsync","uploadBuildCache","buildPath","installAsync"],"mappings":"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"}
1
+ {"version":3,"sources":["run/android/runAndroidAsync.ts"],"sourcesContent":[null],"names":["runAndroidAsync","projectRoot","install","options","isProduction","includes","variant","toLowerCase","mode","loadEnvFiles","ensureNativeProjectAsync","platform","props","resolveOptionsAsync","event","name","device","id","pid","os","type","binary","buildCacheProvider","localPath","resolveBuildCache","provider","runOptions","debugEvent","packageName","Log","log","androidProjectRoot","path","join","shouldUpdateBuildCache","eagerBundleOptions","JSON","stringify","exportEagerAsync","dev","done","span","assembleAsync","port","appName","buildCache","architectures","error","scheme","configuration","deviceId","shouldStartBundler","ensurePortAvailabilityAsync","manager","startBundlerAsync","getSchemesForAndroidAsync","headless","apkFile","resolveInstallApkNameAsync","apkVariantDirectory","doneInstall","binaryPath","fs","existsSync","CommandError","chalk","gray","installAppAsync","appId","getDefaultDevServer","openCustomRuntimeAsync","applicationId","customAppId","launchActivity","logProjectLogsLocation","stopAsync","uploadBuildCache","buildPath","installAsync"],"mappings":"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"}
@@ -102,7 +102,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
102
102
  return newObj;
103
103
  }
104
104
  async function runIosAsync(projectRoot, options) {
105
- const mode = options.configuration === 'Release' ? 'production' : 'development';
105
+ const mode = (options.configuration ?? 'Debug').includes('Debug') ? 'development' : 'production';
106
106
  (0, _nodeEnv.loadEnvFiles)(projectRoot, {
107
107
  mode
108
108
  });
@@ -1 +1 @@
1
- {"version":3,"sources":["run/ios/runIosAsync.ts"],"sourcesContent":[null],"names":["runIosAsync","projectRoot","options","mode","configuration","loadEnvFiles","assertPlatform","install","ensureNativeProjectAsync","platform","maybePromptToSyncPodsAsync","props","profile","resolveOptionsAsync","device","event","name","id","udid","os","osType","type","isSimulator","binary","buildCacheProvider","localPath","resolveBuildCache","runOptions","provider","rebundle","Log","warn","CommandError","binaryPath","Error","appId","AppleAppIdResolver","getAppIdAsync","possibleBinaryPath","getContainerPathAsync","log","spawnAsync","path","join","require","resolve","possibleBundleOutput","fs","existsSync","exportEagerAsync","resetCache","dev","assetsDest","bundleOutput","shouldUpdateBuildCache","getValidBinaryPathAsync","eagerBundleOptions","JSON","stringify","done","span","buildOutput","XcodeBuild","buildAsync","error","scheme","deviceId","getAppBinaryPath","output","copyBinaryToOutputAsync","debugEvent","chalk","uploadBuildCache","buildPath","shouldStartBundler","ensurePortAvailabilityAsync","launchInfo","getLaunchInfoForBinaryAsync","isCustomBinary","simctlAsync","bundleId","manager","startBundlerAsync","port","headless","schemes","getSchemesForIosAsync","launchAppAsync","logProjectLogsLocation","stopAsync","process","exit","outputDir","absoluteOutputDir","appName","basename","outputPath","promises","mkdir","recursive","cp"],"mappings":"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"}
1
+ {"version":3,"sources":["run/ios/runIosAsync.ts"],"sourcesContent":[null],"names":["runIosAsync","projectRoot","options","mode","configuration","includes","loadEnvFiles","assertPlatform","install","ensureNativeProjectAsync","platform","maybePromptToSyncPodsAsync","props","profile","resolveOptionsAsync","device","event","name","id","udid","os","osType","type","isSimulator","binary","buildCacheProvider","localPath","resolveBuildCache","runOptions","provider","rebundle","Log","warn","CommandError","binaryPath","Error","appId","AppleAppIdResolver","getAppIdAsync","possibleBinaryPath","getContainerPathAsync","log","spawnAsync","path","join","require","resolve","possibleBundleOutput","fs","existsSync","exportEagerAsync","resetCache","dev","assetsDest","bundleOutput","shouldUpdateBuildCache","getValidBinaryPathAsync","eagerBundleOptions","JSON","stringify","done","span","buildOutput","XcodeBuild","buildAsync","error","scheme","deviceId","getAppBinaryPath","output","copyBinaryToOutputAsync","debugEvent","chalk","uploadBuildCache","buildPath","shouldStartBundler","ensurePortAvailabilityAsync","launchInfo","getLaunchInfoForBinaryAsync","isCustomBinary","simctlAsync","bundleId","manager","startBundlerAsync","port","headless","schemes","getSchemesForIosAsync","launchAppAsync","logProjectLogsLocation","stopAsync","process","exit","outputDir","absoluteOutputDir","appName","basename","outputPath","promises","mkdir","recursive","cp"],"mappings":"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"}
@@ -40,7 +40,7 @@ const expoStart = async (argv)=>{
40
40
  '--ios': Boolean,
41
41
  '--web': Boolean,
42
42
  '--host': String,
43
- '--tunnel': Boolean,
43
+ '--tunnel': String,
44
44
  '--lan': Boolean,
45
45
  '--localhost': Boolean,
46
46
  '--offline': Boolean,
@@ -57,7 +57,7 @@ const expoStart = async (argv)=>{
57
57
  '-g': '--go',
58
58
  // Alias for adding interop with the Metro docs and RedBox errors.
59
59
  '--reset-cache': '--clear'
60
- }, argv);
60
+ }, normalizeTunnelArgs(argv));
61
61
  if (args['--help']) {
62
62
  (0, _args.printHelp)(`Start a local dev server for the app`, (0, _chalk().default)`npx expo start {dim <dir>}`, [
63
63
  (0, _chalk().default)`<dir> Directory of the Expo project. {dim Default: Current working directory}`,
@@ -75,19 +75,29 @@ const expoStart = async (argv)=>{
75
75
  ``,
76
76
  (0, _chalk().default)`-m, --host <string> Dev server hosting type. {dim Default: lan}`,
77
77
  (0, _chalk().default)` {bold lan}: Use the local network`,
78
- (0, _chalk().default)` {bold tunnel}: Use any network by tunnel through ngrok`,
78
+ (0, _chalk().default)` {bold tunnel}: Use any network through an Expo tunnel`,
79
79
  (0, _chalk().default)` {bold localhost}: Connect to the dev server over localhost`,
80
- `--tunnel Same as --host tunnel`,
80
+ `--tunnel [provider] Use a tunnel. Default: expo (Legacy option: ngrok)`,
81
81
  `--lan Same as --host lan`,
82
82
  `--localhost Same as --host localhost`,
83
83
  ``,
84
84
  `--offline Skip network requests and use anonymous manifest signatures`,
85
85
  (0, _chalk().default)`--https Start the dev server with https protocol. {bold Deprecated in favor of --tunnel}`,
86
86
  `--scheme <scheme> Custom URI protocol to use when launching an app`,
87
- (0, _chalk().default)`-p, --port <number> Port to start the dev server on (does not apply to web or tunnel). {dim Default: 8081}`,
87
+ (0, _chalk().default)`-p, --port <number> Port to start the dev server on (does not apply to web). {dim Default: 8081}`,
88
88
  ``,
89
89
  (0, _chalk().default)`--private-key-path <path> Path to private key for code signing. {dim Required to sign development manifests when the project is configured with an expo-updates code signing certificate.}`,
90
90
  `-h, --help Usage info`
91
+ ].join('\n'), [
92
+ '',
93
+ (0, _chalk().default)` {bold AGENTS:}`,
94
+ '',
95
+ (0, _chalk().default)` Setting {bold CI=1} turns off file watching and Fast Refresh, so code changes won't reach`,
96
+ (0, _chalk().default)` the app until the dev server restarts. Don't set it for local development.`,
97
+ '',
98
+ (0, _chalk().default)` Run without the interactive UI and keep Fast Refresh by redirecting output:`,
99
+ (0, _chalk().default)` {dim $} npx expo start > expo.log 2>&1`,
100
+ ''
91
101
  ].join('\n'));
92
102
  }
93
103
  const projectRoot = (0, _args.getProjectRoot)(args);
@@ -107,5 +117,26 @@ const expoStart = async (argv)=>{
107
117
  webOnly: false
108
118
  }).catch(_errors.logCmdError);
109
119
  };
120
+ /** Preserve the optional project directory when --tunnel is used without a provider. */ function normalizeTunnelArgs(argv = process.argv.slice(2)) {
121
+ const normalized = [];
122
+ for(let i = 0; i < argv.length; i++){
123
+ if (argv[i] === '--') {
124
+ normalized.push(...argv.slice(i));
125
+ break;
126
+ }
127
+ if (argv[i] === '--tunnel') {
128
+ const provider = argv[i + 1];
129
+ if (provider === 'ngrok' || provider === 'expo') {
130
+ normalized.push(`--tunnel=${provider}`);
131
+ i++;
132
+ } else {
133
+ normalized.push('--tunnel=expo');
134
+ }
135
+ } else {
136
+ normalized.push(argv[i]);
137
+ }
138
+ }
139
+ return normalized;
140
+ }
110
141
 
111
142
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["start/index.ts"],"sourcesContent":[null],"names":["expoStart","argv","args","assertArgs","Boolean","Number","String","printHelp","chalk","join","projectRoot","getProjectRoot","loadEnvFiles","mode","resolveOptionsAsync","options","catch","logCmdError","offline","disableNetwork","startAsync","webOnly"],"mappings":";;;;;+BAOaA;;;eAAAA;;;;gEANK;;;;;;sBAGoC;wBAC1B;;;;;;AAErB,MAAMA,YAAqB,OAAOC;IACvC,MAAMC,OAAOC,IAAAA,gBAAU,EACrB;QACE,QAAQ;QACR,UAAUC;QACV,WAAWA;QACX,iBAAiBC;QACjB,YAAYD;QACZ,YAAYA;QACZ,WAAWA;QACX,sBAAsBE;QACtB,UAAUD;QACV,gBAAgBD;QAChB,YAAYE;QACZ,aAAaF;QACb,SAASA;QACT,SAASA;QACT,UAAUE;QACV,YAAYF;QACZ,SAASA;QACT,eAAeA;QACf,aAAaA;QACb,QAAQA;QACR,UAAU;QACV,MAAM;QACN,MAAM;QACN,MAAM;QACN,MAAM;QACN,MAAM;QACN,MAAM;QACN,MAAM;QACN,MAAM;QACN,MAAM;QACN,kEAAkE;QAClE,iBAAiB;IACnB,GACAH;IAGF,IAAIC,IAAI,CAAC,SAAS,EAAE;QAClBK,IAAAA,eAAS,EACP,CAAC,oCAAoC,CAAC,EACtCC,IAAAA,gBAAK,CAAA,CAAC,0BAA0B,CAAC,EACjC;YACEA,IAAAA,gBAAK,CAAA,CAAC,uGAAuG,CAAC;YAC9G,CAAC,kEAAkE,CAAC;YACpE,CAAC,wDAAwD,CAAC;YAC1D,CAAC,qDAAqD,CAAC;YACvD,EAAE;YACFA,IAAAA,gBAAK,CAAA,CAAC,6DAA6D,CAAC;YACpEA,IAAAA,gBAAK,CAAA,CAAC,iDAAiD,CAAC;YACxD,EAAE;YACF,CAAC,uDAAuD,CAAC;YACzD,CAAC,+EAA+E,CAAC;YACjF,CAAC,yDAAyD,CAAC;YAC3D,CAAC,iDAAiD,CAAC;YACnD,EAAE;YACFA,IAAAA,gBAAK,CAAA,CAAC,2EAA2E,CAAC;YAClFA,IAAAA,gBAAK,CAAA,CAAC,iEAAiE,CAAC;YACxEA,IAAAA,gBAAK,CAAA,CAAC,sFAAsF,CAAC;YAC7FA,IAAAA,gBAAK,CAAA,CAAC,0FAA0F,CAAC;YACjG,CAAC,qDAAqD,CAAC;YACvD,CAAC,kDAAkD,CAAC;YACpD,CAAC,wDAAwD,CAAC;YAC1D,EAAE;YACF,CAAC,2FAA2F,CAAC;YAC7FA,IAAAA,gBAAK,CAAA,CAAC,gHAAgH,CAAC;YACvH,CAAC,gFAAgF,CAAC;YAClFA,IAAAA,gBAAK,CAAA,CAAC,sHAAsH,CAAC;YAC7H,EAAE;YACFA,IAAAA,gBAAK,CAAA,CAAC,gMAAgM,CAAC;YACvM,CAAC,0CAA0C,CAAC;SAC7C,CAACC,IAAI,CAAC;IAEX;IAEA,MAAMC,cAAcC,IAAAA,oBAAc,EAACT;IAEnC,0HAA0H;IAC1H,MAAM,EAAEU,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC;IACtCA,aAAaF,aAAa;QACxBG,MAAM,CAACX,IAAI,CAAC,WAAW,GAAG,gBAAgB;IAC5C;IAEA,MAAM,EAAEY,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC;IAC7C,MAAMC,UAAU,MAAMD,oBAAoBJ,aAAaR,MAAMc,KAAK,CAACC,mBAAW;IAE9E,IAAIF,QAAQG,OAAO,EAAE;QACnB,MAAM,EAAEC,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC;QACxCA;IACF;IAEA,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC;IACpC,OAAOA,WAAWV,aAAaK,SAAS;QAAEM,SAAS;IAAM,GAAGL,KAAK,CAACC,mBAAW;AAC/E"}
1
+ {"version":3,"sources":["start/index.ts"],"sourcesContent":[null],"names":["expoStart","argv","args","assertArgs","Boolean","Number","String","normalizeTunnelArgs","printHelp","chalk","join","projectRoot","getProjectRoot","loadEnvFiles","mode","resolveOptionsAsync","options","catch","logCmdError","offline","disableNetwork","startAsync","webOnly","process","slice","normalized","i","length","push","provider"],"mappings":"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"}
@@ -14,6 +14,7 @@ export type Options = {
14
14
  devClient: boolean;
15
15
  scheme: string | null;
16
16
  host: 'localhost' | 'lan' | 'tunnel';
17
+ tunnelProvider: 'expo' | 'ngrok' | null;
17
18
  };
18
19
  export declare function resolveOptionsAsync(projectRoot: string, args: any): Promise<Options>;
19
20
  export declare function resolveSchemeAsync(projectRoot: string, options: {
@@ -61,8 +61,9 @@ async function resolveOptionsAsync(projectRoot, args) {
61
61
  offline: args['--offline'],
62
62
  lan: args['--lan'],
63
63
  localhost: args['--localhost'],
64
- tunnel: args['--tunnel']
64
+ tunnel: !!args['--tunnel']
65
65
  });
66
+ const tunnelProvider = resolveTunnelProvider(args['--tunnel'], host);
66
67
  if (args['--https']) {
67
68
  _log.Log.warn((0, _chalk().default)`{bold --https} option is deprecated in favor of {bold --tunnel}`);
68
69
  }
@@ -91,7 +92,8 @@ async function resolveOptionsAsync(projectRoot, args) {
91
92
  minify: !!args['--minify'],
92
93
  devClient: isDevClient,
93
94
  scheme,
94
- host
95
+ host,
96
+ tunnelProvider
95
97
  };
96
98
  }
97
99
  async function resolveSchemeAsync(projectRoot, options) {
@@ -176,5 +178,20 @@ async function resolvePortsAsync(projectRoot, options, bundlers) {
176
178
  metroPort
177
179
  };
178
180
  }
181
+ /** Resolve the optional tunnel provider, including legacy boolean arguments. */ function resolveTunnelProvider(value, host) {
182
+ switch(value){
183
+ case 'ngrok':
184
+ return 'ngrok';
185
+ case true:
186
+ case 'expo':
187
+ return 'expo';
188
+ case null:
189
+ case false:
190
+ case undefined:
191
+ return host === 'tunnel' ? 'expo' : null;
192
+ default:
193
+ throw new _errors.CommandError('BAD_ARGS', `Invalid tunnel provider: ${value}. Expected expo or ngrok.`);
194
+ }
195
+ }
179
196
 
180
197
  //# sourceMappingURL=resolveOptions.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["start/resolveOptions.ts"],"sourcesContent":[null],"names":["resolveHostType","resolveOptionsAsync","resolvePortsAsync","resolveSchemeAsync","projectRoot","args","CommandError","host","offline","lan","localhost","tunnel","Log","warn","chalk","isUserDefinedDevClient","isAutoDevClient","hasDirectDevClientDependency","isDevClient","scheme","devClient","privateKeyPath","android","web","ios","clear","dev","https","maxWorkers","port","minify","options","canResolveDevClient","getOptionalDevClientSchemeAsync","require","resolvedScheme","resolution","includes","filter","i","length","assert","match","envIsWebcontainer","bundlers","metroPort","resolveMetroPortAsync","defaultPort","fallbackPort","AbortCommandError","webpackPort","choosePortAsync","env","WEB_HOST"],"mappings":"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"}
1
+ {"version":3,"sources":["start/resolveOptions.ts"],"sourcesContent":[null],"names":["resolveHostType","resolveOptionsAsync","resolvePortsAsync","resolveSchemeAsync","projectRoot","args","CommandError","host","offline","lan","localhost","tunnel","tunnelProvider","resolveTunnelProvider","Log","warn","chalk","isUserDefinedDevClient","isAutoDevClient","hasDirectDevClientDependency","isDevClient","scheme","devClient","privateKeyPath","android","web","ios","clear","dev","https","maxWorkers","port","minify","options","canResolveDevClient","getOptionalDevClientSchemeAsync","require","resolvedScheme","resolution","includes","filter","i","length","assert","match","envIsWebcontainer","bundlers","metroPort","resolveMetroPortAsync","defaultPort","fallbackPort","AbortCommandError","webpackPort","choosePortAsync","env","WEB_HOST","value","undefined"],"mappings":"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"}
@@ -136,7 +136,7 @@ class AsyncWsTunnel {
136
136
  ...await this.getTunnelOptionsAsync(),
137
137
  onStatusChange (status) {
138
138
  if (status === 'disconnected') {
139
- _log.error(_chalk().default.red('Tunnel connection has been closed. This is often related to intermittent connection problems with the ws proxy servers. Restart the dev server to try connecting again.') + _chalk().default.gray('\nCheck the Expo status page for outages: https://status.expo.dev/'));
139
+ _log.error(_chalk().default.red('Tunnel connection has been closed. This is often related to intermittent connection problems with the tunnel service. Restart the dev server to try connecting again.') + _chalk().default.gray('\nCheck the Expo status page for outages: https://status.expo.dev/'));
140
140
  }
141
141
  }
142
142
  });
@@ -166,7 +166,7 @@ class AsyncWsTunnel {
166
166
  const apiUrl = await getExpoAccountTunnelUrlAsync(this.projectRoot);
167
167
  if (!apiUrl) {
168
168
  const cause = (0, _UserSettings.hasCredentials)() ? `Your Expo account may not have access to it, or the tunnel service is unavailable.` : `You're not logged in to your Expo account — run 'npx expo login'.`;
169
- throw new _errors.CommandError('WS_TUNNEL_SIGNED_URL', `Couldn't create a signed tunnel URL for this project. ${cause} ` + `Unset EXPO_UNSTABLE_TUNNEL_V2 to use an ngrok tunnel instead.`);
169
+ throw new _errors.CommandError('WS_TUNNEL_SIGNED_URL', `Couldn't create a signed tunnel URL for this project. ${cause} ` + `Run 'npx expo start --tunnel ngrok' to use an ngrok tunnel instead.`);
170
170
  }
171
171
  return {
172
172
  apiUrl,