Skip to content

Commit a8ef85e

Browse files
ScriptedAlchemyreinaldorauchbrunos3d
authored
Fix temp (#425)
* feat: updated injector to receive a simpler format to load the remote * feat: updated /api/get-remote to remove graphql and serve the new simple format * fix read write token * test changes Co-authored-by: Reinaldo A. C. Rauch <[email protected]> Co-authored-by: Bruno Silva <[email protected]>
1 parent 6637cd6 commit a8ef85e

File tree

19 files changed

+2799
-2787
lines changed

19 files changed

+2799
-2787
lines changed

‎dashboard-example/.env

100755100644
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
DASHBOARD_READ_TOKEN=e75c10ba-749d-4451-8fb0-4ad972ebf970
2-
DASHBOARD_READ_WRITE=c754d13b-a294-462e-b0ef-71d2ad307426
1+
DASHBOARD_WRITE_TOKEN=9e07eb1c-0e7f-4373-8635-cfabf5843086
2+
DASHBOARD_READ_TOKEN=6118f0cd-9c70-4191-9abb-292e6d616bc6
3+
DASHBOARD_BASE_URL=http://localhost:3333

‎dashboard-example/.env.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DASHBOARD_WRITE_TOKEN=45a9e887-0ad8-4944-8a46-ef28cd95ba1b
2+
DASHBOARD_READ_TOKEN=40184200-651a-4e9c-bfa0-9277ead428f5
3+
DASHBOARD_BASE_URL=http://localhost:3333

‎dashboard-example/.env.n

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DASHBOARD_WRITE_TOKEN=b65b452b-f714-41ba-9bbd-2327f40209df
2+
DASHBOARD_READ_TOKEN=a1c1c3c8-5deb-4fc4-9700-4c8569d785e6
3+
DASHBOARD_BASE_URL=http://localhost:3333

‎dashboard-example/.env.o

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DASHBOARD_WRITE_TOKEN=8ccfcf21-5402-4f99-a800-33ee48168132
2+
DASHBOARD_READ_TOKEN=592c4ee8-e8f3-4ca7-82b9-0695eb7740b7
3+
DASHBOARD_BASE_URL=http://localhost:3000

‎dashboard-example/dsl/webpack.config.js

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
1-
require("dotenv").config({ path: "../.env" });
21
const HtmlWebpackPlugin = require("html-webpack-plugin");
32
const DashboardPlugin = require("@module-federation/dashboard-plugin");
43
const { ModuleFederationPlugin } = require("webpack").container;
54
const path = require("path");
5+
const { readFileSync } = require("fs");
6+
7+
const env = readFileSync(__dirname + "/../.env")
8+
.toString("utf-8")
9+
.split("\n")
10+
.map((v) => v.trim().split("="));
11+
process.env.DASHBOARD_WRITE_TOKEN = env.find(
12+
([k]) => k === "DASHBOARD_WRITE_TOKEN"
13+
)[1];
14+
process.env.DASHBOARD_BASE_URL = env.find(
15+
([k]) => k === "DASHBOARD_BASE_URL"
16+
)[1];
17+
618
module.exports = {
719
entry: "./src/index",
820
mode: "development",
@@ -77,24 +89,16 @@ module.exports = {
7789
template: "./public/index.html",
7890
}),
7991
new DashboardPlugin({
80-
publishVersion: require("./package.json").version,
81-
filename: "dashboard.json",
82-
dashboardURL: `${
83-
process.env.VERCEL_URL
84-
? "https://federation-dashboard-alpha.vercel.app"
85-
: "http://localhost:3333"
86-
}/api/update?token=${process.env.DASHBOARD_WRITE_TOKEN}`,
87-
metadata: {
88-
baseUrl: process.env.VERCEL_URL
89-
? "https://" + process.env.VERCEL_URL
90-
: "http://localhost:3002",
91-
source: {
92-
url: "https://github.com/module-federation/federation-dashboard/tree/master/dashboard-example/dsl",
93-
},
94-
remote: process.env.VERCEL_URL
95-
? "https://" + process.env.VERCEL_URL + "/remoteEntry.js"
96-
: "http://localhost:3002/remoteEntry.js",
97-
},
98-
})
92+
publishVersion: require("./package.json").version,
93+
filename: "dashboard.json",
94+
dashboardURL: `${process.env.DASHBOARD_BASE_URL}/api/update?token=${process.env.DASHBOARD_WRITE_TOKEN}`,
95+
metadata: {
96+
baseUrl: "http://localhost:3002",
97+
source: {
98+
url: "https://github.com/module-federation/federation-dashboard/tree/master/dashboard-example/dsl",
99+
},
100+
remote: "http://localhost:3002/remoteEntry.js",
101+
},
102+
}),
99103
],
100104
};

