@nx/react-native 21.0.0-beta.0 → 21.0.0-beta.10

package/migrations.json

@@ -1,41 +1,5 @@
 {
   "generators": {
-    "update-18-0-0-add-web-configuration": {
-      "cli": "nx",
-      "version": "18.0.0-beta.0",
-      "description": "Add web configuration to react native projects",
-      "implementation": "./src/migrations/update-18-0-0/add-web-configuration"
-    },
-    "update-18-0-0-change-storybook-targets": {
-      "cli": "nx",
-      "version": "18.0.0-beta.0",
-      "description": "Upgrade react native storybook target to use web",
-      "implementation": "./src/migrations/update-18-0-0/change-storybook-targets"
-    },
-    "update-18-0-0-remove-block-list": {
-      "cli": "nx",
-      "version": "18.0.0-beta.0",
-      "description": "Remove blockList in metro.config.js.",
-      "implementation": "./src/migrations/update-18-0-0/remove-block-list"
-    },
-    "update-18-0-0-remove-metro": {
-      "cli": "nx",
-      "version": "18.0.0-beta.0",
-      "description": "Remove metro-* and @react-native-community/cli-* from package.json devDependencies",
-      "implementation": "./src/migrations/update-18-0-0/remove-metro"
-    },
-    "update-18-0-0-remove-symlink-target": {
-      "cli": "nx",
-      "version": "18.0.0-beta.0",
-      "description": "Remove ensure-symlink target",
-      "implementation": "./src/migrations/update-18-0-0/remove-symlink-target"
-    },
-    "update-18-0-0-add-upgrade-target": {
-      "cli": "nx",
-      "version": "18.0.0-beta.0",
-      "description": "Add upgrade target to react native projects",
-      "implementation": "./src/migrations/update-18-0-0/add-upgrade-target"
-    },
     "update-19-6-0-rename-upgrade-target-name": {
       "cli": "nx",
       "version": "19.6.0-beta.1",
@@ -44,96 +8,6 @@
     }
   },
   "packageJsonUpdates": {
-    "17.1.0": {
-      "version": "17.1.0-beta.1",
-      "packages": {
-        "react-native": {
-          "version": "0.72.6",
-          "alwaysAddToPackageJson": false
-        },
-        "metro": {
-          "version": "0.76.8",
-          "alwaysAddToPackageJson": false
-        },
-        "metro-resolver": {
-          "version": "0.76.8",
-          "alwaysAddToPackageJson": false
-        },
-        "metro-config": {
-          "version": "0.76.8",
-          "alwaysAddToPackageJson": false
-        },
-        "metro-react-native-babel-preset": {
-          "version": "0.76.8",
-          "alwaysAddToPackageJson": false
-        },
-        "metro-babel-register": {
-          "version": "0.76.8",
-          "alwaysAddToPackageJson": false
-        },
-        "metro-react-native-babel-transformer": {
-          "version": "0.76.7",
-          "alwaysAddToPackageJson": false
-        },
-        "@react-native-community/cli": {
-          "version": "11.3.7",
-          "alwaysAddToPackageJson": false
-        },
-        "@react-native-community/cli-platform-android": {
-          "version": "11.3.7",
-          "alwaysAddToPackageJson": false
-        },
-        "@react-native-community/cli-platform-ios": {
-          "version": "11.3.7",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "17.3.0": {
-      "version": "17.3.0-beta.3",
-      "packages": {
-        "@types/node": {
-          "version": "18.16.9"
-        }
-      }
-    },
-    "18.0.0": {
-      "version": "18.0.0-beta.0",
-      "packages": {
-        "react-native": {
-          "version": "0.73.2",
-          "alwaysAddToPackageJson": false
-        },
-        "@react-native/babel-preset": {
-          "version": "^0.73.18",
-          "addToPackageJson": "devDependencies"
-        },
-        "@react-native/metro-config": {
-          "version": "^0.73.2",
-          "addToPackageJson": "devDependencies"
-        },
-        "@types/react": {
-          "version": "~18.2.45",
-          "alwaysAddToPackageJson": false
-        },
-        "@testing-library/react-native": {
-          "version": "~12.4.2",
-          "alwaysAddToPackageJson": false
-        },
-        "react-native-svg-transformer": {
-          "version": "1.2.0",
-          "alwaysAddToPackageJson": false
-        },
-        "react-native-svg": {
-          "version": "14.1.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@react-native-community/cli-platform-android": {
-          "version": "12.3.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "19.0.0": {
       "version": "19.0.0-beta.7",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "21.0.0-beta.0",
+  "version": "21.0.0-beta.10",
   "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": "21.0.0-beta.0",
-    "@nx/jest": "21.0.0-beta.0",
-    "@nx/js": "21.0.0-beta.0",
-    "@nx/eslint": "21.0.0-beta.0",
-    "@nx/react": "21.0.0-beta.0",
-    "@nx/workspace": "21.0.0-beta.0"
+    "@nx/devkit": "21.0.0-beta.10",
+    "@nx/jest": "21.0.0-beta.10",
+    "@nx/js": "21.0.0-beta.10",
+    "@nx/eslint": "21.0.0-beta.10",
+    "@nx/react": "21.0.0-beta.10",
+    "@nx/workspace": "21.0.0-beta.10"
   },
   "executors": "./executors.json",
   "ng-update": {

package/project.json

@@ -39,11 +39,8 @@
       }
     },
     "build": {
-      "executor": "nx:run-commands",
-      "outputs": ["{workspaceRoot}/build/packages/react-native"],
-      "options": {
-        "command": "node ./scripts/copy-readme.js react-native"
-      }
+      "outputs": ["{workspaceRoot}/build/packages/react-native/README.md"],
+      "command": "node ./scripts/copy-readme.js react-native"
     }
   }
 }

package/src/generators/application/application.js

@@ -22,6 +22,7 @@ const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function reactNativeApplicationGenerator(host, schema) {
     return await reactNativeApplicationGeneratorInternal(host, {
         addPlugin: false,
+        useProjectJson: true,
         ...schema,
     });
 }
@@ -43,6 +44,11 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     }
     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,
@@ -88,11 +94,6 @@ async function reactNativeApplicationGeneratorInternal(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/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/application/lib/add-e2e.js

@@ -14,6 +14,7 @@ async function addE2e(host, options) {
                 styledModule: null,
                 hasStyles: false,
                 unitTestRunner: 'none',
+                names: (0, devkit_1.names)(options.name),
             });
         case 'playwright':
             return (0, add_e2e_1.addE2e)(host, {
@@ -23,6 +24,7 @@ async function addE2e(host, options) {
                 styledModule: null,
                 hasStyles: false,
                 unitTestRunner: 'none',
+                names: (0, devkit_1.names)(options.name),
             });
         case 'detox':
             const { detoxApplicationGenerator } = (0, devkit_1.ensurePackage)('@nx/detox', versions_1.nxVersion);

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function addProject(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
@@ -15,22 +14,32 @@ function addProject(host, options) {
         targets: hasPlugin ? {} : getTargets(options),
         tags: options.parsedTags,
     };
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
-            name: options.projectName,
-            version: '0.0.1',
-            private: true,
-            nx: {
-                targets: hasPlugin ? {} : 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.projectName !== options.importPath) {
+            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, {
             ...project,
         });
     }
+    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.d.ts

@@ -1,6 +1,6 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from '../schema';
-export interface NormalizedSchema extends Schema {
+export interface NormalizedSchema extends Omit<Schema, 'useTsSolution'> {
     className: string;
     fileName: string;
     projectName: string;
@@ -13,6 +13,7 @@ export interface NormalizedSchema extends Schema {
     rootProject: boolean;
     e2eProjectName: string;
     e2eProjectRoot: string;
+    importPath: string;
     isTsSolutionSetup: boolean;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -4,10 +4,9 @@ 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, '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,
@@ -16,17 +15,18 @@ async function normalizeOptions(host, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    const { className, fileName } = (0, devkit_1.names)(options.name);
+    const { className, fileName } = (0, devkit_1.names)(projectNames.projectSimpleName);
     const iosProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'ios');
     const androidProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'android');
     const rootProject = appProjectRoot === '.';
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const appProjectName = !isTsSolutionSetup || options.name ? projectName : importPath;
     const e2eProjectName = rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const entryFile = options.js ? 'src/main.js' : 'src/main.tsx';
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     return {
         ...options,
         name: projectNames.projectSimpleName,
@@ -34,10 +34,9 @@ async function normalizeOptions(host, options) {
         fileName,
         lowerCaseName: className.toLowerCase(),
         displayName: options.displayName || className,
-        projectName: isTsSolutionSetup
-            ? (0, get_import_path_1.getImportPath)(host, appProjectName)
-            : appProjectName,
+        projectName: appProjectName,
         appProjectRoot,
+        importPath,
         iosProjectRoot,
         androidProjectRoot,
         parsedTags,
@@ -46,5 +45,6 @@ async function normalizeOptions(host, options) {
         e2eProjectName,
         e2eProjectRoot,
         isTsSolutionSetup,
+        useProjectJson: options.useProjectJson ?? !isTsSolutionSetup,
     };
 }

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

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

package/src/generators/application/schema.json

@@ -95,6 +95,10 @@
       "x-prompt": "Which bundler do you want to use to build the application?",
       "default": "vite",
       "x-priority": "important"
+    },
+    "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

@@ -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.d.ts

@@ -4,6 +4,7 @@ export interface NormalizedSchema extends Schema {
     name: string;
     fileName: string;
     projectRoot: string;
+    importPath: string;
     routePath: string;
     parsedTags: string[];
     appMain?: string;

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

@@ -4,9 +4,8 @@ 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');
+    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',
@@ -25,13 +24,12 @@ async function normalizeOptions(host, options) {
         ...options,
         fileName: projectName,
         routePath: `/${projectNames.projectSimpleName}`,
-        name: isUsingTsSolutionConfig
-            ? (0, get_import_path_1.getImportPath)(host, projectName)
-            : projectName,
+        name: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
         projectRoot,
         parsedTags,
         importPath,
         isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
     return normalized;
 }

package/src/generators/library/library.js

@@ -7,15 +7,20 @@ 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,
+        useProjectJson: true,
         ...schema,
     });
 }
@@ -36,6 +41,9 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
         tasks.push((0, ensure_dependencies_1.ensureDependencies)(host));
     }
     createFiles(host, options);
+    if (options.isUsingTsSolutionConfig) {
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+    }
     const addProjectTask = await addProject(host, options);
     if (addProjectTask) {
         tasks.push(addProjectTask);
@@ -50,9 +58,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')),
@@ -65,9 +80,6 @@ async function reactNativeLibraryGeneratorInternal(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);
@@ -89,61 +101,62 @@ 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,
-            version: '0.0.1',
+    let packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+    };
+    if (!options.useProjectJson) {
+        packageJson = {
+            ...packageJson,
             ...determineEntryFields(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,
             },
-        });
+        };
+        if (options.name !== options.importPath) {
+            packageJson.nx = { name: options.name };
+        }
+        if (options.parsedTags?.length) {
+            packageJson.nx ??= {};
+            packageJson.nx.tags = options.parsedTags;
+        }
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.name, 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,
-    });
-    (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;
+    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;
+    }
+    return () => { };
 }
 function updateTsConfig(tree, options) {
     if (options.isUsingTsSolutionConfig) {
@@ -169,32 +182,17 @@ 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 {};
+    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',

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

@@ -93,6 +93,10 @@
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
+    },
+    "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,4 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "0.0.1"
-}

