@nrwl/react-native 14.5.0 → 14.5.3
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/CHANGELOG.md +1 -1
- package/package.json +11 -11
- package/src/generators/library/files/lib/.babelrc__tmpl__ +9 -1
- package/src/generators/library/files/lib/tsconfig.lib.json__tmpl__ +2 -1
- package/src/generators/library/library.js +1 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/library.spec.ts +1 -1
- package/src/generators/upgrade-native/lib/create-native-files.d.ts +1 -1
- package/src/generators/upgrade-native/lib/create-native-files.js +4 -4
- package/src/generators/upgrade-native/lib/create-native-files.js.map +1 -1
- package/src/generators/upgrade-native/lib/normalize-options.d.ts +2 -1
- package/src/generators/upgrade-native/lib/normalize-options.js +3 -1
- package/src/generators/upgrade-native/lib/normalize-options.js.map +1 -1
- package/src/generators/upgrade-native/upgrade-native.js +4 -6
- package/src/generators/upgrade-native/upgrade-native.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
## [14.5.3](https://github.com/nrwl/nx/compare/14.5.2...14.5.3) (2022-08-04)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/react-native
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/react-native",
|
|
3
|
-
"version": "14.5.
|
|
3
|
+
"version": "14.5.3",
|
|
4
4
|
"description": "React Native brings React's declarative UI framework to iOS and Android. With React Native, you use native UI controls and have full access to the native platform.\n\nThe Nx Plugin for React Native contains generators for managing React Native applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Detox, and Storybook.\n\n- Scaffolding for creating buildable libraries that can be published to npm.\n\n- Utilities for automatic workspace refactoring.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Monorepo",
|
|
@@ -24,23 +24,23 @@
|
|
|
24
24
|
"main": "index.js",
|
|
25
25
|
"types": "index.d.ts",
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@nrwl/detox": "14.5.
|
|
28
|
-
"@nrwl/devkit": "14.5.
|
|
29
|
-
"@nrwl/jest": "14.5.
|
|
30
|
-
"@nrwl/linter": "14.5.
|
|
31
|
-
"@nrwl/react": "14.5.
|
|
32
|
-
"@nrwl/storybook": "14.5.
|
|
33
|
-
"@nrwl/workspace": "14.5.
|
|
27
|
+
"@nrwl/detox": "14.5.3",
|
|
28
|
+
"@nrwl/devkit": "14.5.3",
|
|
29
|
+
"@nrwl/jest": "14.5.3",
|
|
30
|
+
"@nrwl/linter": "14.5.3",
|
|
31
|
+
"@nrwl/react": "14.5.3",
|
|
32
|
+
"@nrwl/storybook": "14.5.3",
|
|
33
|
+
"@nrwl/workspace": "14.5.3",
|
|
34
34
|
"chalk": "^4.1.0",
|
|
35
35
|
"enhanced-resolve": "^5.8.3",
|
|
36
36
|
"fs-extra": "^10.1.0",
|
|
37
37
|
"ignore": "^5.0.4",
|
|
38
|
+
"metro-resolver": "^0.71.3",
|
|
38
39
|
"node-fetch": "^2.6.7",
|
|
39
40
|
"tsconfig-paths": "^3.9.0"
|
|
40
41
|
},
|
|
41
42
|
"peerDependencies": {
|
|
42
|
-
"
|
|
43
|
-
"react-native": "^0.69.1"
|
|
43
|
+
"react-native": "^0.69.3"
|
|
44
44
|
},
|
|
45
45
|
"builders": "./executors.json",
|
|
46
46
|
"ng-update": {
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
},
|
|
50
50
|
"schematics": "./generators.json",
|
|
51
51
|
"typings": "./index.d.ts",
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "72106d0d81ff66f92d4cbb0459dd70cbe1c7aefa"
|
|
53
53
|
}
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
"extends": "./tsconfig.json",
|
|
3
3
|
"compilerOptions": {
|
|
4
4
|
"outDir": "<%= offsetFromRoot %>dist/out-tsc",
|
|
5
|
-
"types": ["node"]
|
|
5
|
+
"types": ["node"],
|
|
6
|
+
"jsx": "react-native"
|
|
6
7
|
},
|
|
7
8
|
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "test-setup.ts"],
|
|
8
9
|
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
|
|
@@ -37,7 +37,7 @@ function addProject(host, options) {
|
|
|
37
37
|
const targets = {};
|
|
38
38
|
if (options.publishable || options.buildable) {
|
|
39
39
|
const { libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
40
|
-
const external = ['react/jsx-runtime'];
|
|
40
|
+
const external = ['react/jsx-runtime', 'react-native'];
|
|
41
41
|
targets.build = {
|
|
42
42
|
executor: '@nrwl/web:rollup',
|
|
43
43
|
outputs: ['{options.outputPath}'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAcsB;AACtB,2FAAqF;AACrF,uCAAgC;AAChC,yDAAqD;AACrD,mDAA+C;AAC/C,+DAA6E;AAE7E,yEAGkD;AAElD,SAAsB,2BAA2B,CAC/C,IAAU,EACV,MAAc;;QAEd,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,IAAI,OAAO,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtD,MAAM,IAAI,KAAK,CACb,oJAAoJ,CACrJ,CAAC;SACH;QAED,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1B,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3B,MAAM,QAAQ,GAAG,MAAM,IAAA,cAAI,EAAC,IAAI,kCAC3B,OAAO,KACV,UAAU,EAAE,IAAI,EAChB,aAAa,EAAE,MAAM,IACrB,CAAC;QAEH,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAU,EAC/B,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC,EAC7D,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,uBAAuB,CAChC,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YACzB,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAO,EAC5B,IAAI,EACJ,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,EAAE,CACX,CAAC;QAEF,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,EAAE;YAC5C,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACzC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;CAAA;AAlDD,kEAkDC;AAED,SAAS,UAAU,CAAC,IAAU,EAAE,OAAyB;IACvD,MAAM,OAAO,GAA2C,EAAE,CAAC;IAE3D,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,EAAE;QAC5C,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -273,7 +273,7 @@ describe('lib', () => {
|
|
|
273
273
|
executor: '@nrwl/web:rollup',
|
|
274
274
|
outputs: ['{options.outputPath}'],
|
|
275
275
|
options: {
|
|
276
|
-
external: ['react/jsx-runtime'],
|
|
276
|
+
external: ['react/jsx-runtime', 'react-native'],
|
|
277
277
|
entryFile: 'libs/my-lib/src/index.ts',
|
|
278
278
|
outputPath: 'dist/libs/my-lib',
|
|
279
279
|
project: 'libs/my-lib/package.json',
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
|
2
2
|
import { UpgradeNativeConfigureSchema } from '../schema';
|
|
3
|
-
export declare function createNativeFiles(host: Tree, schema: UpgradeNativeConfigureSchema,
|
|
3
|
+
export declare function createNativeFiles(host: Tree, schema: UpgradeNativeConfigureSchema, appProjectRoot: string): void;
|
|
@@ -4,10 +4,10 @@ exports.createNativeFiles = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const normalize_options_1 = require("./normalize-options");
|
|
7
|
-
function createNativeFiles(host, schema,
|
|
8
|
-
const options = (0, normalize_options_1.normalizeOptions)(schema);
|
|
9
|
-
const iosProjectRoot = (0, devkit_1.joinPathFragments)(
|
|
10
|
-
const androidProjectRoot = (0, devkit_1.joinPathFragments)(
|
|
7
|
+
function createNativeFiles(host, schema, appProjectRoot) {
|
|
8
|
+
const options = (0, normalize_options_1.normalizeOptions)(schema, appProjectRoot);
|
|
9
|
+
const iosProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'ios');
|
|
10
|
+
const androidProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'android');
|
|
11
11
|
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../../application/files/app/ios'), iosProjectRoot, options);
|
|
12
12
|
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../../application/files/app/android'), androidProjectRoot, options);
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-native-files.js","sourceRoot":"","sources":["../../../../../../../packages/react-native/src/generators/upgrade-native/lib/create-native-files.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AACtE,+BAA4B;AAC5B,2DAAuD;AAIvD,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAoC,EACpC,
|
|
1
|
+
{"version":3,"file":"create-native-files.js","sourceRoot":"","sources":["../../../../../../../packages/react-native/src/generators/upgrade-native/lib/create-native-files.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AACtE,+BAA4B;AAC5B,2DAAuD;AAIvD,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAoC,EACpC,cAAsB;IAEtB,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAEzD,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IAExE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,iCAAiC,CAAC,EAClD,cAAc,EACd,OAAO,CACR,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,qCAAqC,CAAC,EACtD,kBAAkB,EAClB,OAAO,CACR,CAAC;AACJ,CAAC;AAvBD,8CAuBC"}
|
|
@@ -7,5 +7,6 @@ export interface NormalizedSchema {
|
|
|
7
7
|
entryFile: string;
|
|
8
8
|
entryFileIos: string;
|
|
9
9
|
e2eTestRunner: 'detox' | 'none';
|
|
10
|
+
offsetFromRoot: string;
|
|
10
11
|
}
|
|
11
|
-
export declare function normalizeOptions(options: UpgradeNativeConfigureSchema): NormalizedSchema;
|
|
12
|
+
export declare function normalizeOptions(options: UpgradeNativeConfigureSchema, appProjectRoot: string): NormalizedSchema;
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
function normalizeOptions(options
|
|
5
|
+
function normalizeOptions(options, appProjectRoot // app root
|
|
6
|
+
) {
|
|
6
7
|
const { fileName, className } = (0, devkit_1.names)(options.name);
|
|
7
8
|
const entryFileIos = 'src/main';
|
|
8
9
|
const entryFile = options.js ? 'src/main.js' : 'src/main.tsx';
|
|
@@ -20,6 +21,7 @@ function normalizeOptions(options) {
|
|
|
20
21
|
entryFile,
|
|
21
22
|
entryFileIos,
|
|
22
23
|
e2eTestRunner: options.e2eTestRunner,
|
|
24
|
+
offsetFromRoot: (0, devkit_1.offsetFromRoot)(appProjectRoot),
|
|
23
25
|
};
|
|
24
26
|
}
|
|
25
27
|
exports.normalizeOptions = normalizeOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react-native/src/generators/upgrade-native/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react-native/src/generators/upgrade-native/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAqD;AAcrD,SAAgB,gBAAgB,CAC9B,OAAqC,EACrC,cAAsB,CAAC,WAAW;;IAElC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD,MAAM,YAAY,GAAG,UAAU,CAAC;IAChC,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc,CAAC;IAE9D;;;;;OAKG;IACH,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,SAAS;QACT,aAAa,EAAE,SAAS,CAAC,WAAW,EAAE;QACtC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,SAAS;QAC7C,SAAS;QACT,YAAY;QACZ,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,cAAc,EAAE,IAAA,uBAAc,EAAC,cAAc,CAAC;KAC/C,CAAC;AACJ,CAAC;AAzBD,4CAyBC"}
|
|
@@ -15,17 +15,15 @@ const pod_install_task_1 = require("../../utils/pod-install-task");
|
|
|
15
15
|
const chmod_task_1 = require("../../utils/chmod-task");
|
|
16
16
|
function reactNativeUpgradeNativeGenerator(host, schema) {
|
|
17
17
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
18
|
-
const { projectType, root } = (0, devkit_1.readProjectConfiguration)(host, schema.name);
|
|
19
|
-
const iosProjectRoot = (0, devkit_1.joinPathFragments)(host.root,
|
|
20
|
-
const androidProjectRoot = (0, devkit_1.joinPathFragments)(host.root,
|
|
18
|
+
const { projectType, root: appProjectRoot } = (0, devkit_1.readProjectConfiguration)(host, schema.name);
|
|
19
|
+
const iosProjectRoot = (0, devkit_1.joinPathFragments)(host.root, appProjectRoot, 'ios');
|
|
20
|
+
const androidProjectRoot = (0, devkit_1.joinPathFragments)(host.root, appProjectRoot, 'android');
|
|
21
21
|
if (projectType !== 'application' ||
|
|
22
22
|
!(0, fs_extra_1.existsSync)(iosProjectRoot) ||
|
|
23
23
|
!(0, fs_extra_1.existsSync)(androidProjectRoot)) {
|
|
24
24
|
throw new Error(`Could not upgrade React Native code for ${schema.name}`);
|
|
25
25
|
}
|
|
26
|
-
(0,
|
|
27
|
-
(0, fs_extra_1.removeSync)(androidProjectRoot);
|
|
28
|
-
(0, create_native_files_1.createNativeFiles)(host, schema, root);
|
|
26
|
+
(0, create_native_files_1.createNativeFiles)(host, schema, appProjectRoot);
|
|
29
27
|
const podInstallTask = (0, pod_install_task_1.runPodInstall)(iosProjectRoot, schema.install);
|
|
30
28
|
const chmodTaskGradlew = (0, chmod_task_1.runChmod)((0, path_1.join)(androidProjectRoot, 'gradlew'), 0o775);
|
|
31
29
|
const chmodTaskGradlewBat = (0, chmod_task_1.runChmod)((0, path_1.join)(androidProjectRoot, 'gradlew.bat'), 0o775);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-native.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/upgrade-native/upgrade-native.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,2FAAqF;AAErF,yCAMsB;AACtB,+BAA4B;AAC5B,mEAA8D;AAC9D,uCAAkD;AAElD,mEAA6D;AAC7D,uDAAkD;AAElD,SAAsB,iCAAiC,CACrD,IAAU,EACV,MAAoC;;QAEpC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,
|
|
1
|
+
{"version":3,"file":"upgrade-native.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/upgrade-native/upgrade-native.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,2FAAqF;AAErF,yCAMsB;AACtB,+BAA4B;AAC5B,mEAA8D;AAC9D,uCAAkD;AAElD,mEAA6D;AAC7D,uDAAkD;AAElD,SAAsB,iCAAiC,CACrD,IAAU,EACV,MAAoC;;QAEpC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,IAAA,iCAAwB,EACpE,IAAI,EACJ,MAAM,CAAC,IAAI,CACZ,CAAC;QACF,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;QAC3E,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,IAAI,CAAC,IAAI,EACT,cAAc,EACd,SAAS,CACV,CAAC;QAEF,IACE,WAAW,KAAK,aAAa;YAC7B,CAAC,IAAA,qBAAU,EAAC,cAAc,CAAC;YAC3B,CAAC,IAAA,qBAAU,EAAC,kBAAkB,CAAC,EAC/B;YACA,MAAM,IAAI,KAAK,CAAC,2CAA2C,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;SAC3E;QAED,IAAA,uCAAiB,EAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAEhD,MAAM,cAAc,GAAG,IAAA,gCAAa,EAAC,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACrE,MAAM,gBAAgB,GAAG,IAAA,qBAAQ,EAAC,IAAA,WAAI,EAAC,kBAAkB,EAAE,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;QAC9E,MAAM,mBAAmB,GAAG,IAAA,qBAAQ,EAClC,IAAA,WAAI,EAAC,kBAAkB,EAAE,aAAa,CAAC,EACvC,KAAK,CACN,CAAC;QAEF,OAAO,IAAA,sCAAgB,EACrB,cAAc,EACd,gBAAgB,EAChB,mBAAmB,CACpB,CAAC;IACJ,CAAC;CAAA;AArCD,8EAqCC;AAED,kBAAe,iCAAiC,CAAC;AACpC,QAAA,iCAAiC,GAAG,IAAA,2BAAkB,EACjE,iCAAiC,CAClC,CAAC"}
|