Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

.envのDEFAULT_ENGINE_INFOSを改行して定義 #794

Merged
merged 4 commits into from
May 2, 2022
Merged

.envのDEFAULT_ENGINE_INFOSを改行して定義 #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee2822d
➕ dependenciesにdotenvを追加
MT224244 Apr 24, 2022
ebd7a69
🔧 DEFAULT_ENGINE_INFOSを改行して定義
MT224244 Apr 24, 2022
0bf3e9f
🩹 開発時にdotenvが動いていないっぽかったので修正
MT224244 Apr 24, 2022
35b4bdd
Merge branch 'main' into dotenv
MT224244 Apr 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
DEFAULT_ENGINE_INFOS=[{"key":"074fc39e-678b-4c13-8916-ffca8d505d1d","executionEnabled":true,"executionFilePath":"run.exe","host":"http://127.0.0.1:50021"}]
DEFAULT_ENGINE_INFOS=`[
{
"key": "074fc39e-678b-4c13-8916-ffca8d505d1d",
"executionEnabled": true,
"executionFilePath": "run.exe",
"host": "http://127.0.0.1:50021"
}
]`
VUE_APP_GTM_CONTAINER_ID=GTM-DUMMY
21 changes: 17 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"ajv": "8.6.2",
"core-js": "3.12.1",
"dayjs": "1.10.7",
"dotenv": "16.0.0",
"electron-log": "4.4.1",
"electron-store": "8.0.0",
"electron-window-state": "5.0.3",
Expand Down
3 changes: 1 addition & 2 deletions src/background.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ process.on("unhandledRejection", (reason) => {

// .envから設定をprocess.envに読み込み
const appDirPath = path.dirname(app.getPath("exe"));
const envPath = path.join(appDirPath, ".env");
dotenv.config({ path: envPath });
dotenv.config({ override: true });

protocol.registerSchemesAsPrivileged([
{ scheme: "app", privileges: { secure: true, standard: true, stream: true } },
Expand Down