package/src/migrations/update-18-0-0/add-upgrade-target.d.ts

@@ -1,6 +0,0 @@
-import { Tree } from '@nx/devkit';
-/**
- * Add target upgrade for react native apps
- * Remove pod-install from dependsOn for all targets, it does pod-install when creating the app
- */
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-18-0-0/add-upgrade-target.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-/**
- * Add target upgrade for react native apps
- * Remove pod-install from dependsOn for all targets, it does pod-install when creating the app
- */
-async function update(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const [name, config] of projects.entries()) {
-        if (config.targets?.['start']?.executor === '@nx/react-native:start') {
-            if (!config.targets['upgrade']) {
-                config.targets.upgrade = {
-                    executor: '@nx/react-native:upgrade',
-                    options: {},
-                };
-            }
-            if (config.targets?.['pod-install']?.executor ===
-                '@nx/react-native:pod-install') {
-                for (const targetName in config.targets) {
-                    if (config.targets[targetName]?.dependsOn?.length) {
-                        config.targets[targetName].dependsOn = config.targets[targetName].dependsOn.filter((dependsOn) => dependsOn !== 'pod-install');
-                    }
-                }
-            }
-            (0, devkit_1.updateProjectConfiguration)(tree, name, config);
-        }
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-18-0-0/add-web-configuration.d.ts

@@ -1,8 +0,0 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
-/**
- * Add web configuration to react native projects
- * - delete the current serve target which is just a pass-through to start target
- * - rename the babel.config.json to to babel-v72.config.json
- * - add web confiugration, it will add .babelrc.js
- */
-export default function update(tree: Tree): Promise<GeneratorCallback>;

package/src/migrations/update-18-0-0/add-web-configuration.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const web_configuration_1 = require("../../generators/web-configuration/web-configuration");
-/**
- * Add web configuration to react native projects
- * - delete the current serve target which is just a pass-through to start target
- * - rename the babel.config.json to to babel-v72.config.json
- * - add web confiugration, it will add .babelrc.js
- */
-async function update(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    const tasks = [];
-    for (const [projectName, config] of projects.entries()) {
-        if (config.targets?.['start']?.executor === '@nx/react-native:start') {
-            if (config.targets['serve'] &&
-                config.targets['serve'].executor === 'nx:run-commands' &&
-                config.targets['serve'].options?.command?.startsWith('nx start')) {
-                delete config.targets['serve'];
-                (0, devkit_1.updateProjectConfiguration)(tree, projectName, config);
-            }
-            if (tree.exists((0, devkit_1.joinPathFragments)(config.root, 'babel.config.json'))) {
-                tree.rename((0, devkit_1.joinPathFragments)(config.root, 'babel.config.json'), (0, devkit_1.joinPathFragments)(config.root, 'babel-v72.config.json'));
-            }
-            tasks.push(await (0, web_configuration_1.default)(tree, {
-                project: config.name,
-                bundler: 'webpack',
-            }));
-        }
-    }
-    return (0, devkit_1.runTasksInSerial)(...tasks);
-}

package/src/migrations/update-18-0-0/change-storybook-targets.d.ts

@@ -1,5 +0,0 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
-/**
- * Upgrade react native storybook target to use web
- */
-export default function changeStorybookTargets(tree: Tree): Promise<GeneratorCallback>;

package/src/migrations/update-18-0-0/change-storybook-targets.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = changeStorybookTargets;
-const devkit_1 = require("@nx/devkit");
-const output_1 = require("nx/src/utils/output");
-const migrate_7_1 = require("@nx/storybook/src/generators/migrate-7/migrate-7");
-const utilities_1 = require("@nx/storybook/src/utils/utilities");
-const configuration_1 = require("@nx/react/src/generators/storybook-configuration/configuration");
-/**
- * Upgrade react native storybook target to use web
- */
-async function changeStorybookTargets(tree) {
-    const tasks = [];
-    // update the storybook target
-    const projects = (0, devkit_1.getProjects)(tree);
-    let hasStorybookTarget = false;
-    for (const [projectName, config] of projects.entries()) {
-        if (config.targets?.['storybook']?.executor === '@nx/react-native:storybook') {
-            hasStorybookTarget = true;
-            delete config.targets['storybook'];
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, config);
-            tasks.push(await (0, configuration_1.default)(tree, {
-                project: projectName,
-            }));
-        }
-    }
-    /**
-     * This just checks if Storybook is installed in the workspace.
-     * The thing here is that during the previous step of the migration,
-     * during packageJsonUpdates, Nx has already set Storybook
-     * to version 7, if Storybook exists in the workspace.
-     * So, it makes no sense here to check if the version is
-     * 7, because it will always be.
-     */
-    const storybookVersion = (0, utilities_1.storybookMajorVersion)();
-    if (!hasStorybookTarget || !storybookVersion) {
-        return;
-    }
-    output_1.output.log({
-        title: 'Migrating Storybook to v7',
-        bodyLines: [
-            `🚀 This migration will update your Storybook configuration to v7.`,
-            `It will call the @nx/storybook:migrate-7 generator for you.`,
-            `You can read more about the migration and how this generator works here:`,
-            `https://nx.dev/nx-api/storybook/generators/migrate-7`,
-        ],
-    });
-    tasks.push(await (0, migrate_7_1.default)(tree, { autoAcceptAllPrompts: true }));
-    tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, [], [
-        '@storybook/react-native',
-        '@storybook/addon-ondevice-actions',
-        '@storybook/addon-ondevice-backgrounds',
-        '@storybook/addon-ondevice-controls',
-        '@storybook/addon-ondevice-notes',
-    ]));
-    return (0, devkit_1.runTasksInSerial)(...tasks);
-}

