feat: automatic JSX transform of esbuild (#490)

* fix: jsx transform of esbuild * fix: jsx transform * chore: optimize code
ice-lab · Aug 30, 2022 · 40ce2a5 · 40ce2a5 · vercel · Aug 30, 2022
1 parent c2c697e
commit 40ce2a5
Show file tree

Hide file tree

Showing 11 changed files with 124 additions and 309 deletions.
diff --git a/packages/ice/package.json b/packages/ice/package.json
@@ -50,7 +50,7 @@
     "dotenv": "^16.0.0",
     "dotenv-expand": "^8.0.3",
     "ejs": "^3.1.6",
-    "esbuild": "^0.14.23",
+    "esbuild": "^0.14.51",
     "esbuild-register": "^3.3.2",
     "fast-glob": "^3.2.11",
     "find-up": "^5.0.0",

diff --git a/packages/ice/src/polyfills/react.js b/packages/ice/src/polyfills/react.js
diff --git a/packages/ice/src/service/config.ts b/packages/ice/src/service/config.ts
@@ -44,7 +44,6 @@ class Config {
       const { error } = await esbuildCompiler({
         entryPoints: [entry],
         format: 'esm',
-        inject: [],
         outfile,
         plugins: [removeTopLevelCode(keepExports, transformInclude)],
       });

diff --git a/packages/ice/src/service/serverCompiler.ts b/packages/ice/src/service/serverCompiler.ts
@@ -1,5 +1,4 @@
 import * as path from 'path';
-import { fileURLToPath } from 'url';
 import { createHash } from 'crypto';
 import * as fs from 'fs';
 import consola from 'consola';
@@ -24,8 +23,6 @@ import { scanImports } from './analyze.js';
 import type { DepsMetaData } from './preBundleCJSDeps.js';
 import preBundleCJSDeps from './preBundleCJSDeps.js';
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
 interface Options {
   rootDir: string;
   task: TaskConfig<Config>;
@@ -112,7 +109,7 @@ export function createServerCompiler(options: Options) {
       // enable JSX syntax in .js files by default for compatible with migrate project
       // while it is not recommended
       loader: { '.js': 'jsx' },
-      inject: [path.resolve(__dirname, '../polyfills/react.js')],
+      jsx: 'automatic',
       sourcemap: typeof sourceMap === 'boolean'
         // Transform sourceMap for esbuild.
         ? sourceMap : (sourceMap.includes('inline') ? 'inline' : !!sourceMap),

diff --git a/packages/ice/src/webpack/DataLoaderPlugin.ts b/packages/ice/src/webpack/DataLoaderPlugin.ts
@@ -34,7 +34,6 @@ export default class DataLoaderPlugin {
             target: 'esnext',
             entryPoints: [filePath],
             write: false,
-            inject: [],
           }, {
             swc: {
               removeExportExprs: ['default', 'getConfig', 'getServerData', 'getStaticData'],

diff --git a/packages/plugin-pha/package.json b/packages/plugin-pha/package.json
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@ice/types": "^1.0.0",
-    "esbuild": "^0.14.23",
+    "esbuild": "^0.14.51",
     "webpack": "^5.73.0",
     "webpack-dev-server": "^4.9.2"
   },

diff --git a/packages/plugin-pha/src/index.ts b/packages/plugin-pha/src/index.ts
@@ -58,7 +58,6 @@ const plugin: Plugin<PluginOptions> = (options) => ({
           format: 'esm',
           outfile,
           minify,
-          inject: [],
         });
         return `${outfile}`;
       };

diff --git a/packages/plugin-rax-compat/src/index.ts b/packages/plugin-rax-compat/src/index.ts
@@ -53,6 +53,16 @@ const plugin: Plugin<CompatRaxOptions> = (options = {}) => ({
           },
         },
       });
+      if (!config.server) {
+        config.server = {};
+      }
+      const originalOptions = config.server.buildOptions;
+      config.server.buildOptions = (options) => ({
+        ...(originalOptions ? originalOptions(options) : options),
+        jsx: 'transform',
+        jsxFactory: 'createElement',
+        jsxFragment: 'Fragment',
+      });
       Object.assign(config.alias, alias);
       if (options.inlineStyle) {
         if (!warnOnce) {

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -34,7 +34,7 @@
     "@ice/route-manifest": "^1.0.0",
     "@ice/runtime": "^1.0.0",
     "build-scripts": "^2.0.0-24",
-    "esbuild": "^0.14.23",
+    "esbuild": "^0.14.51",
     "eslint": "^8.14.0",
     "eslint-webpack-plugin": "3.1.1",
     "fork-ts-checker-webpack-plugin": "7.2.6",

diff --git a/packages/webpack-config/package.json b/packages/webpack-config/package.json
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@ice/types": "^1.0.0",
     "build-scripts": "^2.0.0-24",
-    "esbuild": "^0.14.23",
+    "esbuild": "^0.14.51",
     "webpack": "^5.73.0",
     "webpack-dev-server": "^4.7.4"
   },