Revert "[Do not merge]: feat(bundling): Add support to rollup for bab…

…elUpwardRootMode" (#17422)
nrwl · Jun 5, 2023 · 1bba749 · 1bba749 · vercel · Jun 5, 2023
1 parent b8cfbcc
commit 1bba749
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 111 deletions.
diff --git a/docs/generated/packages/rollup/executors/rollup.json b/docs/generated/packages/rollup/executors/rollup.json
@@ -150,11 +150,6 @@
         "default": "babel",
         "description": "Which compiler to use."
       },
-      "babelUpwardRootMode": {
-        "type": "boolean",
-        "description": "Whether to set rootmode to upward. See https://babeljs.io/docs/en/options#rootmode",
-        "default": false
-      },
       "javascriptEnabled": {
         "type": "boolean",
         "description": "Sets `javascriptEnabled` option for less loader",

diff --git a/packages/expo/src/executors/build/build.impl.ts b/packages/expo/src/executors/build/build.impl.ts
@@ -3,7 +3,7 @@ import { join, normalize, sep } from 'path';
 import { ChildProcess, fork } from 'child_process';
 
 import { ensureNodeModulesSymlink } from '../../utils/ensure-node-modules-symlink';
-import { unzipBuild } from '../download/download.impl';
+import { copyBuildFile, unzipBuild } from '../download/download.impl';
 
 import { ExpoEasBuildOptions } from './schema';
 import { removeSync } from 'fs-extra';

diff --git a/packages/expo/src/generators/library/files/lib/tsconfig.json.template b/packages/expo/src/generators/library/files/lib/tsconfig.json.template
@@ -1,7 +1,7 @@
 {
   "extends": "<%= rootTsConfigPath %>",
   "compilerOptions": {
-    "jsx": "react-jsx",
+    "jsx": "react-native",
     "allowJs": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true

diff --git a/packages/react-native/src/generators/library/files/lib/tsconfig.json__tmpl__ b/packages/react-native/src/generators/library/files/lib/tsconfig.json__tmpl__
@@ -1,7 +1,7 @@
 {
   "extends": "<%= rootTsConfigPath %>",
   "compilerOptions": {
-    "jsx": "react-jsx",
+    "jsx": "react-native",
     "allowJs": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true

diff --git a/packages/rollup/migrations.json b/packages/rollup/migrations.json
@@ -11,12 +11,6 @@
       "version": "16.0.0-beta.1",
       "description": "Replace @nrwl/rollup with @nx/rollup",
       "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
-    "update-16-3-1-add-babel-upward-root-mode-flag": {
-      "cli": "nx",
-      "version": "16-3-1-beta.0",
-      "description": "Add babelUpwardRootMode if not already defined",
-      "implementation": "./src/migrations/update-16-3-1-add-babel-upward-root-mode-flag/update-16-3-1-add-babel-upward-root-mode-flag"
     }
   },
   "packageJsonUpdates": {}

diff --git a/packages/rollup/src/executors/rollup/rollup.impl.ts b/packages/rollup/src/executors/rollup/rollup.impl.ts
@@ -255,7 +255,7 @@ export function createRollupOptions(
             isModern: true,
           },
           cwd: join(context.root, sourceRoot),
-          rootMode: options.babelUpwardRootMode ? 'upward' : undefined,
+          rootMode: 'upward',
           babelrc: true,
           extensions: fileExtensions,
           babelHelpers: 'bundled',

diff --git a/packages/rollup/src/executors/rollup/schema.d.ts b/packages/rollup/src/executors/rollup/schema.d.ts
@@ -32,5 +32,4 @@ export interface RollupExecutorOptions {
   javascriptEnabled?: boolean;
   generateExportsField?: boolean;
   skipTypeCheck?: boolean;
-  babelUpwardRootMode?: boolean;
 }
diff --git a/packages/rollup/src/executors/rollup/schema.json b/packages/rollup/src/executors/rollup/schema.json
@@ -137,11 +137,6 @@
       "default": "babel",
       "description": "Which compiler to use."
     },
-    "babelUpwardRootMode": {
-      "type": "boolean",
-      "description": "Whether to set rootmode to upward. See https://babeljs.io/docs/en/options#rootmode",
-      "default": false
-    },
     "javascriptEnabled": {
       "type": "boolean",
       "description": "Sets `javascriptEnabled` option for less loader",

diff --git a/...3-1-add-babel-upward-root-mode-flag/update-16-3-1-add-babel-upward-root-mode-flag.spec.ts b/...3-1-add-babel-upward-root-mode-flag/update-16-3-1-add-babel-upward-root-mode-flag.spec.ts
diff --git a/...e-16-3-1-add-babel-upward-root-mode-flag/update-16-3-1-add-babel-upward-root-mode-flag.ts b/...e-16-3-1-add-babel-upward-root-mode-flag/update-16-3-1-add-babel-upward-root-mode-flag.ts