ssr-plugin-react 6.1.37 → 6.1.41

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.1.41](https://github.com/zhangyuang/ssr/compare/v6.1.40...v6.1.41) (2022-01-05)
+
+**Note:** Version bump only for package ssr-plugin-react
+
+
+
+
+
+## [6.1.40](https://github.com/zhangyuang/ssr/compare/v6.1.39...v6.1.40) (2022-01-04)
+
+**Note:** Version bump only for package ssr-plugin-react
+
+
+
+
+
+## [6.1.39](https://github.com/zhangyuang/ssr/compare/v6.1.38...v6.1.39) (2021-12-31)
+
+**Note:** Version bump only for package ssr-plugin-react
+
+
+
+
+
+## [6.1.38](https://github.com/zhangyuang/ssr/compare/v6.1.37...v6.1.38) (2021-12-31)
+
+
+### Features
+
+* better corejsOptions ([732a5ce](https://github.com/zhangyuang/ssr/commit/732a5ce3a60797e4fea564f5994650f9383ef98d))
+
+
+
+
+
 ## [6.1.37](https://github.com/zhangyuang/ssr/compare/v6.1.36...v6.1.37) (2021-12-30)
 
 **Note:** Version bump only for package ssr-plugin-react

package/cjs/config/base.js

@@ -4,9 +4,9 @@ exports.getBaseConfig = void 0;
 const path_1 = require("path");
 const ssr_server_utils_1 = require("ssr-server-utils");
 const webpack = require("webpack");
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const MiniCssExtractPlugin = require((0, ssr_server_utils_1.loadModuleFromFramework)('mini-css-extract-plugin'));
 const WebpackBar = require('webpackbar');
-const loadModule = require.resolve;
+const loadModule = ssr_server_utils_1.loadModuleFromFramework;
 const addBabelLoader = (chain, envOptions) => {
     chain.use('babel-loader')
         .loader(loadModule('babel-loader'))
@@ -43,20 +43,12 @@ const addBabelLoader = (chain, envOptions) => {
 };
 const getBaseConfig = (chain, isServer) => {
     const config = (0, ssr_server_utils_1.loadConfig)();
-    const { moduleFileExtensions, useHash, isDev, chainBaseConfig, corejs, babelExtraModule, alias } = config;
+    const { moduleFileExtensions, useHash, isDev, chainBaseConfig, corejsOptions, babelExtraModule, alias } = config;
     const mode = process.env.NODE_ENV;
     const envOptions = {
-        modules: false
+        modules: false,
+        ...corejsOptions
     };
-    if (corejs) {
-        Object.assign(envOptions, {
-            corejs: {
-                version: 3,
-                proposals: true
-            },
-            useBuiltIns: 'usage'
-        });
-    }
     chain.mode(mode);
     chain.module.strictExportPresence(true);
     chain

package/cjs/config/client.js

@@ -9,7 +9,7 @@ const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
 const safePostCssParser = require('postcss-safe-parser');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const generateAnalysis = Boolean(process.env.GENERATE_ANALYSIS);
-const loadModule = require.resolve;
+const loadModule = ssr_server_utils_1.loadModuleFromFramework;
 let asyncChunkMap = {};
 const getClientWebpack = (chain) => {
     const { isDev, chunkName, getOutput, cwd, useHash, chainClientConfig } = (0, ssr_server_utils_1.loadConfig)();
@@ -18,7 +18,7 @@ const getClientWebpack = (chain) => {
     (0, base_1.getBaseConfig)(chain, false);
     chain.devtool(isDev ? 'cheap-module-source-map' : (shouldUseSourceMap ? 'source-map' : false));
     chain.entry(chunkName)
-        .add(loadModule('../entry/client-entry'))
+        .add(require.resolve('../entry/client-entry'))
         .end()
         .output
         .path(getOutput().clientOutPut)

package/cjs/config/server.js

@@ -5,7 +5,6 @@ const path_1 = require("path");
 const ssr_server_utils_1 = require("ssr-server-utils");
 const webpack = require("webpack");
 const base_1 = require("./base");
-const loadModule = require.resolve;
 const getServerWebpack = (chain) => {
     const config = (0, ssr_server_utils_1.loadConfig)();
     const { isDev, cwd, getOutput, chainServerConfig, whiteList, chunkName } = config;
@@ -13,7 +12,7 @@ const getServerWebpack = (chain) => {
     chain.devtool(isDev ? 'inline-source-map' : false);
     chain.target('node');
     chain.entry(chunkName)
-        .add(loadModule('../entry/server-entry'))
+        .add(require.resolve('../entry/server-entry'))
         .end()
         .output
         .path(getOutput().serverOutPut)

package/esm/config/base.js

@@ -1,9 +1,9 @@
 import { join } from 'path';
-import { getCwd, loadConfig, getLocalNodeModules, setStyle, addImageChain } from 'ssr-server-utils';
+import { getCwd, loadConfig, getLocalNodeModules, setStyle, addImageChain, loadModuleFromFramework } from 'ssr-server-utils';
 import * as webpack from 'webpack';
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const MiniCssExtractPlugin = require(loadModuleFromFramework('mini-css-extract-plugin'));
 const WebpackBar = require('webpackbar');
-const loadModule = require.resolve;
+const loadModule = loadModuleFromFramework;
 const addBabelLoader = (chain, envOptions) => {
     chain.use('babel-loader')
         .loader(loadModule('babel-loader'))
@@ -40,20 +40,12 @@ const addBabelLoader = (chain, envOptions) => {
 };
 const getBaseConfig = (chain, isServer) => {
     const config = loadConfig();
-    const { moduleFileExtensions, useHash, isDev, chainBaseConfig, corejs, babelExtraModule, alias } = config;
+    const { moduleFileExtensions, useHash, isDev, chainBaseConfig, corejsOptions, babelExtraModule, alias } = config;
     const mode = process.env.NODE_ENV;
     const envOptions = {
-        modules: false
+        modules: false,
+        ...corejsOptions
     };
-    if (corejs) {
-        Object.assign(envOptions, {
-            corejs: {
-                version: 3,
-                proposals: true
-            },
-            useBuiltIns: 'usage'
-        });
-    }
     chain.mode(mode);
     chain.module.strictExportPresence(true);
     chain

package/esm/config/client.js

@@ -1,12 +1,12 @@
 import { promises } from 'fs';
 import { resolve } from 'path';
-import { loadConfig, getCwd, cryptoAsyncChunkName, getOutputPublicPath } from 'ssr-server-utils';
+import { loadConfig, getCwd, cryptoAsyncChunkName, getOutputPublicPath, loadModuleFromFramework } from 'ssr-server-utils';
 import { getBaseConfig } from './base';
 const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
 const safePostCssParser = require('postcss-safe-parser');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const generateAnalysis = Boolean(process.env.GENERATE_ANALYSIS);
-const loadModule = require.resolve;
+const loadModule = loadModuleFromFramework;
 let asyncChunkMap = {};
 const getClientWebpack = (chain) => {
     const { isDev, chunkName, getOutput, cwd, useHash, chainClientConfig } = loadConfig();
@@ -15,7 +15,7 @@ const getClientWebpack = (chain) => {
     getBaseConfig(chain, false);
     chain.devtool(isDev ? 'cheap-module-source-map' : (shouldUseSourceMap ? 'source-map' : false));
     chain.entry(chunkName)
-        .add(loadModule('../entry/client-entry'))
+        .add(require.resolve('../entry/client-entry'))
         .end()
         .output
         .path(getOutput().clientOutPut)

package/esm/config/server.js

@@ -2,7 +2,6 @@ import { join } from 'path';
 import { loadConfig, getLocalNodeModules, nodeExternals } from 'ssr-server-utils';
 import * as webpack from 'webpack';
 import { getBaseConfig } from './base';
-const loadModule = require.resolve;
 const getServerWebpack = (chain) => {
     const config = loadConfig();
     const { isDev, cwd, getOutput, chainServerConfig, whiteList, chunkName } = config;
@@ -10,7 +9,7 @@ const getServerWebpack = (chain) => {
     chain.devtool(isDev ? 'inline-source-map' : false);
     chain.target('node');
     chain.entry(chunkName)
-        .add(loadModule('../entry/server-entry'))
+        .add(require.resolve('../entry/server-entry'))
         .end()
         .output
         .path(getOutput().serverOutPut)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssr-plugin-react",
-  "version": "6.1.37",
+  "version": "6.1.41",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -56,10 +56,10 @@
     "postcss-safe-parser": "4.0.1",
     "react-dev-utils": "^11.0.4",
     "serialize-javascript": "^6.0.0",
-    "ssr-client-utils": "^6.1.29",
-    "ssr-hoc-react": "^6.1.29",
-    "ssr-server-utils": "^6.1.37",
-    "ssr-webpack": "^6.1.37",
+    "ssr-client-utils": "^6.1.38",
+    "ssr-hoc-react": "^6.1.38",
+    "ssr-server-utils": "^6.1.41",
+    "ssr-webpack": "^6.1.41",
     "terser-webpack-plugin": "^2.3.5",
     "url-loader": "^4.1.1",
     "vite": "^2.7.0",
@@ -74,7 +74,7 @@
     "@types/react-dom": "^17.0.0",
     "@types/react-router-dom": "^5.1.3",
     "@types/webpack": "^4.41.10",
-    "ssr-types-react": "^6.1.29"
+    "ssr-types-react": "^6.1.38"
   },
-  "gitHead": "4e2e88381c82bdd914b4a751635ddc7ff4c140c2"
+  "gitHead": "281da0c4727326b724bf85bf174701734fee83ce"
 }

package/src/config/base.ts

@@ -1,13 +1,13 @@
 
 import { join } from 'path'
 import { Mode } from 'ssr-types'
-import { getCwd, loadConfig, getLocalNodeModules, setStyle, addImageChain } from 'ssr-server-utils'
+import { getCwd, loadConfig, getLocalNodeModules, setStyle, addImageChain, loadModuleFromFramework } from 'ssr-server-utils'
 import * as WebpackChain from 'webpack-chain'
 import * as webpack from 'webpack'
 
-const MiniCssExtractPlugin = require('mini-css-extract-plugin')
+const MiniCssExtractPlugin = require(loadModuleFromFramework('mini-css-extract-plugin'))
 const WebpackBar = require('webpackbar')
-const loadModule = require.resolve
+const loadModule = loadModuleFromFramework
 
 const addBabelLoader = (chain: WebpackChain.Rule<WebpackChain.Module>, envOptions: any) => {
   chain.use('babel-loader')
@@ -45,21 +45,13 @@ const addBabelLoader = (chain: WebpackChain.Rule<WebpackChain.Module>, envOption
 }
 const getBaseConfig = (chain: WebpackChain, isServer: boolean) => {
   const config = loadConfig()
-  const { moduleFileExtensions, useHash, isDev, chainBaseConfig, corejs, babelExtraModule, alias } = config
+  const { moduleFileExtensions, useHash, isDev, chainBaseConfig, corejsOptions, babelExtraModule, alias } = config
   const mode = process.env.NODE_ENV as Mode
   const envOptions = {
-    modules: false
+    modules: false,
+    ...corejsOptions
   }
 
-  if (corejs) {
-    Object.assign(envOptions, {
-      corejs: {
-        version: 3,
-        proposals: true
-      },
-      useBuiltIns: 'usage'
-    })
-  }
   chain.mode(mode)
   chain.module.strictExportPresence(true)
   chain

package/src/config/client.ts

@@ -1,6 +1,6 @@
 import { promises } from 'fs'
 import { resolve } from 'path'
-import { loadConfig, getCwd, cryptoAsyncChunkName, getOutputPublicPath } from 'ssr-server-utils'
+import { loadConfig, getCwd, cryptoAsyncChunkName, getOutputPublicPath, loadModuleFromFramework } from 'ssr-server-utils'
 import * as WebpackChain from 'webpack-chain'
 import { getBaseConfig } from './base'
 
@@ -8,7 +8,7 @@ const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin')
 const safePostCssParser = require('postcss-safe-parser')
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 const generateAnalysis = Boolean(process.env.GENERATE_ANALYSIS)
-const loadModule = require.resolve
+const loadModule = loadModuleFromFramework
 let asyncChunkMap: Record<string, string> = {}
 
 const getClientWebpack = (chain: WebpackChain) => {
@@ -18,7 +18,7 @@ const getClientWebpack = (chain: WebpackChain) => {
   getBaseConfig(chain, false)
   chain.devtool(isDev ? 'cheap-module-source-map' : (shouldUseSourceMap ? 'source-map' : false))
   chain.entry(chunkName)
-    .add(loadModule('../entry/client-entry'))
+    .add(require.resolve('../entry/client-entry'))
     .end()
     .output
     .path(getOutput().clientOutPut)

package/src/config/server.ts

@@ -4,8 +4,6 @@ import * as WebpackChain from 'webpack-chain'
 import * as webpack from 'webpack'
 import { getBaseConfig } from './base'
 
-const loadModule = require.resolve
-
 const getServerWebpack = (chain: WebpackChain) => {
   const config = loadConfig()
   const { isDev, cwd, getOutput, chainServerConfig, whiteList, chunkName } = config
@@ -13,7 +11,7 @@ const getServerWebpack = (chain: WebpackChain) => {
   chain.devtool(isDev ? 'inline-source-map' : false)
   chain.target('node')
   chain.entry(chunkName)
-    .add(loadModule('../entry/server-entry'))
+    .add(require.resolve('../entry/server-entry'))
     .end()
     .output
     .path(getOutput().serverOutPut)