chore: update ssr-with-rax

moligit · Apr 3, 2020 · 563af51 · 563af51
1 parent 6ab5e94
commit 563af51
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 12 deletions.
diff --git a/example/ssr-with-rax/build/webpack.config.base.js b/example/ssr-with-rax/build/webpack.config.base.js
@@ -22,7 +22,7 @@ const webpackModule = {
         },
         {
           test: /\.(js|mjs|jsx|ts|tsx)$/,
-          // exclude: /node_modules/,
+          exclude: /node_modules/,
           loader: require.resolve('babel-loader'),
           options: {
             cacheDirectory: true,
@@ -33,16 +33,10 @@ const webpackModule = {
                 {
                   modules: false
                 }
-              ]
-            ],
-            plugins: [
-              'babel-plugin-transform-jsx-to-html',
-              [
-                require.resolve('@babel/plugin-transform-react-jsx'),
-                {
-                  pragma: 'createElement'
-                }
-              ]
+              ],
+              ['@babel/preset-react', {
+                'pragma': 'createElement'
+              }]
             ]
           }
         },

diff --git a/example/ssr-with-rax/build/webpack.config.server.js b/example/ssr-with-rax/build/webpack.config.server.js
@@ -10,12 +10,46 @@ const plugins = [
     '__isBrowser__': false //eslint-disable-line
   })
 ]
+const webpackModule = {
+  strictExportPresence: true,
+  rules: [
+    { parser: { requireEnsure: false } },
+    {
+      oneOf: [
+        {
+          test: /\.(js|mjs|jsx|ts|tsx)$/,
+          exclude: /node_modules/,
+          loader: require.resolve('babel-loader'),
+          options: {
+            cacheDirectory: true,
+            cacheCompression: false,
+            presets: [
+              [
+                require.resolve('@babel/preset-env'),
+                {
+                  modules: false
+                }
+              ],
+              ['@babel/preset-react', {
+                'pragma': 'createElement'
+              }]
+            ],
+            plugins: [
+              'babel-plugin-transform-jsx-to-html'
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}
 module.exports = merge(baseConfig, {
   devtool: isDev ? 'eval-source-map' : '',
   entry: {
     Page: paths.entry,
     Layout: paths.layout
   },
+  module: webpackModule,
   target: 'node',
   externals: nodeExternals({
     whitelist: /\.(css|less|sass|scss)$|^rax-+/

diff --git a/example/ssr-with-rax/package.json b/example/ssr-with-rax/package.json
@@ -32,9 +32,9 @@
   ],
   "devDependencies": {
     "@babel/core": "^7.4.4",
-    "@babel/plugin-transform-react-jsx": "^7.8.3",
     "@babel/polyfill": "^7.4.4",
     "@babel/preset-env": "^7.5.5",
+    "@babel/preset-react": "^7.9.4",
     "babel-loader": "8.0.4",
     "babel-plugin-transform-jsx-to-html": "^0.2.0",
     "browserslist": "^4.6.3",