From 75ad1d4c3e25e046a1503b8e0de75506ed919d0d Mon Sep 17 00:00:00 2001 From: Aral Roca Gomez Date: Wed, 12 Feb 2020 13:06:35 +0100 Subject: [PATCH] Fix express version + add missing translation in examples --- .../with-server/locales/ca/more-examples.json | 1 + .../with-server/locales/en/more-examples.json | 1 + .../with-server/locales/es/more-examples.json | 1 + examples/with-server/package.json | 2 +- examples/with-server/yarn.lock | 80 +++++++++++++------ package.json | 2 +- 6 files changed, 61 insertions(+), 26 deletions(-) diff --git a/examples/with-server/locales/ca/more-examples.json b/examples/with-server/locales/ca/more-examples.json index bd3318dd..8094217a 100644 --- a/examples/with-server/locales/ca/more-examples.json +++ b/examples/with-server/locales/ca/more-examples.json @@ -6,6 +6,7 @@ "plural-example_plural": "És en plural perquè el valor és {{count}}", "example-with-html": "<0>Aquest és un exempre <1>utilitzant HTML dintre de la traducció", "no-functional-example": "Traducció feta des d'un component no funcional", + "dynamic-namespaces-link": "Namespaces dinàmics", "nested-example": { "very-nested": { "nested": "Exemple anidat!" diff --git a/examples/with-server/locales/en/more-examples.json b/examples/with-server/locales/en/more-examples.json index 30096e0d..d0041ac7 100644 --- a/examples/with-server/locales/en/more-examples.json +++ b/examples/with-server/locales/en/more-examples.json @@ -6,6 +6,7 @@ "plural-example_plural": "Is in plural because the value is {{count}}", "example-with-html": "<0>This is an example <1>using HTML inside the translation", "no-functional-example": "Translation done from a no-functional component", + "dynamic-namespaces-link": "Dynamic namespaces", "nested-example": { "very-nested": { "nested": "Nested example!" diff --git a/examples/with-server/locales/es/more-examples.json b/examples/with-server/locales/es/more-examples.json index 92f80a51..fe5ec96f 100644 --- a/examples/with-server/locales/es/more-examples.json +++ b/examples/with-server/locales/es/more-examples.json @@ -6,6 +6,7 @@ "plural-example_plural": "Es en plural porque el valor es {{count}}", "example-with-html": "<0>Este es un ejemplo <1>usando HTML dentro de la traducción", "no-functional-example": "Traducción hecha desde un componente no funcional", + "dynamic-namespaces-link": "Namespaces dinámicos", "nested-example": { "very-nested": { "nested": "¡Ejemplo anidado!" diff --git a/examples/with-server/package.json b/examples/with-server/package.json index 3a6706df..03552a89 100644 --- a/examples/with-server/package.json +++ b/examples/with-server/package.json @@ -10,7 +10,7 @@ "next": "link:../../node_modules/next", "next-translate": "link:../../", "react": "link:../../node_modules/react", - "express": "link:../../node_modules/express", + "express": "4.17.1", "react-dom": "link:../../node_modules/react-dom" } } diff --git a/examples/with-server/yarn.lock b/examples/with-server/yarn.lock index 62f9c600..e1ec550b 100644 --- a/examples/with-server/yarn.lock +++ b/examples/with-server/yarn.lock @@ -1667,9 +1667,9 @@ camelcase@5.3.1, camelcase@^5.3.1: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001017, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001023: - version "1.0.30001023" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001023.tgz#b82155827f3f5009077bdd2df3d8968bcbcc6fc4" - integrity sha512-C5TDMiYG11EOhVOA62W1p3UsJ2z4DsHtMBQtjzp3ZsUglcQn62WOUgW0y795c7A5uZ+GCEIvzkMatLIlAsbNTA== + version "1.0.30001027" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz#283e2ef17d94889cc216a22c6f85303d78ca852d" + integrity sha512-7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg== chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" @@ -1726,9 +1726,9 @@ chokidar@^3.3.0: fsevents "~2.1.2" chownr@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" - integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw== + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== chrome-trace-event@^1.0.2: version "1.0.2" @@ -2101,9 +2101,9 @@ cssesc@^3.0.0: integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== cssnano-preset-simple@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/cssnano-preset-simple/-/cssnano-preset-simple-1.0.2.tgz#0af821593cec5edf010e5ff0753fd89eb52d40de" - integrity sha512-FhAjiyAJoQOfvOZVSaNYkmmg2KE/SmaJVBNqglvvZ4QgwtTMVOaggozmRwfyO2QfeyKstRCpeRglziWym0Q9/w== + version "1.0.3" + resolved "https://registry.yarnpkg.com/cssnano-preset-simple/-/cssnano-preset-simple-1.0.3.tgz#a6b00bebb457a79218443d345ba7e28e9d1e3e4a" + integrity sha512-TMtCiUf75Kw+RCyBcYSz14cEmjKb+QI9KDUZbuinqdaZvc7qOuTKU27FTIfnCorbekmA7EGMC3tgN7J4vt1N1Q== dependencies: postcss "^7.0.18" @@ -2282,9 +2282,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.322, electron-to-chromium@^1.3.341: - version "1.3.344" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.344.tgz#f1397a633c35e726730c24be1084cd25c3ee8148" - integrity sha512-tvbx2Wl8WBR+ym3u492D0L6/jH+8NoQXqe46+QhbWH3voVPauGuZYeb1QAXYoOAWuiP2dbSvlBx0kQ1F3hu/Mw== + version "1.3.349" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.349.tgz#663f26a69d348a462df47b4d7ab162a2f29bbcb7" + integrity sha512-uEb2zs6EJ6OZIqaMsCSliYVgzE/f7/s1fLWqtvRtHg/v5KBF2xds974fUnyatfxIDgkqzQVwFtam5KExqywx0Q== elliptic@^6.0.0: version "6.5.2" @@ -2441,9 +2441,41 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -"express@link:../../node_modules/express": - version "0.0.0" - uid "" +express@4.17.1: + version "4.17.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.0" + content-disposition "0.5.3" + content-type "~1.0.4" + cookie "0.4.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.5" + qs "6.7.0" + range-parser "~1.2.1" + safe-buffer "5.1.2" + send "0.17.1" + serve-static "1.14.1" + setprototypeof "1.1.1" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" ext@^1.1.2: version "1.4.0" @@ -3696,9 +3728,9 @@ nanomatch@^1.2.9: to-regex "^3.0.1" needle@^2.2.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" - integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== + version "2.3.2" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528" + integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w== dependencies: debug "^3.2.6" iconv-lite "^0.4.4" @@ -3778,9 +3810,9 @@ node-pre-gyp@*: tar "^4.4.2" node-releases@^1.1.44, node-releases@^1.1.47: - version "1.1.47" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.47.tgz#c59ef739a1fd7ecbd9f0b7cf5b7871e8a8b591e4" - integrity sha512-k4xjVPx5FpwBUj0Gw7uvFOTF4Ep8Hok1I6qjwL3pLfwe7Y0REQSAqOwwv9TWBCUtMHxcXfY4PgRLRozcChvTcA== + version "1.1.49" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz#67ba5a3fac2319262675ef864ed56798bb33b93e" + integrity sha512-xH8t0LS0disN0mtRCh+eByxFPie+msJUBL/lJDBuap53QGiYPa9joh83K4pCZgWJ+2L4b9h88vCVdXQ60NO2bg== dependencies: semver "^6.3.0" @@ -4969,9 +5001,9 @@ resolve-url@^0.2.1: integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= resolve@^1.10.0, resolve@^1.3.2, resolve@^1.8.1: - version "1.15.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz#1b7ca96073ebb52e741ffd799f6b39ea462c67f5" - integrity sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw== + version "1.15.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" + integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== dependencies: path-parse "^1.0.6" diff --git a/package.json b/package.json index d05afcc8..cf2cf05c 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", "babel-preset-minify": "0.5.1", "express": "4.17.1", - "husky": "4.2.1", + "husky": "4.2.2", "jest": "25.1.0", "next": "9.2.1", "prettier": "1.19.1",