@nx/expo 19.2.0-beta.3 → 19.2.0-beta.4

package/migrations.json

@@ -71,6 +71,12 @@
       "cli": "nx",
       "description": "Change webpack to metro in expo projects",
       "factory": "./src/migrations/update-19-0-0/change-webpack-to-metro"
+    },
+    "update-19-2-0-remove-webpack-config": {
+      "version": "19.2.0-beta.2",
+      "cli": "nx",
+      "description": "Remove deprecated webpack.config.js",
+      "factory": "./src/migrations/update-19-2-0/remove-deprecated-webpack-config"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "19.2.0-beta.3",
+  "version": "19.2.0-beta.4",
   "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,7 +28,7 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "19.2.0-beta.3",
+    "@nx/devkit": "19.2.0-beta.4",
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.8.3",
     "fs-extra": "^11.1.0",
@@ -37,13 +37,13 @@
     "node-fetch": "^2.6.7",
     "tslib": "^2.3.0",
     "tsconfig-paths": "^4.1.2",
-    "@nx/jest": "19.2.0-beta.3",
-    "@nx/js": "19.2.0-beta.3",
-    "@nx/eslint": "19.2.0-beta.3",
-    "@nx/react": "19.2.0-beta.3",
-    "@nx/web": "19.2.0-beta.3",
-    "@nx/webpack": "19.2.0-beta.3",
-    "@nrwl/expo": "19.2.0-beta.3"
+    "@nx/jest": "19.2.0-beta.4",
+    "@nx/js": "19.2.0-beta.4",
+    "@nx/eslint": "19.2.0-beta.4",
+    "@nx/react": "19.2.0-beta.4",
+    "@nx/web": "19.2.0-beta.4",
+    "@nx/webpack": "19.2.0-beta.4",
+    "@nrwl/expo": "19.2.0-beta.4"
   },
   "executors": "./executors.json",
   "ng-update": {

package/src/generators/init/init.js

@@ -17,7 +17,7 @@ async function expoInitGeneratorInternal(host, schema) {
     schema.addPlugin ??= addPluginDefault;
     (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host);
     if (schema.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/expo/plugin', plugin_1.createNodes, {
+        await (0, add_plugin_1.addPluginV1)(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'],

package/src/migrations/update-19-0-0/change-webpack-to-metro.js

@@ -16,12 +16,14 @@ async function update(tree) {
             if (config.targets['export-web']) {
                 config.targets['export-web'].options.bundler = 'metro';
             }
-            (0, devkit_1.updateJson)(tree, `${config.root}/app.json`, (appJson) => {
-                if (appJson.expo?.web) {
-                    appJson.expo.web.bundler = 'metro';
-                }
-                return appJson;
-            });
+            if (tree.exists(`${config.root}/app.json`)) {
+                (0, devkit_1.updateJson)(tree, `${config.root}/app.json`, (appJson) => {
+                    if (appJson.expo?.web) {
+                        appJson.expo.web.bundler = 'metro';
+                    }
+                    return appJson;
+                });
+            }
         }
         (0, devkit_1.updateProjectConfiguration)(tree, name, config);
     }

package/src/migrations/update-19-2-0/remove-deprecated-webpack-config.d.ts

@@ -0,0 +1,6 @@
+import { Tree } from '@nx/devkit';
+/**
+ * This function removes the deprecated webpack.config.js file from projects that use the expo:start executor
+ * @param tree
+ */
+export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-19-2-0/remove-deprecated-webpack-config.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+/**
+ * This function removes the deprecated webpack.config.js file from projects that use the expo:start executor
+ * @param tree
+ */
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [_, config] of projects.entries()) {
+        if (config.targets?.['start']?.executor === '@nx/expo:start') {
+            if (tree.exists((0, path_1.join)(config.root, 'webpack.config.js'))) {
+                tree.delete((0, path_1.join)(config.root, 'webpack.config.js'));
+            }
+        }
+    }
+}
+exports.default = update;

package/src/generators/application/files/webpack.config.js.template

@@ -1,57 +0,0 @@
-const createExpoWebpackConfigAsync = require('@expo/webpack-config');
-const { TsconfigPathsPlugin } = require('tsconfig-paths-webpack-plugin');
-const { resolve } = require('path');
-
-/**
- * @deprecated use bundler: 'metro' instead
- */
-module.exports = async function (env, argv) {
-  const config = await createExpoWebpackConfigAsync(env, argv);
-
-  // Customize the config before returning it.
-  // add additional rule to load files under libs
-  const rules = config.module.rules.find((rule) =>
-    Array.isArray(rule.oneOf)
-  )?.oneOf;
-  if (rules) {
-    rules.push({
-      test: /\.(mjs|[jt]sx?)$/,
-      exclude: /node_modules/,
-      use: {
-        loader: require.resolve('@nx/webpack/src/utils/web-babel-loader.js'),
-        options: {
-          presets: [
-            [
-              '@nx/react/babel',
-              {
-                runtime: 'automatic',
-              },
-            ],
-          ],
-        },
-      },
-    });
-  }
-
-  if (!config.resolve) {
-    config.resolve = {};
-  }
-  if (!config.resolve.plugins) {
-    config.resolve.plugins = [];
-  }
-  const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
-  const tsConfigPath = resolve(__dirname, 'tsconfig.json');
-  config.resolve.plugins.push(
-    new TsconfigPathsPlugin({
-      configFile: tsConfigPath,
-      extensions,
-    })
-  );
-  config.resolve.fallback = {
-    ...config.resolve.fallback,
-    crypto: require.resolve('crypto-browserify'),
-    stream: require.resolve('stream-browserify'),
-  };
-
-  return config;
-};