diff --git a/config/dependencies.yaml b/config/dependencies.yaml index dbf0a751d4f..463e35b3489 100644 --- a/config/dependencies.yaml +++ b/config/dependencies.yaml @@ -336,6 +336,7 @@ org: 'rehype-stringify': *rehypeStringify 'remark-copy-linked-files': *remarkCopyLinkedFiles 'remark-gfm': *remarkGfm + 'yaml-loader': 0.8.0 dev: *nextSiteDevDependencies sanity: diff --git a/crowdin.yml b/crowdin.yml index 9335efd4269..dc8e9fae95b 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -6,3 +6,8 @@ files: translation: /packages/i18n/src/locales/%two_letters_code%/**/%original_file_name% - source: /markdown/org/**/en.md translation: /markdown/org/**/%two_letters_code%.md + - source: /sites/org/pages/**/en.yaml + translation: /sites/org/pages/**/%two_letters_code%.yaml + - source: /sites/org/components/**/en.yaml + translation: /sites/org/components/**/%two_letters_code%.yaml + diff --git a/sites/org/package.json b/sites/org/package.json index 317e0c78354..86299c94aad 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -50,7 +50,8 @@ "rehype-slug": "5.1.0", "rehype-stringify": "9.0.3", "remark-copy-linked-files": "https://github.com/joostdecock/remark-copy-linked-files", - "remark-gfm": "3.0.1" + "remark-gfm": "3.0.1", + "yaml-loader": "0.8.0" }, "devDependencies": { "autoprefixer": "10.4.13", diff --git a/sites/org/pages/signup/en.yaml b/sites/org/pages/signup/en.yaml new file mode 100644 index 00000000000..3714b6d3468 --- /dev/null +++ b/sites/org/pages/signup/en.yaml @@ -0,0 +1 @@ +test: ikkel diff --git a/sites/org/pages/signup/i18n.mjs b/sites/org/pages/signup/i18n.mjs new file mode 100644 index 00000000000..4d3d5c4be41 --- /dev/null +++ b/sites/org/pages/signup/i18n.mjs @@ -0,0 +1,5 @@ +import en from './en.yaml' + +export const i18n = { + en, +} diff --git a/sites/org/pages/signup/index.js b/sites/org/pages/signup/index.js index c845cc41a0c..9fbe83fc401 100644 --- a/sites/org/pages/signup/index.js +++ b/sites/org/pages/signup/index.js @@ -9,6 +9,8 @@ import { validateEmail, validateTld } from 'shared/utils.mjs' import SusiWrapper from 'site/components/wrappers/susi.js' import { signUp } from 'shared/backend.mjs' import Spinner from 'shared/components/icons/spinner.js' +// Test for new way of loading translations +import { i18n } from './i18n.mjs' const DarkLink = ({ href, txt }) => ( diff --git a/sites/org/pages/signup/index.json b/sites/org/pages/signup/index.json new file mode 100644 index 00000000000..2090b656f53 --- /dev/null +++ b/sites/org/pages/signup/index.json @@ -0,0 +1,3 @@ +{ + "test": "ikkel" +} diff --git a/sites/shared/config/next.mjs b/sites/shared/config/next.mjs index 4b1174ff243..7f6c6c5e174 100644 --- a/sites/shared/config/next.mjs +++ b/sites/shared/config/next.mjs @@ -15,7 +15,7 @@ const config = (site, remarkPlugins = []) => ({ experimental: { externalDir: true, }, - pageExtensions: ['js', 'md', 'mjs'], + pageExtensions: ['js'], webpack: (config, options) => { // Fixes npm packages that depend on node modules if (!options.isServer) { diff --git a/yarn.lock b/yarn.lock index d2ca3521e45..a2f91ee3f5b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4268,10 +4268,10 @@ resolved "https://registry.npmjs.org/@portabletext/types/-/types-1.0.3.tgz#b23f832ae5331c1d864195a95eba34abf340597e" integrity sha512-SDDsdury2SaTI2D5Ea6o+Y39SSZMYHRMWJHxkxYl3yzFP0n/0EknOhoXcoaV+bxGr2dTTqZi2TOEj+uWYuavSw== -"@prisma/client@4.8.1": - version "4.8.1" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.8.1.tgz#51c16488dfac4e74a275a2753bf20262a65f2a2b" - integrity sha512-d4xhZhETmeXK/yZ7K0KcVOzEfI5YKGGEr4F5SBV04/MU4ncN/HcE28sy3e4Yt8UFW0ZuImKFQJE+9rWt9WbGSQ== +"@prisma/client@4.8.0": + version "4.8.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.8.0.tgz#6ec7adaca6a2e233d7e41dbe7cc6d0fa6143a407" + integrity sha512-Y1riB0p2W52kh3zgssP/YAhln3RjBFcJy3uwEiyjmU+TQYh6QTZDRFBo3JtBWuq2FyMOl1Rye8jxzUP+n0l5Cg== dependencies: "@prisma/engines-version" "4.8.0-61.d6e67a83f971b175a593ccc12e15c4a757f93ffe" @@ -11218,10 +11218,10 @@ i18next-fs-backend@^2.1.0: resolved "https://registry.yarnpkg.com/i18next-fs-backend/-/i18next-fs-backend-2.1.0.tgz#a90983df2992f478e1d5f3a4c794754d19a0bcdc" integrity sha512-gur0HAEkVDeUgZ9WNUcACYYl2N5FUt0C6bQCWsFPc+IYMXYWfiFQa8QQ930QAVYf71I75Ptl4XqQo5sl/u6/mA== -i18next@22.4.6: - version "22.4.6" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-22.4.6.tgz#876352c3ba81bdfedc38eeda124e2bbd05f46988" - integrity sha512-9Tm1ezxWyzV+306CIDMBbYBitC1jedQyYuuLtIv7oxjp2ohh8eyxP9xytIf+2bbQfhH784IQKPSYp+Zq9+YSbw== +i18next@22.4.8: + version "22.4.8" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-22.4.8.tgz#7a3c5d26a93e8e5f32eee07b58484e2f721fb45b" + integrity sha512-XSOy17ZWqflOiJRYE/dzv6vDle2Se32dnHREHb93UnZzZ1+UnvQ8yKtt1fpNL3zvXz5AwCqqixrtTVZmRetaiQ== dependencies: "@babel/runtime" "^7.20.6" @@ -16696,16 +16696,6 @@ react-i18next@12.1.1: "@babel/runtime" "^7.14.5" html-parse-stringify "^3.0.1" -react-instantsearch-core@6.38.1: - version "6.38.1" - resolved "https://registry.yarnpkg.com/react-instantsearch-core/-/react-instantsearch-core-6.38.1.tgz#74a123c81537c1f0ed51f34d36248795f14d30f9" - integrity sha512-14gy/jsakJELVeMEO+QmsHcugIyaU1pRyyuQjuXuBvF+TMHiWUjfYw7de3Lc4oYcTYIeSllYIxLHxdUoxLWZaA== - dependencies: - "@babel/runtime" "^7.1.2" - algoliasearch-helper "^3.11.1" - prop-types "^15.6.2" - react-fast-compare "^3.0.0" - react-instantsearch-core@6.38.2: version "6.38.2" resolved "https://registry.yarnpkg.com/react-instantsearch-core/-/react-instantsearch-core-6.38.2.tgz#155b10a24307a2b735661da26219fe8e5437bb8c" @@ -16716,18 +16706,6 @@ react-instantsearch-core@6.38.2: prop-types "^15.6.2" react-fast-compare "^3.0.0" -react-instantsearch-dom@6.38.1: - version "6.38.1" - resolved "https://registry.yarnpkg.com/react-instantsearch-dom/-/react-instantsearch-dom-6.38.1.tgz#caf29a3a5ced3a3db184aae6ec485ee145ea0de5" - integrity sha512-Wyzm4JW8O79zwsaWqOBdKbg69O7OcUDiF+p+/LW7zdRZ3RK4mO/q5CZDcziwDbNKqC4OEuG+IpIZuCjcJQrFcQ== - dependencies: - "@babel/runtime" "^7.1.2" - algoliasearch-helper "^3.11.1" - classnames "^2.2.5" - prop-types "^15.6.2" - react-fast-compare "^3.0.0" - react-instantsearch-core "6.38.1" - react-instantsearch-dom@6.38.2: version "6.38.2" resolved "https://registry.yarnpkg.com/react-instantsearch-dom/-/react-instantsearch-dom-6.38.2.tgz#c88b004dc420b8f23ef7f3cada44d928b4dc657b" @@ -20232,15 +20210,6 @@ unist-util-visit-parents@^5.0.0, unist-util-visit-parents@^5.1.1: "@types/unist" "^2.0.0" unist-util-is "^5.0.0" -unist-util-visit@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.0.tgz#f41e407a9e94da31594e6b1c9811c51ab0b3d8f5" - integrity sha512-n7lyhFKJfVZ9MnKtqbsqkQEk5P1KShj0+//V7mAcoI6bpbUjh3C/OG8HVD+pBihfh6Ovl01m8dkcv9HNqYajmQ== - dependencies: - "@types/unist" "^2.0.0" - unist-util-is "^5.0.0" - unist-util-visit-parents "^5.0.0" - unist-util-visit@4.1.1, unist-util-visit@^4.0.0, unist-util-visit@^4.1.0, unist-util-visit@~4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.1.tgz#1c4842d70bd3df6cc545276f5164f933390a9aad"