@nrwl/react-native 14.8.7 → 14.9.0-beta.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/CHANGELOG.md +1 -1
- package/LICENSE +22 -22
- package/README.md +6 -27
- package/migrations.json +268 -0
- package/package.json +13 -13
- package/plugins/metro-resolver.js +16 -5
- package/plugins/metro-resolver.js.map +1 -1
- package/project.json +5 -35
- package/src/executors/build-android/build-android.impl.js +3 -4
- package/src/executors/build-android/build-android.impl.js.map +1 -1
- package/src/executors/build-android/build-android.impl.ts +4 -4
- package/src/executors/build-android/schema.json +4 -1
- package/src/executors/bundle/bundle.impl.js +2 -2
- package/src/executors/bundle/bundle.impl.js.map +1 -1
- package/src/executors/bundle/bundle.impl.ts +4 -3
- package/src/executors/bundle/schema.d.ts +1 -1
- package/src/executors/bundle/schema.json +5 -1
- package/src/executors/ensure-symlink/ensure-symlink.impl.js +1 -1
- package/src/executors/ensure-symlink/ensure-symlink.impl.js.map +1 -1
- package/src/executors/ensure-symlink/ensure-symlink.impl.ts +2 -1
- package/src/executors/ensure-symlink/schema.json +2 -0
- package/src/executors/run-android/run-android.impl.js +8 -4
- package/src/executors/run-android/run-android.impl.js.map +1 -1
- package/src/executors/run-android/run-android.impl.ts +8 -3
- package/src/executors/run-android/schema.d.ts +1 -0
- package/src/executors/run-android/schema.json +11 -2
- package/src/executors/run-ios/run-ios.impl.js +1 -1
- package/src/executors/run-ios/run-ios.impl.js.map +1 -1
- package/src/executors/run-ios/run-ios.impl.ts +2 -1
- package/src/executors/run-ios/schema.json +21 -7
- package/src/executors/start/schema.json +4 -1
- package/src/executors/start/start.impl.js +2 -2
- package/src/executors/start/start.impl.js.map +1 -1
- package/src/executors/start/start.impl.ts +3 -2
- package/src/executors/storybook/schema.json +2 -0
- package/src/executors/storybook/storybook.impl.js +1 -1
- package/src/executors/storybook/storybook.impl.js.map +1 -1
- package/src/executors/storybook/storybook.impl.ts +2 -1
- package/src/executors/sync-deps/schema.json +2 -0
- package/src/executors/sync-deps/sync-deps.impl.js +1 -1
- package/src/executors/sync-deps/sync-deps.impl.js.map +1 -1
- package/src/executors/sync-deps/sync-deps.impl.ts +2 -1
- package/src/generators/application/application.d.ts +1 -1
- package/src/generators/application/application.js +6 -8
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/application.spec.ts +124 -5
- package/src/generators/application/files/app/.ruby-version +1 -0
- package/src/generators/application/files/app/Gemfile.template +6 -0
- package/src/generators/application/files/app/android/app/build.gradle.template +71 -217
- package/src/generators/application/files/app/android/app/src/androidTest/java/com/__lowerCaseName__/DetoxTest.java.template +2 -8
- package/src/generators/application/files/app/android/app/src/debug/java/com/__lowerCaseName__/ReactNativeFlipper.java.template +4 -2
- package/src/generators/application/files/app/android/app/src/main/AndroidManifest.xml.template +3 -3
- package/src/generators/application/files/app/android/app/src/main/java/com/__lowerCaseName__/MainActivity.java.template +13 -26
- package/src/generators/application/files/app/android/app/src/main/java/com/__lowerCaseName__/MainApplication.java.template +19 -48
- package/src/generators/application/files/app/android/app/src/release/java/com/__lowerCaseName__/ReactNativeFlipper.java.template +20 -0
- package/src/generators/application/files/app/android/build.gradle.template +13 -36
- package/src/generators/application/files/app/android/gradle.properties +4 -0
- package/src/generators/application/files/app/android/settings.gradle.template +2 -17
- package/src/generators/application/files/app/ios/Podfile.template +21 -5
- package/src/generators/application/files/app/ios/__className__/AppDelegate.h +2 -4
- package/src/generators/application/files/app/ios/__className__/AppDelegate.mm.template +12 -109
- package/src/generators/application/files/app/ios/__className__/Info.plist.template +2 -2
- package/src/generators/application/files/app/ios/__className__.xcodeproj/project.pbxproj.template +4 -2
- package/src/generators/application/files/app/ios/__className__.xcworkspace/{contents.xcworkspacedata → xcshareddata/contents.xcworkspacedata} +1 -1
- package/src/generators/application/files/app/src/app/App.tsx.template +224 -38
- package/src/generators/application/files/app/tsconfig.app.json.template +2 -2
- package/src/generators/application/files/app/tsconfig.json.template +3 -2
- package/src/generators/application/lib/add-detox.js +1 -1
- package/src/generators/application/lib/add-detox.js.map +1 -1
- package/src/generators/application/lib/add-project.js +2 -8
- package/src/generators/application/lib/add-project.js.map +1 -1
- package/src/generators/application/lib/create-application-files.js +2 -2
- package/src/generators/application/lib/create-application-files.js.map +1 -1
- package/src/generators/application/lib/nomalize-options.spec.ts +1 -1
- package/src/generators/application/lib/normalize-options.js +1 -1
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/schema.d.ts +1 -0
- package/src/generators/application/schema.json +14 -7
- package/src/generators/component/component.js +6 -2
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/component.spec.ts +1 -1
- package/src/generators/component/lib/add-import.d.ts +1 -1
- package/src/generators/component/lib/add-import.js +7 -3
- package/src/generators/component/lib/add-import.js.map +1 -1
- package/src/generators/component/schema.json +3 -3
- package/src/generators/component-story/component-story.spec.ts +9 -14
- package/src/generators/init/init.d.ts +3 -3
- package/src/generators/init/init.js +16 -9
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/init/init.spec.ts +1 -1
- package/src/generators/init/lib/gitignore-entries.d.ts +1 -1
- package/src/generators/init/lib/gitignore-entries.js +17 -9
- package/src/generators/init/lib/gitignore-entries.js.map +1 -1
- package/src/generators/init/schema.d.ts +1 -0
- package/src/generators/init/schema.json +8 -1
- package/src/generators/library/files/lib/tsconfig.json__tmpl__ +1 -1
- package/src/generators/library/files/lib/tsconfig.lib.json__tmpl__ +3 -4
- package/src/generators/library/library.js +8 -24
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/library.spec.ts +14 -1
- package/src/generators/library/schema.d.ts +1 -1
- package/src/generators/library/schema.json +14 -10
- package/src/generators/stories/stories-app.spec.ts +1 -1
- package/src/generators/stories/stories-lib.spec.ts +1 -1
- package/src/generators/stories/stories.js +6 -4
- package/src/generators/stories/stories.js.map +1 -1
- package/src/generators/storybook-configuration/configuration.js +3 -2
- package/src/generators/storybook-configuration/configuration.js.map +1 -1
- package/src/generators/storybook-configuration/configuration.spec.ts +10 -6
- package/src/generators/storybook-configuration/files/app/storybook.ts.template +4 -4
- package/src/generators/storybook-configuration/lib/add-resolver-main-fields-to-metro-config.spec.ts +1 -1
- package/src/generators/storybook-configuration/lib/create-storybook-files.js +5 -6
- package/src/generators/storybook-configuration/lib/create-storybook-files.js.map +1 -1
- package/src/generators/storybook-configuration/lib/replace-app-import-with-storybook-toggle.spec.ts +1 -1
- package/src/generators/storybook-configuration/schema.json +6 -3
- package/src/generators/upgrade-native/schema.json +2 -1
- package/src/generators/upgrade-native/upgrade-native.d.ts +5 -1
- package/src/generators/upgrade-native/upgrade-native.js +10 -13
- package/src/generators/upgrade-native/upgrade-native.js.map +1 -1
- package/src/migrations/update-12-10-0/add-react-native-svg-12-10-0.spec.ts +1 -1
- package/src/migrations/update-12-5-0/update-jest-for-react-native.js +1 -1
- package/src/migrations/update-12-5-0/update-jest-for-react-native.js.map +1 -1
- package/src/migrations/update-13-5-0/add-babel-config-root-13-5-0.js +2 -2
- package/src/migrations/update-13-5-0/add-babel-config-root-13-5-0.js.map +1 -1
- package/src/migrations/update-13-5-0/add-babel-config-root-13-5-0.spec.ts +1 -1
- package/src/migrations/update-13-5-0/update-react-native-typing-svg-13-5-0.spec.ts +1 -1
- package/src/migrations/update-14-0-0/add-project-root-metro-config-14-0-0.spec.ts +1 -1
- package/src/migrations/update-14-0-0/update-entry-file-bundle-14-0-0.spec.ts +1 -1
- package/src/migrations/update-14-0-2/change-main-to-class-name-14-0-2.spec.ts +1 -1
- package/src/migrations/update-14-2-1/rename-blockList-metro-config.spec.ts +1 -1
- package/src/migrations/update-14-5-5/add-exclude-sync-deps.spec.ts +1 -1
- package/src/migrations/update-14-5-8/change-searchDir-storybook.spec.ts +1 -1
- package/src/migrations/update-14-6-0/remove-jest-transform.js +1 -1
- package/src/migrations/update-14-6-0/remove-jest-transform.js.map +1 -1
- package/src/migrations/update-14-6-0/remove-jest-transform.spec.ts +1 -1
- package/src/migrations/update-15-0-0/add-babel-inputs.d.ts +2 -0
- package/src/migrations/update-15-0-0/add-babel-inputs.js +11 -0
- package/src/migrations/update-15-0-0/add-babel-inputs.js.map +1 -0
- package/src/migrations/update-15-0-0/add-babel-inputs.spec.ts +73 -0
- package/src/utils/add-jest.d.ts +1 -1
- package/src/utils/add-jest.js +3 -2
- package/src/utils/add-jest.js.map +1 -1
- package/src/utils/add-linting.d.ts +3 -2
- package/src/utils/add-linting.js +16 -17
- package/src/utils/add-linting.js.map +1 -1
- package/src/utils/add-linting.spec.ts +2 -17
- package/src/utils/chmod-android-gradle-files.d.ts +3 -0
- package/src/utils/chmod-android-gradle-files.js +24 -0
- package/src/utils/chmod-android-gradle-files.js.map +1 -0
- package/src/utils/find-all-npm-dependencies.spec.ts +1 -1
- package/src/utils/pod-install-task.js +1 -1
- package/src/utils/pod-install-task.js.map +1 -1
- package/src/utils/versions.d.ts +17 -13
- package/src/utils/versions.js +18 -14
- package/src/utils/versions.js.map +1 -1
- package/src/generators/application/files/app/android/app/_BUCK.template +0 -55
- package/src/generators/application/files/app/android/app/build_defs.bzl +0 -19
- package/src/generators/application/files/app/android/app/src/main/java/com/__lowerCaseName__/newarchitecture/MainApplicationReactNativeHost.java.template +0 -116
- package/src/generators/application/files/app/android/app/src/main/java/com/__lowerCaseName__/newarchitecture/components/MainComponentsRegistry.java.template +0 -36
- package/src/generators/application/files/app/android/app/src/main/java/com/__lowerCaseName__/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java.template +0 -48
- package/src/generators/application/files/app/android/app/src/main/jni/CMakeLists.txt.template +0 -6
- package/src/generators/application/files/app/android/app/src/main/jni/MainApplicationModuleProvider.cpp +0 -32
- package/src/generators/application/files/app/android/app/src/main/jni/MainApplicationModuleProvider.h +0 -16
- package/src/generators/application/files/app/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp +0 -45
- package/src/generators/application/files/app/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h.template +0 -38
- package/src/generators/application/files/app/android/app/src/main/jni/MainComponentsRegistry.cpp +0 -65
- package/src/generators/application/files/app/android/app/src/main/jni/MainComponentsRegistry.h.template +0 -32
- package/src/generators/application/files/app/android/app/src/main/jni/OnLoad.cpp +0 -11
- package/src/generators/application/files/app/ios/__className__.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +0 -8
- package/src/generators/application/files/app/src/app/icons/blog.svg +0 -1
- package/src/generators/application/files/app/src/app/icons/book.svg +0 -1
- package/src/generators/application/files/app/src/app/icons/checkmark.svg +0 -1
- package/src/generators/application/files/app/src/app/icons/chevron-right.svg +0 -1
- package/src/generators/application/files/app/src/app/icons/courses.svg +0 -1
- package/src/generators/application/files/app/src/app/icons/github.svg +0 -1
- package/src/generators/application/files/app/src/app/icons/heart.svg +0 -1
- package/src/generators/application/files/app/src/app/icons/logo.png +0 -0
- package/src/generators/application/files/app/src/app/icons/nx-cloud.svg +0 -1
- package/src/generators/application/files/app/src/app/icons/pointer.svg +0 -1
- package/src/generators/application/files/app/src/app/icons/terminal.svg +0 -1
- package/src/generators/application/files/app/src/app/icons/vscode.svg +0 -1
- package/src/generators/application/files/app/src/app/icons/youtube.svg +0 -1
- package/src/generators/init/lib/init-root-babel-config.d.ts +0 -2
- package/src/generators/init/lib/init-root-babel-config.js +0 -20
- package/src/generators/init/lib/init-root-babel-config.js.map +0 -1
- package/src/utils/chmod-task.d.ts +0 -2
- package/src/utils/chmod-task.js +0 -18
- package/src/utils/chmod-task.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AACtB,mDAAiD;AAEjD,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,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAC9C,iBAAiB,EACjB,oBAAS,CACV,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC,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;AA9BD,0EA8BC;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,CAAC,aAAa,CAAC,IAAI,CAAC;YAC/B,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"}
|
|
@@ -8,6 +8,14 @@ import applicationGenerator from '../application/application';
|
|
|
8
8
|
import componentGenerator from '../component/component';
|
|
9
9
|
import storybookConfigurationGenerator from './configuration';
|
|
10
10
|
|
|
11
|
+
// nested code imports graph from the repo, which might have innacurate graph version
|
|
12
|
+
jest.mock('nx/src/project-graph/project-graph', () => ({
|
|
13
|
+
...jest.requireActual<any>('nx/src/project-graph/project-graph'),
|
|
14
|
+
createProjectGraphAsync: jest
|
|
15
|
+
.fn()
|
|
16
|
+
.mockImplementation(async () => ({ nodes: {}, dependencies: {} })),
|
|
17
|
+
}));
|
|
18
|
+
|
|
11
19
|
describe('react-native:storybook-configuration', () => {
|
|
12
20
|
let appTree;
|
|
13
21
|
|
|
@@ -35,7 +43,6 @@ describe('react-native:storybook-configuration', () => {
|
|
|
35
43
|
appTree.write('.gitignore', '');
|
|
36
44
|
await storybookConfigurationGenerator(appTree, {
|
|
37
45
|
name: 'test-ui-lib',
|
|
38
|
-
standaloneConfig: false,
|
|
39
46
|
});
|
|
40
47
|
|
|
41
48
|
expect(
|
|
@@ -55,7 +62,6 @@ describe('react-native:storybook-configuration', () => {
|
|
|
55
62
|
await storybookConfigurationGenerator(appTree, {
|
|
56
63
|
name: 'test-ui-lib',
|
|
57
64
|
generateStories: true,
|
|
58
|
-
standaloneConfig: false,
|
|
59
65
|
});
|
|
60
66
|
|
|
61
67
|
expect(
|
|
@@ -71,7 +77,6 @@ describe('react-native:storybook-configuration', () => {
|
|
|
71
77
|
appTree = await createTestAppLib('test-ui-app');
|
|
72
78
|
await storybookConfigurationGenerator(appTree, {
|
|
73
79
|
name: 'test-ui-app',
|
|
74
|
-
standaloneConfig: false,
|
|
75
80
|
});
|
|
76
81
|
|
|
77
82
|
expect(
|
|
@@ -87,7 +92,6 @@ describe('react-native:storybook-configuration', () => {
|
|
|
87
92
|
await storybookConfigurationGenerator(appTree, {
|
|
88
93
|
name: 'test-ui-app',
|
|
89
94
|
generateStories: true,
|
|
90
|
-
standaloneConfig: false,
|
|
91
95
|
});
|
|
92
96
|
|
|
93
97
|
// Currently the auto-generate stories feature only picks up components under the 'lib' directory.
|
|
@@ -103,7 +107,7 @@ describe('react-native:storybook-configuration', () => {
|
|
|
103
107
|
});
|
|
104
108
|
|
|
105
109
|
export async function createTestUILib(libName: string): Promise<Tree> {
|
|
106
|
-
let appTree = createTreeWithEmptyWorkspace();
|
|
110
|
+
let appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
107
111
|
|
|
108
112
|
await libraryGenerator(appTree, {
|
|
109
113
|
linter: Linter.EsLint,
|
|
@@ -119,7 +123,7 @@ export async function createTestAppLib(
|
|
|
119
123
|
libName: string,
|
|
120
124
|
plainJS = false
|
|
121
125
|
): Promise<Tree> {
|
|
122
|
-
let appTree = createTreeWithEmptyWorkspace();
|
|
126
|
+
let appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
123
127
|
|
|
124
128
|
await applicationGenerator(appTree, {
|
|
125
129
|
e2eTestRunner: 'none',
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { configure, getStorybookUI } from '@storybook/react-native';
|
|
2
2
|
|
|
3
|
-
import { loadStories } from '
|
|
3
|
+
import { loadStories } from '<%= offsetFromRoot %>../.storybook/story-loader';
|
|
4
4
|
|
|
5
|
-
configure(loadStories(), module
|
|
5
|
+
configure(() => loadStories(), module);
|
|
6
6
|
|
|
7
|
-
const StorybookUIRoot = getStorybookUI(
|
|
7
|
+
const StorybookUIRoot = getStorybookUI();
|
|
8
8
|
|
|
9
|
-
export default StorybookUIRoot;
|
|
9
|
+
export default StorybookUIRoot;
|
package/src/generators/storybook-configuration/lib/add-resolver-main-fields-to-metro-config.spec.ts
CHANGED
|
@@ -9,7 +9,7 @@ describe('addResolverMainFieldsToMetroConfig', () => {
|
|
|
9
9
|
let tree: Tree;
|
|
10
10
|
|
|
11
11
|
beforeEach(() => {
|
|
12
|
-
tree = createTreeWithEmptyWorkspace();
|
|
12
|
+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
13
13
|
|
|
14
14
|
addProjectConfiguration(tree, 'products', {
|
|
15
15
|
root: 'apps/products',
|
|
@@ -9,29 +9,28 @@ const chalk = require("chalk");
|
|
|
9
9
|
* This function generate ./storybook under project root.
|
|
10
10
|
*/
|
|
11
11
|
function createStorybookFiles(host, schema) {
|
|
12
|
-
var _a;
|
|
12
|
+
var _a, _b;
|
|
13
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
14
|
const { root, projectType, targets, sourceRoot } = (0, devkit_1.readProjectConfiguration)(host, schema.name);
|
|
15
15
|
// do not proceed if not a react native project
|
|
16
|
-
if (((_a = targets === null || targets === void 0 ? void 0 : targets.start) === null || _a === void 0 ? void 0 : _a.executor) !== '@nrwl/react-native:start'
|
|
16
|
+
if (((_a = targets === null || targets === void 0 ? void 0 : targets.start) === null || _a === void 0 ? void 0 : _a.executor) !== '@nrwl/react-native:start' &&
|
|
17
|
+
((_b = targets === null || targets === void 0 ? void 0 : targets.start) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/expo:start') {
|
|
18
|
+
devkit_1.logger.error(`Unable to add storybook to ${schema.name}. It is not a Nx React Native / Expo project.`);
|
|
17
19
|
return;
|
|
18
20
|
}
|
|
19
21
|
const storybookUIFileName = schema.js ? 'storybook.js' : 'storybook.ts';
|
|
20
22
|
const storybookUIFilePath = (0, path_1.join)(root, `./${storybookUIFileName}`);
|
|
21
23
|
if (host.exists(storybookUIFilePath)) {
|
|
22
|
-
devkit_1.logger.warn(`${storybookUIFileName} file already exists for
|
|
24
|
+
devkit_1.logger.warn(`${storybookUIFileName} file already exists for ${projectType} ${schema.name}! Skipping generating this file.`);
|
|
23
25
|
return;
|
|
24
26
|
}
|
|
25
27
|
if (projectType !== 'application') {
|
|
26
28
|
devkit_1.logger.info(`${chalk.bold.cyan('info')} To see your Storybook stories on the device, you should start your mobile app for the <platform> of your choice (typically ios or android).`);
|
|
27
29
|
}
|
|
28
|
-
const projectDirectory = projectType === 'application' ? 'app' : 'lib';
|
|
29
|
-
devkit_1.logger.debug(`Adding storybook file to React Native app ${projectDirectory}`);
|
|
30
30
|
// copy files to app's .storybook folder
|
|
31
31
|
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app'), (0, path_1.join)(root, 'src', 'storybook'), {
|
|
32
32
|
tmpl: '',
|
|
33
33
|
offsetFromRoot: (0, devkit_1.offsetFromRoot)(sourceRoot),
|
|
34
|
-
projectType: projectDirectory,
|
|
35
34
|
});
|
|
36
35
|
// copy files to workspace root's .storybook folder
|
|
37
36
|
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/root'), (0, path_1.join)(root, (0, devkit_1.offsetFromRoot)(root), '.storybook'), {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-storybook-files.js","sourceRoot":"","sources":["../../../../../../../packages/react-native/src/generators/storybook-configuration/lib/create-storybook-files.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,+BAA4B;AAC5B,+BAA+B;AAI/B;;GAEG;AACH,SAAsB,oBAAoB,CACxC,IAAU,EACV,MAAgC;;;QAEhC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EACzE,IAAI,EACJ,MAAM,CAAC,IAAI,CACZ,CAAC;QAEF,+CAA+C;QAC/C,
|
|
1
|
+
{"version":3,"file":"create-storybook-files.js","sourceRoot":"","sources":["../../../../../../../packages/react-native/src/generators/storybook-configuration/lib/create-storybook-files.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,+BAA4B;AAC5B,+BAA+B;AAI/B;;GAEG;AACH,SAAsB,oBAAoB,CACxC,IAAU,EACV,MAAgC;;;QAEhC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EACzE,IAAI,EACJ,MAAM,CAAC,IAAI,CACZ,CAAC;QAEF,+CAA+C;QAC/C,IACE,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,QAAQ,MAAK,0BAA0B;YACvD,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,QAAQ,MAAK,kBAAkB,EAC/C;YACA,eAAM,CAAC,KAAK,CACV,8BAA8B,MAAM,CAAC,IAAI,+CAA+C,CACzF,CAAC;YACF,OAAO;SACR;QAED,MAAM,mBAAmB,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC;QACxE,MAAM,mBAAmB,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,KAAK,mBAAmB,EAAE,CAAC,CAAC;QAEnE,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;YACpC,eAAM,CAAC,IAAI,CACT,GAAG,mBAAmB,4BAA4B,WAAW,IAAI,MAAM,CAAC,IAAI,kCAAkC,CAC/G,CAAC;YACF,OAAO;SACR;QACD,IAAI,WAAW,KAAK,aAAa,EAAE;YACjC,eAAM,CAAC,IAAI,CACT,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAChB,MAAM,CACP,8IAA8I,CAChJ,CAAC;SACH;QAED,wCAAwC;QACxC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,cAAc,CAAC,EAC/B,IAAA,WAAI,EAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,EAC9B;YACE,IAAI,EAAE,EAAE;YACR,cAAc,EAAE,IAAA,uBAAc,EAAC,UAAU,CAAC;SAC3C,CACF,CAAC;QAEF,mDAAmD;QACnD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,eAAe,CAAC,EAChC,IAAA,WAAI,EAAC,IAAI,EAAE,IAAA,uBAAc,EAAC,IAAI,CAAC,EAAE,YAAY,CAAC,EAC9C;YACE,IAAI,EAAE,EAAE;SACT,CACF,CAAC;QAEF,IAAI,MAAM,CAAC,EAAE,EAAE;YACb,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;SACZ;;CACF;AA7DD,oDA6DC"}
|
package/src/generators/storybook-configuration/lib/replace-app-import-with-storybook-toggle.spec.ts
CHANGED
|
@@ -9,7 +9,7 @@ describe('replaceAppImportWithStorybookToggle', () => {
|
|
|
9
9
|
let tree: Tree;
|
|
10
10
|
|
|
11
11
|
beforeEach(() => {
|
|
12
|
-
tree = createTreeWithEmptyWorkspace();
|
|
12
|
+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
13
13
|
|
|
14
14
|
addProjectConfiguration(tree, 'products', {
|
|
15
15
|
root: 'apps/products',
|
|
@@ -21,7 +21,8 @@
|
|
|
21
21
|
"type": "boolean",
|
|
22
22
|
"description": "Automatically generate *.stories.ts files for components declared in this project?",
|
|
23
23
|
"x-prompt": "Automatically generate *.stories.ts files for components declared in this project?",
|
|
24
|
-
"default": true
|
|
24
|
+
"default": true,
|
|
25
|
+
"x-priority": "important"
|
|
25
26
|
},
|
|
26
27
|
"js": {
|
|
27
28
|
"type": "boolean",
|
|
@@ -36,12 +37,14 @@
|
|
|
36
37
|
"linter": {
|
|
37
38
|
"description": "The tool to use for running lint checks.",
|
|
38
39
|
"type": "string",
|
|
39
|
-
"enum": ["eslint"
|
|
40
|
+
"enum": ["eslint"],
|
|
40
41
|
"default": "eslint"
|
|
41
42
|
},
|
|
42
43
|
"standaloneConfig": {
|
|
43
44
|
"description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
|
44
|
-
"type": "boolean"
|
|
45
|
+
"type": "boolean",
|
|
46
|
+
"default": true,
|
|
47
|
+
"x-deprecated": "Nx only supports standaloneConfig"
|
|
45
48
|
},
|
|
46
49
|
"ignorePaths": {
|
|
47
50
|
"type": "array",
|
|
@@ -1,5 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This function is a destructive command that replace React Native iOS and Android code with latest.
|
|
3
|
+
* It would replace the Android and iOS folder entirely.
|
|
4
|
+
*/
|
|
5
|
+
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
1
6
|
import { UpgradeNativeConfigureSchema } from './schema';
|
|
2
|
-
import { Tree, GeneratorCallback } from '@nrwl/devkit';
|
|
3
7
|
export declare function reactNativeUpgradeNativeGenerator(host: Tree, schema: UpgradeNativeConfigureSchema): Promise<GeneratorCallback>;
|
|
4
8
|
export default reactNativeUpgradeNativeGenerator;
|
|
5
9
|
export declare const reactNativeUpgradeNativeSchematic: (generatorOptions: UpgradeNativeConfigureSchema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -1,33 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.reactNativeUpgradeNativeSchematic = exports.reactNativeUpgradeNativeGenerator = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
2
|
/**
|
|
6
3
|
* This function is a destructive command that replace React Native iOS and Android code with latest.
|
|
7
4
|
* It would replace the Android and iOS folder entirely.
|
|
8
5
|
*/
|
|
9
|
-
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.reactNativeUpgradeNativeSchematic = exports.reactNativeUpgradeNativeGenerator = void 0;
|
|
8
|
+
const tslib_1 = require("tslib");
|
|
10
9
|
const devkit_1 = require("@nrwl/devkit");
|
|
11
|
-
const
|
|
12
|
-
const create_native_files_1 = require("./lib/create-native-files");
|
|
13
|
-
const fs_extra_1 = require("fs-extra");
|
|
10
|
+
const fs_1 = require("fs");
|
|
14
11
|
const pod_install_task_1 = require("../../utils/pod-install-task");
|
|
15
|
-
const
|
|
12
|
+
const chmod_android_gradle_files_1 = require("../../utils/chmod-android-gradle-files");
|
|
13
|
+
const create_native_files_1 = require("./lib/create-native-files");
|
|
16
14
|
function reactNativeUpgradeNativeGenerator(host, schema) {
|
|
17
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
18
16
|
const { projectType, root: appProjectRoot } = (0, devkit_1.readProjectConfiguration)(host, schema.name);
|
|
19
17
|
const iosProjectRoot = (0, devkit_1.joinPathFragments)(host.root, appProjectRoot, 'ios');
|
|
20
18
|
const androidProjectRoot = (0, devkit_1.joinPathFragments)(host.root, appProjectRoot, 'android');
|
|
21
19
|
if (projectType !== 'application' ||
|
|
22
|
-
!(0,
|
|
23
|
-
!(0,
|
|
20
|
+
!(0, fs_1.existsSync)(iosProjectRoot) ||
|
|
21
|
+
!(0, fs_1.existsSync)(androidProjectRoot)) {
|
|
24
22
|
throw new Error(`Could not upgrade React Native code for ${schema.name}`);
|
|
25
23
|
}
|
|
26
24
|
(0, create_native_files_1.createNativeFiles)(host, schema, appProjectRoot);
|
|
27
25
|
const podInstallTask = (0, pod_install_task_1.runPodInstall)(iosProjectRoot, schema.install);
|
|
28
|
-
const chmodTaskGradlew = (0,
|
|
29
|
-
|
|
30
|
-
return (0, run_tasks_in_serial_1.runTasksInSerial)(podInstallTask, chmodTaskGradlew, chmodTaskGradlewBat);
|
|
26
|
+
const chmodTaskGradlew = (0, chmod_android_gradle_files_1.chmodAndroidGradlewFilesTask)(androidProjectRoot);
|
|
27
|
+
return (0, devkit_1.runTasksInSerial)(podInstallTask, chmodTaskGradlew);
|
|
31
28
|
});
|
|
32
29
|
}
|
|
33
30
|
exports.reactNativeUpgradeNativeGenerator = reactNativeUpgradeNativeGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-native.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/upgrade-native/upgrade-native.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"upgrade-native.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/upgrade-native/upgrade-native.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;AAEH,yCAOsB;AACtB,2BAAgC;AAEhC,mEAA6D;AAC7D,uFAAsF;AAEtF,mEAA8D;AAG9D,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,eAAU,EAAC,cAAc,CAAC;YAC3B,CAAC,IAAA,eAAU,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,yDAA4B,EAAC,kBAAkB,CAAC,CAAC;QAE1E,OAAO,IAAA,yBAAgB,EAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;IAC5D,CAAC;CAAA;AA7BD,8EA6BC;AAED,kBAAe,iCAAiC,CAAC;AACpC,QAAA,iCAAiC,GAAG,IAAA,2BAAkB,EACjE,iCAAiC,CAClC,CAAC"}
|
|
@@ -10,7 +10,7 @@ describe('Add react-native-svg to dev dependencies', () => {
|
|
|
10
10
|
let tree: Tree;
|
|
11
11
|
|
|
12
12
|
beforeEach(async () => {
|
|
13
|
-
tree = createTreeWithEmptyWorkspace();
|
|
13
|
+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
14
14
|
addProjectConfiguration(tree, 'products', {
|
|
15
15
|
root: 'apps/products',
|
|
16
16
|
sourceRoot: 'apps/products/src',
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const executor_options_utils_1 = require("@nrwl/devkit/src/generators/executor-options-utils");
|
|
5
6
|
const path_1 = require("path");
|
|
6
|
-
const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
|
|
7
7
|
/**
|
|
8
8
|
* This function update jest.config.js and test.setup.ts for react native project for Jest 27.
|
|
9
9
|
* Inside jest.config.js, remove ...workspacePreset because it has testEnvironment set as jsdom.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-jest-for-react-native.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/migrations/update-12-5-0/update-jest-for-react-native.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,+BAA4B;
|
|
1
|
+
{"version":3,"file":"update-jest-for-react-native.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/migrations/update-12-5-0/update-jest-for-react-native.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,+FAA4F;AAC5F,+BAA4B;AAG5B;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,IAAU;IAClC,IAAA,+CAAsB,EACpB,IAAI,EACJ,iBAAiB,EACjB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;QACnB,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,OAAO;SACR;QAED,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC;QAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;QAC5D,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC;QACnD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QAEjC,IAAI,eAAe,KAAK,MAAM,IAAI,MAAM,KAAK,cAAc,EAAE;YAC3D,OAAO;SACR;QAED,IAAI;YACF,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YACpD,IAAI,CAAC,KAAK,CACR,cAAc,EACd,QAAQ;iBACL,OAAO,CACN,qBAAqB,EACrB,0CAA0C,CAC3C;iBACA,OAAO,CACN,uDAAuD,EACvD,EAAE,CACH,CACJ,CAAC;SACH;QAAC,WAAM;YACN,eAAM,CAAC,KAAK,CACV,IAAA,qBAAY,EAAA,+CAA+C,OAAO,GAAG,CACtE,CAAC;SACH;QAED,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACzD,IAAI,aAAqB,CAAC;YAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,EAAE;gBAC5C,aAAa,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;aAC7C;iBAAM,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,EAAE;gBACnD,aAAa,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;aAC7C;YAED,IAAI,aAAa,EAAE;gBACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;gBACnD,IAAI,CAAC,KAAK,CACR,aAAa,EACb,QAAQ;qBACL,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC;qBACpC,OAAO,CAAC,uCAAuC,EAAE,EAAE,CAAC,CACxD,CAAC;aACH;SACF;QAAC,WAAM;YACN,eAAM,CAAC,KAAK,CACV,IAAA,qBAAY,EAAA,2CAA2C,OAAO,GAAG,CAClE,CAAC;SACH;IACH,CAAC,CACF,CAAC;AACJ,CAAC;AAED,SAA8B,MAAM,CAAC,IAAU;;QAC7C,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAHD,yBAGC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const add_babel_inputs_1 = require("@nrwl/js/src/utils/add-babel-inputs");
|
|
6
6
|
function update(tree) {
|
|
7
7
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
8
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
@@ -13,7 +13,7 @@ function update(tree) {
|
|
|
13
13
|
.map(([_, project]) => project)
|
|
14
14
|
.some((project) => { var _a, _b; return ((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.start) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/react-native:start'; });
|
|
15
15
|
if (hasReactNaiveProject) {
|
|
16
|
-
(0,
|
|
16
|
+
(0, add_babel_inputs_1.addBabelInputs)(tree);
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-babel-config-root-13-5-0.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/migrations/update-13-5-0/add-babel-config-root-13-5-0.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;
|
|
1
|
+
{"version":3,"file":"add-babel-config-root-13-5-0.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/migrations/update-13-5-0/add-babel-config-root-13-5-0.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,0EAAqE;AAErE,SAA8B,MAAM,CAAC,IAAU;;QAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE;YACxE,OAAO;SACR;QAED,MAAM,oBAAoB,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;aAC9C,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC;aAC9B,IAAI,CACH,CAAC,OAAO,EAAE,EAAE,eACV,OAAA,CAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,0BAA0B,CAAA,EAAA,CAClE,CAAC;QAEJ,IAAI,oBAAoB,EAAE;YACxB,IAAA,iCAAc,EAAC,IAAI,CAAC,CAAC;SACtB;IACH,CAAC;CAAA;AAjBD,yBAiBC"}
|
|
@@ -6,7 +6,7 @@ describe('Add react-native-svg to dev dependencies', () => {
|
|
|
6
6
|
let tree: Tree;
|
|
7
7
|
|
|
8
8
|
beforeEach(async () => {
|
|
9
|
-
tree = createTreeWithEmptyWorkspace();
|
|
9
|
+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
10
10
|
addProjectConfiguration(tree, 'products', {
|
|
11
11
|
root: 'apps/products',
|
|
12
12
|
sourceRoot: 'apps/products/src',
|
|
@@ -6,7 +6,7 @@ describe('Update svg typings in tsconfig for react native app', () => {
|
|
|
6
6
|
let tree: Tree;
|
|
7
7
|
|
|
8
8
|
beforeEach(async () => {
|
|
9
|
-
tree = createTreeWithEmptyWorkspace();
|
|
9
|
+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
10
10
|
addProjectConfiguration(tree, 'products', {
|
|
11
11
|
root: 'apps/products',
|
|
12
12
|
sourceRoot: 'apps/products/src',
|
|
@@ -7,7 +7,7 @@ describe('Add projectRoot option in metro.config.js', () => {
|
|
|
7
7
|
let tree: Tree;
|
|
8
8
|
|
|
9
9
|
beforeEach(async () => {
|
|
10
|
-
tree = createTreeWithEmptyWorkspace();
|
|
10
|
+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
11
11
|
addProjectConfiguration(tree, 'products', {
|
|
12
12
|
root: 'apps/products',
|
|
13
13
|
sourceRoot: 'apps/products/src',
|
|
@@ -7,7 +7,7 @@ describe('Update entryFile for bundle target for react native apps', () => {
|
|
|
7
7
|
let tree: Tree;
|
|
8
8
|
|
|
9
9
|
beforeEach(async () => {
|
|
10
|
-
tree = createTreeWithEmptyWorkspace();
|
|
10
|
+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
11
11
|
addProjectConfiguration(tree, 'products', {
|
|
12
12
|
root: 'apps/products',
|
|
13
13
|
sourceRoot: 'apps/products/src',
|
|
@@ -7,7 +7,7 @@ describe('Change from main tag to className tag', () => {
|
|
|
7
7
|
let tree: Tree;
|
|
8
8
|
|
|
9
9
|
beforeEach(async () => {
|
|
10
|
-
tree = createTreeWithEmptyWorkspace();
|
|
10
|
+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
11
11
|
addProjectConfiguration(tree, 'products', {
|
|
12
12
|
root: 'apps/products',
|
|
13
13
|
sourceRoot: 'apps/products/src',
|
|
@@ -7,7 +7,7 @@ describe('Rename blacklistRE to blockList in metro.config.js for react native ap
|
|
|
7
7
|
let tree: Tree;
|
|
8
8
|
|
|
9
9
|
beforeEach(async () => {
|
|
10
|
-
tree = createTreeWithEmptyWorkspace();
|
|
10
|
+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
11
11
|
addProjectConfiguration(tree, 'products', {
|
|
12
12
|
root: 'apps/products',
|
|
13
13
|
sourceRoot: 'apps/products/src',
|
|
@@ -10,7 +10,7 @@ describe('add-exclude-sync-deps', () => {
|
|
|
10
10
|
let tree: Tree;
|
|
11
11
|
|
|
12
12
|
beforeEach(async () => {
|
|
13
|
-
tree = createTreeWithEmptyWorkspace();
|
|
13
|
+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
14
14
|
addProjectConfiguration(tree, 'products', {
|
|
15
15
|
root: 'apps/products',
|
|
16
16
|
sourceRoot: 'apps/products/src',
|
|
@@ -10,7 +10,7 @@ describe('change-searchDir-storybook', () => {
|
|
|
10
10
|
let tree: Tree;
|
|
11
11
|
|
|
12
12
|
beforeEach(async () => {
|
|
13
|
-
tree = createTreeWithEmptyWorkspace();
|
|
13
|
+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
14
14
|
addProjectConfiguration(tree, 'products', {
|
|
15
15
|
root: 'apps/products',
|
|
16
16
|
sourceRoot: 'apps/products/src',
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const executor_options_utils_1 = require("@nrwl/devkit/src/generators/executor-options-utils");
|
|
5
6
|
const jest_1 = require("@nrwl/jest");
|
|
6
|
-
const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
/**
|
|
9
9
|
* Remove transfrom and testRunner in jest
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-jest-transform.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/migrations/update-14-6-0/remove-jest-transform.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,qCAA0D;AAE1D
|
|
1
|
+
{"version":3,"file":"remove-jest-transform.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/migrations/update-14-6-0/remove-jest-transform.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,+FAA4F;AAC5F,qCAA0D;AAE1D,+BAA4B;AAE5B;;GAEG;AACH,SAA8B,MAAM,CAAC,IAAU;;QAC7C,IAAA,+CAAsB,EACpB,IAAI,EACJ,iBAAiB,EACjB,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;YACvB,IAAI,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBACzD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;gBAE1D,IAAI,UAAU,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE;oBACjD,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;oBAC5D,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;oBAC/B,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;iBAChC;aACF;QACH,CAAC,CACF,CAAC;QAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAlBD,yBAkBC;AAED,SAAS,eAAe,CAAC,IAAU,EAAE,OAA6B;;IAChE,MAAM,cAAc,GAAG,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,IAAI,0CAAE,OAAO,0CAAE,UAAU,CAAC;IAClE,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;QAAE,OAAO;IAC5D,IAAI;QACF,IAAA,mCAA4B,EAAC,IAAI,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;QAChE,IAAA,mCAA4B,EAAC,IAAI,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;KAClE;IAAC,WAAM;QACN,eAAM,CAAC,KAAK,CACV,IAAA,qBAAY,EAAA,oBAAoB,cAAc,gBAAgB,OAAO,CAAC,IAAI,GAAG,CAC9E,CAAC;KACH;AACH,CAAC;AAED,SAAS,eAAe,CAAC,IAAU,EAAE,OAA6B;IAChE,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACnD,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IAC9D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;QAC7B,OAAO;KACR;IACD,IAAI;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QACD,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;KAC1B;IAAC,WAAM;QACN,eAAM,CAAC,KAAK,CACV,IAAA,qBAAY,EAAA,yBAAyB,WAAW,OAAO,aAAa,gBAAgB,OAAO,CAAC,IAAI,GAAG,CACpG,CAAC;KACH;AACH,CAAC"}
|
|
@@ -6,7 +6,7 @@ describe('Rename jest preprocessor', () => {
|
|
|
6
6
|
let tree: Tree;
|
|
7
7
|
|
|
8
8
|
beforeEach(async () => {
|
|
9
|
-
tree = createTreeWithEmptyWorkspace();
|
|
9
|
+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
10
10
|
addProjectConfiguration(tree, 'products', {
|
|
11
11
|
root: 'apps/products',
|
|
12
12
|
sourceRoot: 'apps/products/src',
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const add_babel_inputs_1 = require("@nrwl/js/src/utils/add-babel-inputs");
|
|
5
|
+
function default_1(tree) {
|
|
6
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
+
(0, add_babel_inputs_1.addBabelInputs)(tree);
|
|
8
|
+
});
|
|
9
|
+
}
|
|
10
|
+
exports.default = default_1;
|
|
11
|
+
//# sourceMappingURL=add-babel-inputs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-babel-inputs.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/migrations/update-15-0-0/add-babel-inputs.ts"],"names":[],"mappings":";;;AACA,0EAAqE;AAErE,mBAA+B,IAAU;;QACvC,IAAA,iCAAc,EAAC,IAAI,CAAC,CAAC;IACvB,CAAC;CAAA;AAFD,4BAEC"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
|
|
2
|
+
import { Tree, readNxJson, updateNxJson } from '@nrwl/devkit';
|
|
3
|
+
import addBabelInputs from './add-babel-inputs';
|
|
4
|
+
|
|
5
|
+
describe('15.0.0 migration (add-babel-inputs)', () => {
|
|
6
|
+
let tree: Tree;
|
|
7
|
+
|
|
8
|
+
beforeEach(() => {
|
|
9
|
+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
it('should add babel.config.json to sharedGlobals', async () => {
|
|
13
|
+
updateNxJson(tree, {
|
|
14
|
+
namedInputs: {
|
|
15
|
+
default: ['{projectRoot}/**/*', 'sharedGlobals'],
|
|
16
|
+
sharedGlobals: [],
|
|
17
|
+
production: ['default'],
|
|
18
|
+
},
|
|
19
|
+
});
|
|
20
|
+
tree.write('babel.config.json', '');
|
|
21
|
+
|
|
22
|
+
await addBabelInputs(tree);
|
|
23
|
+
|
|
24
|
+
const updated = readNxJson(tree);
|
|
25
|
+
expect(updated).toMatchInlineSnapshot(`
|
|
26
|
+
Object {
|
|
27
|
+
"namedInputs": Object {
|
|
28
|
+
"default": Array [
|
|
29
|
+
"{projectRoot}/**/*",
|
|
30
|
+
"sharedGlobals",
|
|
31
|
+
],
|
|
32
|
+
"production": Array [
|
|
33
|
+
"default",
|
|
34
|
+
],
|
|
35
|
+
"sharedGlobals": Array [
|
|
36
|
+
"{workspaceRoot}/babel.config.json",
|
|
37
|
+
],
|
|
38
|
+
},
|
|
39
|
+
}
|
|
40
|
+
`);
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
it('should add babel.config.js', async () => {
|
|
44
|
+
updateNxJson(tree, {
|
|
45
|
+
namedInputs: {
|
|
46
|
+
default: ['{projectRoot}/**/*', 'sharedGlobals'],
|
|
47
|
+
sharedGlobals: [],
|
|
48
|
+
production: ['default'],
|
|
49
|
+
},
|
|
50
|
+
});
|
|
51
|
+
tree.write('babel.config.js', '');
|
|
52
|
+
|
|
53
|
+
await addBabelInputs(tree);
|
|
54
|
+
|
|
55
|
+
const updated = readNxJson(tree);
|
|
56
|
+
expect(updated).toMatchInlineSnapshot(`
|
|
57
|
+
Object {
|
|
58
|
+
"namedInputs": Object {
|
|
59
|
+
"default": Array [
|
|
60
|
+
"{projectRoot}/**/*",
|
|
61
|
+
"sharedGlobals",
|
|
62
|
+
],
|
|
63
|
+
"production": Array [
|
|
64
|
+
"default",
|
|
65
|
+
],
|
|
66
|
+
"sharedGlobals": Array [
|
|
67
|
+
"{workspaceRoot}/babel.config.js",
|
|
68
|
+
],
|
|
69
|
+
},
|
|
70
|
+
}
|
|
71
|
+
`);
|
|
72
|
+
});
|
|
73
|
+
});
|
package/src/utils/add-jest.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
|
2
|
-
export declare function addJest(host: Tree, unitTestRunner: 'jest' | 'none', projectName: string, appProjectRoot: string, js: boolean): Promise<import("@nrwl/devkit").GeneratorCallback>;
|
|
2
|
+
export declare function addJest(host: Tree, unitTestRunner: 'jest' | 'none', projectName: string, appProjectRoot: string, js: boolean, skipPackageJson: boolean): Promise<import("@nrwl/devkit").GeneratorCallback>;
|
package/src/utils/add-jest.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addJest = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const jest_1 = require("@nrwl/jest");
|
|
6
|
-
function addJest(host, unitTestRunner, projectName, appProjectRoot, js) {
|
|
6
|
+
function addJest(host, unitTestRunner, projectName, appProjectRoot, js, skipPackageJson) {
|
|
7
7
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
8
|
if (unitTestRunner !== 'jest') {
|
|
9
9
|
return () => { };
|
|
@@ -15,6 +15,7 @@ function addJest(host, unitTestRunner, projectName, appProjectRoot, js) {
|
|
|
15
15
|
skipSerializers: true,
|
|
16
16
|
setupFile: 'none',
|
|
17
17
|
compiler: 'babel',
|
|
18
|
+
skipPackageJson,
|
|
18
19
|
});
|
|
19
20
|
// overwrite the jest.config.ts file because react native needs to have special transform property
|
|
20
21
|
const configPath = `${appProjectRoot}/jest.config.${js ? 'js' : 'ts'}`;
|
|
@@ -25,7 +26,7 @@ function addJest(host, unitTestRunner, projectName, appProjectRoot, js) {
|
|
|
25
26
|
moduleFileExtensions: ['ts', 'js', 'html', 'tsx', 'jsx'],
|
|
26
27
|
setupFilesAfterEnv: ['<rootDir>/test-setup.${js ? 'js' : 'ts'}'],
|
|
27
28
|
moduleNameMapper: {
|
|
28
|
-
'
|
|
29
|
+
'\\\\.svg$': '@nrwl/react-native/plugins/jest/svg-mock'
|
|
29
30
|
}
|
|
30
31
|
};`;
|
|
31
32
|
host.write(configPath, content);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-jest.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/add-jest.ts"],"names":[],"mappings":";;;;AACA,qCAAkD;AAElD,SAAsB,OAAO,CAC3B,IAAU,EACV,cAA+B,EAC/B,WAAmB,EACnB,cAAsB,EACtB,EAAW;;
|
|
1
|
+
{"version":3,"file":"add-jest.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/add-jest.ts"],"names":[],"mappings":";;;;AACA,qCAAkD;AAElD,SAAsB,OAAO,CAC3B,IAAU,EACV,cAA+B,EAC/B,WAAmB,EACnB,cAAsB,EACtB,EAAW,EACX,eAAwB;;QAExB,IAAI,cAAc,KAAK,MAAM,EAAE;YAC7B,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;YAChD,EAAE;YACF,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,IAAI;YAChB,eAAe,EAAE,IAAI;YACrB,SAAS,EAAE,MAAM;YACjB,QAAQ,EAAE,OAAO;YACjB,eAAe;SAChB,CAAC,CAAC;QAEH,kGAAkG;QAClG,MAAM,UAAU,GAAG,GAAG,cAAc,gBAAgB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACvE,MAAM,OAAO,GAAG;kBACA,WAAW;;;;+CAIkB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;;;;GAI5D,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAEhC,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AArCD,0BAqCC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { Linter } from '@nrwl/linter';
|
|
2
|
-
import { Tree } from '@nrwl/devkit';
|
|
2
|
+
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
3
3
|
interface NormalizedSchema {
|
|
4
4
|
linter?: Linter;
|
|
5
5
|
projectName: string;
|
|
6
6
|
projectRoot: string;
|
|
7
7
|
setParserOptionsProject?: boolean;
|
|
8
8
|
tsConfigPaths: string[];
|
|
9
|
+
skipPackageJson?: boolean;
|
|
9
10
|
}
|
|
10
|
-
export declare function addLinting(host: Tree, options: NormalizedSchema): Promise<
|
|
11
|
+
export declare function addLinting(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
|
|
11
12
|
export {};
|