package/src/migrations/update-18-0-0/remove-block-list.d.ts

@@ -1,6 +0,0 @@
-import { Tree } from '@nx/devkit';
-/**
- * This migration removes blockList in metro.config.js.
- * It is now excluding dist folder in watchFolders in withNxMetro.
- */
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-18-0-0/remove-block-list.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-/**
- * This migration removes blockList in metro.config.js.
- * It is now excluding dist folder in watchFolders in withNxMetro.
- */
-async function update(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const [_, config] of projects.entries()) {
-        if (config.targets?.['start']?.executor === '@nx/react-native:start') {
-            if (tree.exists((0, devkit_1.joinPathFragments)(config.root, 'metro.config.js'))) {
-                let content = tree
-                    .read((0, devkit_1.joinPathFragments)(config.root, 'metro.config.js'))
-                    .toString();
-                content = content.replace(/blockList: exclusionList(.+?(?=\n))/, '');
-                content = content.replace('// unstable_enableSymlinks: true,', '');
-                content = content.replace('// unstable_enablePackageExports: true,', '');
-                content = content.replace('unstable_enableSymlinks: true,', '');
-                content = content.replace('unstable_enablePackageExports: true,', '');
-                content = content.replace(`const exclusionList = require('metro-config/src/defaults/exclusionList');`, '');
-                tree.write((0, devkit_1.joinPathFragments)(config.root, 'metro.config.js'), content);
-                await (0, devkit_1.formatFiles)(tree);
-            }
-        }
-    }
-}

