Skip to content

Commit 547ea5e

Browse files
committed
Dotenv load .env in prod
1 parent 6c2796c commit 547ea5e

File tree

5 files changed

+22
-2
lines changed

5 files changed

+22
-2
lines changed

.erb/configs/webpack.config.renderer.prod.babel.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
99
import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
1010
import { merge } from 'webpack-merge';
1111
import TerserPlugin from 'terser-webpack-plugin';
12+
import Dotenv from 'dotenv-webpack';
1213
import baseConfig from './webpack.config.base';
1314
import CheckNodeEnv from '../scripts/CheckNodeEnv';
1415
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
@@ -170,6 +171,11 @@ export default merge(baseConfig, {
170171
DEBUG_PROD: false,
171172
}),
172173

174+
new Dotenv({
175+
path: path.join(__dirname, '../../.env'),
176+
systemvars: true,
177+
}),
178+
173179
new MiniCssExtractPlugin({
174180
filename: 'style.css',
175181
}),

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@
157157
"css-loader": "^5.0.1",
158158
"css-minimizer-webpack-plugin": "^2.0.0",
159159
"detect-port": "^1.3.0",
160+
"dotenv-webpack": "^7.0.3",
160161
"electron": "^12.0.2",
161162
"electron-builder": "^22.11.1",
162163
"electron-devtools-installer": "git+https://github.com/MarshallOfSound/electron-devtools-installer.git",

src/base/repositories/AbstractFileRepository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default abstract class AbstractFileRepository<T = any> {
4242
}
4343

4444
public restore(defaultValue: T): T {
45-
console.log(`${this.logPrefix} restore`);
45+
console.log(`${this.logPrefix} restore ${this.filePath}`);
4646
if (fs.existsSync(this.filePath)) {
4747
const data = fs.readFileSync(this.filePath, { encoding: 'utf-8' });
4848
// TODO handle parse error. Backup file with issues and return defaultValue

src/screens/Main.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ const Main = () => {
4040
<Profile />
4141
</Header>
4242
<Switch>
43-
{process.env.GA_UACODE}
4443
<Route path="/hours" component={HoursScreen} />
4544
<Route path="/projects" component={ProjectsScreen} />
4645
<Route path="/dashboard" component={Dashboard} />

yarn.lock

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3931,11 +3931,25 @@ dot-prop@^5.2.0:
39313931
dependencies:
39323932
is-obj "^2.0.0"
39333933

3934+
dotenv-defaults@^2.0.2:
3935+
version "2.0.2"
3936+
resolved "https://registry.yarnpkg.com/dotenv-defaults/-/dotenv-defaults-2.0.2.tgz#6b3ec2e4319aafb70940abda72d3856770ee77ac"
3937+
integrity sha512-iOIzovWfsUHU91L5i8bJce3NYK5JXeAwH50Jh6+ARUdLiiGlYWfGw6UkzsYqaXZH/hjE/eCd/PlfM/qqyK0AMg==
3938+
dependencies:
3939+
dotenv "^8.2.0"
3940+
39343941
dotenv-expand@^5.1.0:
39353942
version "5.1.0"
39363943
resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
39373944
integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
39383945

3946+
dotenv-webpack@^7.0.3:
3947+
version "7.0.3"
3948+
resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-7.0.3.tgz#f50ec3c7083a69ec6076e110566720003b7b107b"
3949+
integrity sha512-O0O9pOEwrk+n1zzR3T2uuXRlw64QxHSPeNN1GaiNBloQFNaCUL9V8jxSVz4jlXXFP/CIqK8YecWf8BAvsSgMjw==
3950+
dependencies:
3951+
dotenv-defaults "^2.0.2"
3952+
39393953
dotenv@10.0.0:
39403954
version "10.0.0"
39413955
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"

0 commit comments

Comments
 (0)