@expo/cli 0.2.10 → 0.2.11
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/bin/cli +2 -2
- package/build/src/start/platforms/android/AndroidAppIdResolver.js +6 -2
- package/build/src/start/platforms/android/AndroidAppIdResolver.js.map +1 -1
- package/build/src/start/platforms/ios/AppleAppIdResolver.js +11 -4
- package/build/src/start/platforms/ios/AppleAppIdResolver.js.map +1 -1
- package/build/src/start/server/middleware/ClassicManifestMiddleware.js +1 -1
- package/build/src/utils/analytics/rudderstackClient.js +2 -2
- package/package.json +2 -2
package/build/bin/cli
CHANGED
|
@@ -121,7 +121,7 @@ const args = (0, _arg).default({
|
|
|
121
121
|
});
|
|
122
122
|
if (args["--version"]) {
|
|
123
123
|
// Version is added in the build script.
|
|
124
|
-
console.log("0.2.
|
|
124
|
+
console.log("0.2.11");
|
|
125
125
|
process.exit(0);
|
|
126
126
|
}
|
|
127
127
|
if (args["--non-interactive"]) {
|
|
@@ -248,7 +248,7 @@ commands[command]().then((exec)=>{
|
|
|
248
248
|
logEventAsync("action", {
|
|
249
249
|
action: `expo ${command}`,
|
|
250
250
|
source: "expo/cli",
|
|
251
|
-
source_version: "0.2.
|
|
251
|
+
source_version: "0.2.11"
|
|
252
252
|
});
|
|
253
253
|
});
|
|
254
254
|
|
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
});
|
|
5
5
|
var _configPlugins = require("@expo/config-plugins");
|
|
6
6
|
var _appIdResolver = require("../AppIdResolver");
|
|
7
|
+
const debug = require("debug")("expo:start:platforms:android:AndroidAppIdResolver");
|
|
7
8
|
class AndroidAppIdResolver extends _appIdResolver.AppIdResolver {
|
|
8
9
|
constructor(projectRoot){
|
|
9
10
|
super(projectRoot, "android", "android.package");
|
|
@@ -12,7 +13,8 @@ class AndroidAppIdResolver extends _appIdResolver.AppIdResolver {
|
|
|
12
13
|
try {
|
|
13
14
|
await _configPlugins.AndroidConfig.Paths.getProjectPathOrThrowAsync(this.projectRoot);
|
|
14
15
|
return true;
|
|
15
|
-
} catch
|
|
16
|
+
} catch (error) {
|
|
17
|
+
debug("Expected error checking for native project:", error);
|
|
16
18
|
return false;
|
|
17
19
|
}
|
|
18
20
|
}
|
|
@@ -31,7 +33,9 @@ class AndroidAppIdResolver extends _appIdResolver.AppIdResolver {
|
|
|
31
33
|
if ((ref = androidManifest.manifest) == null ? void 0 : (ref1 = ref.$) == null ? void 0 : ref1.package) {
|
|
32
34
|
return androidManifest.manifest.$.package;
|
|
33
35
|
}
|
|
34
|
-
} catch
|
|
36
|
+
} catch (error) {
|
|
37
|
+
debug("Expected error resolving the package name from the AndroidManifest.xml:", error);
|
|
38
|
+
}
|
|
35
39
|
return null;
|
|
36
40
|
}
|
|
37
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/start/platforms/android/AndroidAppIdResolver.ts"],"sourcesContent":["import { AndroidConfig } from '@expo/config-plugins';\n\nimport { AppIdResolver } from '../AppIdResolver';\n\n/** Resolves the Android package name from the Expo config or native files. */\nexport class AndroidAppIdResolver extends AppIdResolver {\n constructor(projectRoot: string) {\n super(projectRoot, 'android', 'android.package');\n }\n\n async hasNativeProjectAsync(): Promise<boolean> {\n try {\n await AndroidConfig.Paths.getProjectPathOrThrowAsync(this.projectRoot);\n return true;\n } catch {\n return false;\n }\n }\n\n async resolveAppIdFromNativeAsync(): Promise<string | null> {\n const applicationIdFromGradle = await AndroidConfig.Package.getApplicationIdAsync(\n this.projectRoot\n ).catch(() => null);\n if (applicationIdFromGradle) {\n return applicationIdFromGradle;\n }\n\n try {\n const filePath = await AndroidConfig.Paths.getAndroidManifestAsync(this.projectRoot);\n const androidManifest = await AndroidConfig.Manifest.readAndroidManifestAsync(filePath);\n // Assert MainActivity defined.\n await AndroidConfig.Manifest.getMainActivityOrThrow(androidManifest);\n if (androidManifest.manifest?.$?.package) {\n return androidManifest.manifest.$.package;\n }\n } catch {}\n\n return null;\n }\n}\n"],"names":["AndroidAppIdResolver","AppIdResolver","constructor","projectRoot","hasNativeProjectAsync","AndroidConfig","Paths","getProjectPathOrThrowAsync","resolveAppIdFromNativeAsync","applicationIdFromGradle","Package","getApplicationIdAsync","catch","androidManifest","filePath","getAndroidManifestAsync","Manifest","readAndroidManifestAsync","getMainActivityOrThrow","manifest","$","package"],"mappings":"AAAA;;;;AAA8B,IAAA,cAAsB,WAAtB,sBAAsB,CAAA;AAEtB,IAAA,cAAkB,WAAlB,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"sources":["../../../../../src/start/platforms/android/AndroidAppIdResolver.ts"],"sourcesContent":["import { AndroidConfig } from '@expo/config-plugins';\n\nimport { AppIdResolver } from '../AppIdResolver';\n\nconst debug = require('debug')(\n 'expo:start:platforms:android:AndroidAppIdResolver'\n) as typeof console.log;\n\n/** Resolves the Android package name from the Expo config or native files. */\nexport class AndroidAppIdResolver extends AppIdResolver {\n constructor(projectRoot: string) {\n super(projectRoot, 'android', 'android.package');\n }\n\n async hasNativeProjectAsync(): Promise<boolean> {\n try {\n await AndroidConfig.Paths.getProjectPathOrThrowAsync(this.projectRoot);\n return true;\n } catch (error: any) {\n debug('Expected error checking for native project:', error);\n return false;\n }\n }\n\n async resolveAppIdFromNativeAsync(): Promise<string | null> {\n const applicationIdFromGradle = await AndroidConfig.Package.getApplicationIdAsync(\n this.projectRoot\n ).catch(() => null);\n if (applicationIdFromGradle) {\n return applicationIdFromGradle;\n }\n\n try {\n const filePath = await AndroidConfig.Paths.getAndroidManifestAsync(this.projectRoot);\n const androidManifest = await AndroidConfig.Manifest.readAndroidManifestAsync(filePath);\n // Assert MainActivity defined.\n await AndroidConfig.Manifest.getMainActivityOrThrow(androidManifest);\n if (androidManifest.manifest?.$?.package) {\n return androidManifest.manifest.$.package;\n }\n } catch (error: any) {\n debug('Expected error resolving the package name from the AndroidManifest.xml:', error);\n }\n\n return null;\n }\n}\n"],"names":["debug","require","AndroidAppIdResolver","AppIdResolver","constructor","projectRoot","hasNativeProjectAsync","AndroidConfig","Paths","getProjectPathOrThrowAsync","error","resolveAppIdFromNativeAsync","applicationIdFromGradle","Package","getApplicationIdAsync","catch","androidManifest","filePath","getAndroidManifestAsync","Manifest","readAndroidManifestAsync","getMainActivityOrThrow","manifest","$","package"],"mappings":"AAAA;;;;AAA8B,IAAA,cAAsB,WAAtB,sBAAsB,CAAA;AAEtB,IAAA,cAAkB,WAAlB,kBAAkB,CAAA;AAEhD,MAAMA,KAAK,GAAGC,OAAO,CAAC,OAAO,CAAC,CAC5B,mDAAmD,CACpD,AAAsB,AAAC;AAGjB,MAAMC,oBAAoB,SAASC,cAAa,cAAA;IACrDC,YAAYC,WAAmB,CAAE;QAC/B,KAAK,CAACA,WAAW,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;KAClD;IAED,MAAMC,qBAAqB,GAAqB;QAC9C,IAAI;YACF,MAAMC,cAAa,cAAA,CAACC,KAAK,CAACC,0BAA0B,CAAC,IAAI,CAACJ,WAAW,CAAC,CAAC;YACvE,OAAO,IAAI,CAAC;SACb,CAAC,OAAOK,KAAK,EAAO;YACnBV,KAAK,CAAC,6CAA6C,EAAEU,KAAK,CAAC,CAAC;YAC5D,OAAO,KAAK,CAAC;SACd;KACF;IAED,MAAMC,2BAA2B,GAA2B;QAC1D,MAAMC,uBAAuB,GAAG,MAAML,cAAa,cAAA,CAACM,OAAO,CAACC,qBAAqB,CAC/E,IAAI,CAACT,WAAW,CACjB,CAACU,KAAK,CAAC,IAAM,IAAI;QAAA,CAAC,AAAC;QACpB,IAAIH,uBAAuB,EAAE;YAC3B,OAAOA,uBAAuB,CAAC;SAChC;QAED,IAAI;gBAKEI,GAAwB;YAJ5B,MAAMC,QAAQ,GAAG,MAAMV,cAAa,cAAA,CAACC,KAAK,CAACU,uBAAuB,CAAC,IAAI,CAACb,WAAW,CAAC,AAAC;YACrF,MAAMW,eAAe,GAAG,MAAMT,cAAa,cAAA,CAACY,QAAQ,CAACC,wBAAwB,CAACH,QAAQ,CAAC,AAAC;YACxF,+BAA+B;YAC/B,MAAMV,cAAa,cAAA,CAACY,QAAQ,CAACE,sBAAsB,CAACL,eAAe,CAAC,CAAC;YACrE,IAAIA,CAAAA,GAAwB,GAAxBA,eAAe,CAACM,QAAQ,SAAG,GAA3BN,KAAAA,CAA2B,GAA3BA,QAAAA,GAAwB,CAAEO,CAAC,SAAA,GAA3BP,KAAAA,CAA2B,QAAEQ,OAAO,AAAT,EAAW;gBACxC,OAAOR,eAAe,CAACM,QAAQ,CAACC,CAAC,CAACC,OAAO,CAAC;aAC3C;SACF,CAAC,OAAOd,KAAK,EAAO;YACnBV,KAAK,CAAC,yEAAyE,EAAEU,KAAK,CAAC,CAAC;SACzF;QAED,OAAO,IAAI,CAAC;KACb;CACF;QArCYR,oBAAoB,GAApBA,oBAAoB"}
|
|
@@ -11,15 +11,18 @@ function _interopRequireDefault(obj) {
|
|
|
11
11
|
default: obj
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
|
+
const debug = require("debug")("expo:start:platforms:ios:AppleAppIdResolver");
|
|
14
15
|
class AppleAppIdResolver extends _appIdResolver.AppIdResolver {
|
|
15
16
|
constructor(projectRoot){
|
|
16
17
|
super(projectRoot, "ios", "ios.bundleIdentifier");
|
|
17
18
|
}
|
|
18
19
|
async hasNativeProjectAsync() {
|
|
19
20
|
try {
|
|
21
|
+
// Never returns nullish values.
|
|
20
22
|
return !!_configPlugins.IOSConfig.Paths.getAppDelegateFilePath(this.projectRoot);
|
|
21
|
-
} catch
|
|
22
|
-
|
|
23
|
+
} catch (error) {
|
|
24
|
+
debug("Expected error checking for native project:", error);
|
|
25
|
+
return false;
|
|
23
26
|
}
|
|
24
27
|
}
|
|
25
28
|
async resolveAppIdFromNativeAsync() {
|
|
@@ -29,7 +32,9 @@ class AppleAppIdResolver extends _appIdResolver.AppIdResolver {
|
|
|
29
32
|
if (bundleId) {
|
|
30
33
|
return bundleId;
|
|
31
34
|
}
|
|
32
|
-
} catch
|
|
35
|
+
} catch (error) {
|
|
36
|
+
debug("Expected error resolving the bundle identifier from the pbxproj:", error);
|
|
37
|
+
}
|
|
33
38
|
// Check Info.plist
|
|
34
39
|
try {
|
|
35
40
|
const infoPlistPath = _configPlugins.IOSConfig.Paths.getInfoPlistPath(this.projectRoot);
|
|
@@ -37,7 +42,9 @@ class AppleAppIdResolver extends _appIdResolver.AppIdResolver {
|
|
|
37
42
|
if (data.CFBundleIdentifier && !data.CFBundleIdentifier.startsWith("$(")) {
|
|
38
43
|
return data.CFBundleIdentifier;
|
|
39
44
|
}
|
|
40
|
-
} catch
|
|
45
|
+
} catch (error1) {
|
|
46
|
+
debug("Expected error resolving the bundle identifier from the project Info.plist:", error1);
|
|
47
|
+
}
|
|
41
48
|
return null;
|
|
42
49
|
}
|
|
43
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/start/platforms/ios/AppleAppIdResolver.ts"],"sourcesContent":["import { IOSConfig } from '@expo/config-plugins';\nimport plist from '@expo/plist';\nimport fs from 'fs';\n\nimport { AppIdResolver } from '../AppIdResolver';\n\n/** Resolves the iOS bundle identifier from the Expo config or native files. */\nexport class AppleAppIdResolver extends AppIdResolver {\n constructor(projectRoot: string) {\n super(projectRoot, 'ios', 'ios.bundleIdentifier');\n }\n\n async hasNativeProjectAsync(): Promise<boolean> {\n try {\n return !!IOSConfig.Paths.getAppDelegateFilePath(this.projectRoot);\n } catch {\n return
|
|
1
|
+
{"version":3,"sources":["../../../../../src/start/platforms/ios/AppleAppIdResolver.ts"],"sourcesContent":["import { IOSConfig } from '@expo/config-plugins';\nimport plist from '@expo/plist';\nimport fs from 'fs';\n\nimport { AppIdResolver } from '../AppIdResolver';\n\nconst debug = require('debug')('expo:start:platforms:ios:AppleAppIdResolver') as typeof console.log;\n\n/** Resolves the iOS bundle identifier from the Expo config or native files. */\nexport class AppleAppIdResolver extends AppIdResolver {\n constructor(projectRoot: string) {\n super(projectRoot, 'ios', 'ios.bundleIdentifier');\n }\n\n async hasNativeProjectAsync(): Promise<boolean> {\n try {\n // Never returns nullish values.\n return !!IOSConfig.Paths.getAppDelegateFilePath(this.projectRoot);\n } catch (error: any) {\n debug('Expected error checking for native project:', error);\n return false;\n }\n }\n\n async resolveAppIdFromNativeAsync(): Promise<string | null> {\n // Check xcode project\n try {\n const bundleId = IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(this.projectRoot);\n if (bundleId) {\n return bundleId;\n }\n } catch (error: any) {\n debug('Expected error resolving the bundle identifier from the pbxproj:', error);\n }\n\n // Check Info.plist\n try {\n const infoPlistPath = IOSConfig.Paths.getInfoPlistPath(this.projectRoot);\n const data = await plist.parse(fs.readFileSync(infoPlistPath, 'utf8'));\n if (data.CFBundleIdentifier && !data.CFBundleIdentifier.startsWith('$(')) {\n return data.CFBundleIdentifier;\n }\n } catch (error) {\n debug('Expected error resolving the bundle identifier from the project Info.plist:', error);\n }\n\n return null;\n }\n}\n"],"names":["debug","require","AppleAppIdResolver","AppIdResolver","constructor","projectRoot","hasNativeProjectAsync","IOSConfig","Paths","getAppDelegateFilePath","error","resolveAppIdFromNativeAsync","bundleId","BundleIdentifier","getBundleIdentifierFromPbxproj","infoPlistPath","getInfoPlistPath","data","plist","parse","fs","readFileSync","CFBundleIdentifier","startsWith"],"mappings":"AAAA;;;;AAA0B,IAAA,cAAsB,WAAtB,sBAAsB,CAAA;AAC9B,IAAA,MAAa,kCAAb,aAAa,EAAA;AAChB,IAAA,GAAI,kCAAJ,IAAI,EAAA;AAEW,IAAA,cAAkB,WAAlB,kBAAkB,CAAA;;;;;;AAEhD,MAAMA,KAAK,GAAGC,OAAO,CAAC,OAAO,CAAC,CAAC,6CAA6C,CAAC,AAAsB,AAAC;AAG7F,MAAMC,kBAAkB,SAASC,cAAa,cAAA;IACnDC,YAAYC,WAAmB,CAAE;QAC/B,KAAK,CAACA,WAAW,EAAE,KAAK,EAAE,sBAAsB,CAAC,CAAC;KACnD;IAED,MAAMC,qBAAqB,GAAqB;QAC9C,IAAI;YACF,gCAAgC;YAChC,OAAO,CAAC,CAACC,cAAS,UAAA,CAACC,KAAK,CAACC,sBAAsB,CAAC,IAAI,CAACJ,WAAW,CAAC,CAAC;SACnE,CAAC,OAAOK,KAAK,EAAO;YACnBV,KAAK,CAAC,6CAA6C,EAAEU,KAAK,CAAC,CAAC;YAC5D,OAAO,KAAK,CAAC;SACd;KACF;IAED,MAAMC,2BAA2B,GAA2B;QAC1D,sBAAsB;QACtB,IAAI;YACF,MAAMC,QAAQ,GAAGL,cAAS,UAAA,CAACM,gBAAgB,CAACC,8BAA8B,CAAC,IAAI,CAACT,WAAW,CAAC,AAAC;YAC7F,IAAIO,QAAQ,EAAE;gBACZ,OAAOA,QAAQ,CAAC;aACjB;SACF,CAAC,OAAOF,KAAK,EAAO;YACnBV,KAAK,CAAC,kEAAkE,EAAEU,KAAK,CAAC,CAAC;SAClF;QAED,mBAAmB;QACnB,IAAI;YACF,MAAMK,aAAa,GAAGR,cAAS,UAAA,CAACC,KAAK,CAACQ,gBAAgB,CAAC,IAAI,CAACX,WAAW,CAAC,AAAC;YACzE,MAAMY,IAAI,GAAG,MAAMC,MAAK,QAAA,CAACC,KAAK,CAACC,GAAE,QAAA,CAACC,YAAY,CAACN,aAAa,EAAE,MAAM,CAAC,CAAC,AAAC;YACvE,IAAIE,IAAI,CAACK,kBAAkB,IAAI,CAACL,IAAI,CAACK,kBAAkB,CAACC,UAAU,CAAC,IAAI,CAAC,EAAE;gBACxE,OAAON,IAAI,CAACK,kBAAkB,CAAC;aAChC;SACF,CAAC,OAAOZ,MAAK,EAAE;YACdV,KAAK,CAAC,6EAA6E,EAAEU,MAAK,CAAC,CAAC;SAC7F;QAED,OAAO,IAAI,CAAC;KACb;CACF;QAvCYR,kBAAkB,GAAlBA,kBAAkB"}
|
|
@@ -128,7 +128,7 @@ async function createHostInfoAsync() {
|
|
|
128
128
|
host: await _userSettings.default.getAnonymousIdentifierAsync(),
|
|
129
129
|
server: "expo",
|
|
130
130
|
// Defined in the build step
|
|
131
|
-
serverVersion: "0.2.
|
|
131
|
+
serverVersion: "0.2.11",
|
|
132
132
|
serverDriver: _manifestMiddleware.DEVELOPER_TOOL,
|
|
133
133
|
serverOS: _os.default.platform(),
|
|
134
134
|
serverOSVersion: _os.default.release()
|
|
@@ -94,7 +94,7 @@ async function logEventAsync(event, properties = {}) {
|
|
|
94
94
|
}
|
|
95
95
|
const { userId , deviceId } = identifyData;
|
|
96
96
|
const commonEventProperties = {
|
|
97
|
-
source_version: "0.2.
|
|
97
|
+
source_version: "0.2.11",
|
|
98
98
|
source: "expo"
|
|
99
99
|
};
|
|
100
100
|
const identity = {
|
|
@@ -135,7 +135,7 @@ function getContext() {
|
|
|
135
135
|
},
|
|
136
136
|
app: {
|
|
137
137
|
name: "expo",
|
|
138
|
-
version: "0.2.
|
|
138
|
+
version: "0.2.11"
|
|
139
139
|
},
|
|
140
140
|
ci: ciInfo.isCI ? {
|
|
141
141
|
name: ciInfo.name,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@expo/cli",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.11",
|
|
4
4
|
"description": "The Expo CLI",
|
|
5
5
|
"main": "build/bin/cli",
|
|
6
6
|
"bin": {
|
|
@@ -137,5 +137,5 @@
|
|
|
137
137
|
"structured-headers": "^0.4.1",
|
|
138
138
|
"taskr": "1.1.0"
|
|
139
139
|
},
|
|
140
|
-
"gitHead": "
|
|
140
|
+
"gitHead": "f2136cdc98ea6595298d01900861d649bcc6cae1"
|
|
141
141
|
}
|