Skip to content

Commit 8d29e35

Browse files
fix execution order, use package from registry
1 parent f6637d6 commit 8d29e35

File tree

12 files changed

+21
-263
lines changed

12 files changed

+21
-263
lines changed

multi-threaded-ssr/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"private": true,
33
"scripts": {
44
"start": "yarn build && yarn serve",
5-
"build": "lerna run --scope @multi-threaded-ssr/icarus-2 build && lerna run --scope @multi-threaded-ssr/icarus-1 build",
6-
"serve": "lerna run --scope @multi-threaded-ssr/* --parallel serve",
5+
"build": "lerna run build --parallel --scope @multi-threaded-ssr/icarus-2 --scope @multi-threaded-ssr/icarus-1",
76
"clean": "lerna run --scope @multi-threaded-ssr/* --parallel clean"
87
}
98
}

multi-threaded-ssr/plugins/FederatedRuntimePlugin.js

Lines changed: 0 additions & 166 deletions
This file was deleted.

multi-threaded-ssr/plugins/HttpRuntime.js

Lines changed: 0 additions & 74 deletions
This file was deleted.

multi-threaded-ssr/plugins/package.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

multi-threaded-ssr/website1/build/webpack.config.js/server.base.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ const merge = require("webpack-merge");
44
const fs = require("fs");
55
const ModuleFederationPlugin = require("webpack").container
66
.ModuleFederationPlugin;
7-
const FederatedRuntimePlugin = require("../../../plugins/FederatedRuntimePlugin");
8-
const HttpRuntime = require("../../../plugins/HttpRuntime");
7+
const FederatedRuntimePlugin = require("@module-federation/federated-runtime-plugin/FederatedRuntimePlugin");
8+
const HttpRuntime = require("@module-federation/federated-runtime-plugin/HttpRuntime");
99
const common = require("./common.base");
1010
const { server: serverLoaders } = require("./loaders");
1111
const plugins = require("./plugins");

multi-threaded-ssr/website1/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"scripts": {
99
"start": "npm run clean && cross-env NODE_ENV=development babel-node server/index.js",
1010
"start:prod": "npm run build && npm run serve",
11-
"serve": "cross-env NODE_ENV=production node buildServer/main.js",
12-
"build": "npm run build:server && npm run build:client",
11+
"serve": "PORT=3000 node buildServer/main.js",
12+
"build": "npm run build:server && npm run build:client && yarn serve",
1313
"build:client": "rimraf buildClient && cross-env NODE_ENV=production webpack --progress -p --config build/webpack.config.js/client.prod.js --profile --json > buildServer/stats.json",
1414
"build:server": "cross-env NODE_ENV=production webpack --progress -p --config build/webpack.config.js/server.prod.js",
1515
"build:node": "cross-env NODE_ENV=production babel server -d buildServer",
@@ -19,8 +19,7 @@
1919
"lint": "eslint --fix src server build",
2020
"format": "prettier --single-quote --semi=false --write '{src,server,webpack}/**/*.js' && npm run lint",
2121
"deploy": "yarn build && ./deploy-heroku.sh",
22-
"production:test": "yarn run build && rm -rf node_modules && NODE_ENV=production npm install --production && yarn serve",
23-
"clean": "rm -rf dist"
22+
"production:test": "yarn run build && rm -rf node_modules && NODE_ENV=production npm install --production && yarn serve"
2423
},
2524
"dependencies": {
2625
"@babel/polyfill": "^7.4.4",

multi-threaded-ssr/website2/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@
1313
"build:client": "rimraf buildClient && cross-env NODE_ENV=production webpack --progress -p --config build/webpack.config.js/client.prod.js --profile --json > buildServer/stats.json",
1414
"build:server": "cross-env NODE_ENV=production webpack --progress -p --config build/webpack.config.js/server.prod.js",
1515
"build:node": "cross-env NODE_ENV=production babel server -d buildServer",
16-
"clean": "rimraf buildClient",
16+
"clean": "rimraf buildClient && rm -rf dist",
1717
"precommit": "lint-staged",
1818
"cm": "git-cz",
1919
"lint": "eslint --fix src server build",
2020
"format": "prettier --single-quote --semi=false --write '{src,server,webpack}/**/*.js' && npm run lint",
2121
"deploy": "yarn build && ./deploy-heroku.sh",
22-
"production:test": "yarn run build && rm -rf node_modules && NODE_ENV=production npm install --production && yarn serve",
23-
"clean": "rm -rf dist"
22+
"production:test": "yarn run build && rm -rf node_modules && NODE_ENV=production npm install --production && yarn serve"
2423
},
2524
"dependencies": {
2625
"@babel/polyfill": "^7.4.4",
@@ -57,6 +56,7 @@
5756
"@babel/preset-env": "7.10.0",
5857
"@babel/preset-react": "7.10.0",
5958
"@module-federation/remote-federation-plugin": "*",
59+
"@module-federation/federated-runtime-plugin": "*",
6060
"autoprefixer": "9.8.0",
6161
"babel-eslint": "10.1.0",
6262
"babel-loader": "8.1.0",

streamed-federation/app1/src/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import ReactDomServer from "react-dom/server";
88
import { StaticRouter, matchPath } from "react-router-dom";
99
import { Provider as ReduxProvider } from "react-redux";
1010
import { Helmet } from "react-helmet";
11-
import { initializeFederatedImports } from "@module-federation/propriatery-tools/packages/remote-federation-plugin/lib/s3-federated-imports";
11+
import { initializeFederatedImports } from "@module-federation/remote-federation-plugin/lib/s3-federated-imports";
1212
const { performance, PerformanceObserver } = require("perf_hooks");
1313

1414
import routes from "./routes";

streamed-federation/app1/webpack.client.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const StreamedFederationPlugin = require("@module-federation/propriatery-tools/packages/remote-federation-plugin");
1+
const StreamedFederationPlugin = require("@module-federation/remote-federation-plugin");
22
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
33

44
module.exports = {

streamed-federation/app1/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const StreamedFederationPlugin = require("@module-federation/propriatery-tools/packages/remote-federation-plugin");
1+
const StreamedFederationPlugin = require("@module-federation/remote-federation-plugin");
22
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
33
const path = require("path");
44
const externals = [

0 commit comments

Comments
 (0)