@nrwl/react-native 14.8.3 → 15.0.0-beta.1

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [14.8.3](https://github.com/nrwl/nx/compare/14.8.2...14.8.3) (2022-10-04)
+# [15.0.0-beta.1](https://github.com/nrwl/nx/compare/14.8.0...15.0.0-beta.1) (2022-10-05)
 
 **Note:** Version bump only for package @nrwl/react-native

package/migrations.json

@@ -65,6 +65,12 @@
       "cli": "nx",
       "description": "Remove transform in jest.config",
       "factory": "./src/migrations/update-14-6-0/remove-jest-transform"
+    },
+    "add-babel-inputs": {
+      "cli": "nx",
+      "version": "15.0.0-beta.0",
+      "description": "Adds babel.config.json to the hash of all tasks",
+      "factory": "./src/migrations/update-15-0-0/add-babel-inputs"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/react-native",
-  "version": "14.8.3",
+  "version": "15.0.0-beta.1",
   "private": false,
   "description": "The Nx Plugin for React Native contains generators for managing React Native applications and libraries within an Nx workspace. It provides: \n\n-Integration with libraries such as Jest, Detox, and Storybook.\n-Scaffolding for creating buildable libraries that can be published to npm.\n-Utilities for automatic workspace refactoring.",
   "keywords": [
@@ -25,13 +25,13 @@
   "main": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@nrwl/detox": "14.8.3",
-    "@nrwl/devkit": "14.8.3",
-    "@nrwl/jest": "14.8.3",
-    "@nrwl/linter": "14.8.3",
-    "@nrwl/react": "14.8.3",
-    "@nrwl/storybook": "14.8.3",
-    "@nrwl/workspace": "14.8.3",
+    "@nrwl/detox": "15.0.0-beta.1",
+    "@nrwl/devkit": "15.0.0-beta.1",
+    "@nrwl/jest": "15.0.0-beta.1",
+    "@nrwl/linter": "15.0.0-beta.1",
+    "@nrwl/react": "15.0.0-beta.1",
+    "@nrwl/storybook": "15.0.0-beta.1",
+    "@nrwl/workspace": "15.0.0-beta.1",
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.8.3",
     "fs-extra": "^10.1.0",
@@ -53,5 +53,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c30d39a028f495c54811a8cd9cc09b84ac5130c8"
+  "gitHead": "49c5e5069b80605943ef3bbe965e291d79354cd5"
 }

package/src/generators/application/schema.json

@@ -42,7 +42,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint", "tslint"],
+      "enum": ["eslint"],
       "default": "eslint"
     },
     "unitTestRunner": {

package/src/generators/component-story/component-story.spec.ts

@@ -15,7 +15,7 @@ describe('react-native:component-story', () => {
 
   describe('default setup', () => {
     beforeEach(async () => {
-      appTree = await createTestUILib('test-ui-lib', true);
+      appTree = await createTestUILib('test-ui-lib');
     });
 
     describe('when file does not contain a component', () => {
@@ -376,7 +376,7 @@ describe('react-native:component-story', () => {
 
   describe('using eslint', () => {
     beforeEach(async () => {
-      appTree = await createTestUILib('test-ui-lib', false);
+      appTree = await createTestUILib('test-ui-lib');
       await componentGenerator(appTree, {
         name: 'test-ui-lib',
         project: 'test-ui-lib',
@@ -404,16 +404,13 @@ describe('react-native:component-story', () => {
   });
 });
 
-export async function createTestUILib(
-  libName: string,
-  useEsLint = false
-): Promise<Tree> {
+export async function createTestUILib(libName: string): Promise<Tree> {
   let appTree = createTreeWithEmptyWorkspace();
   appTree.write('.gitignore', '');
 
   await libraryGenerator(appTree, {
     name: libName,
-    linter: useEsLint ? Linter.EsLint : Linter.TsLint,
+    linter: Linter.EsLint,
     skipFormat: true,
     skipTsConfig: false,
     unitTestRunner: 'jest',
@@ -425,14 +422,12 @@ export async function createTestUILib(
     export: true,
   });
 
-  if (useEsLint) {
-    const currentWorkspaceJson = getProjects(appTree);
+  const currentWorkspaceJson = getProjects(appTree);
 
-    const projectConfig = currentWorkspaceJson.get(libName);
-    projectConfig.targets.lint.options.linter = 'eslint';
+  const projectConfig = currentWorkspaceJson.get(libName);
+  projectConfig.targets.lint.options.linter = 'eslint';
 
-    updateProjectConfiguration(appTree, libName, projectConfig);
-  }
+  updateProjectConfiguration(appTree, libName, projectConfig);
 
   return appTree;
 }

package/src/generators/library/schema.json

@@ -30,7 +30,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint", "tslint"],
+      "enum": ["eslint"],
       "default": "eslint"
     },
     "unitTestRunner": {

package/src/generators/storybook-configuration/schema.json

@@ -36,7 +36,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint", "tslint"],
+      "enum": ["eslint"],
       "default": "eslint"
     },
     "standaloneConfig": {

package/src/migrations/update-15-0-0/add-babel-inputs.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nrwl/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-15-0-0/add-babel-inputs.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const path_1 = require("path");
+function default_1(tree) {
+    var _a;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const workspaceConfiguration = (0, devkit_1.readWorkspaceConfiguration)(tree);
+        const globalBabelFile = ['babel.config.js', 'babel.config.json'].find((file) => tree.exists(file));
+        if (globalBabelFile && ((_a = workspaceConfiguration.namedInputs) === null || _a === void 0 ? void 0 : _a.sharedGlobals)) {
+            const sharedGlobalFileset = new Set(workspaceConfiguration.namedInputs.sharedGlobals);
+            sharedGlobalFileset.add((0, path_1.join)('{workspaceRoot}', globalBabelFile));
+            workspaceConfiguration.namedInputs.sharedGlobals =
+                Array.from(sharedGlobalFileset);
+        }
+        (0, devkit_1.updateWorkspaceConfiguration)(tree, workspaceConfiguration);
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=add-babel-inputs.js.map

package/src/migrations/update-15-0-0/add-babel-inputs.js.map

@@ -0,0 +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":";;;AAAA,yCAKsB;AACtB,+BAA4B;AAE5B,mBAA+B,IAAU;;;QACvC,MAAM,sBAAsB,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QAEhE,MAAM,eAAe,GAAG,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,CAAC,IAAI,CACnE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAC5B,CAAC;QAEF,IAAI,eAAe,KAAI,MAAA,sBAAsB,CAAC,WAAW,0CAAE,aAAa,CAAA,EAAE;YACxE,MAAM,mBAAmB,GAAG,IAAI,GAAG,CACjC,sBAAsB,CAAC,WAAW,CAAC,aAAa,CACjD,CAAC;YACF,mBAAmB,CAAC,GAAG,CAAC,IAAA,WAAI,EAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC,CAAC;YAClE,sBAAsB,CAAC,WAAW,CAAC,aAAa;gBAC9C,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SACnC;QAED,IAAA,qCAA4B,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;QAE3D,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAnBD,4BAmBC"}

package/src/migrations/update-15-0-0/add-babel-inputs.spec.ts

@@ -0,0 +1,81 @@
+import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import {
+  Tree,
+  readWorkspaceConfiguration,
+  updateWorkspaceConfiguration,
+} from '@nrwl/devkit';
+import addBabelInputs from './add-babel-inputs';
+
+describe('15.0.0 migration (add-babel-inputs)', () => {
+  let tree: Tree;
+
+  beforeEach(() => {
+    tree = createTreeWithEmptyWorkspace();
+  });
+
+  it('should add babel.config.json to sharedGlobals', async () => {
+    updateWorkspaceConfiguration(tree, {
+      version: 2,
+      namedInputs: {
+        default: ['{projectRoot}/**/*', 'sharedGlobals'],
+        sharedGlobals: [],
+        production: ['default'],
+      },
+    });
+    tree.write('babel.config.json', '');
+
+    await addBabelInputs(tree);
+
+    const updated = readWorkspaceConfiguration(tree);
+    expect(updated).toMatchInlineSnapshot(`
+      Object {
+        "namedInputs": Object {
+          "default": Array [
+            "{projectRoot}/**/*",
+            "sharedGlobals",
+          ],
+          "production": Array [
+            "default",
+          ],
+          "sharedGlobals": Array [
+            "{workspaceRoot}/babel.config.json",
+          ],
+        },
+        "version": 2,
+      }
+    `);
+  });
+
+  it('should add babel.config.js', async () => {
+    updateWorkspaceConfiguration(tree, {
+      version: 2,
+      namedInputs: {
+        default: ['{projectRoot}/**/*', 'sharedGlobals'],
+        sharedGlobals: [],
+        production: ['default'],
+      },
+    });
+    tree.write('babel.config.js', '');
+
+    await addBabelInputs(tree);
+
+    const updated = readWorkspaceConfiguration(tree);
+    expect(updated).toMatchInlineSnapshot(`
+      Object {
+        "namedInputs": Object {
+          "default": Array [
+            "{projectRoot}/**/*",
+            "sharedGlobals",
+          ],
+          "production": Array [
+            "default",
+          ],
+          "sharedGlobals": Array [
+            "{workspaceRoot}/babel.config.js",
+          ],
+        },
+        "version": 2,
+      }
+    `);
+  });
+});

package/src/utils/add-linting.js

@@ -18,9 +18,6 @@ function addLinting(host, options) {
             eslintFilePatterns: [`${options.projectRoot}/**/*.{ts,tsx,js,jsx}`],
             skipFormat: true,
         });
-        if (options.linter === linter_1.Linter.TsLint) {
-            return () => { };
-        }
         const reactEslintJson = (0, react_1.createReactEslintJson)(options.projectRoot, options.setParserOptionsProject);
         (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintrc.json'), (json) => {
             var _a;

package/src/utils/add-linting.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/add-linting.ts"],"names":[],"mappings":";;;;AAAA,2FAAqF;AACrF,yCAA4D;AAC5D,yCAKsB;AACtB,uCAA6E;AAW7E,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,IAAI,EAAE;YAClC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,uBAAuB,CAAC;YACnE,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;YACpC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,eAAe,GAAG,IAAA,6BAAqB,EAC3C,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,uBAAuB,CAChC,CAAC;QAEF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,CAAC,IAAyB,EAAE,EAAE;;YAC5B,IAAI,GAAG,eAAe,CAAC;YACvB,IAAI,CAAC,cAAc,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;YAEpE,uDAAuD;YACvD,MAAM,cAAc,GAAG,MAAA,IAAI,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAChD,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACzE,CAAC;YACF,IAAI,cAAc,EAAE;gBAClB,cAAc,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,IAAI,EAAE,CAAC;gBAClD,cAAc,CAAC,KAAK,CAAC,mCAAmC,CAAC,GAAG,KAAK,CAAC;aACnE;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,IAAA,qCAA4B,EACpD,IAAI,EACJ,+BAAuB,CAAC,YAAY,EACpC,+BAAuB,CAAC,eAAe,CACxC,CAAC;QAEF,OAAO,IAAA,sCAAgB,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACjD,CAAC;CAAA;AAjDD,gCAiDC"}
+{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/add-linting.ts"],"names":[],"mappings":";;;;AAAA,2FAAqF;AACrF,yCAA4D;AAC5D,yCAKsB;AACtB,uCAA6E;AAW7E,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,IAAI,EAAE;YAClC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,uBAAuB,CAAC;YACnE,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,IAAA,6BAAqB,EAC3C,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,uBAAuB,CAChC,CAAC;QAEF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,CAAC,IAAyB,EAAE,EAAE;;YAC5B,IAAI,GAAG,eAAe,CAAC;YACvB,IAAI,CAAC,cAAc,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;YAEpE,uDAAuD;YACvD,MAAM,cAAc,GAAG,MAAA,IAAI,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAChD,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACzE,CAAC;YACF,IAAI,cAAc,EAAE;gBAClB,cAAc,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,IAAI,EAAE,CAAC;gBAClD,cAAc,CAAC,KAAK,CAAC,mCAAmC,CAAC,GAAG,KAAK,CAAC;aACnE;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,IAAA,qCAA4B,EACpD,IAAI,EACJ,+BAAuB,CAAC,YAAY,EACpC,+BAAuB,CAAC,eAAe,CACxC,CAAC;QAEF,OAAO,IAAA,sCAAgB,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACjD,CAAC;CAAA;AA7CD,gCA6CC"}

package/src/utils/add-linting.spec.ts

@@ -28,21 +28,6 @@ describe('Add Linting', () => {
     expect(project.targets.lint.executor).toEqual('@nrwl/linter:eslint');
   });
 
-  it('should add update `workspace.json` file properly when tslint is passed', () => {
-    addLinting(tree, {
-      projectName: 'my-lib',
-      linter: Linter.TsLint,
-      tsConfigPaths: ['libs/my-lib/tsconfig.lib.json'],
-      projectRoot: 'libs/my-lib',
-    });
-    const project = readProjectConfiguration(tree, 'my-lib');
-
-    expect(project.targets.lint).toBeDefined();
-    expect(project.targets.lint.executor).toEqual(
-      '@angular-devkit/build-angular:tslint'
-    );
-  });
-
   it('should not add lint target when "none" is passed', async () => {
     addLinting(tree, {
       projectName: 'my-lib',