@nx/expo 20.5.0-rc.4 → 20.6.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "20.5.0-rc.4",
+  "version": "20.6.0-beta.0",
   "private": false,
   "description": "The Expo Plugin for Nx contains executors and generators for managing and developing an expo application within your workspace. For example, you can directly build for different target platforms as well as generate projects and publish your code.",
   "keywords": [
@@ -28,13 +28,13 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "20.5.0-rc.4",
-    "@nx/eslint": "20.5.0-rc.4",
-    "@nx/jest": "20.5.0-rc.4",
-    "@nx/js": "20.5.0-rc.4",
-    "@nx/react": "20.5.0-rc.4",
-    "@nx/web": "20.5.0-rc.4",
-    "@nx/webpack": "20.5.0-rc.4",
+    "@nx/devkit": "20.6.0-beta.0",
+    "@nx/eslint": "20.6.0-beta.0",
+    "@nx/jest": "20.6.0-beta.0",
+    "@nx/js": "20.6.0-beta.0",
+    "@nx/react": "20.6.0-beta.0",
+    "@nx/web": "20.6.0-beta.0",
+    "@nx/webpack": "20.6.0-beta.0",
     "enhanced-resolve": "^5.8.3",
     "metro-config": "~0.80.4",
     "metro-resolver": "~0.80.4",

package/src/generators/application/application.js

@@ -20,6 +20,7 @@ const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function expoApplicationGenerator(host, schema) {
     return await expoApplicationGeneratorInternal(host, {
         addPlugin: false,
+        useProjectJson: true,
         ...schema,
     });
 }
@@ -45,7 +46,7 @@ async function expoApplicationGeneratorInternal(host, schema) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isTsSolutionSetup) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
     }
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,

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

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
 const devkit_1 = require("@nx/devkit");
