@nx/expo 20.4.0 → 20.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "20.4.0",
+  "version": "20.4.2",
   "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,17 +28,16 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "20.4.0",
-    "@nx/eslint": "20.4.0",
-    "@nx/jest": "20.4.0",
-    "@nx/js": "20.4.0",
-    "@nx/react": "20.4.0",
-    "@nx/web": "20.4.0",
-    "@nx/webpack": "20.4.0",
+    "@nx/devkit": "20.4.2",
+    "@nx/eslint": "20.4.2",
+    "@nx/jest": "20.4.2",
+    "@nx/js": "20.4.2",
+    "@nx/react": "20.4.2",
+    "@nx/web": "20.4.2",
+    "@nx/webpack": "20.4.2",
     "enhanced-resolve": "^5.8.3",
     "metro-config": "~0.80.4",
     "metro-resolver": "~0.80.4",
-    "node-fetch": "^2.6.7",
     "picocolors": "^1.1.0",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0"

package/src/executors/serve/lib/is-packager-running.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isPackagerRunning = isPackagerRunning;
-const node_fetch_1 = require("node-fetch");
 async function isPackagerRunning(packagerPort) {
     try {
-        const resp = await (0, node_fetch_1.default)(`http://localhost:${packagerPort}/status`);
+        const resp = await fetch(`http://localhost:${packagerPort}/status`);
         const data = await resp.text();
         return data === 'packager-status:running' ? 'running' : 'unrecognized';
     }

package/src/generators/library/files/lib/package.json.template

@@ -1,5 +1,5 @@
 {
-  "name": "<%= name %>",
+  "name": "<%= projectName %>",
   "version": "0.0.1",
   "main": "<%= appMain %>"
 }

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

@@ -3,6 +3,7 @@ import { Schema } from '../schema';
 export interface NormalizedSchema extends Schema {
     name: string;
     fileName: string;
+    projectName: string;
     projectRoot: string;
     routePath: string;
     parsedTags: string[];

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

@@ -4,6 +4,7 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 async function normalizeOptions(host, options) {
     await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
@@ -20,16 +21,20 @@ async function normalizeOptions(host, options) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const appMain = options.js ? 'src/index.js' : 'src/index.ts';
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     const normalized = {
         ...options,
         fileName: projectName,
         routePath: `/${projectNames.projectSimpleName}`,
         name: projectName,
+        projectName: isUsingTsSolutionConfig
+            ? (0, get_import_path_1.getImportPath)(host, projectName)
+            : projectName,
         projectRoot,
         parsedTags,
         importPath,
         appMain,
-        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
+        isUsingTsSolutionConfig,
     };
     return normalized;
 }

package/src/generators/library/library.js

@@ -14,7 +14,6 @@ const init_root_babel_config_1 = require("../../utils/init-root-babel-config");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function expoLibraryGenerator(host, schema) {
     return await expoLibraryGeneratorInternal(host, {
@@ -33,6 +32,9 @@ async function expoLibraryGeneratorInternal(host, schema) {
     if (options.publishable === true && !schema.importPath) {
         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);
+    }
     const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     tasks.push(initTask);
     if (!options.skipPackageJson) {
@@ -46,13 +48,13 @@ async function expoLibraryGeneratorInternal(host, schema) {
     }
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,
-        projectName: options.name,
+        projectName: options.projectName,
         tsConfigPaths: [
             (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
         ],
     });
     tasks.push(lintTask);
-    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson, options.addPlugin);
+    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.projectRoot, options.js, options.skipPackageJson, options.addPlugin);
     tasks.push(jestTask);
     if (options.publishable || options.buildable) {
         updateLibPackageNpmScope(host, options);
@@ -69,9 +71,6 @@ async function expoLibraryGeneratorInternal(host, schema) {
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
-    if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
-    }
     (0, sort_fields_1.sortPackageJsonFields)(host, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
@@ -94,23 +93,34 @@ async function addProject(host, options) {
         targets: {},
     };
     if (options.isUsingTsSolutionConfig) {
-        const packageName = (0, get_import_path_1.getImportPath)(host, options.name);
         const sourceEntry = !options.buildable
             ? options.js
                 ? './src/index.js'
                 : './src/index.ts'
             : undefined;
         (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
-            name: packageName,
+            name: options.projectName,
             version: '0.0.1',
             main: sourceEntry,
             types: sourceEntry,
-            nx: {
-                name: packageName === options.name ? undefined : options.name,
-                projectType: 'library',
-                sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
-                tags: options.parsedTags?.length ? options.parsedTags : undefined,
-            },
+            // For buildable libraries, the entries are configured by the bundler (i.e. Rollup).
+            exports: options.buildable
+                ? undefined
+                : {
+                    './package.json': './package.json',
+                    '.': options.js
+                        ? './src/index.js'
+                        : {
+                            types: './src/index.ts',
+                            import: './src/index.ts',
+                            default: './src/index.ts',
+                        },
+                },
+            nx: options.parsedTags?.length
+                ? {
+                    tags: options.parsedTags,
+                }
+                : undefined,
         });
     }
     else {
@@ -122,7 +132,7 @@ async function addProject(host, options) {
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
     const rollupConfigTask = await configurationGenerator(host, {
         ...options,
-        project: options.name,
+        project: options.projectName,
         skipFormat: true,
     });
     const external = ['react/jsx-runtime', 'react-native', 'react', 'react-dom'];
@@ -146,7 +156,7 @@ async function addProject(host, options) {
             ],
         },
     };
-    (0, devkit_1.updateProjectConfiguration)(host, options.name, project);
+    (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
     return rollupConfigTask;
 }
 function updateTsConfig(tree, options) {
@@ -171,7 +181,9 @@ function createFiles(host, options) {
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot),
     });
-    if (!options.publishable && !options.buildable) {
+    if (!options.publishable &&
+        !options.buildable &&
+        !options.isUsingTsSolutionConfig) {
         host.delete(`${options.projectRoot}/package.json`);
     }
     if (options.js) {