@nx/expo 21.0.0-beta.0 → 21.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "21.0.0-beta.0",
+  "version": "21.0.0-beta.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,13 +28,13 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "21.0.0-beta.0",
-    "@nx/eslint": "21.0.0-beta.0",
-    "@nx/jest": "21.0.0-beta.0",
-    "@nx/js": "21.0.0-beta.0",
-    "@nx/react": "21.0.0-beta.0",
-    "@nx/web": "21.0.0-beta.0",
-    "@nx/webpack": "21.0.0-beta.0",
+    "@nx/devkit": "21.0.0-beta.2",
+    "@nx/eslint": "21.0.0-beta.2",
+    "@nx/jest": "21.0.0-beta.2",
+    "@nx/js": "21.0.0-beta.2",
+    "@nx/react": "21.0.0-beta.2",
+    "@nx/web": "21.0.0-beta.2",
+    "@nx/webpack": "21.0.0-beta.2",
     "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,
     });
 }
@@ -42,6 +43,11 @@ async function expoApplicationGeneratorInternal(host, schema) {
     (0, init_root_babel_config_1.initRootBabelConfig)(host);
     await (0, create_application_files_1.createApplicationFiles)(host, options);
     (0, add_project_1.addProject)(host, options);
+    // 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) {
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+    }
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,
         projectRoot: options.appProjectRoot,
