@nrwl/expo 14.0.0 → 14.0.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/index.d.ts +1 -0
- package/index.js +3 -1
- package/index.js.map +1 -1
- package/migrations.json +17 -1
- package/package.json +4 -3
- package/plugins/metro-resolver.js +16 -27
- package/plugins/metro-resolver.js.map +1 -1
- package/plugins/with-nx-metro.d.ts +2 -0
- package/plugins/with-nx-metro.js +12 -5
- package/plugins/with-nx-metro.js.map +1 -1
- package/plugins/with-nx-webpack.d.ts +4 -0
- package/plugins/with-nx-webpack.js +103 -0
- package/plugins/with-nx-webpack.js.map +1 -0
- package/src/executors/sync-deps/sync-deps.impl.js +1 -2
- package/src/executors/sync-deps/sync-deps.impl.js.map +1 -1
- package/src/generators/application/files/babel.config.js.template +7 -0
- package/src/generators/application/files/metro.config.js.template +4 -0
- package/src/generators/application/files/webpack.config.js.template +10 -97
- package/src/generators/init/init.js +0 -1
- package/src/generators/init/init.js.map +1 -1
- package/src/migrations/update-14-0-0/add-project-root-metro-config-14-0-0.d.ts +6 -0
- package/src/migrations/update-14-0-0/add-project-root-metro-config-14-0-0.js +35 -0
- package/src/migrations/update-14-0-0/add-project-root-metro-config-14-0-0.js.map +1 -0
- package/src/utils/versions.d.ts +1 -2
- package/src/utils/versions.js +2 -3
- package/src/utils/versions.js.map +1 -1
- package/src/generators/application/files/.babelrc.js.template +0 -6
package/index.d.ts
CHANGED
package/index.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.withNxMetro = exports.expoApplicationGenerator = exports.expoInitGenerator = void 0;
|
|
3
|
+
exports.withNxWebpack = exports.withNxMetro = exports.expoApplicationGenerator = exports.expoInitGenerator = void 0;
|
|
4
4
|
var init_1 = require("./src/generators/init/init");
|
|
5
5
|
Object.defineProperty(exports, "expoInitGenerator", { enumerable: true, get: function () { return init_1.expoInitGenerator; } });
|
|
6
6
|
var application_1 = require("./src/generators/application/application");
|
|
7
7
|
Object.defineProperty(exports, "expoApplicationGenerator", { enumerable: true, get: function () { return application_1.expoApplicationGenerator; } });
|
|
8
8
|
var with_nx_metro_1 = require("./plugins/with-nx-metro");
|
|
9
9
|
Object.defineProperty(exports, "withNxMetro", { enumerable: true, get: function () { return with_nx_metro_1.withNxMetro; } });
|
|
10
|
+
var with_nx_webpack_1 = require("./plugins/with-nx-webpack");
|
|
11
|
+
Object.defineProperty(exports, "withNxWebpack", { enumerable: true, get: function () { return with_nx_webpack_1.withNxWebpack; } });
|
|
10
12
|
//# sourceMappingURL=index.js.map
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/expo/index.ts"],"names":[],"mappings":";;;AAAA,mDAA+D;AAAtD,yGAAA,iBAAiB,OAAA;AAC1B,wEAAoF;AAA3E,uHAAA,wBAAwB,OAAA;AACjC,yDAAsD;AAA7C,4GAAA,WAAW,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/expo/index.ts"],"names":[],"mappings":";;;AAAA,mDAA+D;AAAtD,yGAAA,iBAAiB,OAAA;AAC1B,wEAAoF;AAA3E,uHAAA,wBAAwB,OAAA;AACjC,yDAAsD;AAA7C,4GAAA,WAAW,OAAA;AACpB,6DAA0D;AAAjD,gHAAA,aAAa,OAAA"}
|
package/migrations.json
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
{
|
|
2
|
-
"schematics": {
|
|
2
|
+
"schematics": {
|
|
3
|
+
"add-project-root-metro-config-14-0-0": {
|
|
4
|
+
"version": "14.0.1-beta.0",
|
|
5
|
+
"cli": "nx",
|
|
6
|
+
"description": "Add projectRoot option in metro.config.js",
|
|
7
|
+
"factory": "./src/migrations/update-14-0-0/add-project-root-metro-config-14-0-0"
|
|
8
|
+
}
|
|
9
|
+
},
|
|
3
10
|
"packageJsonUpdates": {
|
|
4
11
|
"13.8.6": {
|
|
5
12
|
"version": "13.8.6-beta.0",
|
|
@@ -23,6 +30,15 @@
|
|
|
23
30
|
"addToPackageJson": "devDependencies"
|
|
24
31
|
}
|
|
25
32
|
}
|
|
33
|
+
},
|
|
34
|
+
"14.0.1": {
|
|
35
|
+
"version": "14.0.1-beta.0",
|
|
36
|
+
"packages": {
|
|
37
|
+
"expo-cli": {
|
|
38
|
+
"version": "5.4.3",
|
|
39
|
+
"alwaysAddToPackageJson": false
|
|
40
|
+
}
|
|
41
|
+
}
|
|
26
42
|
}
|
|
27
43
|
}
|
|
28
44
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/expo",
|
|
3
|
-
"version": "14.0.
|
|
3
|
+
"version": "14.0.1",
|
|
4
4
|
"description": "Expo Plugin for Nx",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Monorepo",
|
|
@@ -33,9 +33,10 @@
|
|
|
33
33
|
"@nrwl/workspace": "*",
|
|
34
34
|
"chalk": "4.1.0",
|
|
35
35
|
"enhanced-resolve": "^5.8.3",
|
|
36
|
-
"expo-cli": "^5.4.
|
|
36
|
+
"expo-cli": "^5.4.3",
|
|
37
37
|
"metro-resolver": "^0.66.2",
|
|
38
|
-
"tsconfig-paths": "^3.9.0"
|
|
38
|
+
"tsconfig-paths": "^3.9.0",
|
|
39
|
+
"tsconfig-paths-webpack-plugin": "^3.5.2"
|
|
39
40
|
},
|
|
40
41
|
"peerDependencies": {
|
|
41
42
|
"expo": "^44.0.5"
|
|
@@ -17,13 +17,13 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
17
17
|
*/
|
|
18
18
|
function getResolveRequest(extensions) {
|
|
19
19
|
return function (_context, realModuleName, platform, moduleName) {
|
|
20
|
-
const
|
|
21
|
-
if (
|
|
20
|
+
const debug = process.env.NX_REACT_NATIVE_DEBUG === 'true';
|
|
21
|
+
if (debug)
|
|
22
22
|
console.log(chalk.cyan(`[Nx] Resolving: ${moduleName}`));
|
|
23
23
|
const { resolveRequest } = _context, context = (0, tslib_1.__rest)(_context, ["resolveRequest"]);
|
|
24
|
-
const resolvedPath = defaultMetroResolver(context, moduleName, platform) ||
|
|
25
|
-
tsconfigPathsResolver(context, extensions, realModuleName, moduleName, platform) ||
|
|
26
|
-
pnpmResolver(extensions, context, realModuleName, moduleName);
|
|
24
|
+
const resolvedPath = defaultMetroResolver(context, moduleName, platform, debug) ||
|
|
25
|
+
tsconfigPathsResolver(context, extensions, realModuleName, moduleName, platform, debug) ||
|
|
26
|
+
pnpmResolver(extensions, context, realModuleName, moduleName, debug);
|
|
27
27
|
if (resolvedPath) {
|
|
28
28
|
return resolvedPath;
|
|
29
29
|
}
|
|
@@ -35,13 +35,12 @@ exports.getResolveRequest = getResolveRequest;
|
|
|
35
35
|
* This function try to resolve path using metro's default resolver
|
|
36
36
|
* @returns path if resolved, else undefined
|
|
37
37
|
*/
|
|
38
|
-
function defaultMetroResolver(context, moduleName, platform) {
|
|
39
|
-
const DEBUG = process.env.NX_REACT_NATIVE_DEBUG === 'true';
|
|
38
|
+
function defaultMetroResolver(context, moduleName, platform, debug) {
|
|
40
39
|
try {
|
|
41
40
|
return metroResolver.resolve(context, moduleName, platform);
|
|
42
41
|
}
|
|
43
42
|
catch (_a) {
|
|
44
|
-
if (
|
|
43
|
+
if (debug)
|
|
45
44
|
console.log(chalk.cyan(`[Nx] Unable to resolve with default Metro resolver: ${moduleName}`));
|
|
46
45
|
}
|
|
47
46
|
}
|
|
@@ -50,8 +49,7 @@ function defaultMetroResolver(context, moduleName, platform) {
|
|
|
50
49
|
* @returns path if resolved, else undefined
|
|
51
50
|
* This pnpm resolver is inspired from https://github.com/vjpr/pnpm-react-native-example/blob/main/packages/pnpm-expo-helper/util/make-resolver.js
|
|
52
51
|
*/
|
|
53
|
-
function pnpmResolver(extensions, context, realModuleName, moduleName) {
|
|
54
|
-
const DEBUG = process.env.NX_REACT_NATIVE_DEBUG === 'true';
|
|
52
|
+
function pnpmResolver(extensions, context, realModuleName, moduleName, debug) {
|
|
55
53
|
try {
|
|
56
54
|
const pnpmResolve = getPnpmResolver(extensions);
|
|
57
55
|
const lookupStartPath = (0, path_1.dirname)(context.originModulePath);
|
|
@@ -61,7 +59,7 @@ function pnpmResolver(extensions, context, realModuleName, moduleName) {
|
|
|
61
59
|
}
|
|
62
60
|
}
|
|
63
61
|
catch (_a) {
|
|
64
|
-
if (
|
|
62
|
+
if (debug)
|
|
65
63
|
console.log(chalk.cyan(`[Nx] Unable to resolve with default PNPM resolver: ${moduleName}`));
|
|
66
64
|
}
|
|
67
65
|
}
|
|
@@ -69,22 +67,14 @@ function pnpmResolver(extensions, context, realModuleName, moduleName) {
|
|
|
69
67
|
* This function try to resolve files that are specified in tsconfig's paths
|
|
70
68
|
* @returns path if resolved, else undefined
|
|
71
69
|
*/
|
|
72
|
-
function tsconfigPathsResolver(context, extensions, realModuleName, moduleName, platform) {
|
|
73
|
-
const
|
|
74
|
-
const
|
|
75
|
-
const match = matcher(realModuleName, undefined, undefined, extensions.map((ext) => `.${ext}`));
|
|
70
|
+
function tsconfigPathsResolver(context, extensions, realModuleName, moduleName, platform, debug) {
|
|
71
|
+
const tsConfigPathMatcher = getMatcher(debug);
|
|
72
|
+
const match = tsConfigPathMatcher(realModuleName, undefined, undefined, extensions.map((ext) => `.${ext}`));
|
|
76
73
|
if (match) {
|
|
77
|
-
|
|
78
|
-
if (metroResolvePath) {
|
|
79
|
-
return metroResolvePath;
|
|
80
|
-
}
|
|
81
|
-
return {
|
|
82
|
-
type: 'sourceFile',
|
|
83
|
-
filePath: match,
|
|
84
|
-
};
|
|
74
|
+
return metroResolver.resolve(context, match, platform);
|
|
85
75
|
}
|
|
86
76
|
else {
|
|
87
|
-
if (
|
|
77
|
+
if (debug) {
|
|
88
78
|
console.log(chalk.red(`[Nx] Failed to resolve ${chalk.bold(moduleName)}`));
|
|
89
79
|
console.log(chalk.cyan(`[Nx] The following tsconfig paths was used:\n:${chalk.bold(JSON.stringify(paths, null, 2))}`));
|
|
90
80
|
}
|
|
@@ -93,14 +83,13 @@ function tsconfigPathsResolver(context, extensions, realModuleName, moduleName,
|
|
|
93
83
|
let matcher;
|
|
94
84
|
let absoluteBaseUrl;
|
|
95
85
|
let paths;
|
|
96
|
-
function getMatcher() {
|
|
97
|
-
const DEBUG = process.env.NX_REACT_NATIVE_DEBUG === 'true';
|
|
86
|
+
function getMatcher(debug) {
|
|
98
87
|
if (!matcher) {
|
|
99
88
|
const result = (0, tsconfig_paths_1.loadConfig)();
|
|
100
89
|
if (result.resultType === 'success') {
|
|
101
90
|
absoluteBaseUrl = result.absoluteBaseUrl;
|
|
102
91
|
paths = result.paths;
|
|
103
|
-
if (
|
|
92
|
+
if (debug) {
|
|
104
93
|
console.log(chalk.cyan(`[Nx] Located tsconfig at ${chalk.bold(absoluteBaseUrl)}`));
|
|
105
94
|
console.log(chalk.cyan(`[Nx] Found the following paths:\n:${chalk.bold(JSON.stringify(paths, null, 2))}`));
|
|
106
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metro-resolver.js","sourceRoot":"","sources":["../../../../packages/expo/plugins/metro-resolver.ts"],"names":[],"mappings":";;;;AAAA,gDAAgD;AAEhD,mDAA6D;AAC7D,+BAA+B;AAC/B,uDAA0E;AAC1E,+BAAqC;AACrC,yBAAyB;AACzB,yCAA6C;AAE7C;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,UAAoB;IACpD,OAAO,UACL,QAAa,EACb,cAAsB,EACtB,QAAuB,EACvB,UAAkB;QAElB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,KAAK,MAAM,CAAC;QAE3D,IAAI,KAAK;YAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAC,CAAC;QAEpE,MAAM,EAAE,cAAc,KAAiB,QAAQ,EAApB,OAAO,uBAAK,QAAQ,EAAzC,kBAA8B,CAAW,CAAC;QAEhD,MAAM,YAAY,GAChB,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"metro-resolver.js","sourceRoot":"","sources":["../../../../packages/expo/plugins/metro-resolver.ts"],"names":[],"mappings":"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"}
|
package/plugins/with-nx-metro.js
CHANGED
|
@@ -3,21 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.withNxMetro = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
+
const fs_extra_1 = require("fs-extra");
|
|
6
7
|
const metro_resolver_1 = require("./metro-resolver");
|
|
7
8
|
function withNxMetro(config, opts = {}) {
|
|
9
|
+
var _a;
|
|
8
10
|
const extensions = ['', 'ts', 'tsx', 'js', 'jsx', 'json'];
|
|
9
11
|
if (opts.debug)
|
|
10
12
|
process.env.NX_REACT_NATIVE_DEBUG = 'true';
|
|
11
13
|
if (opts.extensions)
|
|
12
14
|
extensions.push(...opts.extensions);
|
|
13
|
-
config.projectRoot =
|
|
14
|
-
|
|
15
|
-
config.
|
|
15
|
+
config.projectRoot = opts.projectRoot || devkit_1.workspaceRoot;
|
|
16
|
+
// Add support for paths specified by tsconfig
|
|
17
|
+
config.resolver = Object.assign(Object.assign({}, config.resolver), { resolveRequest: (0, metro_resolver_1.getResolveRequest)(extensions) });
|
|
18
|
+
let watchFolders = config.watchFolders || [];
|
|
19
|
+
watchFolders = watchFolders.concat([
|
|
16
20
|
(0, path_1.join)(devkit_1.workspaceRoot, 'node_modules'),
|
|
17
21
|
(0, path_1.join)(devkit_1.workspaceRoot, (0, devkit_1.workspaceLayout)().libsDir),
|
|
18
22
|
]);
|
|
19
|
-
|
|
20
|
-
|
|
23
|
+
if ((_a = opts.watchFolders) === null || _a === void 0 ? void 0 : _a.length) {
|
|
24
|
+
watchFolders = watchFolders.concat(opts.watchFolders);
|
|
25
|
+
}
|
|
26
|
+
watchFolders = watchFolders.filter((folder) => (0, fs_extra_1.existsSync)(folder));
|
|
27
|
+
config.watchFolders = watchFolders;
|
|
21
28
|
return config;
|
|
22
29
|
}
|
|
23
30
|
exports.withNxMetro = withNxMetro;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-nx-metro.js","sourceRoot":"","sources":["../../../../packages/expo/plugins/with-nx-metro.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAC9D,+BAA4B;AAC5B,qDAAqD;
|
|
1
|
+
{"version":3,"file":"with-nx-metro.js","sourceRoot":"","sources":["../../../../packages/expo/plugins/with-nx-metro.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAC9D,+BAA4B;AAC5B,uCAAsC;AAEtC,qDAAqD;AASrD,SAAgB,WAAW,CAAC,MAAW,EAAE,OAAsB,EAAE;;IAC/D,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC1D,IAAI,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,MAAM,CAAC;IAC3D,IAAI,IAAI,CAAC,UAAU;QAAE,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;IAEzD,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,sBAAa,CAAC;IAEvD,8CAA8C;IAC9C,MAAM,CAAC,QAAQ,mCACV,MAAM,CAAC,QAAQ,KAClB,cAAc,EAAE,IAAA,kCAAiB,EAAC,UAAU,CAAC,GAC9C,CAAC;IAEF,IAAI,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;IAC7C,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;QACjC,IAAA,WAAI,EAAC,sBAAa,EAAE,cAAc,CAAC;QACnC,IAAA,WAAI,EAAC,sBAAa,EAAE,IAAA,wBAAe,GAAE,CAAC,OAAO,CAAC;KAC/C,CAAC,CAAC;IACH,IAAI,MAAA,IAAI,CAAC,YAAY,0CAAE,MAAM,EAAE;QAC7B,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;KACvD;IAED,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,qBAAU,EAAC,MAAM,CAAC,CAAC,CAAC;IACnE,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;IAEnC,OAAO,MAAM,CAAC;AAChB,CAAC;AA1BD,kCA0BC"}
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.withNxWebpack = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
/**
|
|
8
|
+
* This function add addtional rules to expo's webpack config to make expo web working
|
|
9
|
+
*/
|
|
10
|
+
function withNxWebpack(config) {
|
|
11
|
+
var _a;
|
|
12
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
13
|
+
// add additional rule to load files under libs
|
|
14
|
+
const rules = (_a = config.module.rules[1]) === null || _a === void 0 ? void 0 : _a.oneOf;
|
|
15
|
+
if (rules) {
|
|
16
|
+
rules.push({
|
|
17
|
+
test: /\.(mjs|[jt]sx?)$/,
|
|
18
|
+
exclude: /node_modules/,
|
|
19
|
+
use: {
|
|
20
|
+
loader: require.resolve('@nrwl/web/src/utils/web-babel-loader.js'),
|
|
21
|
+
options: {
|
|
22
|
+
presets: [
|
|
23
|
+
[
|
|
24
|
+
'@nrwl/react/babel',
|
|
25
|
+
{
|
|
26
|
+
runtime: 'automatic',
|
|
27
|
+
},
|
|
28
|
+
],
|
|
29
|
+
],
|
|
30
|
+
},
|
|
31
|
+
},
|
|
32
|
+
});
|
|
33
|
+
// svg rule from https://github.com/kristerkari/react-native-svg-transformer/issues/135#issuecomment-1008310514
|
|
34
|
+
rules.unshift({
|
|
35
|
+
test: /\.svg$/,
|
|
36
|
+
exclude: /node_modules/,
|
|
37
|
+
use: [
|
|
38
|
+
{
|
|
39
|
+
loader: require.resolve('@svgr/webpack'),
|
|
40
|
+
options: {
|
|
41
|
+
svgoConfig: {
|
|
42
|
+
plugins: {
|
|
43
|
+
cleanupAttrs: true,
|
|
44
|
+
cleanupEnableBackground: true,
|
|
45
|
+
cleanupIDs: true,
|
|
46
|
+
cleanupListOfValues: true,
|
|
47
|
+
cleanupNumericValues: true,
|
|
48
|
+
collapseGroups: true,
|
|
49
|
+
convertEllipseToCircle: true,
|
|
50
|
+
convertPathData: true,
|
|
51
|
+
convertShapeToPath: true,
|
|
52
|
+
convertStyleToAttrs: true,
|
|
53
|
+
convertTransform: true,
|
|
54
|
+
inlineStyles: true,
|
|
55
|
+
mergePaths: true,
|
|
56
|
+
minifyStyles: true,
|
|
57
|
+
moveElemsAttrsToGroup: true,
|
|
58
|
+
moveGroupAttrsToElems: true,
|
|
59
|
+
removeComments: true,
|
|
60
|
+
removeDesc: true,
|
|
61
|
+
removeDimensions: false,
|
|
62
|
+
removeDoctype: true,
|
|
63
|
+
removeEditorsNSData: true,
|
|
64
|
+
removeEmptyAttrs: true,
|
|
65
|
+
removeEmptyContainers: true,
|
|
66
|
+
removeEmptyText: true,
|
|
67
|
+
removeHiddenElems: true,
|
|
68
|
+
removeMetadata: true,
|
|
69
|
+
removeNonInheritableGroupAttrs: true,
|
|
70
|
+
removeRasterImages: true,
|
|
71
|
+
removeScriptElement: false,
|
|
72
|
+
removeStyleElement: false,
|
|
73
|
+
removeTitle: true,
|
|
74
|
+
removeUnknownsAndDefaults: true,
|
|
75
|
+
removeUnusedNS: true,
|
|
76
|
+
removeUselessDefs: true,
|
|
77
|
+
removeUselessStrokeAndFill: true,
|
|
78
|
+
removeViewBox: false,
|
|
79
|
+
removeXMLNS: true,
|
|
80
|
+
removeXMLProcInst: true,
|
|
81
|
+
reusePaths: true,
|
|
82
|
+
sortAttrs: true,
|
|
83
|
+
sortDefsChildren: true,
|
|
84
|
+
convertColors: false,
|
|
85
|
+
},
|
|
86
|
+
},
|
|
87
|
+
},
|
|
88
|
+
},
|
|
89
|
+
],
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
|
|
93
|
+
const tsConfigPath = (0, path_1.resolve)('tsconfig.json');
|
|
94
|
+
config.resolve.plugins.push(new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({
|
|
95
|
+
configFile: tsConfigPath,
|
|
96
|
+
extensions,
|
|
97
|
+
}));
|
|
98
|
+
config.resolve.symlinks = true;
|
|
99
|
+
return config;
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
exports.withNxWebpack = withNxWebpack;
|
|
103
|
+
//# sourceMappingURL=with-nx-webpack.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"with-nx-webpack.js","sourceRoot":"","sources":["../../../../packages/expo/plugins/with-nx-webpack.ts"],"names":[],"mappings":";;;;AAAA,iFAAoE;AACpE,+BAA+B;AAE/B;;GAEG;AACH,SAAsB,aAAa,CAAC,MAAM;;;QACxC,+CAA+C;QAC/C,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,0CAAE,KAAK,CAAC;QAC5C,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EAAE,cAAc;gBACvB,GAAG,EAAE;oBACH,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,yCAAyC,CAAC;oBAClE,OAAO,EAAE;wBACP,OAAO,EAAE;4BACP;gCACE,mBAAmB;gCACnB;oCACE,OAAO,EAAE,WAAW;iCACrB;6BACF;yBACF;qBACF;iBACF;aACF,CAAC,CAAC;YACH,+GAA+G;YAC/G,KAAK,CAAC,OAAO,CAAC;gBACZ,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,cAAc;gBACvB,GAAG,EAAE;oBACH;wBACE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;wBACxC,OAAO,EAAE;4BACP,UAAU,EAAE;gCACV,OAAO,EAAE;oCACP,YAAY,EAAE,IAAI;oCAClB,uBAAuB,EAAE,IAAI;oCAC7B,UAAU,EAAE,IAAI;oCAChB,mBAAmB,EAAE,IAAI;oCACzB,oBAAoB,EAAE,IAAI;oCAC1B,cAAc,EAAE,IAAI;oCACpB,sBAAsB,EAAE,IAAI;oCAC5B,eAAe,EAAE,IAAI;oCACrB,kBAAkB,EAAE,IAAI;oCACxB,mBAAmB,EAAE,IAAI;oCACzB,gBAAgB,EAAE,IAAI;oCACtB,YAAY,EAAE,IAAI;oCAClB,UAAU,EAAE,IAAI;oCAChB,YAAY,EAAE,IAAI;oCAClB,qBAAqB,EAAE,IAAI;oCAC3B,qBAAqB,EAAE,IAAI;oCAC3B,cAAc,EAAE,IAAI;oCACpB,UAAU,EAAE,IAAI;oCAChB,gBAAgB,EAAE,KAAK;oCACvB,aAAa,EAAE,IAAI;oCACnB,mBAAmB,EAAE,IAAI;oCACzB,gBAAgB,EAAE,IAAI;oCACtB,qBAAqB,EAAE,IAAI;oCAC3B,eAAe,EAAE,IAAI;oCACrB,iBAAiB,EAAE,IAAI;oCACvB,cAAc,EAAE,IAAI;oCACpB,8BAA8B,EAAE,IAAI;oCACpC,kBAAkB,EAAE,IAAI;oCACxB,mBAAmB,EAAE,KAAK;oCAC1B,kBAAkB,EAAE,KAAK;oCACzB,WAAW,EAAE,IAAI;oCACjB,yBAAyB,EAAE,IAAI;oCAC/B,cAAc,EAAE,IAAI;oCACpB,iBAAiB,EAAE,IAAI;oCACvB,0BAA0B,EAAE,IAAI;oCAChC,aAAa,EAAE,KAAK;oCACpB,WAAW,EAAE,IAAI;oCACjB,iBAAiB,EAAE,IAAI;oCACvB,UAAU,EAAE,IAAI;oCAChB,SAAS,EAAE,IAAI;oCACf,gBAAgB,EAAE,IAAI;oCACtB,aAAa,EAAE,KAAK;iCACrB;6BACF;yBACF;qBACF;iBACF;aACF,CAAC,CAAC;SACJ;QAED,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;QAE9C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CACzB,IAAI,mDAAmB,CAAC;YACtB,UAAU,EAAE,YAAY;YACxB,UAAU;SACX,CAAC,CACH,CAAC;QAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC/B,OAAO,MAAM,CAAC;;CACf;AA7FD,sCA6FC"}
|
|
@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const chalk = require("chalk");
|
|
7
7
|
const devkit_1 = require("@nrwl/devkit");
|
|
8
|
-
const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
|
|
9
8
|
const find_all_npm_dependencies_1 = require("../../utils/find-all-npm-dependencies");
|
|
10
9
|
function syncDepsExecutor(options, context) {
|
|
11
10
|
return (0, tslib_1.__asyncGenerator)(this, arguments, function* syncDepsExecutor_1() {
|
|
@@ -17,7 +16,7 @@ function syncDepsExecutor(options, context) {
|
|
|
17
16
|
exports.default = syncDepsExecutor;
|
|
18
17
|
function syncDeps(projectName, projectRoot, include) {
|
|
19
18
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
20
|
-
const graph = yield (0,
|
|
19
|
+
const graph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
21
20
|
const npmDeps = (0, find_all_npm_dependencies_1.findAllNpmDependencies)(graph, projectName);
|
|
22
21
|
const packageJsonPath = (0, path_1.join)(projectRoot, 'package.json');
|
|
23
22
|
const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-deps.impl.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/sync-deps/sync-deps.impl.ts"],"names":[],"mappings":";;;;AAAA,+BAA4B;AAC5B,+BAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"sync-deps.impl.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/sync-deps/sync-deps.impl.ts"],"names":[],"mappings":";;;;AAAA,+BAA4B;AAC5B,+BAA+B;AAC/B,yCAMsB;AAEtB,qFAA+E;AAQ/E,SAA+B,gBAAgB,CAC7C,OAA4B,EAC5B,OAAwB;;QAExB,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACzE,4BAA4B,CAC1B,OAAO,CAAC,WAAW,EACnB,2BAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA,CAClE,CAAC;QAEF,iCAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;IAC1B,CAAC;CAAA;AAXD,mCAWC;AAED,SAAsB,QAAQ,CAC5B,WAAmB,EACnB,WAAmB,EACnB,OAAgB;;QAEhB,MAAM,KAAK,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAA,kDAAsB,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3D,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,eAAe,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,MAAM,WAAW,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE;YAC7B,WAAW,CAAC,YAAY,GAAG,EAAE,CAAC;YAC9B,OAAO,GAAG,IAAI,CAAC;SAChB;QAED,IAAI,WAAW,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;SAC9B;QAED,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACtB,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE;gBAClC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;gBACpC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAClB,OAAO,GAAG,IAAI,CAAC;aAChB;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,EAAE;YACX,IAAA,sBAAa,EAAC,eAAe,EAAE,WAAW,CAAC,CAAC;SAC7C;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAnCD,4BAmCC;AAED,SAAgB,4BAA4B,CAC1C,WAAmB,EACnB,IAAc;IAEd,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,eAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAC5B,MAAM,CACP,yCAAyC,WAAW;IACrD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;KACjE;SAAM;QACL,eAAM,CAAC,IAAI,CACT,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAChB,MAAM,CACP,sBAAsB,WAAW,oCAAoC,CACvE,CAAC;KACH;AACH,CAAC;AAhBD,oEAgBC"}
|
|
@@ -17,5 +17,9 @@ module.exports = (async () => {
|
|
|
17
17
|
debug: false,
|
|
18
18
|
// all the file extensions used for imports other than 'ts', 'tsx', 'js', 'jsx'
|
|
19
19
|
extensions: [],
|
|
20
|
+
// the project root to start the metro server
|
|
21
|
+
projectRoot: __dirname,
|
|
22
|
+
// Specify any additional (to projectRoot) watch folders, this is used to know which files to watch
|
|
23
|
+
watchFolders: []
|
|
20
24
|
});
|
|
21
25
|
})();
|
|
@@ -1,102 +1,15 @@
|
|
|
1
1
|
const createExpoWebpackConfigAsync = require('@expo/webpack-config');
|
|
2
|
-
const {
|
|
2
|
+
const { withNxWebpack } = require('@nrwl/expo');
|
|
3
3
|
|
|
4
4
|
module.exports = async function (env, argv) {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
options: {
|
|
15
|
-
presets: [
|
|
16
|
-
[
|
|
17
|
-
'@nrwl/react/babel',
|
|
18
|
-
{
|
|
19
|
-
runtime: 'automatic',
|
|
20
|
-
},
|
|
21
|
-
],
|
|
22
|
-
],
|
|
23
|
-
},
|
|
24
|
-
},
|
|
25
|
-
});
|
|
26
|
-
// svg rule from https://github.com/kristerkari/react-native-svg-transformer/issues/135#issuecomment-1008310514
|
|
27
|
-
rules.unshift({
|
|
28
|
-
test: /\.svg$/,
|
|
29
|
-
exclude: /node_modules/,
|
|
30
|
-
use: [
|
|
31
|
-
{
|
|
32
|
-
loader: require.resolve('@svgr/webpack'),
|
|
33
|
-
options: {
|
|
34
|
-
svgoConfig: {
|
|
35
|
-
plugins: [
|
|
36
|
-
{ name: 'removeDoctype', active: true },
|
|
37
|
-
{ name: 'removeXMLProcInst', active: true },
|
|
38
|
-
{ name: 'removeComments', active: true },
|
|
39
|
-
{ name: 'removeMetadata', active: true },
|
|
40
|
-
{ name: 'removeXMLNS', active: true },
|
|
41
|
-
{ name: 'removeEditorsNSData', active: true },
|
|
42
|
-
{ name: 'cleanupAttrs', active: true },
|
|
43
|
-
{ name: 'inlineStyles', active: true },
|
|
44
|
-
{ name: 'minifyStyles', active: true },
|
|
45
|
-
{ name: 'convertStyleToAttrs', active: true },
|
|
46
|
-
{ name: 'cleanupIDs', active: true },
|
|
47
|
-
{ name: 'removeRasterImages', active: true },
|
|
48
|
-
{ name: 'removeUselessDefs', active: true },
|
|
49
|
-
{ name: 'cleanupNumericValues', active: true },
|
|
50
|
-
{ name: 'cleanupListOfValues', active: true },
|
|
51
|
-
{ name: 'convertColors', active: true },
|
|
52
|
-
{ name: 'removeUnknownsAndDefaults', active: true },
|
|
53
|
-
{ name: 'removeNonInheritableGroupAttrs', active: true },
|
|
54
|
-
{ name: 'removeUselessStrokeAndFill', active: true },
|
|
55
|
-
{ name: 'removeViewBox', active: false },
|
|
56
|
-
{ name: 'cleanupEnableBackground', active: true },
|
|
57
|
-
{ name: 'removeHiddenElems', active: true },
|
|
58
|
-
{ name: 'removeEmptyText', active: true },
|
|
59
|
-
{ name: 'convertShapeToPath', active: true },
|
|
60
|
-
{ name: 'moveElemsAttrsToGroup', active: true },
|
|
61
|
-
{ name: 'moveGroupAttrsToElems', active: true },
|
|
62
|
-
{ name: 'collapseGroups', active: true },
|
|
63
|
-
{ name: 'convertPathData', active: true },
|
|
64
|
-
{ name: 'convertEllipseToCircle', active: true },
|
|
65
|
-
{ name: 'convertTransform', active: true },
|
|
66
|
-
{ name: 'removeEmptyAttrs', active: true },
|
|
67
|
-
{ name: 'removeEmptyContainers', active: true },
|
|
68
|
-
{ name: 'mergePaths', active: true },
|
|
69
|
-
{ name: 'removeUnusedNS', active: true },
|
|
70
|
-
{ name: 'reusePaths', active: true },
|
|
71
|
-
{ name: 'sortAttrs', active: true },
|
|
72
|
-
{ name: 'sortDefsChildren', active: true },
|
|
73
|
-
{ name: 'removeTitle', active: true },
|
|
74
|
-
{ name: 'removeDesc', active: true },
|
|
75
|
-
{ name: 'removeDimensions', active: false },
|
|
76
|
-
{ name: 'removeStyleElement', active: false },
|
|
77
|
-
{ name: 'removeScriptElement', active: false },
|
|
78
|
-
],
|
|
79
|
-
},
|
|
80
|
-
inlineStyles: {
|
|
81
|
-
onlyMatchedOnce: false,
|
|
82
|
-
},
|
|
83
|
-
removeDimensions: false,
|
|
84
|
-
removeUnknownsAndDefaults: false,
|
|
85
|
-
convertColors: false,
|
|
86
|
-
},
|
|
87
|
-
},
|
|
88
|
-
],
|
|
89
|
-
});
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
|
|
93
|
-
let tsConfigPath = 'tsconfig.json';
|
|
94
|
-
|
|
95
|
-
config.resolve.plugins.push(
|
|
96
|
-
new TsconfigPathsPlugin({
|
|
97
|
-
configFile: tsConfigPath,
|
|
98
|
-
extensions,
|
|
99
|
-
})
|
|
100
|
-
);
|
|
5
|
+
let config = await createExpoWebpackConfigAsync(env, argv);
|
|
6
|
+
config = await withNxWebpack(config);
|
|
7
|
+
|
|
8
|
+
// You can override the config here, for example:
|
|
9
|
+
// config.resolve.alias = {
|
|
10
|
+
// ...config.resolve.alias,
|
|
11
|
+
// react: path.resolve('../../node_modules/react'),
|
|
12
|
+
// };
|
|
13
|
+
|
|
101
14
|
return config;
|
|
102
15
|
};
|
|
@@ -65,7 +65,6 @@ function updateDependencies(host) {
|
|
|
65
65
|
'@testing-library/jest-native': versions_1.testingLibraryJestNativeVersion,
|
|
66
66
|
'jest-expo': versions_1.jestExpoVersion,
|
|
67
67
|
'expo-cli': versions_1.expoCliVersion,
|
|
68
|
-
'tsconfig-paths-webpack-plugin': versions_1.tsConfigPathsWebpackPluginVersion,
|
|
69
68
|
'@svgr/webpack': versions_1.svgrWebpackVersion,
|
|
70
69
|
'babel-preset-expo': versions_1.babelPresetExpoVersion,
|
|
71
70
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,iGAA4F;AAC5F,yCAQsB;AAEtB,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
/**
|
|
6
|
+
* Add projectRoot and watchFolders options in metro.config.js
|
|
7
|
+
* @param tree
|
|
8
|
+
*/
|
|
9
|
+
function update(tree) {
|
|
10
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
11
|
+
const projects = (0, devkit_1.getProjects)(tree);
|
|
12
|
+
projects.forEach((project) => {
|
|
13
|
+
var _a, _b;
|
|
14
|
+
const metroConfigPath = `${project.root}/metro.config.js`;
|
|
15
|
+
if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.start) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/react-native:start' ||
|
|
16
|
+
!tree.exists(metroConfigPath))
|
|
17
|
+
return;
|
|
18
|
+
try {
|
|
19
|
+
const metroConfigContent = tree.read(metroConfigPath, 'utf-8');
|
|
20
|
+
if (metroConfigContent.includes('projectRoot: __dirname')) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
if (metroConfigContent.includes('projectRoot'))
|
|
24
|
+
return;
|
|
25
|
+
tree.write(metroConfigPath, metroConfigContent.replace('debug: ', 'projectRoot: __dirname, watchFolders: [], debug: '));
|
|
26
|
+
}
|
|
27
|
+
catch (_c) {
|
|
28
|
+
devkit_1.logger.error((0, devkit_1.stripIndents) `Unable to update ${metroConfigPath} for project ${project.root}.`);
|
|
29
|
+
}
|
|
30
|
+
});
|
|
31
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
exports.default = update;
|
|
35
|
+
//# sourceMappingURL=add-project-root-metro-config-14-0-0.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-project-root-metro-config-14-0-0.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/migrations/update-14-0-0/add-project-root-metro-config-14-0-0.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAEtB;;;GAGG;AACH,SAA8B,MAAM,CAAC,IAAU;;QAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;;YAC3B,MAAM,eAAe,GAAG,GAAG,OAAO,CAAC,IAAI,kBAAkB,CAAC;YAC1D,IACE,CAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,0BAA0B;gBAC/D,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;gBAE7B,OAAO;YACT,IAAI;gBACF,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;gBAC/D,IAAI,kBAAkB,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE;oBACzD,OAAO;iBACR;gBACD,IAAI,kBAAkB,CAAC,QAAQ,CAAC,aAAa,CAAC;oBAAE,OAAO;gBACvD,IAAI,CAAC,KAAK,CACR,eAAe,EACf,kBAAkB,CAAC,OAAO,CACxB,SAAS,EACT,mDAAmD,CACpD,CACF,CAAC;aACH;YAAC,WAAM;gBACN,eAAM,CAAC,KAAK,CACV,IAAA,qBAAY,EAAA,oBAAoB,eAAe,gBAAgB,OAAO,CAAC,IAAI,GAAG,CAC/E,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QACH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA9BD,yBA8BC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ export declare const expoStructuredHeadersVersion = "2.1.1";
|
|
|
7
7
|
export declare const expoSplashScreenVersion = "0.14.2";
|
|
8
8
|
export declare const expoUpdatesVersion = "~0.11.6";
|
|
9
9
|
export declare const jestExpoVersion = "44.0.1";
|
|
10
|
-
export declare const expoCliVersion = "5.4.
|
|
10
|
+
export declare const expoCliVersion = "5.4.3";
|
|
11
11
|
export declare const babelPresetExpoVersion = "~9.0.2";
|
|
12
12
|
export declare const reactVersion = "17.0.1";
|
|
13
13
|
export declare const reactNativeVersion = "0.64.3";
|
|
@@ -23,4 +23,3 @@ export declare const svgrWebpackVersion = "^5.5.0";
|
|
|
23
23
|
export declare const metroVersion = "0.66.2";
|
|
24
24
|
export declare const testingLibraryReactNativeVersion = "9.0.0";
|
|
25
25
|
export declare const testingLibraryJestNativeVersion = "4.0.4";
|
|
26
|
-
export declare const tsConfigPathsWebpackPluginVersion = "3.5.2";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.metroVersion = exports.svgrWebpackVersion = exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.reactNativeScreensVersion = exports.reactNativeSafeAreaContextVersion = exports.reactNativeReanimatedVersion = exports.reactNativeGestureHandlerVersion = exports.reactNativeWebVersion = exports.typesReactNativeVersion = exports.reactNativeVersion = exports.reactVersion = exports.babelPresetExpoVersion = exports.expoCliVersion = exports.jestExpoVersion = exports.expoUpdatesVersion = exports.expoSplashScreenVersion = exports.expoStructuredHeadersVersion = exports.expoMetroConfigVersion = exports.expoStatusBarVersion = exports.expoDevClientVersion = exports.expoVersion = exports.nxVersion = void 0;
|
|
4
4
|
exports.nxVersion = '*';
|
|
5
5
|
exports.expoVersion = '44.0.6';
|
|
6
6
|
exports.expoDevClientVersion = '0.8.4';
|
|
@@ -10,7 +10,7 @@ exports.expoStructuredHeadersVersion = '2.1.1';
|
|
|
10
10
|
exports.expoSplashScreenVersion = '0.14.2';
|
|
11
11
|
exports.expoUpdatesVersion = '~0.11.6';
|
|
12
12
|
exports.jestExpoVersion = '44.0.1';
|
|
13
|
-
exports.expoCliVersion = '5.4.
|
|
13
|
+
exports.expoCliVersion = '5.4.3';
|
|
14
14
|
exports.babelPresetExpoVersion = '~9.0.2';
|
|
15
15
|
// TODO(Emily): Remove this once expo supports react-native 0.68.0.
|
|
16
16
|
// v18 is only supported on the New Architecture
|
|
@@ -29,5 +29,4 @@ exports.svgrWebpackVersion = '^5.5.0';
|
|
|
29
29
|
exports.metroVersion = '0.66.2';
|
|
30
30
|
exports.testingLibraryReactNativeVersion = '9.0.0';
|
|
31
31
|
exports.testingLibraryJestNativeVersion = '4.0.4';
|
|
32
|
-
exports.tsConfigPathsWebpackPluginVersion = '3.5.2';
|
|
33
32
|
//# sourceMappingURL=versions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/expo/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,oBAAoB,GAAG,OAAO,CAAC;AAC/B,QAAA,oBAAoB,GAAG,OAAO,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,4BAA4B,GAAG,OAAO,CAAC;AACvC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAC/B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,OAAO,CAAC;AACzB,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAE/C,mEAAmE;AACnE,gDAAgD;AAChD,yFAAyF;AAC5E,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,4BAA4B,GAAG,OAAO,CAAC;AACvC,QAAA,iCAAiC,GAAG,OAAO,CAAC;AAC5C,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AAErC,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAE9B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,+BAA+B,GAAG,OAAO,CAAC
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/expo/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,oBAAoB,GAAG,OAAO,CAAC;AAC/B,QAAA,oBAAoB,GAAG,OAAO,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,4BAA4B,GAAG,OAAO,CAAC;AACvC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAC/B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,OAAO,CAAC;AACzB,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAE/C,mEAAmE;AACnE,gDAAgD;AAChD,yFAAyF;AAC5E,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,4BAA4B,GAAG,OAAO,CAAC;AACvC,QAAA,iCAAiC,GAAG,OAAO,CAAC;AAC5C,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AAErC,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAE9B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,+BAA+B,GAAG,OAAO,CAAC"}
|