@nx/react-native 17.3.0-beta.5 → 17.3.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "17.3.0-beta.5",
+  "version": "17.3.0-beta.8",
   "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": [
@@ -32,18 +32,18 @@
     "ignore": "^5.0.4",
     "metro-config": "~0.76.8",
     "metro-resolver": "~0.76.8",
-    "minimatch": "3.0.5",
+    "minimatch": "9.0.3",
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/detox": "17.3.0-beta.5",
-    "@nx/devkit": "17.3.0-beta.5",
-    "@nx/jest": "17.3.0-beta.5",
-    "@nx/js": "17.3.0-beta.5",
-    "@nx/eslint": "17.3.0-beta.5",
-    "@nx/react": "17.3.0-beta.5",
-    "@nx/workspace": "17.3.0-beta.5",
-    "@nrwl/react-native": "17.3.0-beta.5"
+    "@nx/detox": "17.3.0-beta.8",
+    "@nx/devkit": "17.3.0-beta.8",
+    "@nx/jest": "17.3.0-beta.8",
+    "@nx/js": "17.3.0-beta.8",
+    "@nx/eslint": "17.3.0-beta.8",
+    "@nx/react": "17.3.0-beta.8",
+    "@nx/workspace": "17.3.0-beta.8",
+    "@nrwl/react-native": "17.3.0-beta.8"
   },
   "peerDependencies": {
     "react-native": ">= 0.72.0 < 0.73.0"

package/src/generators/component/files/__fileName__.tsx__tmpl__

@@ -26,7 +26,7 @@ export function <%= className %>(props: <%= className %>Props) {
       <Text>Welcome to <%= name %>!</Text>
     </View>
   );
-};
+}
 <% } %>
 
 export default <%= className %>;

package/src/generators/init/init.d.ts

@@ -1,5 +1,5 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function reactNativeInitGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
-export declare function updateDependencies(host: Tree): GeneratorCallback;
+export declare function updateDependencies(host: Tree, schema: Schema): GeneratorCallback;
 export default reactNativeInitGenerator;

package/src/generators/init/init.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDependencies = exports.reactNativeInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
+const plugin_1 = require("../../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
 async function reactNativeInitGenerator(host, schema) {
@@ -12,7 +14,10 @@ async function reactNativeInitGenerator(host, schema) {
     const tasks = [];
     if (!schema.skipPackageJson) {
         tasks.push(moveDependency(host));
-        tasks.push(updateDependencies(host));
+        tasks.push(updateDependencies(host, schema));
+    }
+    if (schema.updatePackageScripts) {
+        await (0, update_package_scripts_1.updatePackageScripts)(host, plugin_1.createNodes);
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
@@ -20,7 +25,7 @@ async function reactNativeInitGenerator(host, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.reactNativeInitGenerator = reactNativeInitGenerator;
-function updateDependencies(host) {
+function updateDependencies(host, schema) {
     return (0, devkit_1.addDependenciesToPackageJson)(host, {
         react: versions_1.reactVersion,
         'react-dom': versions_1.reactDomVersion,
@@ -30,7 +35,7 @@ function updateDependencies(host) {
         '@react-native-community/cli': versions_1.reactNativeCommunityCli,
         '@react-native-community/cli-platform-android': versions_1.reactNativeCommunityCliAndroid,
         '@react-native-community/cli-platform-ios': versions_1.reactNativeCommunityCliIos,
-    });
+    }, undefined, schema.keepExistingVersions);
 }
 exports.updateDependencies = updateDependencies;
 function moveDependency(host) {

package/src/generators/init/schema.d.ts

@@ -1,4 +1,6 @@
 export interface Schema {
   skipFormat?: boolean;
   skipPackageJson?: boolean; //default is false
+  keepExistingVersions?: boolean; //default is false
+  updatePackageScripts?: boolean;
 }

package/src/generators/init/schema.json

@@ -17,6 +17,18 @@
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
+    },
+    "updatePackageScripts": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Update `package.json` scripts with inferred targets",
+      "default": false
     }
   },
   "required": []

package/src/generators/stories/stories.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const component_story_1 = require("../component-story/component-story");
 const stories_1 = require("@nx/react/src/generators/stories/stories");
-const minimatch = require("minimatch");
+const minimatch_1 = require("minimatch");
 const versions_1 = require("../../utils/versions");
 async function createAllStories(tree, projectName, ignorePaths) {
     (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
@@ -16,7 +16,7 @@ async function createAllStories(tree, projectName, ignorePaths) {
     const projectPath = await (0, stories_1.projectRootPath)(tree, projectConfiguration);
     let componentPaths = [];
     (0, devkit_1.visitNotIgnoredFiles)(tree, projectPath, (path) => {
-        if (ignorePaths?.some((pattern) => minimatch(path, pattern)))
+        if (ignorePaths?.some((pattern) => (0, minimatch_1.minimatch)(path, pattern)))
             return;
         if ((path.endsWith('.tsx') && !path.endsWith('.spec.tsx')) ||
             (path.endsWith('.js') && !path.endsWith('.spec.js')) ||

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

@@ -15,8 +15,8 @@ describe('Add Linting', () => {
     });
   });
 
-  it('should add update configuration when eslint is passed', () => {
-    addLinting(tree, {
+  it('should add update configuration when eslint is passed', async () => {
+    await addLinting(tree, {
       projectName: 'my-lib',
       linter: Linter.EsLint,
       tsConfigPaths: ['libs/my-lib/tsconfig.lib.json'],
@@ -29,7 +29,7 @@ describe('Add Linting', () => {
   });
 
   it('should not add lint target when "none" is passed', async () => {
-    addLinting(tree, {
+    await addLinting(tree, {
       projectName: 'my-lib',
       linter: Linter.None,
       tsConfigPaths: ['libs/my-lib/tsconfig.lib.json'],