@@ -63,11 +69,6 @@ async function expoApplicationGeneratorInternal(host, schema) {
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
-    // 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.useTsSolution) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
-    }
     (0, sort_fields_1.sortPackageJsonFields)(host, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

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,17 +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: {
-                        projectType: 'application',
-                        sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-                        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, {
@@ -43,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,
@@ -78,17 +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: {
-                        projectType: 'application',
-                        sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-                        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, {
@@ -97,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,
@@ -135,7 +137,7 @@ async function addE2e(tree, options) {
                 e2eDirectory: options.e2eProjectRoot,
                 appProject: options.projectName,
                 appDisplayName: options.displayName,
-                appName: options.name,
+                appName: options.simpleName,
                 framework: 'expo',
                 setParserOptionsProject: options.setParserOptionsProject,
                 skipFormat: true,

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

@@ -2,12 +2,9 @@
 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 get_import_path_1 = require("@nx/js/src/utils/get-import-path");
+const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
 function addProject(host, options) {
-    const nxJson = (0, devkit_1.readNxJson)(host);
     const hasPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(host);
     if (!hasPlugin) {
         (0, target_defaults_utils_1.addBuildTargetDefaults)(host, '@nx/expo:build');
@@ -19,24 +16,30 @@ function addProject(host, options) {
         targets: hasPlugin ? {} : getTargets(options),
         tags: options.parsedTags,
     };
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
-        const packageName = (0, get_import_path_1.getImportPath)(host, options.name);
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
-            name: packageName,
-            version: '0.0.1',
-            private: true,
-            nx: {
-                name: packageName === options.name ? undefined : options.name,
-                projectType: 'application',
-                sourceRoot: `${options.appProjectRoot}/src`,
-                targets: hasPlugin ? undefined : getTargets(options),
-                tags: options.parsedTags?.length ? options.parsedTags : undefined,
-            },
-        });
+    const packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+        private: true,
+    };
+    if (!options.useProjectJson) {
+        if (options.importPath !== options.projectName) {
+            packageJson.nx = { name: options.projectName };
+        }
+        if (!hasPlugin) {
+            packageJson.nx ??= {};
+            packageJson.nx.targets = getTargets(options);
+        }
+        if (options.parsedTags?.length) {
+            packageJson.nx ??= {};
+            packageJson.nx.tags = options.parsedTags;
+        }
     }
     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/create-application-files.js

@@ -2,17 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createApplicationFiles = createApplicationFiles;
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
 const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
+const path_1 = require("path");
 async function createApplicationFiles(host, options) {
-    const packageManagerLockFile = {
-        npm: 'package-lock.json',
-        yarn: 'yarn.lock',
-        pnpm: 'pnpm-lock.yaml',
-        bun: 'bun.lockb',
-    };
     const packageManager = (0, devkit_1.detectPackageManager)(host.root);
-    const packageLockFile = packageManagerLockFile[packageManager];
     const onBoardingStatus = await (0, onboarding_1.createNxCloudOnboardingURLForWelcomeApp)(host, options.nxCloudToken);
     const connectCloudUrl = onBoardingStatus === 'unclaimed' &&
         (await (0, onboarding_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
@@ -20,14 +13,12 @@ async function createApplicationFiles(host, options) {
         ...options,
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
         packageManager,
-        packageLockFile,
     });
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `../files/nx-welcome/${onBoardingStatus}`), options.appProjectRoot, {
         ...options,
         connectCloudUrl,
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
         packageManager,
-        packageLockFile,
     });
     if (options.unitTestRunner === 'none') {
         host.delete((0, path_1.join)(options.appProjectRoot, `App.spec.tsx`));

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

@@ -1,9 +1,11 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from '../schema';
-export interface NormalizedSchema extends Schema {
+export interface NormalizedSchema extends Omit<Schema, 'name' | 'useTsSolution'> {
     className: string;
+    simpleName: string;
     projectName: string;
     appProjectRoot: string;
+    importPath: string;
     lowerCaseName: string;
     parsedTags: string[];
     rootProject: boolean;

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

@@ -5,8 +5,8 @@ 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");
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
-    const { projectName: appProjectName, names: projectNames, projectRoot: appProjectRoot, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -15,27 +15,32 @@ async function normalizeOptions(host, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    const { className } = (0, devkit_1.names)(options.name);
+    const { className } = (0, devkit_1.names)(projectName);
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     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 {
         ...options,
         unitTestRunner: options.unitTestRunner || 'jest',
         e2eTestRunner: options.e2eTestRunner || 'none',
-        name: projectNames.projectSimpleName,
+        simpleName: projectNames.projectSimpleName,
         className,
         lowerCaseName: className.toLowerCase(),
         displayName: options.displayName || className,
         projectName: appProjectName,
         appProjectRoot,
+        importPath,
         parsedTags,
         rootProject,
         e2eProjectName,
         e2eProjectRoot,
-        isTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
+        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/component/component.js

@@ -29,7 +29,9 @@ function addExportsToBarrel(host, options) {
     const proj = workspace.get(options.projectName);
     const isApp = (0, ts_solution_setup_1.getProjectType)(host, proj.root, proj.projectType) === 'application';
     if (options.export && !isApp) {
-        const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.fileExtensionType === 'js' ? 'index.js' : 'index.ts');
+        const indexFilePath = (0, devkit_1.joinPathFragments)(...(options.projectSourceRoot
+            ? [options.projectSourceRoot]
+            : [options.projectRoot, 'src']), options.fileExtensionType === 'js' ? 'index.js' : 'index.ts');
         if (!host.exists(indexFilePath)) {
             return;
         }

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

@@ -10,5 +10,6 @@ export interface NormalizedSchema extends Omit<Schema, 'js'> {
     className: string;
     filePath: string;
     projectName: string;
+    projectRoot: string;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -31,5 +31,6 @@ async function normalizeOptions(host, options) {
         filePath,
         projectSourceRoot,
         projectName,
+        projectRoot: root,
     };
 }

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,12 +1,12 @@
 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;
+    importPath: string;
     routePath: string;
     parsedTags: string[];
-    appMain: string;
     isUsingTsSolutionConfig: boolean;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -5,7 +5,7 @@ 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");
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
@@ -19,17 +19,18 @@ async function normalizeOptions(host, options) {
     const parsedTags = options.tags
         ? 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 useProjectJson = options.useProjectJson ?? !isUsingTsSolutionConfig;
     const normalized = {
         ...options,
         fileName: projectName,
         routePath: `/${projectNames.projectSimpleName}`,
-        name: projectName,
+        projectName: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
         projectRoot,
         parsedTags,
         importPath,
-        appMain,
-        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
+        isUsingTsSolutionConfig,
+        useProjectJson,
     };
     return normalized;
 }

package/src/generators/library/library.js

@@ -7,18 +7,21 @@ const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
 const add_linting_1 = require("../../utils/add-linting");
 const add_jest_1 = require("../../utils/add-jest");
-const versions_1 = require("../../utils/versions");
 const normalize_options_1 = require("./lib/normalize-options");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 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");
+const add_rollup_build_target_1 = require("@nx/react/src/generators/library/lib/add-rollup-build-target");
+const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const component_1 = require("../component/component");
+const path_1 = require("path");
+const versions_1 = require("../../utils/versions");
 async function expoLibraryGenerator(host, schema) {
     return await expoLibraryGeneratorInternal(host, {
         addPlugin: false,
+        useProjectJson: true,
         ...schema,
     });
 }
@@ -33,6 +36,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) {
+        await (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,20 +52,27 @@ 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);
-    }
+    const relativeCwd = (0, artifact_name_and_directory_utils_1.getRelativeCwd)();
+    const path = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', options.fileName);
+    const componentTask = await (0, component_1.expoComponentGenerator)(host, {
+        path: relativeCwd ? (0, path_1.relative)(relativeCwd, path) : path,
+        skipTests: options.unitTestRunner === 'none',
+        export: true,
+        skipFormat: true,
+        js: options.js,
+    });
+    tasks.push(() => componentTask);
     if (!options.skipTsConfig && !options.isUsingTsSolutionConfig) {
         (0, js_1.addTsConfigPath)(host, options.importPath, [
-            (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
+            (0, devkit_1.joinPathFragments)(options.projectRoot, options.js ? './src/index.js' : './src/index.ts'),
         ]);
     }
     (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.projectRoot, 'tsconfig.lib.json', {
@@ -69,9 +82,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);
@@ -81,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);
 }
@@ -93,61 +103,65 @@ 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 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,
-            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,
-            },
-        });
+        packageJson = {
+            ...packageJson,
+            ...determineEntryFields(options),
+            files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
+        };
+    }
+    if (!options.useProjectJson) {
+        if (options.projectName !== options.importPath) {
+            packageJson.nx = { name: options.projectName };
+        }
+        if (options.parsedTags?.length) {
+            packageJson.nx ??= {};
+            packageJson.nx.tags = options.parsedTags;
+        }
     }
     else {
-        (0, devkit_1.addProjectConfiguration)(host, options.name, project);
+        (0, devkit_1.addProjectConfiguration)(host, options.projectName, project);
     }
-    if (!options.publishable && !options.buildable) {
-        return () => { };
+    if (!options.useProjectJson ||
+        options.isUsingTsSolutionConfig ||
+        options.publishable ||
+        options.buildable) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), packageJson);
     }
-    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
-    const rollupConfigTask = await configurationGenerator(host, {
-        ...options,
-        project: options.name,
-        skipFormat: true,
-    });
-    const external = ['react/jsx-runtime', 'react-native', 'react', 'react-dom'];
-    (0, target_defaults_utils_1.addBuildTargetDefaults)(host, '@nx/rollup:rollup');
-    project.targets.build = {
-        executor: '@nx/rollup:rollup',
-        outputs: ['{options.outputPath}'],
-        options: {
-            outputPath: `dist/${options.projectRoot}`,
-            tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
-            project: `${options.projectRoot}/package.json`,
-            entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),
-            external,
-            rollupConfig: `@nx/react/plugins/bundle-rollup`,
-            assets: [
-                {
-                    glob: `${options.projectRoot}/README.md`,
-                    input: '.',
-                    output: '.',
-                },
-            ],
-        },
-    };
-    (0, devkit_1.updateProjectConfiguration)(host, options.name, project);
-    return rollupConfigTask;
+    if (options.publishable || options.buildable) {
+        const external = new Set([
+            'react/jsx-runtime',
+            'react-native',
+            'react',
+            'react-dom',
+        ]);
+        const rollupTask = await (0, add_rollup_build_target_1.addRollupBuildTarget)(host, {
+            ...options,
+            name: options.projectName,
+            format: ['cjs', 'esm'],
+            style: 'none',
+            js: options.js,
+            skipFormat: true,
+        }, external);
+        (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
+            json.peerDependencies = {
+                ...json.peerDependencies,
+                react: versions_1.reactVersion,
+                'react-native': versions_1.reactNativeVersion,
+            };
+            return json;
+        });
+        return rollupTask;
+    }
+    return () => { };
 }
 function updateTsConfig(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), (json) => {
@@ -166,32 +180,35 @@ 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),
     });
