-
Notifications
You must be signed in to change notification settings - Fork 96
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
101 additions
and
460 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,60 +1,60 @@ | ||
{ | ||
"proton-mail": [ | ||
"common.patch", | ||
"url-2.patch", | ||
"constants-4.patch", | ||
"url-3.patch", | ||
"constants-5.patch", | ||
"sentry-8.patch", | ||
"pack-api-arg-3.patch", | ||
"pack-webpack-5.patch", | ||
"session-storage-3.patch", | ||
"link-handler-5.patch", | ||
"embedded-verification-1.patch", | ||
"pack-api-arg-4.patch", | ||
"pack-webpack-6.patch", | ||
"session-storage-4.patch", | ||
"link-handler-6.patch", | ||
"embedded-verification-3.patch", | ||
"proton-mail.patch" | ||
], | ||
"proton-account": [ | ||
"common.patch", | ||
"url-3.patch", | ||
"constants-5.patch", | ||
"sentry-8.patch", | ||
"pack-api-arg-3.patch", | ||
"pack-webpack-5.patch", | ||
"pack-api-arg-4.patch", | ||
"pack-webpack-6.patch", | ||
"session-storage-4.patch", | ||
"link-handler-6.patch", | ||
"embedded-verification-2.patch", | ||
"embedded-verification-3.patch", | ||
"proton-account.patch" | ||
], | ||
"proton-calendar": [ | ||
"common.patch", | ||
"url-2.patch", | ||
"constants-4.patch", | ||
"url-3.patch", | ||
"constants-5.patch", | ||
"sentry-8.patch", | ||
"pack-api-arg-3.patch", | ||
"pack-webpack-5.patch", | ||
"session-storage-3.patch", | ||
"link-handler-5.patch", | ||
"embedded-verification-1.patch" | ||
"session-storage-4.patch", | ||
"link-handler-6.patch", | ||
"embedded-verification-2.patch" | ||
], | ||
"proton-drive": [ | ||
"common.patch", | ||
"url-2.patch", | ||
"constants-4.patch", | ||
"url-3.patch", | ||
"constants-5.patch", | ||
"sentry-8.patch", | ||
"pack-api-arg-3.patch", | ||
"pack-webpack-4.patch", | ||
"session-storage-3.patch", | ||
"link-handler-5.patch", | ||
"embedded-verification-1.patch", | ||
"pack-webpack-5.patch", | ||
"session-storage-4.patch", | ||
"link-handler-6.patch", | ||
"embedded-verification-2.patch", | ||
"proton-drive.patch" | ||
], | ||
"proton-vpn-settings": [ | ||
"common.patch", | ||
"url-2.patch", | ||
"constants-4.patch", | ||
"url-3.patch", | ||
"constants-5.patch", | ||
"sentry-8.patch", | ||
"pack-api-arg-3.patch", | ||
"pack-webpack-5.patch", | ||
"session-storage-3.patch", | ||
"link-handler-5.patch", | ||
"embedded-verification-1.patch" | ||
"pack-api-arg-4.patch", | ||
"pack-webpack-6.patch", | ||
"session-storage-4.patch", | ||
"link-handler-6.patch", | ||
"embedded-verification-3.patch" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/packages/pack/lib/config.js b/packages/pack/lib/config.js | ||
index b6484f719..a8ebc7fc0 100644 | ||
--- a/packages/pack/lib/config.js | ||
+++ b/packages/pack/lib/config.js | ||
@@ -129,7 +129,7 @@ const getConfigFile = ({ buildData, appData }) => { | ||
export const BRANCH = '${buildData.branch}'; | ||
export const DATE_VERSION = '${buildData.date}'; | ||
export const APP_NAME = '${appData.appName}'; | ||
- export const API_URL = '${(!appData.apiProxy && appData.api) || '/api'}'; | ||
+ export const API_URL = '${appData.api}'; | ||
export const LOCALES = ${JSON.stringify(LOCALES)}; | ||
export const VERSION_PATH = '${appData.publicPath}assets/version.json'; | ||
export const SENTRY_DSN = '${appData.sentryDsn}'; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
diff --git a/packages/pack/webpack.config.js b/packages/pack/webpack.config.js | ||
index 9fdd56f70..3a7300257 100644 | ||
--- a/packages/pack/webpack.config.js | ||
+++ b/packages/pack/webpack.config.js | ||
@@ -15,7 +15,7 @@ const getConfig = (env) => { | ||
api: env.api, | ||
appMode: env.appMode || 'standalone', | ||
featureFlags: env.featureFlags || '', | ||
- writeSRI: env.writeSri !== 'false', | ||
+ writeSRI: false, | ||
browserslist: isProduction | ||
? `> 0.5%, not IE 11, Firefox ESR, Safari 11` | ||
: 'last 1 chrome version, last 1 firefox version, last 1 safari version', | ||
@@ -33,7 +33,20 @@ const getConfig = (env) => { | ||
logical: env.logical || false, | ||
}; | ||
|
||
- return { | ||
+ return (() => { | ||
+ const file = path.resolve("./proton.config.js"); | ||
+ if (require("fs").existsSync(file)) { | ||
+ console.log( | ||
+ /*reset:*/"\x1b[0m" + | ||
+ /*yellow:*/"\x1b[33m" + | ||
+ ">>>" + | ||
+ /*reset:*/"\x1b[0m", + | ||
+ `Found ${file}, extend the config`, | ||
+ ) | ||
+ return require(file); | ||
+ } | ||
+ return (value) => value; | ||
+ })()({ | ||
target: `browserslist:${options.browserslist}`, | ||
mode: options.isProduction ? 'production' : 'development', | ||
bail: options.isProduction, | ||
@@ -120,7 +133,7 @@ const getConfig = (env) => { | ||
}, | ||
}), | ||
}, | ||
- }; | ||
+ }); | ||
}; | ||
|
||
module.exports = getConfig; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.