-const web_1 = require("@nx/web");
-const versions_1 = require("../../../utils/versions");
-const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
+const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
-const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const web_1 = require("@nx/web");
+const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
+const versions_1 = require("../../../utils/versions");
 async function addE2e(tree, options) {
     const hasPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(tree);
     if (!hasPlugin) {
@@ -21,15 +20,15 @@ async function addE2e(tree, options) {
     switch (options.e2eTestRunner) {
         case 'cypress': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
-                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
-                    name: options.e2eProjectName,
-                    version: '0.0.1',
-                    private: true,
-                    nx: {
-                        implicitDependencies: [options.projectName],
-                    },
-                });
+            const packageJson = {
+                name: options.e2eProjectName,
+                version: '0.0.1',
+                private: true,
+            };
+            if (!options.useProjectJson) {
+                packageJson.nx = {
+                    implicitDependencies: [options.projectName],
+                };
             }
             else {
                 (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -41,6 +40,9 @@ async function addE2e(tree, options) {
                     tags: [],
                 });
             }
+            if (!options.useProjectJson || options.isTsSolutionSetup) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+            }
             const e2eTask = await configurationGenerator(tree, {
                 ...options,
                 project: options.e2eProjectName,
@@ -76,15 +78,15 @@ async function addE2e(tree, options) {
         }
         case 'playwright': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-            if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
-                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
-                    name: options.e2eProjectName,
-                    version: '0.0.1',
-                    private: true,
-                    nx: {
-                        implicitDependencies: [options.projectName],
-                    },
-                });
+            const packageJson = {
+                name: options.e2eProjectName,
+                version: '0.0.1',
+                private: true,
+            };
+            if (!options.useProjectJson) {
+                packageJson.nx = {
+                    implicitDependencies: [options.projectName],
+                };
             }
             else {
                 (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -93,8 +95,12 @@ async function addE2e(tree, options) {
                     sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                     targets: {},
                     implicitDependencies: [options.projectName],
+                    tags: [],
                 });
             }
+            if (!options.useProjectJson || options.isTsSolutionSetup) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+            }
             const e2eTask = await configurationGenerator(tree, {
                 project: options.e2eProjectName,
                 skipFormat: true,

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

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
-const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
 function addProject(host, options) {
     const hasPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(host);
     if (!hasPlugin) {
@@ -17,12 +16,12 @@ function addProject(host, options) {
         targets: hasPlugin ? {} : getTargets(options),
         tags: options.parsedTags,
     };
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
-        const packageJson = {
-            name: options.importPath,
-            version: '0.0.1',
-            private: true,
-        };
+    const packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+        private: true,
+    };
+    if (!options.useProjectJson) {
         if (options.importPath !== options.projectName) {
             packageJson.nx = { name: options.projectName };
         }
@@ -34,11 +33,13 @@ function addProject(host, options) {
             packageJson.nx ??= {};
             packageJson.nx.tags = options.parsedTags;
         }
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.projectName, projectConfiguration, options.standaloneConfig);
     }
+    if (!options.useProjectJson || options.isTsSolutionSetup) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
+    }
 }
 function getTargets(options) {
     const architect = {};

package/src/generators/application/lib/normalize-options.js

@@ -22,6 +22,7 @@ async function normalizeOptions(host, options) {
     const rootProject = appProjectRoot === '.';
     const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     const appProjectName = !isTsSolutionSetup || options.name ? projectName : importPath;
+    const useProjectJson = options.useProjectJson ?? !isTsSolutionSetup;
     const e2eProjectName = rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     return {
@@ -40,5 +41,6 @@ async function normalizeOptions(host, options) {
         e2eProjectName,
         e2eProjectRoot,
         isTsSolutionSetup,
+        useProjectJson,
     };
 }

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

@@ -20,4 +20,5 @@ export interface Schema {
   nxCloudToken?: string;
   useTsSolution?: boolean;
   formatter?: 'prettier' | 'none';
+  useProjectJson?: boolean;
 }

package/src/generators/application/schema.json

@@ -86,6 +86,10 @@
       "type": "boolean",
       "description": "Do not add dependencies to `package.json`.",
       "default": false
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"]

package/src/generators/library/files/lib/README.md

@@ -1,7 +1,7 @@
-# <%= name %>
+# <%= projectName %>
 
 This library was generated with [Nx](https://nx.dev).
 
 ## Running unit tests
 
-Run `nx test <%= name %>` to execute the unit tests via [Jest](https://jestjs.io).
+Run `nx test <%= projectName %>` to execute the unit tests via [Jest](https://jestjs.io).

package/src/generators/library/lib/normalize-options.d.ts

@@ -1,7 +1,6 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from '../schema';
-export interface NormalizedSchema extends Schema {
-    name: string;
+export interface NormalizedSchema extends Omit<Schema, 'name'> {
     fileName: string;
     projectName: string;
     projectRoot: string;

package/src/generators/library/lib/normalize-options.js

@@ -20,16 +20,17 @@ async function normalizeOptions(host, options) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const useProjectJson = options.useProjectJson ?? !isUsingTsSolutionConfig;
     const normalized = {
         ...options,
         fileName: projectName,
         routePath: `/${projectNames.projectSimpleName}`,
-        name: projectName,
         projectName: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
         projectRoot,
         parsedTags,
         importPath,
         isUsingTsSolutionConfig,
+        useProjectJson,
     };
     return normalized;
 }

package/src/generators/library/library.js

@@ -21,6 +21,7 @@ const versions_1 = require("../../utils/versions");
 async function expoLibraryGenerator(host, schema) {
     return await expoLibraryGeneratorInternal(host, {
         addPlugin: false,
+        useProjectJson: true,
         ...schema,
     });
 }
@@ -36,7 +37,7 @@ async function expoLibraryGeneratorInternal(host, schema) {
         throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
     }
     if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
     }
     const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     tasks.push(initTask);
@@ -90,7 +91,7 @@ async function expoLibraryGeneratorInternal(host, schema) {
         tasks.push(() => (0, devkit_1.installPackagesTask)(host, true));
     }
     tasks.push(() => {
-        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
+        (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
@@ -102,17 +103,22 @@ async function addProject(host, options) {
         tags: options.parsedTags,
         targets: {},
     };
+    let packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+        peerDependencies: {
+            react: versions_1.reactVersion,
+            'react-native': versions_1.reactNativeVersion,
+        },
+    };
     if (options.isUsingTsSolutionConfig) {
-        const packageJson = {
-            name: options.projectName,
-            version: '0.0.1',
+        packageJson = {
+            ...packageJson,
             ...determineEntryFields(options),
             files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
-            peerDependencies: {
-                react: versions_1.reactVersion,
-                'react-native': versions_1.reactNativeVersion,
-            },
         };
+    }
+    if (!options.useProjectJson) {
         if (options.projectName !== options.importPath) {
             packageJson.nx = { name: options.projectName };
         }
@@ -120,10 +126,15 @@ async function addProject(host, options) {
             packageJson.nx ??= {};
             packageJson.nx.tags = options.parsedTags;
         }
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), packageJson);
     }
     else {
-        (0, devkit_1.addProjectConfiguration)(host, options.name, project);
+        (0, devkit_1.addProjectConfiguration)(host, options.projectName, project);
+    }
+    if (!options.useProjectJson ||
+        options.isUsingTsSolutionConfig ||
+        options.publishable ||
+        options.buildable) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), packageJson);
     }
     if (options.publishable || options.buildable) {
         const external = new Set([
@@ -169,7 +180,6 @@ function updateTsConfig(tree, options) {
 function createFiles(host, options) {
     (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/lib'), options.projectRoot, {
         ...options,
-        ...(0, devkit_1.names)(options.name),
         tmpl: '',
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot),

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

@@ -19,4 +19,5 @@ export interface Schema {
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean; // default is false
   addPlugin?: boolean;
+  useProjectJson?: boolean;
 }

package/src/generators/library/schema.json

@@ -89,6 +89,10 @@
       "type": "boolean",
       "description": "Do not add dependencies to `package.json`.",
       "default": false
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"]