‎dashboard-example/home/public/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<!-- <link rel="prefetch" as="document" href="https://federation-dashboard-alpha.vercel.app/api/get-remote?token=e75c10ba-749d-4451-8fb0-4ad972ebf970&currentHost=home&remoteName=nav">-->
88
<!-- <link rel="prefetch" as="document" href="https://federation-dashboard-alpha.vercel.app/api/get-remote?token=e75c10ba-749d-4451-8fb0-4ad972ebf970&currentHost=home&remoteName=dsl">-->
99
<!-- <script src="https://medusa-example-dsl.vercel.app/remoteEntry.js"></script>-->
10-
<script src="http://localhost:3002/remoteEntry.js"></script>
10+
<!-- <script src="http://localhost:3002/remoteEntry.js"></script> -->
1111
<!-- <script src="https://medusa-example-nav.vercel.app/remoteEntry.js"></script>-->
12-
<script src="http://localhost:3003/remoteEntry.js"></script>
12+
<!-- <script src="http://localhost:3003/remoteEntry.js"></script> -->
1313
<!-- <script src="https://medusa-example-search.vercel.app/remoteEntry.js"></script>-->
14-
<script src="http://localhost:3004/remoteEntry.js"></script>
14+
<!-- <script src="http://localhost:3004/remoteEntry.js"></script> -->
1515
<!-- <script src="https://medusa-example-utils.vercel.app/remoteEntry.js"></script>-->
16-
<script src="http://localhost:3005/remoteEntry.js"></script>
16+
<!-- <script src="http://localhost:3005/remoteEntry.js"></script> -->
1717
</head>
1818
<body>
1919
<div id="root"></div>

‎dashboard-example/home/webpack.config.js

Lines changed: 37 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
1-
require("dotenv").config({ path: "../.env" });
21
const HtmlWebpackPlugin = require("html-webpack-plugin");
32
const DashboardPlugin = require("@module-federation/dashboard-plugin");
4-
const clientVersion = require("../../dashboard-plugin/client-version");
3+
const { readFileSync } = require("fs");
4+
const tokens = readFileSync(__dirname + "/../.env")
5+
.toString("utf-8")
6+
.split("\n")
7+
.map((v) => v.trim().split("="));
8+
process.env.DASHBOARD_READ_TOKEN = tokens.find(
9+
([k]) => k === "DASHBOARD_READ_TOKEN"
10+
)[1];
11+
process.env.DASHBOARD_WRITE_TOKEN = tokens.find(
12+
([k]) => k === "DASHBOARD_WRITE_TOKEN"
13+
)[1];
14+
process.env.DASHBOARD_BASE_URL = tokens.find(
15+
([k]) => k === "DASHBOARD_BASE_URL"
16+
)[1];
517

618
const {
719
container: { ModuleFederationPlugin },
820
} = require("webpack");
921
const path = require("path");
1022

