Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deployment #873

Merged
merged 11 commits into from
Sep 13, 2024
Merged

Deployment #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e528c6a
Merge pull request #864 from serlo/production
kulla Sep 8, 2024
ea01603
chore(deps-dev): bump @sentry/types from 8.28.0 to 8.29.0
dependabot[bot] Sep 9, 2024
43b68be
chore(deps-dev): bump @typescript-eslint/eslint-plugin
dependabot[bot] Sep 9, 2024
d0c72ce
Merge pull request #865 from serlo/dependabot/npm_and_yarn/sentry/typ…
kulla Sep 10, 2024
da385e4
Merge pull request #867 from serlo/dependabot/npm_and_yarn/typescript…
kulla Sep 10, 2024
46ff2f3
chore(deps-dev): bump @typescript-eslint/parser from 8.4.0 to 8.5.0
dependabot[bot] Sep 10, 2024
27928ee
feat(redirects): allow de version of /editor
elbotho Sep 11, 2024
b5c3f99
chore(deps): bump path-to-regexp from 6.2.1 to 6.3.0
dependabot[bot] Sep 12, 2024
b1cc2a0
Merge pull request #871 from serlo/de-editor-page
elbotho Sep 13, 2024
63129c9
Merge pull request #872 from serlo/dependabot/npm_and_yarn/path-to-re…
elbotho Sep 13, 2024
c82adf1
Merge pull request #868 from serlo/dependabot/npm_and_yarn/typescript…
elbotho Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file renamed ...ypes-npm-8.28.0-a9f4e3d1e9-2f2ffc3104.zip → ...ypes-npm-8.29.0-38b0503c3b-672c0ca045.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...lugin-npm-8.4.0-9775d2ac91-62009bfd28.zip → ...lugin-npm-8.5.0-b5b74414cb-7cecb0b84c.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/@typescript-eslint-parser-npm-8.4.0-692d5060ee-4c91ac5e7e.zip
View file
Open in desktop
Binary file not shown.
Binary file added .yarn/cache/@typescript-eslint-parser-npm-8.5.0-bb2fdd364d-e53f0a05d8.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...nager-npm-8.4.0-3a08c0f4c1-0a513bcaf3.zip → ...nager-npm-8.5.0-98a72dd38c-ee21059965.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...utils-npm-8.4.0-97c51ed5f1-5fec2aa96d.zip → ...utils-npm-8.5.0-c4d538f287-ad06f073d8.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...types-npm-8.4.0-c459014452-d1d486503e.zip → ...types-npm-8.5.0-61928050e0-74a7ec57f8.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...stree-npm-8.4.0-cebd835d51-6ae4a2fb8c.zip → ...stree-npm-8.5.0-13fbe3a735-e8a4d2fc56.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...utils-npm-8.4.0-24bc69642f-dc49756118.zip → ...utils-npm-8.5.0-a83280b386-d91d4f29aa.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...-keys-npm-8.4.0-7aa853e361-000f375aaa.zip → ...-keys-npm-8.5.0-52d5311a87-dbba7071e9.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/path-to-regexp-npm-6.2.1-8ebfe03654-f0227af828.zip
View file
Open in desktop
Binary file not shown.
Binary file added .yarn/cache/path-to-regexp-npm-6.3.0-ee2cdde576-eca78602e6.zip
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
"@cloudflare/workers-types": "^4.20240903.0",
"@iarna/toml": "^2.2.5",
"@jest/globals": "^29.7.0",
"@sentry/types": "^8.28.0",
"@sentry/types": "^8.29.0",
"@testing-library/jest-dom": "^6.5.0",
"@types/iarna__toml": "^2.0.5",
"@types/jest": "^29.5.12",
"@typescript-eslint/eslint-plugin": "^8.4.0",
"@typescript-eslint/parser": "^8.4.0",
"@typescript-eslint/eslint-plugin": "^8.5.0",
"@typescript-eslint/parser": "^8.5.0",
"cross-env": "^7.0.3",
"depcheck": "^1.4.7",
"eslint": "^8.57.0",
Expand Down
5 changes: 3 additions & 2 deletions src/redirects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ export function redirects(request: Request, env: CFEnvironment) {
}

