@nrwl/react-native 13.0.0-beta.1 → 13.0.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/react-native",
-  "version": "13.0.0-beta.1",
+  "version": "13.0.0-beta.10",
   "description": "React Native Plugin for Nx",
   "keywords": [
     "Monorepo",
@@ -24,11 +24,11 @@
   "main": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@nrwl/detox": "13.0.0-beta.1",
-    "@nrwl/devkit": "13.0.0-beta.1",
-    "@nrwl/jest": "13.0.0-beta.1",
-    "@nrwl/linter": "13.0.0-beta.1",
-    "@nrwl/react": "13.0.0-beta.1",
+    "@nrwl/detox": "13.0.0-beta.10",
+    "@nrwl/devkit": "13.0.0-beta.10",
+    "@nrwl/jest": "13.0.0-beta.10",
+    "@nrwl/linter": "13.0.0-beta.10",
+    "@nrwl/react": "13.0.0-beta.10",
     "chalk": "^4.1.0",
     "ignore": "^5.0.4",
     "metro-resolver": "^0.66.2",
@@ -36,7 +36,7 @@
     "tsconfig-paths": "^3.9.0"
   },
   "peerDependencies": {
-    "@nrwl/workspace": "13.0.0-beta.1",
+    "@nrwl/workspace": "13.0.0-beta.10",
     "react-native": "0.65.1"
   },
   "builders": "./executors.json",

package/src/generators/application/application.spec.ts

@@ -39,13 +39,10 @@ describe('app', () => {
       e2eTestRunner: 'none',
     });
 
