Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mdn/yari
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b9bfa01fa28f3287a61a1c8db6cd0d93399af979
Choose a base ref
..
head repository: mdn/yari
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 19a23d2b68e1a2d2139a2050f2e79d16cca76a2e
Choose a head ref
Showing with 8,954 additions and 13,595 deletions.
  1. +2 −0 .eslintignore
  2. +0 −6 .eslintrc.cjs
  3. +0 −24 .github/dependabot.yml
  4. +0 −81 .github/workflows/aws-lambda.yml
  5. +0 −7 .github/workflows/dev-build.yml
  6. +117 −20 .github/workflows/prod-build.yml
  7. +119 −22 .github/workflows/stage-build.yml
  8. +0 −15 .github/workflows/testing.yml
  9. +0 −1 .github/workflows/xyz-build.yml
  10. +2 −0 .prettierignore
  11. +1 −1 client/pwa/package.json
  12. +4 −4 client/pwa/yarn.lock
  13. +5 −0 cloud-function/.env-dist
  14. +19 −0 cloud-function/.gcloudignore
  15. +7 −0 cloud-function/.gitignore
  16. +2 −0 cloud-function/Procfile
  17. +54 −0 cloud-function/README.md
  18. +3,587 −0 cloud-function/package-lock.json
  19. +58 −0 cloud-function/package.json
  20. +85 −0 cloud-function/src/app.ts
  21. +12 −8 deployer/aws-lambda/content-origin-request/build.js → cloud-function/src/build-redirects.ts
  22. +5 −0 cloud-function/src/constants.ts
  23. +79 −0 cloud-function/src/env.ts
  24. +79 −0 cloud-function/src/handlers/handle-stripe-plans.ts
  25. +13 −0 cloud-function/src/handlers/proxy-api.ts
  26. +46 −0 cloud-function/src/handlers/proxy-content.ts
  27. +99 −0 cloud-function/src/handlers/proxy-kevel.ts
  28. +12 −0 cloud-function/src/handlers/proxy-telemetry.ts
  29. +104 −0 cloud-function/src/headers.ts
  30. +12 −0 cloud-function/src/index.ts
  31. +19 −0 cloud-function/src/middlewares/lowercase-pathname.ts
  32. +5 −0 cloud-function/src/middlewares/not-found.ts
  33. +32 −0 cloud-function/src/middlewares/redirect-fundamental.ts
  34. +28 −0 cloud-function/src/middlewares/redirect-leading-slash.ts
  35. +54 −0 cloud-function/src/middlewares/redirect-locale.ts
  36. +47 −0 cloud-function/src/middlewares/redirect-moved-pages.ts
  37. +70 −0 cloud-function/src/middlewares/redirect-trailing-slash.ts
  38. +15 −0 cloud-function/src/middlewares/require-origin.ts
  39. +34 −0 cloud-function/src/middlewares/resolve-index-html.ts
  40. +57 −0 cloud-function/src/proxy.ts
  41. +37 −0 cloud-function/src/stripe-plans/index.ts
  42. +1,916 −1,912 .../aws-lambda/mdn-stripe-price-ids/plans-prod-lookup.json → cloud-function/src/stripe-plans/prod.ts
  43. +1,917 −1,913 ...ws-lambda/mdn-stripe-price-ids/plans-stage-lookup.json → cloud-function/src/stripe-plans/stage.ts
  44. +44 −0 cloud-function/src/utils.ts
  45. +30 −0 cloud-function/tsconfig.json
  46. +0 −24 deployer/README.md
  47. +0 −99 deployer/aws-lambda/README.md
  48. +0 −1 deployer/aws-lambda/content-origin-request/.gitignore
  49. +0 −257 deployer/aws-lambda/content-origin-request/index.js
  50. +0 −37 deployer/aws-lambda/content-origin-request/package.json
  51. +0 −1 deployer/aws-lambda/content-origin-request/redirects.json
  52. +0 −51 deployer/aws-lambda/content-origin-request/yarn.lock
  53. +0 −71 deployer/aws-lambda/content-origin-response/index.js
  54. +0 −22 deployer/aws-lambda/content-origin-response/package.json
  55. +0 −6 deployer/aws-lambda/content-origin-response/yarn.lock
  56. +0 −1 deployer/aws-lambda/kevel/.gitignore
  57. +0 −19 deployer/aws-lambda/kevel/build.js
  58. +0 −151 deployer/aws-lambda/kevel/index.js
  59. +0 −31 deployer/aws-lambda/kevel/package.json
  60. +0 −116 deployer/aws-lambda/kevel/yarn.lock
  61. +0 −88 deployer/aws-lambda/mdn-stripe-price-ids/index.js
  62. +0 −26 deployer/aws-lambda/mdn-stripe-price-ids/package.json
  63. +0 −1,159 deployer/aws-lambda/mdn-stripe-price-ids/tests/__mocks__/plans-prod-lookup-test.json
  64. +0 −1,307 deployer/aws-lambda/mdn-stripe-price-ids/tests/__mocks__/plans-stage-lookup-test.json
  65. +0 −129 deployer/aws-lambda/mdn-stripe-price-ids/tests/handler.test.js
  66. +0 −2,374 deployer/aws-lambda/mdn-stripe-price-ids/yarn.lock
  67. +0 −26 deployer/aws-lambda/tests/package.json
  68. +0 −131 deployer/aws-lambda/tests/server.js
  69. +0 −307 deployer/aws-lambda/tests/server.test.js
  70. +0 −2,768 deployer/aws-lambda/tests/yarn.lock
  71. +8 −8 deployer/poetry.lock
  72. +1 −1 deployer/pyproject.toml
  73. +0 −3 deployer/src/deployer/constants.py
  74. +0 −34 deployer/src/deployer/main.py
  75. +0 −248 deployer/src/deployer/update_lambda_functions.py
  76. +0 −9 kumascript/macros/AddonSidebar.ejs
  77. +30 −7 libs/locale-utils/index.js
  78. +5 −1 libs/locale-utils/package.json
  79. +13 −0 libs/locale-utils/yarn.lock
  80. +8 −7 package.json
  81. +61 −61 yarn.lock
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -6,6 +6,8 @@ libs/
client/public/service-worker.js
client/public/
client/src/document/*.js
cloud-function/src/internal/
cloud-function/**/*.js
filecheck/*.js
mdn/content/
tool/*.js
6 changes: 0 additions & 6 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -65,12 +65,6 @@ module.exports = {
"no-process-exit": 0,
},
},
{
files: ["deployer/aws-lambda/**/*.js"],
parserOptions: {
sourceType: "module",
},
},
{
files: ["ssr/**/*.js"],
parserOptions: {
24 changes: 0 additions & 24 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -37,30 +37,6 @@ updates:
interval: daily
open-pull-requests-limit: 10

- package-ecosystem: npm
directory: "/deployer/aws-lambda/mdn-stripe-price-ids"
schedule:
interval: daily
open-pull-requests-limit: 10

- package-ecosystem: npm
directory: "/deployer/aws-lambda/content-origin-request"
schedule:
interval: daily
open-pull-requests-limit: 10

- package-ecosystem: npm
directory: "/deployer/aws-lambda/content-origin-response"
schedule:
interval: daily
open-pull-requests-limit: 10

- package-ecosystem: npm
directory: "/deployer/aws-lambda/tests"
schedule:
interval: daily
open-pull-requests-limit: 10

# This forces the Dependabot commit messages to conform to something
# our auto-merge workflow can always cope with.
# See https://github.com/ahmadnassri/action-dependabot-auto-merge/issues/31#issuecomment-718779806
81 changes: 0 additions & 81 deletions .github/workflows/aws-lambda.yml

This file was deleted.

7 changes: 0 additions & 7 deletions .github/workflows/dev-build.yml
Original file line number Diff line number Diff line change
@@ -174,7 +174,6 @@ jobs:

DEPLOYER_BUCKET_NAME: mdn-content-dev
DEPLOYER_BUCKET_PREFIX: ${{ github.event.inputs.deployment_prefix }}
DEPLOYER_DISTRIBUTION_ID: E9813D0RN1QZI
DEPLOYER_LOG_EACH_SUCCESSFUL_UPLOAD: ${{ github.event.inputs.log_each_successful_upload }}

AWS_ACCESS_KEY_ID: ${{ secrets.DEPLOYER_STAGE_AND_DEV_AWS_ACCESS_KEY_ID }}
@@ -200,12 +199,6 @@ jobs:
echo "DEPLOYER_BUCKET_PREFIX=$DEPLOYER_BUCKET_PREFIX"
poetry run deployer upload --prune ../client/build
poetry run deployer update-lambda-functions ./aws-lambda
# TODO
# Execute command to tell the Dev CloudFront distribution to use the
# latest and greatest *version* of the updated lambda functions.
# (Or, make it an optional flag to the `update-lambda-functions` command)
poetry run deployer search-index ../client/build
- name: Configure AWS Credentials
Loading