@nrwl/react-native 14.5.2 → 14.5.5-beta.0
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 +10 -9
- 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/stories/schema.d.ts +1 -0
- package/src/generators/stories/schema.json +15 -0
- package/src/generators/stories/stories-app.spec.ts +78 -0
- package/src/generators/stories/stories-lib.spec.ts +26 -0
- package/src/generators/stories/stories.d.ts +1 -1
- package/src/generators/stories/stories.js +6 -3
- package/src/generators/stories/stories.js.map +1 -1
- package/src/generators/storybook-configuration/configuration.js +1 -0
- package/src/generators/storybook-configuration/configuration.js.map +1 -1
- package/src/generators/storybook-configuration/schema.d.ts +1 -0
- package/src/generators/storybook-configuration/schema.json +15 -0
- 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
|
-
## [14.5.
|
|
6
|
+
## [14.5.5-beta.0](https://github.com/nrwl/nx/compare/14.5.4...14.5.5-beta.0) (2022-08-09)
|
|
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.5-beta.0",
|
|
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,18 +24,19 @@
|
|
|
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.5-beta.0",
|
|
28
|
+
"@nrwl/devkit": "14.5.5-beta.0",
|
|
29
|
+
"@nrwl/jest": "14.5.5-beta.0",
|
|
30
|
+
"@nrwl/linter": "14.5.5-beta.0",
|
|
31
|
+
"@nrwl/react": "14.5.5-beta.0",
|
|
32
|
+
"@nrwl/storybook": "14.5.5-beta.0",
|
|
33
|
+
"@nrwl/workspace": "14.5.5-beta.0",
|
|
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
38
|
"metro-resolver": "^0.71.3",
|
|
39
|
+
"minimatch": "3.0.5",
|
|
39
40
|
"node-fetch": "^2.6.7",
|
|
40
41
|
"tsconfig-paths": "^3.9.0"
|
|
41
42
|
},
|
|
@@ -49,5 +50,5 @@
|
|
|
49
50
|
},
|
|
50
51
|
"schematics": "./generators.json",
|
|
51
52
|
"typings": "./index.d.ts",
|
|
52
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "efea1a511edfa904230b9e7b787ef71877ff6d9c"
|
|
53
54
|
}
|
|
@@ -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',
|
|
@@ -15,6 +15,21 @@
|
|
|
15
15
|
"index": 0
|
|
16
16
|
},
|
|
17
17
|
"x-prompt": "For which project do you want to generate stories?"
|
|
18
|
+
},
|
|
19
|
+
"ignorePaths": {
|
|
20
|
+
"type": "array",
|
|
21
|
+
"description": "Paths to ignore when looking for components.",
|
|
22
|
+
"items": {
|
|
23
|
+
"type": "string",
|
|
24
|
+
"description": "Path to ignore."
|
|
25
|
+
},
|
|
26
|
+
"examples": [
|
|
27
|
+
"apps/my-app/src/not-stories/**",
|
|
28
|
+
"**/**/src/**/not-stories/**",
|
|
29
|
+
"libs/my-lib/**/*.something.ts",
|
|
30
|
+
"**/**/src/**/*.other.*",
|
|
31
|
+
"libs/my-lib/src/not-stories/**,**/**/src/**/*.other.*,apps/my-app/**/*.something.ts"
|
|
32
|
+
]
|
|
18
33
|
}
|
|
19
34
|
},
|
|
20
35
|
"required": ["project"]
|
|
@@ -32,6 +32,84 @@ describe('react:stories for applications', () => {
|
|
|
32
32
|
).toBeTruthy();
|
|
33
33
|
});
|
|
34
34
|
|
|
35
|
+
it('should ignore paths', async () => {
|
|
36
|
+
await reactNativeComponentGenerator(appTree, {
|
|
37
|
+
name: 'another-cmp',
|
|
38
|
+
project: 'test-ui-app',
|
|
39
|
+
});
|
|
40
|
+
await storiesGenerator(appTree, {
|
|
41
|
+
project: 'test-ui-app',
|
|
42
|
+
ignorePaths: ['apps/test-ui-app/src/app/**'],
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
expect(appTree.exists('apps/test-ui-app/src/app/App.tsx')).toBeTruthy();
|
|
46
|
+
expect(
|
|
47
|
+
appTree.exists('apps/test-ui-app/src/app/App.stories.tsx')
|
|
48
|
+
).toBeFalsy();
|
|
49
|
+
expect(
|
|
50
|
+
appTree.exists(
|
|
51
|
+
'apps/test-ui-app/src/app/another-cmp/another-cmp.stories.tsx'
|
|
52
|
+
)
|
|
53
|
+
).toBeFalsy();
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
it('should ignore paths with a direct path to a component', async () => {
|
|
57
|
+
await reactNativeComponentGenerator(appTree, {
|
|
58
|
+
name: 'another-new-cmp',
|
|
59
|
+
project: 'test-ui-app',
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
await storiesGenerator(appTree, {
|
|
63
|
+
project: 'test-ui-app',
|
|
64
|
+
ignorePaths: [
|
|
65
|
+
'apps/test-ui-app/src/app/another-new-cmp/another-new-cmp.tsx',
|
|
66
|
+
],
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
expect(appTree.exists('apps/test-ui-app/src/app/App.tsx')).toBeTruthy();
|
|
70
|
+
expect(
|
|
71
|
+
appTree.exists('apps/test-ui-app/src/app/App.stories.tsx')
|
|
72
|
+
).toBeTruthy();
|
|
73
|
+
expect(
|
|
74
|
+
appTree.exists(
|
|
75
|
+
'apps/test-ui-app/src/app/another-new-cmp/another-new-cmp.stories.tsx'
|
|
76
|
+
)
|
|
77
|
+
).toBeFalsy();
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
it('should ignore a path that has a nested component, but still generate nested component stories', async () => {
|
|
81
|
+
await reactNativeComponentGenerator(appTree, {
|
|
82
|
+
name: 'another-new-cmp',
|
|
83
|
+
project: 'test-ui-app',
|
|
84
|
+
});
|
|
85
|
+
await reactNativeComponentGenerator(appTree, {
|
|
86
|
+
name: 'comp-a',
|
|
87
|
+
directory: 'app/another-new-cmp',
|
|
88
|
+
project: 'test-ui-app',
|
|
89
|
+
});
|
|
90
|
+
await storiesGenerator(appTree, {
|
|
91
|
+
project: 'test-ui-app',
|
|
92
|
+
ignorePaths: [
|
|
93
|
+
'apps/test-ui-app/src/app/another-new-cmp/another-new-cmp.tsx',
|
|
94
|
+
],
|
|
95
|
+
});
|
|
96
|
+
|
|
97
|
+
expect(appTree.exists('apps/test-ui-app/src/app/App.tsx')).toBeTruthy();
|
|
98
|
+
expect(
|
|
99
|
+
appTree.exists('apps/test-ui-app/src/app/App.stories.tsx')
|
|
100
|
+
).toBeTruthy();
|
|
101
|
+
expect(
|
|
102
|
+
appTree.exists(
|
|
103
|
+
'apps/test-ui-app/src/app/another-new-cmp/comp-a/comp-a.stories.tsx'
|
|
104
|
+
)
|
|
105
|
+
).toBeTruthy();
|
|
106
|
+
expect(
|
|
107
|
+
appTree.exists(
|
|
108
|
+
'apps/test-ui-app/src/app/another-new-cmp/another-new-cmp.stories.tsx'
|
|
109
|
+
)
|
|
110
|
+
).toBeFalsy();
|
|
111
|
+
});
|
|
112
|
+
|
|
35
113
|
it('should ignore files that do not contain components', async () => {
|
|
36
114
|
// create another component
|
|
37
115
|
appTree.write(
|
|
@@ -38,6 +38,32 @@ describe('react-native:stories for libraries', () => {
|
|
|
38
38
|
).toBeTruthy();
|
|
39
39
|
});
|
|
40
40
|
|
|
41
|
+
it('should ignore paths', async () => {
|
|
42
|
+
await reactNativeComponentGenerator(appTree, {
|
|
43
|
+
name: 'test-ui-lib',
|
|
44
|
+
project: 'test-ui-lib',
|
|
45
|
+
});
|
|
46
|
+
await reactNativeComponentGenerator(appTree, {
|
|
47
|
+
name: 'another-cmp',
|
|
48
|
+
project: 'test-ui-lib',
|
|
49
|
+
});
|
|
50
|
+
await storiesGenerator(appTree, {
|
|
51
|
+
project: 'test-ui-lib',
|
|
52
|
+
ignorePaths: ['libs/test-ui-lib/src/lib/another-cmp/**'],
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
expect(
|
|
56
|
+
appTree.exists(
|
|
57
|
+
'libs/test-ui-lib/src/lib/test-ui-lib/test-ui-lib.stories.tsx'
|
|
58
|
+
)
|
|
59
|
+
).toBeTruthy();
|
|
60
|
+
expect(
|
|
61
|
+
appTree.exists(
|
|
62
|
+
'libs/test-ui-lib/src/lib/another-cmp/another-cmp.stories.tsx'
|
|
63
|
+
)
|
|
64
|
+
).toBeFalsy();
|
|
65
|
+
});
|
|
66
|
+
|
|
41
67
|
it('should ignore files that do not contain components', async () => {
|
|
42
68
|
await reactNativeComponentGenerator(appTree, {
|
|
43
69
|
name: 'test-ui-lib',
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
|
2
2
|
import { StorybookStoriesSchema } from './schema';
|
|
3
|
-
export declare function createAllStories(tree: Tree, projectName: string): Promise<void>;
|
|
3
|
+
export declare function createAllStories(tree: Tree, projectName: string, ignorePaths?: string[]): Promise<void>;
|
|
4
4
|
export declare function storiesGenerator(host: Tree, schema: StorybookStoriesSchema): Promise<void>;
|
|
5
5
|
export default storiesGenerator;
|
|
6
6
|
export declare const storiesSchematic: (generatorOptions: StorybookStoriesSchema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -7,14 +7,17 @@ const path_1 = require("path");
|
|
|
7
7
|
const component_story_1 = require("../component-story/component-story");
|
|
8
8
|
const stories_1 = require("@nrwl/react/src/generators/stories/stories");
|
|
9
9
|
const utilities_1 = require("@nrwl/storybook/src/utils/utilities");
|
|
10
|
-
|
|
10
|
+
const minimatch = require("minimatch");
|
|
11
|
+
function createAllStories(tree, projectName, ignorePaths) {
|
|
11
12
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
13
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
13
14
|
const projectConfiguration = projects.get(projectName);
|
|
14
|
-
const { sourceRoot } = projectConfiguration;
|
|
15
|
+
const { sourceRoot, root } = projectConfiguration;
|
|
15
16
|
const projectPath = (0, stories_1.projectRootPath)(projectConfiguration);
|
|
16
17
|
let componentPaths = [];
|
|
17
18
|
(0, devkit_1.visitNotIgnoredFiles)(tree, projectPath, (path) => {
|
|
19
|
+
if (ignorePaths === null || ignorePaths === void 0 ? void 0 : ignorePaths.some((pattern) => minimatch(path, pattern)))
|
|
20
|
+
return;
|
|
18
21
|
if ((path.endsWith('.tsx') && !path.endsWith('.spec.tsx')) ||
|
|
19
22
|
(path.endsWith('.js') && !path.endsWith('.spec.js')) ||
|
|
20
23
|
(path.endsWith('.jsx') && !path.endsWith('.spec.jsx'))) {
|
|
@@ -45,7 +48,7 @@ function createAllStories(tree, projectName) {
|
|
|
45
48
|
exports.createAllStories = createAllStories;
|
|
46
49
|
function storiesGenerator(host, schema) {
|
|
47
50
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
48
|
-
yield createAllStories(host, schema.project);
|
|
51
|
+
yield createAllStories(host, schema.project, schema.ignorePaths);
|
|
49
52
|
});
|
|
50
53
|
}
|
|
51
54
|
exports.storiesGenerator = storiesGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/stories/stories.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,+BAA4B;
|
|
1
|
+
{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/stories/stories.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,+BAA4B;AAC5B,wEAAyE;AAEzE,wEAGoD;AACpD,mEAAsE;AACtE,uCAAwC;AAExC,SAAsB,gBAAgB,CACpC,IAAU,EACV,WAAmB,EACnB,WAAsB;;QAEtB,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,oBAAoB,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAEvD,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,oBAAoB,CAAC;QAClD,MAAM,WAAW,GAAG,IAAA,yBAAe,EAAC,oBAAoB,CAAC,CAAC;QAE1D,IAAI,cAAc,GAAa,EAAE,CAAC;QAClC,IAAA,6BAAoB,EAAC,IAAI,EAAE,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/C,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAAE,OAAO;YAErE,IACE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACtD,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBACpD,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,EACtD;gBACA,yDAAyD;gBACzD,IAAI,CAAC,IAAA,2BAAe,EAAC,IAAI,EAAE,IAAI,CAAC,EAAE;oBAChC,gCAAgC;oBAChC,0CAA0C;oBAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC9C,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,EAAE,CAAC;oBAExD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;wBAC3B,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBAC3B;iBACF;aACF;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CACf,cAAc,CAAC,GAAG,CAAC,CAAO,aAAa,EAAE,EAAE;YACzC,MAAM,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,IAAA,WAAI,EAAC,UAAU,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YAExE,IAAI,CAAC,IAAA,sCAA4B,EAAC,IAAI,EAAE,aAAa,CAAC,EAAE;gBACtD,OAAO;aACR;YAED,MAAM,IAAA,yBAAuB,EAAC,IAAI,EAAE;gBAClC,aAAa,EAAE,cAAc;gBAC7B,OAAO,EAAE,WAAW;aACrB,CAAC,CAAC;QACL,CAAC,CAAA,CAAC,CACH,CAAC;IACJ,CAAC;CAAA;AAhDD,4CAgDC;AAED,SAAsB,gBAAgB,CACpC,IAAU,EACV,MAA8B;;QAE9B,MAAM,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IACnE,CAAC;CAAA;AALD,4CAKC;AAED,kBAAe,gBAAgB,CAAC;AACnB,QAAA,gBAAgB,GAAG,IAAA,2BAAkB,EAAC,gBAAgB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,+CAAyD;AAEzD,gDAAkD;AAClD,6GAAoG;AACpG,yEAAoE;AACpE,6GAAqG;AAIrG,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,MAAM,IAAA,iBAAgB,EAAC,IAAI,EAAE;YAC3B,OAAO,EAAE,MAAM,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,+CAAyD;AAEzD,gDAAkD;AAClD,6GAAoG;AACpG,yEAAoE;AACpE,6GAAqG;AAIrG,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,MAAM,IAAA,iBAAgB,EAAC,IAAI,EAAE;YAC3B,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAgC;;QAEhC,MAAM,WAAW,GAAG,MAAM,IAAA,kCAAsB,EAAC,IAAI,EAAE;YACrD,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,WAAW,EAAE,yBAAyB;YACtC,gBAAgB,EAAE,KAAK;YACvB,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,eAAe,EAAE,MAAM,CAAC,eAAe;SACxC,CAAC,CAAC;QAEH,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACpC,IAAA,6CAAoB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnC,IAAA,8EAAmC,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAClD,IAAA,6EAAkC,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEjD,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACrC;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACxB,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAzBD,0EAyBC;AAED,SAAS,gBAAgB,CAAC,IAAU,EAAE,WAAmB;IACvD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAClE,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG;QACnC,QAAQ,EAAE,8BAA8B;QACxC,OAAO,EAAE;YACP,SAAS,EAAE,aAAa,CAAC,IAAI;YAC7B,UAAU,EAAE,8BAA8B;YAC1C,OAAO,EAAE,kCAAkC;YAC3C,MAAM,EAAE,KAAK;SACd;KACF,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;AAC/D,CAAC;AAED,kBAAe,+BAA+B,CAAC;AAClC,QAAA,+BAA+B,GAAG,IAAA,2BAAkB,EAC/D,+BAA+B,CAChC,CAAC"}
|
|
@@ -42,6 +42,21 @@
|
|
|
42
42
|
"standaloneConfig": {
|
|
43
43
|
"description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
|
44
44
|
"type": "boolean"
|
|
45
|
+
},
|
|
46
|
+
"ignorePaths": {
|
|
47
|
+
"type": "array",
|
|
48
|
+
"description": "Paths to ignore when looking for components.",
|
|
49
|
+
"items": {
|
|
50
|
+
"type": "string",
|
|
51
|
+
"description": "Path to ignore."
|
|
52
|
+
},
|
|
53
|
+
"examples": [
|
|
54
|
+
"apps/my-app/src/not-stories/**",
|
|
55
|
+
"**/**/src/**/not-stories/**",
|
|
56
|
+
"libs/my-lib/**/*.something.ts",
|
|
57
|
+
"**/**/src/**/*.other.*",
|
|
58
|
+
"libs/my-lib/src/not-stories/**,**/**/src/**/*.other.*,apps/my-app/**/*.something.ts"
|
|
59
|
+
]
|
|
45
60
|
}
|
|
46
61
|
},
|
|
47
62
|
"required": ["name"]
|
|
@@ -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"}
|