if (
(!isInstance(url.subdomain) || url.subdomain !== Instance.En) &&
url.pathnameWithoutTrailingSlash === '/editor'
url.pathnameWithoutTrailingSlash === '/editor' &&
(!isInstance(url.subdomain) ||
![Instance.En, Instance.De].includes(url.subdomain))
) {
return Response.redirect('https://en.serlo.org/editor', 301)
}
Expand Down
120 changes: 60 additions & 60 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,10 +1264,10 @@ __metadata:
languageName: node
linkType: hard

"@sentry/types@npm:^8.28.0":
version: 8.28.0
resolution: "@sentry/types@npm:8.28.0"
checksum: 2f2ffc31042e17492c4869202bb67e5bd4c7dd136dad7e0e49d1c5c6cc5ad41eee3b9bc6e156db24136ea90fc8827a4a1bd185324b586a6488ebc94d9d7a4988
"@sentry/types@npm:^8.29.0":
version: 8.29.0
resolution: "@sentry/types@npm:8.29.0"
checksum: 672c0ca045237c9c9190ecd2e9dd811353126da69779e06dd7d5d7b6c054b75b054d1cd69ef68722e203fc6f66e3ffff7404d7a59ec18578afc2e7cc006b71f6
languageName: node
linkType: hard

Expand All @@ -1287,12 +1287,12 @@ __metadata:
"@cloudflare/workers-types": ^4.20240903.0
"@iarna/toml": ^2.2.5
"@jest/globals": ^29.7.0
"@sentry/types": ^8.28.0
"@sentry/types": ^8.29.0
"@testing-library/jest-dom": ^6.5.0
"@types/iarna__toml": ^2.0.5
"@types/jest": ^29.5.12
"@typescript-eslint/eslint-plugin": ^8.4.0
"@typescript-eslint/parser": ^8.4.0
"@typescript-eslint/eslint-plugin": ^8.5.0
"@typescript-eslint/parser": ^8.5.0
cross-env: ^7.0.3
depcheck: ^1.4.7
eslint: ^8.57.0
Expand Down Expand Up @@ -1555,15 +1555,15 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/eslint-plugin@npm:^8.4.0":
version: 8.4.0
resolution: "@typescript-eslint/eslint-plugin@npm:8.4.0"
"@typescript-eslint/eslint-plugin@npm:^8.5.0":
version: 8.5.0
resolution: "@typescript-eslint/eslint-plugin@npm:8.5.0"
dependencies:
"@eslint-community/regexpp": ^4.10.0
"@typescript-eslint/scope-manager": 8.4.0
"@typescript-eslint/type-utils": 8.4.0
"@typescript-eslint/utils": 8.4.0
"@typescript-eslint/visitor-keys": 8.4.0
"@typescript-eslint/scope-manager": 8.5.0
"@typescript-eslint/type-utils": 8.5.0
"@typescript-eslint/utils": 8.5.0
"@typescript-eslint/visitor-keys": 8.5.0
graphemer: ^1.4.0
ignore: ^5.3.1
natural-compare: ^1.4.0
Expand All @@ -1574,25 +1574,25 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 62009bfd28d489cd78a59997b16c6b0d2ea4ac3e485ac3c5f1afb4934a5396e439241778441a753a2a96b07aaa7bd200fb8989368febf749fc669d8c8f7e5f0c
checksum: 7cecb0b84c03940bf680ad66f823f4220811ebc5ed6f30588c2a64a41bab24b5bbfcefdace4b5bc11256fb145ece15459ad1ee1f9c4d3e7beff21ccc7a529b43
languageName: node
linkType: hard