-    if (!options.publishable && !options.buildable) {
-        host.delete(`${options.projectRoot}/package.json`);
-    }
     if (options.js) {
         (0, devkit_1.toJS)(host);
     }
     updateTsConfig(host, options);
 }
-function updateLibPackageNpmScope(host, options) {
-    return (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
-        json.name = options.importPath;
-        json.peerDependencies = {
-            react: versions_1.reactVersion,
-            'react-native': versions_1.reactNativeVersion,
-        };
-        return json;
-    });
-}
-function maybeJs(options, path) {
-    return options.js && (path.endsWith('.ts') || path.endsWith('.tsx'))
-        ? path.replace(/\.tsx?$/, '.js')
-        : path;
+function determineEntryFields(options) {
+    if (options.buildable ||
+        options.publishable ||
+        !options.isUsingTsSolutionConfig) {
+        // For buildable libraries, the entries are configured by the bundler (i.e. Rollup).
+        return undefined;
+    }
+    return {
+        main: options.js ? './src/index.js' : './src/index.ts',
+        types: options.js ? './src/index.js' : './src/index.ts',
+        exports: {
+            '.': options.js
+                ? './src/index.js'
+                : {
+                    types: './src/index.ts',
+                    import: './src/index.ts',
+                    default: './src/index.ts',
+                },
+            './package.json': './package.json',
+        },
+    };
 }
 exports.default = expoLibraryGenerator;

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"]

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

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