package/src/migrations/update-18-0-0/remove-metro.d.ts

@@ -1,14 +0,0 @@
-import { Tree } from '@nx/devkit';
-/**
- * Remove metro-* package since it is no longer explicity required in package.json.
- * react-native has dependency of @react-native/community-cli-plugin
- * @react-native/community-cli-plugin has dependency of metro
- *
- * Also remove @react-native-community/cli-* since it is a dependency of react-native.
- * (excpet reactNativeCommunityCliPlatformAndroidVersion because android files refer it by path)
- *
- * https://react-native-community.github.io/upgrade-helper/?from=0.72.6&to=0.73.1#RnDiffApp-package.json
- * @param tree
- * @returns
- */
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-18-0-0/remove-metro.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-/**
- * Remove metro-* package since it is no longer explicity required in package.json.
- * react-native has dependency of @react-native/community-cli-plugin
- * @react-native/community-cli-plugin has dependency of metro
- *
- * Also remove @react-native-community/cli-* since it is a dependency of react-native.
- * (excpet reactNativeCommunityCliPlatformAndroidVersion because android files refer it by path)
- *
- * https://react-native-community.github.io/upgrade-helper/?from=0.72.6&to=0.73.1#RnDiffApp-package.json
- * @param tree
- * @returns
- */
-async function update(tree) {
-    (0, devkit_1.removeDependenciesFromPackageJson)(tree, [], [
-        'metro',
-        'metro-resolver',
-        'metro-config',
-        'metro-react-native-babel-preset',
-        'metro-babel-register',
-        'metro-react-native-babel-transformer',
-        '@react-native-community/cli',
-        '@react-native-community/cli-platform-ios',
-    ]);
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-18-0-0/remove-symlink-target.d.ts

@@ -1,6 +0,0 @@
-import { Tree } from '@nx/devkit';
-/**
- * Remove ensure-symlink target.
- * It is going to be supported by react-native version 0.73 by default.
- */
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-18-0-0/remove-symlink-target.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const node_fs_1 = require("node:fs");
-/**
- * Remove ensure-symlink target.
- * It is going to be supported by react-native version 0.73 by default.
- */
-async function update(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const [projectName, config] of projects.entries()) {
-        if (config.targets?.['ensure-symlink']?.executor ===
-            '@nx/react-native:ensure-symlink') {
-            removeTargets(config.targets, 'ensure-symlink');
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, config);
-            (0, node_fs_1.rmSync)(`${config.root}/node_modules`, { recursive: true, force: true });
-        }
-    }
-}
-function removeTargets(targets, targetNameToRemove) {
-    for (const targetName in targets) {
-        if (targetName === targetNameToRemove) {
-            delete targets[targetName];
-        }
-        if (targets[targetName]?.dependsOn?.length) {
-            targets[targetName].dependsOn = targets[targetName].dependsOn.filter((dependsOn) => dependsOn !== targetNameToRemove);
-        }
-    }
-}

package/src/utils/format-file.d.ts

@@ -1 +0,0 @@
-export declare function formatFile(content: any, ...values: any[]): string;

package/src/utils/format-file.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatFile = formatFile;
-const devkit_1 = require("@nx/devkit");
-const prettier_1 = require("prettier");
-function formatFile(content, ...values) {
-    return (0, prettier_1.format)((0, devkit_1.stripIndents)(content, values)
-        .split('\n')
-        .map((line) => line.trim())
-        .join('')
-        .trim(), {
-        singleQuote: true,
-        parser: 'typescript',
-    });
-}