-    const nxJson = readJson(appTree, '/nx.json');
-    expect(nxJson).toMatchObject({
-      npmScope: 'proj',
-      projects: {
-        'my-app': {
-          tags: ['one', 'two'],
-        },
+    const { projects } = readJson(appTree, '/workspace.json');
+    expect(projects).toMatchObject({
+      'my-app': {
+        tags: ['one', 'two'],
       },
     });
   });

package/src/generators/application/lib/add-project.js

@@ -3,16 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function addProject(host, options) {
-    const nxConfig = {
-        tags: options.parsedTags,
-    };
     const project = {
         root: options.appProjectRoot,
         sourceRoot: `${options.appProjectRoot}/src`,
         projectType: 'application',
         targets: Object.assign({}, getTargets(options)),
+        tags: options.parsedTags,
     };
-    devkit_1.addProjectConfiguration(host, options.projectName, Object.assign(Object.assign({}, project), nxConfig));
+    devkit_1.addProjectConfiguration(host, options.projectName, Object.assign({}, project));
     const workspace = devkit_1.readWorkspaceConfiguration(host);
     if (!workspace.defaultProject) {
         workspace.defaultProject = options.projectName;

package/src/generators/application/lib/add-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/react-native/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AAAA,yCAQsB;AAGtB,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,MAAM,QAAQ,GAA+B;QAC3C,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,MAAM;QAC3C,WAAW,EAAE,aAAa;QAC1B,OAAO,oBAAO,UAAU,CAAC,OAAO,CAAC,CAAE;KACpC,CAAC;IAEF,gCAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,kCAC5C,OAAO,GACP,QAAQ,EACX,CAAC;IAEH,MAAM,SAAS,GAAG,mCAA0B,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE;QAC7B,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;QAE/C,qCAA4B,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;KAC/C;AACH,CAAC;AAxBD,gCAwBC;AAED,SAAS,UAAU,CAAC,OAAyB;IAC3C,MAAM,SAAS,GAA2C,EAAE,CAAC;IAE7D,SAAS,CAAC,KAAK,GAAG;QAChB,QAAQ,EAAE,0BAA0B;QACpC,OAAO,EAAE;YACP,IAAI,EAAE,IAAI;SACX;KACF,CAAC;IAEF,SAAS,CAAC,KAAK,GAAG;QAChB,QAAQ,EAAE,8BAA8B;QACxC,OAAO,EAAE;YACP,OAAO,EAAE,YAAY,OAAO,CAAC,IAAI,EAAE;SACpC;KACF,CAAC;IAEF,SAAS,CAAC,SAAS,CAAC,GAAG;QACrB,QAAQ,EAAE,4BAA4B;QACtC,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,YAAY,CAAC,GAAG;QACxB,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,cAAc,QAAQ,CAAC;QAC5C,OAAO,EAAE;YACP,SAAS,EAAE,GAAG,OAAO,CAAC,cAAc,eAAe;YACnD,QAAQ,EAAE,KAAK;YACf,YAAY,EAAE,QAAQ,OAAO,CAAC,cAAc,oBAAoB;SACjE;KACF,CAAC;IAEF,SAAS,CAAC,aAAa,CAAC,GAAG;QACzB,QAAQ,EAAE,gCAAgC;QAC1C,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,eAAe,CAAC,GAAG;QAC3B,QAAQ,EAAE,kCAAkC;QAC5C,OAAO,EAAE;YACP,GAAG,OAAO,CAAC,cAAc,mCAAmC;YAC5D,GAAG,OAAO,CAAC,cAAc,gCAAgC;SAC1D;QACD,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,gBAAgB,CAAC,GAAG;QAC5B,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE;YACP,SAAS,EAAE,GAAG,OAAO,CAAC,cAAc,eAAe;YACnD,QAAQ,EAAE,SAAS;YACnB,YAAY,EAAE,QAAQ,OAAO,CAAC,cAAc,wBAAwB;SACrE;KACF,CAAC;IAEF,SAAS,CAAC,WAAW,CAAC,GAAG;QACvB,QAAQ,EAAE,8BAA8B;QACxC,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,gBAAgB,CAAC,GAAG;QAC5B,QAAQ,EAAE,mCAAmC;QAC7C,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/react-native/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AAGtB,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,MAAM;QAC3C,WAAW,EAAE,aAAa;QAC1B,OAAO,oBAAO,UAAU,CAAC,OAAO,CAAC,CAAE;QACnC,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,gCAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,oBAC5C,OAAO,EACV,CAAC;IAEH,MAAM,SAAS,GAAG,mCAA0B,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE;QAC7B,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;QAE/C,qCAA4B,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;KAC/C;AACH,CAAC;AApBD,gCAoBC;AAED,SAAS,UAAU,CAAC,OAAyB;IAC3C,MAAM,SAAS,GAA2C,EAAE,CAAC;IAE7D,SAAS,CAAC,KAAK,GAAG;QAChB,QAAQ,EAAE,0BAA0B;QACpC,OAAO,EAAE;YACP,IAAI,EAAE,IAAI;SACX;KACF,CAAC;IAEF,SAAS,CAAC,KAAK,GAAG;QAChB,QAAQ,EAAE,8BAA8B;QACxC,OAAO,EAAE;YACP,OAAO,EAAE,YAAY,OAAO,CAAC,IAAI,EAAE;SACpC;KACF,CAAC;IAEF,SAAS,CAAC,SAAS,CAAC,GAAG;QACrB,QAAQ,EAAE,4BAA4B;QACtC,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,YAAY,CAAC,GAAG;QACxB,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,cAAc,QAAQ,CAAC;QAC5C,OAAO,EAAE;YACP,SAAS,EAAE,GAAG,OAAO,CAAC,cAAc,eAAe;YACnD,QAAQ,EAAE,KAAK;YACf,YAAY,EAAE,QAAQ,OAAO,CAAC,cAAc,oBAAoB;SACjE;KACF,CAAC;IAEF,SAAS,CAAC,aAAa,CAAC,GAAG;QACzB,QAAQ,EAAE,gCAAgC;QAC1C,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,eAAe,CAAC,GAAG;QAC3B,QAAQ,EAAE,kCAAkC;QAC5C,OAAO,EAAE;YACP,GAAG,OAAO,CAAC,cAAc,mCAAmC;YAC5D,GAAG,OAAO,CAAC,cAAc,gCAAgC;SAC1D;QACD,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,gBAAgB,CAAC,GAAG;QAC5B,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE;YACP,SAAS,EAAE,GAAG,OAAO,CAAC,cAAc,eAAe;YACnD,QAAQ,EAAE,SAAS;YACnB,YAAY,EAAE,QAAQ,OAAO,CAAC,cAAc,wBAAwB;SACrE;KACF,CAAC;IAEF,SAAS,CAAC,WAAW,CAAC,GAAG;QACvB,QAAQ,EAAE,8BAA8B;QACxC,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,gBAAgB,CAAC,GAAG;QAC5B,QAAQ,EAAE,mCAAmC;QAC7C,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/src/generators/init/init.spec.ts

@@ -37,12 +37,12 @@ describe('init', () => {
   describe('defaultCollection', () => {
     it('should be set if none was set before', async () => {
       await reactNativeInitGenerator(tree, { e2eTestRunner: 'none' });
-      const workspaceJson = readJson(tree, 'workspace.json');
-      expect(workspaceJson.cli.defaultCollection).toEqual('@nrwl/react-native');
+      const { cli } = readJson(tree, 'nx.json');
+      expect(cli.defaultCollection).toEqual('@nrwl/react-native');
     });
 
     it('should not be set if something else was set before', async () => {
-      updateJson(tree, 'workspace.json', (json) => {
+      updateJson(tree, 'nx.json', (json) => {
         json.cli = {
           defaultCollection: '@nrwl/react',
         };
@@ -52,8 +52,8 @@ describe('init', () => {
         return json;
       });
       await reactNativeInitGenerator(tree, { e2eTestRunner: 'none' });
-      const workspaceJson = readJson(tree, 'workspace.json');
-      expect(workspaceJson.cli.defaultCollection).toEqual('@nrwl/react');
+      const { cli } = readJson(tree, 'nx.json');
+      expect(cli.defaultCollection).toEqual('@nrwl/react');
     });
   });
 });

package/src/generators/library/library.spec.ts

@@ -23,7 +23,7 @@ describe('lib', () => {
 
   describe('not nested', () => {
     it('should update workspace.json', async () => {
-      await libraryGenerator(appTree, defaultSchema);
+      await libraryGenerator(appTree, { ...defaultSchema, tags: 'one,two' });
       const workspaceJson = readJson(appTree, '/workspace.json');
       expect(workspaceJson.projects['my-lib'].root).toEqual('libs/my-lib');
       expect(workspaceJson.projects['my-lib'].architect.build).toBeUndefined();
@@ -34,16 +34,7 @@ describe('lib', () => {
           lintFilePatterns: ['libs/my-lib/**/*.{ts,tsx,js,jsx}'],
         },
       });
-    });
-
-    it('should update nx.json', async () => {
-      await libraryGenerator(appTree, { ...defaultSchema, tags: 'one,two' });
-      const nxJson = readJson(appTree, '/nx.json');
-      expect(nxJson.projects).toEqual({
-        'my-lib': {
-          tags: ['one', 'two'],
-        },
-      });
+      expect(workspaceJson.projects['my-lib'].tags).toEqual(['one', 'two']);
     });
 
     it('should update tsconfig.base.json', async () => {
@@ -108,8 +99,8 @@ describe('lib', () => {
         directory: 'myDir',
         tags: 'one',
       });
-      const nxJson = readJson(appTree, '/nx.json');
-      expect(nxJson.projects).toEqual({
+      const workspaceJson = readJson(appTree, '/workspace.json');
+      expect(workspaceJson.projects).toMatchObject({
         'my-dir-my-lib': {
           tags: ['one'],
         },
@@ -122,8 +113,8 @@ describe('lib', () => {
         tags: 'one,two',
       });
 
-      const nxJson2 = readJson(appTree, '/nx.json');
-      expect(nxJson2.projects).toEqual({
+      const workspaceJson2 = readJson(appTree, '/workspace.json');
+      expect(workspaceJson2.projects).toMatchObject({
         'my-dir-my-lib': {
           tags: ['one'],
         },

package/src/utils/find-all-npm-dependencies.js

@@ -4,15 +4,22 @@ exports.findAllNpmDependencies = void 0;
 function findAllNpmDependencies(graph, projectName, list = [], seen = new Set()) {
     var _a;
     // In case of bad circular dependencies
-    if (seen.has(projectName))
+    if (seen.has(projectName)) {
         return list;
+    }
     seen.add(projectName);
-    const node = graph.nodes[projectName];
+    const node = graph.externalNodes[projectName];
     // Don't want to include '@nrwl/react-native' because React Native
     // autolink will warn that the package has no podspec file for iOS.
-    if (node.type === 'npm' && node.name !== 'npm:@nrwl/react-native')
-        list.push(node.data.packageName);
-    (_a = graph.dependencies[projectName]) === null || _a === void 0 ? void 0 : _a.forEach((dep) => findAllNpmDependencies(graph, dep.target, list, seen));
+    if (node) {
+        if (node.name !== 'npm:@nrwl/react-native') {
+            list.push(node.data.packageName);
+        }
+    }
+    else {
+        // it's workspace project, search for it's dependencies
+        (_a = graph.dependencies[projectName]) === null || _a === void 0 ? void 0 : _a.forEach((dep) => findAllNpmDependencies(graph, dep.target, list, seen));
+    }
     return list;
 }
 exports.findAllNpmDependencies = findAllNpmDependencies;

package/src/utils/find-all-npm-dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-all-npm-dependencies.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/find-all-npm-dependencies.ts"],"names":[],"mappings":";;;AAEA,SAAgB,sBAAsB,CACpC,KAAmB,EACnB,WAAmB,EACnB,OAAiB,EAAE,EACnB,OAAO,IAAI,GAAG,EAAU;;IAExB,uCAAuC;IACvC,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEtB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAEtC,kEAAkE;IAClE,mEAAmE;IACnE,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,wBAAwB;QAC/D,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEnC,MAAA,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,0CAAE,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAC/C,sBAAsB,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CACtD,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC;AAtBD,wDAsBC"}
+{"version":3,"file":"find-all-npm-dependencies.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/find-all-npm-dependencies.ts"],"names":[],"mappings":";;;AAEA,SAAgB,sBAAsB,CACpC,KAAmB,EACnB,WAAmB,EACnB,OAAiB,EAAE,EACnB,OAAO,IAAI,GAAG,EAAU;;IAExB,uCAAuC;IACvC,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;QACzB,OAAO,IAAI,CAAC;KACb;IACD,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEtB,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAE9C,kEAAkE;IAClE,mEAAmE;IACnE,IAAI,IAAI,EAAE;QACR,IAAI,IAAI,CAAC,IAAI,KAAK,wBAAwB,EAAE;YAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAClC;KACF;SAAM;QACL,uDAAuD;QACvD,MAAA,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,0CAAE,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAC/C,sBAAsB,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CACtD,CAAC;KACH;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AA3BD,wDA2BC"}

package/src/utils/find-all-npm-dependencies.spec.ts

@@ -24,11 +24,13 @@ test('findAllNpmDependencies', () => {
         name: 'lib3',
         data: { files: [] },
       },
+    },
+    externalNodes: {
       'npm:react-native-image-picker': {
         type: 'npm',
         name: 'npm:react-native-image-picker',
         data: {
-          files: [],
+          version: '1',
           packageName: 'react-native-image-picker',
         },
       },
@@ -36,7 +38,7 @@ test('findAllNpmDependencies', () => {
         type: 'npm',
         name: 'npm:react-native-dialog',
         data: {
-          files: [],
+          version: '1',
           packageName: 'react-native-dialog',
         },
       },
@@ -44,7 +46,7 @@ test('findAllNpmDependencies', () => {
         type: 'npm',
         name: 'npm:react-native-snackbar',
         data: {
-          files: [],
+          version: '1',
           packageName: 'react-native-snackbar',
         },
       },
@@ -52,7 +54,7 @@ test('findAllNpmDependencies', () => {
         type: 'npm',
         name: 'npm:@nrwl/react-native',
         data: {
-          files: [],
+          version: '1',
           packageName: '@nrwl/react-native',
         },
       },

package/src/utils/versions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.reactTestRendererVersion = exports.jestReactNativeVersion = exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.metroReactNativeBabelPresetVersion = exports.reactNativeCommunityCliAndroid = exports.reactNativeCommunityCliIos = exports.reactNativeCommunityCli = exports.metroVersion = exports.typesReactNativeVersion = exports.reactNativeVersion = exports.typesReactVersion = exports.reactVersion = exports.nxVersion = void 0;
-exports.nxVersion = '13.0.0-beta.1';
+exports.nxVersion = '13.0.0-beta.10';
 exports.reactVersion = '17.0.2';
 exports.typesReactVersion = '17.0.19';
 exports.reactNativeVersion = '0.66.0';