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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "18.3.0-beta.0",
+  "version": "18.3.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": [
@@ -26,7 +26,7 @@
   "main": "./index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "18.3.0-beta.0",
+    "@nx/devkit": "18.3.0-beta.2",
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.8.3",
     "fs-extra": "^11.1.0",
@@ -36,13 +36,13 @@
     "tslib": "^2.3.0",
     "tsconfig-paths": "^4.1.2",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
-    "@nx/jest": "18.3.0-beta.0",
-    "@nx/js": "18.3.0-beta.0",
-    "@nx/eslint": "18.3.0-beta.0",
-    "@nx/react": "18.3.0-beta.0",
-    "@nx/web": "18.3.0-beta.0",
-    "@nx/webpack": "18.3.0-beta.0",
-    "@nrwl/expo": "18.3.0-beta.0"
+    "@nx/jest": "18.3.0-beta.2",
+    "@nx/js": "18.3.0-beta.2",
+    "@nx/eslint": "18.3.0-beta.2",
+    "@nx/react": "18.3.0-beta.2",
+    "@nx/web": "18.3.0-beta.2",
+    "@nx/webpack": "18.3.0-beta.2",
+    "@nrwl/expo": "18.3.0-beta.2"
   },
   "executors": "./executors.json",
   "ng-update": {

package/plugins/with-nx-metro.js

@@ -4,6 +4,7 @@ exports.withNxMetro = void 0;
 const devkit_1 = require("@nx/devkit");
 const metro_config_1 = require("metro-config");
 const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
 const metro_resolver_1 = require("./metro-resolver");
 async function withNxMetro(userConfig, opts = {}) {
     const extensions = ['', 'ts', 'tsx', 'js', 'jsx', 'json'];
@@ -13,7 +14,7 @@ async function withNxMetro(userConfig, opts = {}) {
         extensions.push(...opts.extensions);
     let watchFolders = (0, fs_extra_1.readdirSync)(devkit_1.workspaceRoot)
         .filter((fileName) => !['dist', 'e2e'].includes(fileName) && !fileName.startsWith('.'))
-        .map((fileName) => (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, fileName))
+        .map((fileName) => (0, path_1.join)(devkit_1.workspaceRoot, fileName))
         .filter((filePath) => (0, fs_extra_1.statSync)(filePath).isDirectory());
     if (opts.watchFolders?.length) {
         watchFolders = watchFolders.concat(opts.watchFolders);
@@ -22,7 +23,7 @@ async function withNxMetro(userConfig, opts = {}) {
     const nxConfig = {
         resolver: {
             resolveRequest: (0, metro_resolver_1.getResolveRequest)(extensions),
-            nodeModulesPaths: [(0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'node_modules')],
+            nodeModulesPaths: [(0, path_1.join)(devkit_1.workspaceRoot, 'node_modules')],
         },
         watchFolders,
     };

package/src/executors/update/schema.json

@@ -28,7 +28,7 @@
     },
     "republish": {
       "type": "boolean",
-      "description": "Enable JSON output, non-JSON messages will be printed to stderr",
+      "description": "Republish a previous update within a branch",
       "default": false
     },
     "group": {

package/src/generators/init/init.js

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDependencies = exports.expoInitGeneratorInternal = exports.expoInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
+const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
-const has_expo_plugin_1 = require("../../utils/has-expo-plugin");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
 function expoInitGenerator(tree, schema) {
     return expoInitGeneratorInternal(tree, { addPlugin: false, ...schema });
@@ -18,16 +17,27 @@ async function expoInitGeneratorInternal(host, schema) {
     schema.addPlugin ??= addPluginDefault;
     (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host);
     if (schema.addPlugin) {
-        addPlugin(host);
+        await (0, add_plugin_1.addPlugin)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/expo/plugin', plugin_1.createNodes, {
+            startTargetName: ['start', 'expo:start', 'expo-start'],
+            buildTargetName: ['build', 'expo:build', 'expo-build'],
+            prebuildTargetName: ['prebuild', 'expo:prebuild', 'expo-prebuild'],
+            serveTargetName: ['serve', 'expo:serve', 'expo-serve'],
+            installTargetName: ['install', 'expo:install', 'expo-install'],
+            exportTargetName: ['export', 'expo:export', 'expo-export'],
+            submitTargetName: ['submit', 'expo:submit', 'expo-submit'],
+            runIosTargetName: ['run-ios', 'expo:run-ios', 'expo-run-ios'],
+            runAndroidTargetName: [
+                'run-android',
+                'expo:run-android',
+                'expo-run-android',
+            ],
+        }, schema.updatePackageScripts);
     }
     const tasks = [];
     if (!schema.skipPackageJson) {
         tasks.push(moveDependency(host));
         tasks.push(updateDependencies(host, schema));
     }
-    if (schema.updatePackageScripts) {
-        await (0, update_package_scripts_1.updatePackageScripts)(host, plugin_1.createNodes);
-    }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
@@ -49,26 +59,4 @@ exports.updateDependencies = updateDependencies;
 function moveDependency(host) {
     return (0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/react-native'], []);
 }
-function addPlugin(host) {
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    if ((0, has_expo_plugin_1.hasExpoPlugin)(host)) {
-        return;
-    }
-    nxJson.plugins ??= [];
-    nxJson.plugins.push({
-        plugin: '@nx/expo/plugin',
-        options: {
-            startTargetName: 'start',
-            serveTargetName: 'serve',
-            runIosTargetName: 'run-ios',
-            runAndroidTargetName: 'run-android',
-            exportTargetName: 'export',
-            prebuildTargetName: 'prebuild',
-            installTargetName: 'install',
-            buildTargetName: 'build',
-            submitTargetName: 'submit',
-        },
-    });
-    (0, devkit_1.updateNxJson)(host, nxJson);
-}
 exports.default = expoInitGenerator;

package/src/utils/ensure-dependencies.js

@@ -4,6 +4,7 @@ exports.ensureDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("./versions");
 function ensureDependencies(host) {
+    const isPnpm = (0, devkit_1.detectPackageManager)(host.root) === 'pnpm';
     return (0, devkit_1.addDependenciesToPackageJson)(host, {
         'expo-splash-screen': versions_1.expoSplashScreenVersion,
         'expo-status-bar': versions_1.expoStatusBarVersion,
@@ -19,6 +20,11 @@ function ensureDependencies(host) {
         '@testing-library/jest-native': versions_1.testingLibraryJestNativeVersion,
         'jest-expo': versions_1.jestExpoVersion,
         'babel-preset-expo': versions_1.babelPresetExpoVersion,
+        ...(isPnpm
+            ? {
+                '@babel/runtime': versions_1.babelRuntimeVersion, // @babel/runtime is used by react-native-svg
+            }
+            : {}),
     });
 }
 exports.ensureDependencies = ensureDependencies;

package/src/utils/versions.d.ts

@@ -17,3 +17,4 @@ export declare const reactNativeSvgVersion = "14.1.0";
 export declare const testingLibraryReactNativeVersion = "~12.4.2";
 export declare const testingLibraryJestNativeVersion = "~5.4.3";
 export declare const jestExpoVersion = "~50.0.1";
+export declare const babelRuntimeVersion = "7.22.6";

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jestExpoVersion = exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.expoMetroRuntimeVersion = exports.expoMetroConfigVersion = exports.reactNativeWebVersion = exports.reactNativeVersion = exports.typesReactVersion = exports.reactTestRendererVersion = exports.reactDomVersion = exports.reactVersion = exports.babelPresetExpoVersion = exports.expoCliVersion = exports.expoStatusBarVersion = exports.expoSplashScreenVersion = exports.expoVersion = exports.nxVersion = void 0;
+exports.babelRuntimeVersion = exports.jestExpoVersion = exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.expoMetroRuntimeVersion = exports.expoMetroConfigVersion = exports.reactNativeWebVersion = exports.reactNativeVersion = exports.typesReactVersion = exports.reactTestRendererVersion = exports.reactDomVersion = exports.reactVersion = exports.babelPresetExpoVersion = exports.expoCliVersion = exports.expoStatusBarVersion = exports.expoSplashScreenVersion = exports.expoVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.expoVersion = '~50.0.3';
 exports.expoSplashScreenVersion = '~0.26.1';
@@ -20,3 +20,4 @@ exports.reactNativeSvgVersion = '14.1.0';
 exports.testingLibraryReactNativeVersion = '~12.4.2';
 exports.testingLibraryJestNativeVersion = '~5.4.3';
 exports.jestExpoVersion = '~50.0.1';
+exports.babelRuntimeVersion = '7.22.6';