Skip to content

Commit

Permalink
update built-in web clients (4.0.0-beta9)
Browse files Browse the repository at this point in the history
  • Loading branch information
vladimiry committed Feb 19, 2020
1 parent b57d011 commit 5494933
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
6 changes: 5 additions & 1 deletion scripts/prepare-webclient/protonmail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const folderAsDomainEntries: Array<FolderAsDomainEntry<{
repoType: "WebClient",
folderAsDomainEntries,
flows: {
build: async ({repoDir: cwd, folderAsDomainEntry}) => {
async build({repoDir: cwd, folderAsDomainEntry}) {
const {configApiParam} = await configure(
// TODO proton-v4: drop "envFileName" parameter when proton moves "WebClient" to "proton-pack" building
{cwd, envFileName: "./env/env.json", repoType: "WebClient"},
Expand Down Expand Up @@ -109,6 +109,10 @@ const folderAsDomainEntries: Array<FolderAsDomainEntry<{
`,
);

// TODO drop "./node_modules/proton-translations" dir creating
// https://github.com/ProtonMail/WebClient/issues/158#issuecomment-588103753
await execShell(["npx", ["make-dir-cli", "./node_modules/proton-translations"], {cwd}]);

await execShell(["npm", ["run", "build", "--", "--api", configApiParam], {cwd}]);

if (!hasSeenOboardingModalSuppressor.isReplaced()) {
Expand Down
8 changes: 4 additions & 4 deletions src/shared/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ export const PROVIDER_REPOS: ReadonlyDeep<Record<"WebClient" | "proton-mail-sett
repoRelativeDistDir: "./build",
baseDir: "", // TODO define model as {baseDir?: string} instead of using empty string value
repo: "https://github.com/ProtonMail/WebClient.git",
commit: "f96be268c0117e6556092c3fbc5b6c379d716032",
version: "4.0.0-beta8",
commit: "4d751fc3ec902a33e14a81076292d14174047a6d",
version: "4.0.0-beta9",
protonPackAppConfig: {
// TODO proton-v4: make sure this value comes to the build after 4.0.0-beta7+ update
// currently it's hadrcoded in the WebClient code
Expand All @@ -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: "3f1a1acd7f18c97f3a7c872a9d66e3d95f83acde",
commit: "e85825885138b0eab1de63785abe12072c004389",
version: "unknown",
protonPackAppConfig: {
clientId: "WebMailSettings",
Expand All @@ -93,7 +93,7 @@ export const PROVIDER_REPOS: ReadonlyDeep<Record<"WebClient" | "proton-mail-sett
repoRelativeDistDir: "./dist",
baseDir: "contacts",
repo: "https://github.com/ProtonMail/proton-contacts.git",
commit: "417c4195504473c12ff046474e135f21749c6903",
commit: "3a6fee911fea8a74e784e23e43de431324fb61b3",
version: "unknown",
protonPackAppConfig: {
clientId: "WebContacts",
Expand Down

0 comments on commit 5494933

Please sign in to comment.