@nx/react-native 0.0.0-pr-3-16b3273 → 0.0.0-pr-29464-b66c9d0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "0.0.0-pr-3-16b3273",
+  "version": "0.0.0-pr-29464-b66c9d0",
   "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": [
@@ -35,12 +35,12 @@
     "picocolors": "^1.1.0",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-3-16b3273",
-    "@nx/jest": "0.0.0-pr-3-16b3273",
-    "@nx/js": "0.0.0-pr-3-16b3273",
-    "@nx/eslint": "0.0.0-pr-3-16b3273",
-    "@nx/react": "0.0.0-pr-3-16b3273",
-    "@nx/workspace": "0.0.0-pr-3-16b3273"
+    "@nx/devkit": "0.0.0-pr-29464-b66c9d0",
+    "@nx/jest": "0.0.0-pr-29464-b66c9d0",
+    "@nx/js": "0.0.0-pr-29464-b66c9d0",
+    "@nx/eslint": "0.0.0-pr-29464-b66c9d0",
+    "@nx/react": "0.0.0-pr-29464-b66c9d0",
+    "@nx/workspace": "0.0.0-pr-29464-b66c9d0"
   },
   "executors": "./executors.json",
   "ng-update": {

package/src/generators/application/files/app/android/gradlew.bat

@@ -1,94 +1,94 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

package/src/generators/component/component.js

@@ -11,7 +11,9 @@ async function reactNativeComponentGenerator(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     createComponentFiles(host, options);
     addExportsToBarrel(host, options);
-    await (0, devkit_1.formatFiles)(host);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
 }
 function createComponentFiles(host, options) {
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, 'files', options.fileExtensionType), options.directory, {
@@ -31,7 +33,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'> {
     fileExtension: string;
     fileExtensionType: FileExtensionType;
     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) {
         fileExtensionType,
         projectSourceRoot,
         projectName,
+        projectRoot: root,
     };
 }

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

@@ -7,6 +7,7 @@ export interface Schema {
   skipTests?: boolean;
   export?: boolean;
   classComponent?: boolean;
+  skipFormat?: boolean;
 
   /**
    * @deprecated Provide the full file path including the file extension in the `path` option. This option will be removed in Nx v21.

package/src/generators/component/schema.json

@@ -59,6 +59,12 @@
       "alias": "C",
       "description": "Use class components instead of functional component.",
       "default": false
+    },
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false,
+      "x-priority": "internal"
     }
   },
   "required": ["path"]

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

@@ -26,7 +26,7 @@ async function normalizeOptions(host, options) {
         fileName: projectName,
         routePath: `/${projectNames.projectSimpleName}`,
         name: isUsingTsSolutionConfig
-            ? (0, get_import_path_1.getImportPath)(host, projectName)
+            ? options.importPath ?? (0, get_import_path_1.getImportPath)(host, projectName)
             : projectName,
         projectRoot,
         parsedTags,

package/src/generators/library/library.js

@@ -7,12 +7,16 @@ 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 component_1 = require("../component/component");
 const normalize_options_1 = require("./lib/normalize-options");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 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 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 path_1 = require("path");
+const versions_1 = require("../../utils/versions");
 async function reactNativeLibraryGenerator(host, schema) {
     return await reactNativeLibraryGeneratorInternal(host, {
         addPlugin: false,
@@ -50,9 +54,16 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
     tasks.push(lintTask);
     const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson, options.addPlugin, 'tsconfig.lib.json');
     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.default)(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')),
@@ -89,7 +100,6 @@ async function addProject(host, options) {
         tags: options.parsedTags,
         targets: {},
     };
-    const packageJsonPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json');
     if (options.isUsingTsSolutionConfig) {
         (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
             name: options.name,
@@ -98,52 +108,41 @@ async function addProject(host, options) {
             nx: {
                 tags: options.parsedTags?.length ? options.parsedTags : undefined,
             },
+            files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
+            peerDependencies: {
+                react: versions_1.reactVersion,
+                'react-native': versions_1.reactNativeVersion,
+            },
         });
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.name, project);
     }
-    if (!options.publishable && !options.buildable) {
-        return () => { };
+    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,
+            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;
     }
-    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
-    const rollupConfigTask = await configurationGenerator(host, {
-        ...options,
-        project: options.name,
-        skipFormat: true,
-    });
-    (0, devkit_1.updateJson)(host, packageJsonPath, (json) => {
-        if (json.type === 'module') {
-            // The @nx/rollup:configuration generator can set the type to 'module' which would
-            // potentially break this library.
-            delete json.type;
-        }
-        return json;
-    });
-    const external = ['react/jsx-runtime', 'react-native', 'react', 'react-dom'];
-    project.targets.build = {
-        executor: '@nx/rollup:rollup',
-        outputs: ['{options.outputPath}'],
-        options: {
-            outputPath: options.isUsingTsSolutionConfig
-                ? `${options.projectRoot}/dist`
-                : `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;
+    return () => { };
 }
 function updateTsConfig(tree, options) {
     if (options.isUsingTsSolutionConfig) {
@@ -169,33 +168,12 @@ function createFiles(host, options) {
         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) {
-        return {};
-    }
     return {
         main: options.js ? './src/index.js' : './src/index.ts',
         types: options.js ? './src/index.js' : './src/index.ts',

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

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