"@typescript-eslint/parser@npm:^8.4.0":
version: 8.4.0
resolution: "@typescript-eslint/parser@npm:8.4.0"
"@typescript-eslint/parser@npm:^8.5.0":
version: 8.5.0
resolution: "@typescript-eslint/parser@npm:8.5.0"
dependencies:
"@typescript-eslint/scope-manager": 8.4.0
"@typescript-eslint/types": 8.4.0
"@typescript-eslint/typescript-estree": 8.4.0
"@typescript-eslint/visitor-keys": 8.4.0
"@typescript-eslint/scope-manager": 8.5.0
"@typescript-eslint/types": 8.5.0
"@typescript-eslint/typescript-estree": 8.5.0
"@typescript-eslint/visitor-keys": 8.5.0
debug: ^4.3.4
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 4c91ac5e7e276a8e216971dfc525c9864250e2cc37f7a476290fc09ff7e646d332dedf52481dc69f7a78611f3709f032f8d64550a88cd1febfa9f009f3b3e564
checksum: e53f0a05d8167673d8c9ce7ca22fbd673bb4910e69a96a084cf1dac22555e04d00774533de5bdb3a6bf72f8706fa5f414ee5b398646b6651ba0fd2e875ba3c8a
languageName: node
linkType: hard

Expand All @@ -1606,28 +1606,28 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:8.4.0":
version: 8.4.0
resolution: "@typescript-eslint/scope-manager@npm:8.4.0"
"@typescript-eslint/scope-manager@npm:8.5.0":
version: 8.5.0
resolution: "@typescript-eslint/scope-manager@npm:8.5.0"
dependencies:
"@typescript-eslint/types": 8.4.0
"@typescript-eslint/visitor-keys": 8.4.0
checksum: 0a513bcaf35dbee789bff6ca9cbc8f237b2efa85347bda17de3c66a35e913790b8e69b7ad824eeebd6bb9e218cd8b696da8901f10bf0e9107a8ed19072f86152
"@typescript-eslint/types": 8.5.0
"@typescript-eslint/visitor-keys": 8.5.0
checksum: ee210599652cd21df39467c2b0eeecf97fceb13cf3402e2c11eb47ee4fe1ec9caacba7dedc0917a62febd607bd3517c6ff3a179074c7d2ac4db412d3ea7f392c
languageName: node
linkType: hard

"@typescript-eslint/type-utils@npm:8.4.0":
version: 8.4.0
resolution: "@typescript-eslint/type-utils@npm:8.4.0"
"@typescript-eslint/type-utils@npm:8.5.0":
version: 8.5.0
resolution: "@typescript-eslint/type-utils@npm:8.5.0"
dependencies:
"@typescript-eslint/typescript-estree": 8.4.0
"@typescript-eslint/utils": 8.4.0
"@typescript-eslint/typescript-estree": 8.5.0
"@typescript-eslint/utils": 8.5.0
debug: ^4.3.4
ts-api-utils: ^1.3.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 5fec2aa96d1d5dcad1cbaea967d0aae978d872b9659d943f21a857bedce8ac9385e1e30f051c34154990a7d9da611cf84107d4ec5c23924c8db4337d93e79d14
checksum: ad06f073d8d4d9220e97d0604da91f7f9b0ed8210888496b37348966d962136656fe4c2e650f0c21f8b551cd27c3b93893e80d7277d9526d29faf875c83481c1
languageName: node
linkType: hard

Expand All @@ -1638,10 +1638,10 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/types@npm:8.4.0":
version: 8.4.0
resolution: "@typescript-eslint/types@npm:8.4.0"
checksum: d1d486503e10e98bf124931e83d83e82cba1690d846190a8d196137d6c00ccbe47e7b84cc0b86cb3daffaaca22d32df5694ac0bcb28812139855b427857751f4
"@typescript-eslint/types@npm:8.5.0":
version: 8.5.0
resolution: "@typescript-eslint/types@npm:8.5.0"
checksum: 74a7ec57f867f02e1c957763a0db3f0f29d41293abb0fc1e067f4de404c0c4e07d7126fff7a10a4e1ccb9ebd45351dd7709dad42367a9defaa9a411ed1b8e29d
languageName: node
linkType: hard

