diff --git a/apps/accounts/package.json b/apps/accounts/package.json index 40c6472e2..3136b0e80 100644 --- a/apps/accounts/package.json +++ b/apps/accounts/package.json @@ -7,8 +7,5 @@ "@ente/accounts": "*", "@ente/eslint-config": "*", "@ente/shared": "*" - }, - "devDependencies": { - "@types/node": "^14.6.4" } } diff --git a/apps/photos/package.json b/apps/photos/package.json index 7e1636e75..1a088c99d 100644 --- a/apps/photos/package.json +++ b/apps/photos/package.json @@ -66,7 +66,6 @@ "@next/bundle-analyzer": "^14.1", "@types/bs58": "^4.0.1", "@types/leaflet": "^1.9.3", - "@types/node": "^14.6.4", "@types/photoswipe": "^4.1.1", "@types/react-collapse": "^5.0.1", "@types/react-datepicker": "^4.15.0", diff --git a/docs/deploy.md b/docs/deploy.md index 8838204c0..aff3dbd59 100644 --- a/docs/deploy.md +++ b/docs/deploy.md @@ -32,11 +32,32 @@ see the Cloudflare dashboard for the latest: - _testing.ente.io_: `main` - _web.ente.io_: `photos-release` - _auth.ente.io_: `auth-release` +- _accounts.ente.io_: `accounts-release` +- _cast.ente.io_: `cast-release` Thus to trigger a, say, production deployment of the photos app, we can open and merge a PR into the `photos-release` branch. Cloudflare will then build and deploy the code to _web.ente.io_. +Apart from this, there are also some subdomains: + +- `albums.ente.io` is a CNAME alias to the production deployment + (`web.ente.io`). However, when the code detects that it is being served from + `albums.ente.io`, it redirects to the `/shared-albums` page (Enhancement: + serve it as a separate app with a smaller bundle size). + +- `payments.ente.io` and `family.ente.io` are currently in a separate + repositories (Enhancement: bring them in here). + +In Cloudflare Pages setting the following environment variables are defined: + +- `NODE_VERSION`: Determines which version of Node is used when we do `yarn + build:foo`. Currently this is set to `20.10.0`. The major version here should + match that of `@types/node` in our dev dependencies. + +- `SENTRY_AUTH_TOKEN`: An encrypted environment variable that is used by the + Sentry Webpack Plugin to upload sourcemaps during the build. + ## Adding a new app 1. Add a mapping in `scripts/deploy.sh`. diff --git a/packages/next/package.json b/packages/next/package.json index 5f40a32df..03f2c17b5 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -7,6 +7,7 @@ "next": "^14.1" }, "devDependencies": { - "@/build-config": "*" + "@/build-config": "*", + "@types/node": "^20" } } diff --git a/yarn.lock b/yarn.lock index a51ed7f96..be4cf6488 100644 --- a/yarn.lock +++ b/yarn.lock @@ -826,18 +826,13 @@ resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a" integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA== -"@types/node@*": +"@types/node@*", "@types/node@^20": version "20.11.20" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.20.tgz#f0a2aee575215149a62784210ad88b3a34843659" integrity sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg== dependencies: undici-types "~5.26.4" -"@types/node@^14.6.4": - version "14.18.63" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b" - integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ== - "@types/offscreencanvas@~2019.3.0": version "2019.3.0" resolved "https://registry.yarnpkg.com/@types/offscreencanvas/-/offscreencanvas-2019.3.0.tgz#3336428ec7e9180cf4566dfea5da04eb586a6553"