Skip to content

Commit

Permalink
update built-in web clients
Browse files Browse the repository at this point in the history
* proton-mail-settings: picking fixed "package-lock.json"
  • Loading branch information
vladimiry committed Feb 20, 2020
1 parent e497d91 commit 389c56a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
10 changes: 1 addition & 9 deletions scripts/prepare-webclient/protonmail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,19 +139,11 @@ const folderAsDomainEntries: Array<FolderAsDomainEntry<{
flows: {
// TODO proton-v4: remove "npm install" code block
// https://github.com/ProtonMail/WebClient/issues/158
install: repoType === "proton-contacts" || repoType === "proton-mail-settings"
install: repoType === "proton-contacts"
? async ({repoDir}) => {
const npmLockFile = path.join(repoDir, "./package-lock.json");

if (fsExtra.existsSync(npmLockFile)) {
if (repoType === "proton-mail-settings") {
// TODO prefer "npm ci" to "npm install"
// lock file of "proton-mail-settings" project got out of sync state
// so we gave to run "npm install" for now
// https://github.com/ProtonMail/WebClient/issues/158#issuecomment-588252103
await execShell(["npm", ["install"], {cwd: repoDir}]);
return;
}
throw new Error(`"${npmLockFile}" file exists, it's time for switching to "npm ci" call`);
}

Expand Down
2 changes: 1 addition & 1 deletion src/shared/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const PROVIDER_REPOS: ReadonlyDeep<Record<"WebClient" | "proton-mail-sett
repoRelativeDistDir: "./dist",
baseDir: "settings",
repo: "https://github.com/ProtonMail/proton-mail-settings.git",
commit: "41e625d21218f5a5ad767173fce41098e7176458",
commit: "1a7cb9d5b48a0b97eb0eb927dd0c8a65b38ef604",
version: "unknown",
protonPackAppConfig: {
clientId: "WebMailSettings",
Expand Down

0 comments on commit 389c56a

Please sign in to comment.