Expand All @@ -1664,12 +1664,12 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:8.4.0":
version: 8.4.0
resolution: "@typescript-eslint/typescript-estree@npm:8.4.0"
"@typescript-eslint/typescript-estree@npm:8.5.0":
version: 8.5.0
resolution: "@typescript-eslint/typescript-estree@npm:8.5.0"
dependencies:
"@typescript-eslint/types": 8.4.0
"@typescript-eslint/visitor-keys": 8.4.0
"@typescript-eslint/types": 8.5.0
"@typescript-eslint/visitor-keys": 8.5.0
debug: ^4.3.4
fast-glob: ^3.3.2
is-glob: ^4.0.3
Expand All @@ -1679,21 +1679,21 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 6ae4a2fb8c6066c9a893e4bd6b741e8ff45a4f17178d5e13dea41c414fa0f141f93f1b412c0a683aeb209c4e5781d4380bba51c513d439c6432136ab8823c83c
checksum: e8a4d2fc560ab9084c4cafa7933ce17ca9906c88610282507a54c509dea4c03c00182880e34396cfb3b643264d032620dfe14ceba7cc03022ad0fd4213c5548d
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:8.4.0":
version: 8.4.0
resolution: "@typescript-eslint/utils@npm:8.4.0"
"@typescript-eslint/utils@npm:8.5.0":
version: 8.5.0
resolution: "@typescript-eslint/utils@npm:8.5.0"
dependencies:
"@eslint-community/eslint-utils": ^4.4.0
"@typescript-eslint/scope-manager": 8.4.0
"@typescript-eslint/types": 8.4.0
"@typescript-eslint/typescript-estree": 8.4.0
"@typescript-eslint/scope-manager": 8.5.0
"@typescript-eslint/types": 8.5.0
"@typescript-eslint/typescript-estree": 8.5.0
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
checksum: dc4975611815e8da8b54ed5fb4faa7a47a2f1d06c7df509c08b8d5603baf5eda3d56a02193955fce33f2ca7dafbb053610e9c7bd889799a1f6077b7d99a08cde
checksum: d91d4f29aa3275e35734dbf84dfdb2e0e5557c2ed4181e760b3d9319379f19295a79d223b06f5f3583e4de80938dfe47814a11b7fd66a737b5ca6bbe6a555632
languageName: node
linkType: hard

Expand Down Expand Up @@ -1721,13 +1721,13 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:8.4.0":
version: 8.4.0
resolution: "@typescript-eslint/visitor-keys@npm:8.4.0"
"@typescript-eslint/visitor-keys@npm:8.5.0":
version: 8.5.0
resolution: "@typescript-eslint/visitor-keys@npm:8.5.0"
dependencies:
"@typescript-eslint/types": 8.4.0
"@typescript-eslint/types": 8.5.0
eslint-visitor-keys: ^3.4.3
checksum: 000f375aaad20343d74cb71e3cf9295f60a0f9f5bc07bd15883bffcc3f7e25b69bb48b21f0cbb2805588a1bc309b9b9fd1162028872ee79c553c843bece6c9ac
checksum: dbba7071e9723d0e525d8b350834d95699037e9e7ba9cf2b3b4fb6cf3fd47072869874f665daca54bc084c910a4ae0acfd5670625a4cc62a173662b09f92e79e
languageName: node
linkType: hard

Expand Down Expand Up @@ -6455,9 +6455,9 @@ __metadata:
linkType: hard

"path-to-regexp@npm:^6.2.0":
version: 6.2.1
resolution: "path-to-regexp@npm:6.2.1"
checksum: f0227af8284ea13300f4293ba111e3635142f976d4197f14d5ad1f124aebd9118783dd2e5f1fe16f7273743cc3dbeddfb7493f237bb27c10fdae07020cc9b698
version: 6.3.0
resolution: "path-to-regexp@npm:6.3.0"
checksum: eca78602e6434a1b6799d511d375ec044e8d7e28f5a48aa5c28d57d8152fb52f3fc62fb1cfc5dfa2198e1f041c2a82ed14043d75740a2fe60e91b5089a153250
languageName: node
linkType: hard

Expand Down