23+
const dashboardURL = `${process.env.DASHBOARD_BASE_URL}/api/get-remote?token=${process.env.DASHBOARD_READ_TOKEN}`;
24+
1125
module.exports = {
1226
entry: "./src/index",
1327
mode: "development",
@@ -67,41 +81,25 @@ module.exports = {
6781
filename: "remoteEntry.js",
6882
library: { type: "var", name: "home" },
6983
remotes: {
70-
dsl: clientVersion({
84+
dsl: DashboardPlugin.clientVersion({
7185
currentHost: "home",
7286
remoteName: "dsl",
73-
dashboardURL: `${
74-
process.env.VERCEL_URL
75-
? "https://federation-dashboard-alpha.vercel.app"
76-
: "http://localhost:3333"
77-
}/api/get-remote?token=${process.env.DASHBOARD_READ_TOKEN}`,
87+
dashboardURL,
7888
}),
79-
search: clientVersion({
89+
search: DashboardPlugin.clientVersion({
8090
currentHost: "home",
8191
remoteName: "search",
82-
dashboardURL: `${
83-
process.env.VERCEL_URL
84-
? "https://federation-dashboard-alpha.vercel.app"
85-
: "http://localhost:3333"
86-
}/api/get-remote?token=${process.env.DASHBOARD_READ_TOKEN}`,
92+
dashboardURL,
8793
}),
88-
nav: clientVersion({
94+
nav: DashboardPlugin.clientVersion({
8995
currentHost: "home",
9096
remoteName: "nav",
91-
dashboardURL: `${
92-
process.env.VERCEL_URL
93-
? "https://federation-dashboard-alpha.vercel.app"
94-
: "http://localhost:3333"
95-
}/api/get-remote?token=${process.env.DASHBOARD_READ_TOKEN}`,
97+
dashboardURL,
9698
}),
97-
utils: clientVersion({
99+
utils: DashboardPlugin.clientVersion({
98100
currentHost: "home",
99101
remoteName: "utils",
100-
dashboardURL: `${
101-
process.env.VERCEL_URL
102-
? "https://federation-dashboard-alpha.vercel.app"
103-
: "http://localhost:3333"
104-
}/api/get-remote?token=${process.env.DASHBOARD_READ_TOKEN}`,
102+
dashboardURL,
105103
}),
106104
},
107105
exposes: {
@@ -115,26 +113,19 @@ module.exports = {
115113
template: "./public/index.html",
116114
excludeChunks: ["remoteEntry"],
117115
}),
118-
119116
new DashboardPlugin({
120-
publishVersion: require("./package.json").version,
121-
filename: "dashboard.json",
122-
dashboardURL: process.env.VERCEL_URL
123-
? "https://federation-dashboard-alpha.vercel.app/api/update?token=c754d13b-a294-462e-b0ef-71d2ad307426"
124-
: `http://localhost:3333/api/update?token=${process.env.DASHBOARD_WRITE_TOKEN}`,
125-
versionChangeWebhook: "http://cnn.com/",
126-
metadata: {
127-
clientUrl: "http://localhost:3333",
128-
baseUrl: process.env.VERCEL_URL
129-
? "https://" + process.env.VERCEL_URL
130-
: "http://localhost:3001",
131-
source: {
132-
url: "https://github.com/module-federation/federation-dashboard/tree/master/dashboard-example/home",
133-
},
134-
remote: process.env.VERCEL_URL
135-
? "https://" + process.env.VERCEL_URL + "/remoteEntry.js"
136-
: "http://localhost:3001/remoteEntry.js",
137-
},
138-
})
117+
publishVersion: require("./package.json").version,
118+
filename: "dashboard.json",
119+
dashboardURL: `${process.env.DASHBOARD_BASE_URL}/api/update?token=${process.env.DASHBOARD_WRITE_TOKEN}`,
120+
versionChangeWebhook: "http://cnn.com/",
121+
metadata: {
122+
clientUrl: process.env.DASHBOARD_BASE_URL,
123+
baseUrl: "http://localhost:3001",
124+
source: {
125+
url: "https://github.com/module-federation/federation-dashboard/tree/master/dashboard-example/home",
126+
},
127+
remote: "http://localhost:3001/remoteEntry.js",
128+
},
129+
}),
139130
],
140131
};

‎dashboard-example/nav/webpack.config.js

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
1-
require("dotenv").config({ path: "../.env" });
21
const HtmlWebpackPlugin = require("html-webpack-plugin");
32
const DashboardPlugin = require("@module-federation/dashboard-plugin");
4-
const clientVersion = require("../../dashboard-plugin/client-version");
53
const { ModuleFederationPlugin } = require("webpack").container;
64
const path = require("path");
5+
const { readFileSync } = require("fs");
6+
7+
const tokens = readFileSync(__dirname + "/../.env")
8+
.toString("utf-8")
9+
.split("\n")
10+
.map((v) => v.trim().split("="));
11+
process.env.DASHBOARD_READ_TOKEN = tokens.find(
12+
([k]) => k === "DASHBOARD_READ_TOKEN"
13+
)[1];
14+
process.env.DASHBOARD_WRITE_TOKEN = tokens.find(
15+
([k]) => k === "DASHBOARD_WRITE_TOKEN"
16+
)[1];
17+
process.env.DASHBOARD_BASE_URL = tokens.find(
18+
([k]) => k === "DASHBOARD_BASE_URL"
19+
)[1];
20+
721
module.exports = {
822
entry: "./src/index",
923
mode: "development",
@@ -63,14 +77,10 @@ module.exports = {
6377
library: { type: "var", name: "nav__REMOTE_VERSION__" },
6478
filename: "remoteEntry.js",
6579
remotes: {
66-
dsl: clientVersion({
80+
dsl: DashboardPlugin.clientVersion({
6781
currentHost: "nav",
6882
remoteName: "dsl",
69-
dashboardURL: `${
70-
process.env.VERCEL_URL
71-
? "https://federation-dashboard-alpha.vercel.app"
72-
: "http://localhost:3333"
73-
}/api/get-remote?token=${process.env.DASHBOARD_READ_TOKEN}`,
83+
dashboardURL: `${process.env.DASHBOARD_BASE_URL}/api/get-remote?token=${process.env.DASHBOARD_READ_TOKEN}`,
7484
}),
7585
search: "search",
7686
utils: "utils",
@@ -85,24 +95,18 @@ module.exports = {
8595
new HtmlWebpackPlugin({
8696
template: "./public/index.html",
8797
}),
88-
new DashboardPlugin({
89-
publishVersion: require("./package.json").version,
90-
filename: "dashboard.json",
91-
dashboardURL: process.env.VERCEL_URL
92-
? `https://federation-dashboard-alpha.vercel.app/api/update?token=${process.env.DASHBOARD_WRITE_TOKEN}`
93-
: `http://localhost:3333/api/update?token=${process.env.DASHBOARD_WRITE_TOKEN}`,
94-
versionChangeWebhook: "http://cnn.com/",
95-
metadata: {
96-
baseUrl: process.env.VERCEL_URL
97-
? "https://" + process.env.VERCEL_URL
98-
: "http://localhost:3003",
99-
source: {
100-
url: "https://github.com/module-federation/federation-dashboard/tree/master/dashboard-example/nav",
101-
},
102-
remote: process.env.VERCEL_URL
103-
? "https://" + process.env.VERCEL_URL + "/remoteEntry.js"
104-
: "http://localhost:3003/remoteEntry.js",
105-
},
106-
})
98+
new DashboardPlugin({
99+
publishVersion: require("./package.json").version,
100+
filename: "dashboard.json",
101+
dashboardURL: `${process.env.DASHBOARD_BASE_URL}/api/update?token=${process.env.DASHBOARD_WRITE_TOKEN}`,
102+
versionChangeWebhook: "http://cnn.com/",
103+
metadata: {
104+
baseUrl: "http://localhost:3003",
105+
source: {
106+
url: "https://github.com/module-federation/federation-dashboard/tree/master/dashboard-example/nav",
107+
},
108+
remote: "http://localhost:3003/remoteEntry.js",
109+
},
110+
}),
107111
],
108112
};

‎dashboard-example/search/webpack.config.js

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
1-
require("dotenv").config({ path: "../.env" });
21
const HtmlWebpackPlugin = require("html-webpack-plugin");
32
const DashboardPlugin = require("@module-federation/dashboard-plugin");
4-
const clientVersion = require("../../dashboard-plugin/client-version");
53
const { ModuleFederationPlugin } = require("webpack").container;
64
const path = require("path");
75

6+
const { readFileSync } = require("fs");
7+
const tokens = readFileSync(__dirname + "/../.env")
8+
.toString("utf-8")
9+
.split("\n")
10+
.map((v) => v.trim().split("="));
11+
process.env.DASHBOARD_READ_TOKEN = tokens.find(
12+
([k]) => k === "DASHBOARD_READ_TOKEN"
13+
)[1];
14+
process.env.DASHBOARD_WRITE_TOKEN = tokens.find(
15+
([k]) => k === "DASHBOARD_WRITE_TOKEN"
16+
)[1];
17+
process.env.DASHBOARD_BASE_URL = tokens.find(
18+
([k]) => k === "DASHBOARD_BASE_URL"
19+
)[1];
20+
821
module.exports = {
922
entry: "./src/index",
1023
mode: "development",
@@ -64,14 +77,10 @@ module.exports = {
6477
filename: "remoteEntry.js",
6578
remotes: {
6679
nav: "nav",
67-
dsl: clientVersion({
80+
dsl: DashboardPlugin.clientVersion({
6881
currentHost: "search",
6982
remoteName: "dsl",
70-
dashboardURL: `${
71-
process.env.VERCEL_URL
72-
? "https://federation-dashboard-alpha.vercel.app"
73-
: "http://localhost:3333"
74-
}/api/get-remote?token=${process.env.DASHBOARD_READ_TOKEN}`,
83+
dashboardURL: `${process.env.DASHBOARD_BASE_URL}/api/get-remote?token=${process.env.DASHBOARD_READ_TOKEN}`,
7584
}),
7685
home: "home",
7786
utils: "utils",
@@ -86,24 +95,16 @@ module.exports = {
8695
template: "./public/index.html",
8796
}),
8897
new DashboardPlugin({
89-
publishVersion: require("./package.json").version,
90-
filename: "dashboard.json",
91-
dashboardURL: `${
92-
process.env.VERCEL_URL
93-
? "https://federation-dashboard-alpha.vercel.app"
94-
: "http://localhost:3333"
95-
}/api/update?token=${process.env.DASHBOARD_WRITE_TOKEN}`,
96-
metadata: {
97-
baseUrl: process.env.VERCEL_URL
98-
? "https://" + process.env.VERCEL_URL
99-
: "http://localhost:3004",
100-
source: {
101-
url: "https://github.com/module-federation/federation-dashboard/tree/master/dashboard-example/search",
102-
},
103-
remote: process.env.VERCEL_URL
104-
? "https://" + process.env.VERCEL_URL + "/remoteEntry.js"
105-
: "http://localhost:3004/remoteEntry.js",
106-
},
107-
})
98+
publishVersion: require("./package.json").version,
99+
filename: "dashboard.json",
100+
dashboardURL: `${process.env.DASHBOARD_BASE_URL}/api/update?token=${process.env.DASHBOARD_WRITE_TOKEN}`,
101+
metadata: {
102+
baseUrl: "http://localhost:3004",
103+
source: {
104+
url: "https://github.com/module-federation/federation-dashboard/tree/master/dashboard-example/search",
105+
},
106+
remote: "http://localhost:3004/remoteEntry.js",
107+
},
108+
}),
108109
],
109110
};

‎dashboard-example/utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@dashboard/utils",
3-
"version": "0.0.2",
3+
"version": "0.0.3",
44
"private": true,
55
"devDependencies": {
66
"@babel/core": "7.15.5",

0 commit comments

Comments
 (0)