Skip to content

Commit 84b2c1d

Browse files
YHhaoareyouYHhaoareyou
authored
fix: env without using dotenv explicitly (#385)
1 parent ef10256 commit 84b2c1d

File tree

10 files changed

+359
-288
lines changed

10 files changed

+359
-288
lines changed

‎campus/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"@babel/preset-react": "7.16.7",
2323
"@babel/preset-typescript": "7.16.7",
2424
"@babel/runtime": "7.17.2",
25+
"@types/node": "17.0.21",
2526
"@types/systemjs": "6.1.1",
2627
"@typescript-eslint/eslint-plugin": "5.14.0",
2728
"@typescript-eslint/parser": "5.14.0",

‎campus/pnpm-lock.yaml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎campus/vite.config.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
import reactRefresh from "@vitejs/plugin-react-refresh";
2-
import { defineConfig } from "vite";
2+
import { defineConfig, loadEnv } from "vite";
33
import dynamicImport from "vite-plugin-dynamic-import";
44
const path = require("path");
5-
const { parsed } = require("dotenv").config({
6-
path: path.resolve(__dirname, "./src/.env"),
7-
});
85

96
export default defineConfig(({ mode }) => {
7+
const env = loadEnv(mode, process.cwd(), "");
108
const publicAssetsBaseUrl =
119
mode === "production"
1210
? "/campus/"
1311
: mode === "staging"
14-
? `https://${parsed.MF_DOMAIN_WITH_PREFIX}/`
12+
? `https://${env.MF_DOMAIN_WITH_PREFIX}/`
1513
: "http://localhost:8081/";
1614

1715
return {

‎root/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"@babel/preset-env": "7.16.11",
2626
"@babel/preset-typescript": "7.16.7",
2727
"@babel/runtime": "7.17.2",
28+
"@types/node": "17.0.21",
2829
"@types/systemjs": "6.1.1",
2930
"@typescript-eslint/eslint-plugin": "5.14.0",
3031
"@typescript-eslint/parser": "5.14.0",

‎root/pnpm-lock.yaml‎

Lines changed: 329 additions & 267 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎root/src/index.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@
4747
{
4848
"imports": {
4949
"@wasedatime/root-config": "/wasedatime-root-config.js",
50-
"@wasedatime/syllabus": "https://<%= PREFIX %>.<%= MF_SYLLABUS_DOMAIN %>/wasedatime-syllabus.js",
51-
"@wasedatime/campus": "https://<%= PREFIX %>.<%= MF_CAMPUS_DOMAIN %>/wasedatime-campus.js"
50+
"@wasedatime/syllabus": "https://<%= env.PREFIX %>.<%= env.MF_SYLLABUS_DOMAIN %>/wasedatime-syllabus.js",
51+
"@wasedatime/campus": "https://<%= env.PREFIX %>.<%= env.MF_CAMPUS_DOMAIN %>/wasedatime-campus.js"
5252
}
5353
}
5454
</script>
55-
<link rel="preload" href="https://<%= PREFIX %>.<%= MF_SYLLABUS_DOMAIN %>/assets/style.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
56-
<noscript><link rel="stylesheet" href="https://<%= PREFIX %>.<%= MF_SYLLABUS_DOMAIN %>/assets/style.css"></noscript>
57-
<link rel="preload" href="https://<%= PREFIX %>.<%= MF_CAMPUS_DOMAIN %>/assets/style.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
58-
<noscript><link rel="stylesheet" href="https://<%= PREFIX %>.<%= MF_CAMPUS_DOMAIN %>/assets/style.css"></noscript>
55+
<link rel="preload" href="https://<%= env.PREFIX %>.<%= env.MF_SYLLABUS_DOMAIN %>/assets/style.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
56+
<noscript><link rel="stylesheet" href="https://<%= env.PREFIX %>.<%= env.MF_SYLLABUS_DOMAIN %>/assets/style.css"></noscript>
57+
<link rel="preload" href="https://<%= env.PREFIX %>.<%= env.MF_CAMPUS_DOMAIN %>/assets/style.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
58+
<noscript><link rel="stylesheet" href="https://<%= env.PREFIX %>.<%= env.MF_CAMPUS_DOMAIN %>/assets/style.css"></noscript>
5959
<% } else { %>
6060
<script type="importmap-shim" defer>
6161
{

‎root/vite.config.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ import reactRefresh from "@vitejs/plugin-react-refresh";
44
import dynamicImport from "vite-plugin-dynamic-import";
55
import { VitePWA } from "vite-plugin-pwa";
66
const path = require("path");
7-
const { parsed } = require("dotenv").config({
8-
path: path.resolve(__dirname, "./src/.env"),
9-
});
107

118
export default defineConfig(({ mode }) => {
9+
const env = loadEnv(mode, process.cwd(), "");
1210
return {
1311
root: "./src",
1412
publicDir: "assets",
@@ -34,8 +32,8 @@ export default defineConfig(({ mode }) => {
3432
external:
3533
mode === "staging"
3634
? [
37-
`https://${parsed.PREFIX}.${parsed.MF_SYLLABUS_DOMAIN}/assets/style.css`,
38-
`https://${parsed.PREFIX}.${parsed.MF_CAMPUS_DOMAIN}/assets/style.css`,
35+
`https://${env.PREFIX}.${env.MF_SYLLABUS_DOMAIN}/assets/style.css`,
36+
`https://${env.PREFIX}.${env.MF_CAMPUS_DOMAIN}/assets/style.css`,
3937
]
4038
: mode === "production"
4139
? ["/syllabus/assets/style.css", "/campus/assets/style.css"]
@@ -59,7 +57,7 @@ export default defineConfig(({ mode }) => {
5957
isLocal: config.mode === "development",
6058
isDev: config.mode === "staging",
6159
standalone: false,
62-
...parsed,
60+
env,
6361
})),
6462
reactRefresh(),
6563
dynamicImport(),

‎syllabus/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"@babel/preset-typescript": "7.16.7",
2525
"@babel/runtime": "7.17.2",
2626
"@semantic-ui-react/css-patch": "1.0.0",
27+
"@types/node": "17.0.21",
2728
"@types/react-s-alert": "^1.3.3",
2829
"@types/systemjs": "6.1.1",
2930
"@typescript-eslint/eslint-plugin": "5.14.0",

‎syllabus/pnpm-lock.yaml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎syllabus/vite.config.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@ import { defineConfig, loadEnv } from "vite";
22
import reactRefresh from "@vitejs/plugin-react-refresh";
33
import dynamicImport from "vite-plugin-dynamic-import";
44
const path = require("path");
5-
const { parsed } = require("dotenv").config({
6-
path: path.resolve(__dirname, "./src/.env"),
7-
});
85

96
export default defineConfig(({ mode }) => {
7+
const env = loadEnv(mode, process.cwd(), "");
108
const publicAssetsBaseUrl =
119
mode === "production"
1210
? "/syllabus/"
1311
: mode === "staging"
14-
? `https://${parsed.MF_DOMAIN_WITH_PREFIX}/`
12+
? `https://${env.MF_DOMAIN_WITH_PREFIX}/`
1513
: "http://localhost:8080/";
1614

1715
return {

0 commit comments

Comments
 (0)