Release 1.0.7 (#614)

* replace quotes only for the special $' pattern specific to .replace() (#529) * replace quotes only for the special $' pattern specific to .replace() instead of replacing quoutes everywhere * use .replace() callback to avoid parsing special string patterns * write tests to verify that templateWithHoc and templateWithLoader correctly replaces special string cases. Update snapshots * Update package version * fix(transCore): when no suffix don't match spaces (#534) * Update package version * _one works (#541) * Update package version * Update README.md (#552) * Update package version * Update dependencies (#554) * Update dependencies * Update example deps * Update Trans text after change lang (#566) * Ignore api.(ts|js...) file (#567) * Add useMemo to useTranslation (#574) * Update deps (#582) * Update version of package.json * Adding tests (#585) * Add new property `extensionsRgx` to config (#589) * Add new property `extensionsRgx` to config To be able to use custom Next.js page extensions (vercel/next.js#8454 (comment)), a new property `extensionsRgx` is added to the i18n configuration. # How to use // i18n.js ``` module.exports = { extensionsRgx: /\.(page|api)\.(tsx|ts|js|mjs|jsx)$/, ... } ``` * docs: add `extensionsRgx` configuration property * Update package.json * Listen for `namespaces` changes and load necessary namespaces (#592) * Update package.json version * Revert "Add useMemo to useTranslation" (#605) This reverts commit 8abc458. # Conflicts: # package.json * Remove console.warn because is already solved on Next.js 10.2.1-canary.4 (#609) Already fixed in [Next.js canary 10.2.1-canary.4](https://github.com/vercel/next.js/releases/tag/v10.2.1-canary.4) Co-authored-by: AndrewB <[email protected]> Co-authored-by: slevy85 <[email protected]> Co-authored-by: Justin <[email protected]> Co-authored-by: Bernd Artmüller <[email protected]> Co-authored-by: Rihards Ščeredins <[email protected]>
aralroca · May 21, 2021 · 8c86d10 · 8c86d10
1 parent 21701d3
commit 8c86d10
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -231,6 +231,8 @@ In the configuration file you can use both the configuration that we specified h
 | `loader`        | If you wish to disable the webpack loader and manually load the namespaces on each page, we give you the opportunity to do so by disabling this option.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `Boolean`                       | `true`                                                                          |
 | `interpolation`   | Change the delimeter that is used for interpolation.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `{prefix: string; suffix: string}` | `{prefix: '{{', suffix: '}}'}`
 | `staticsHoc`   | The HOCs we have in our API ([appWithI18n](#appwithi18n)), do not use [hoist-non-react-statics](https://github.com/mridgway/hoist-non-react-statics) in order not to include more kb than necessary _(static values different than getInitialProps in the pages are rarely used)_. If you have any conflict with statics, you can add hoist-non-react-statics (or any other alternative) here. [See an example](docs/hoist-non-react-statics.md).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `Function` | `null`
+| `extensionsRgx`   | Change the regex used by the webpack loader to find Next.js pages. | `Regex` | `/\.(tsx\|ts\|js\|mjs\|jsx)$/`
+
 
 ## 4. API
 

diff --git a/__tests__/__snapshots__/templateWithLoader.test.js.snap b/__tests__/__snapshots__/templateWithLoader.test.js.snap
@@ -438,6 +438,44 @@ export async function getStaticProps(ctx) {
 "
 `;
 
+exports[`templateWithLoader loader as a wrapper page: /index | loader: getStaticProps | hasLoader: true 1`] = `
+"import __i18nConfig from \\"@next-translate-root/i18n\\";
+import __loadNamespaces from \\"next-translate/loadNamespaces\\";
+
+(\\"$SomeString$\\");
+$$SomeString$$ & $SomeString$ & \`$SomeString$\`;
+(\\".cssClass{content:' ';\\");
+('Hello \\"world\\"');
+
+export default function Page() {
+  return <div>Hello world</div>;
+}
+
+const _getStaticProps = wrapper.getStaticProps(() => ({ props: {} }));
+
+export async function getStaticProps(ctx) {
+  let res = _getStaticProps(ctx);
+  if (typeof res.then === \\"function\\") res = await res;
+  return {
+    ...res,
+    props: {
+      ...(res.props || {}),
+      ...(await __loadNamespaces({
+        ...ctx,
+        pathname: \\"/index\\",
+        loaderName: \\"getStaticProps\\",
+        ...__i18nConfig,
+        loadLocaleFrom: (l, n) =>
+          import(\`@next-translate-root/locales/\${l}/\${n}\`).then(
+            (m) => m.default
+          ),
+      })),
+    },
+  };
+}
+"
+`;
+
 exports[`templateWithLoader loader imported to another place page: /index | loader: getStaticProps | hasLoader: true 1`] = `
 "import __i18nConfig from \\"@next-translate-root/i18n\\";
 import __loadNamespaces from \\"next-translate/loadNamespaces\\";

diff --git a/__tests__/hasHOC.test.js b/__tests__/hasHOC.test.js
@@ -324,6 +324,18 @@ describe('hasHOC', () => {
       `)
       ).toBe(false)
     })
+    test('with -> it has getStaticProps in a wrapper', () => {
+      expect(
+        hasHOC(`
+        import withWrapper from 'somewhere'
+
+        function Page() {
+          return <div>Hello world</div>
+        }
+
+        export const getStaticProps = wrapper()`)
+      ).toBe(false)
+    })
     test('with -> it has getStaticProps', () => {
       expect(
         hasHOC(`

diff --git a/__tests__/templateWithLoader.test.js b/__tests__/templateWithLoader.test.js
@@ -179,6 +179,24 @@ const tests = [
       },
     ],
   },
+  {
+    describe: 'loader as a wrapper',
+    code: `
+      export default function Page() {
+        return <div>Hello world</div>
+      }
+
+      const getStaticProps = wrapper.getStaticProps(() => ({ props: {} }))
+      export { getStaticProps }
+  `,
+    cases: [
+      {
+        page: '/index',
+        loader: 'getStaticProps',
+        hasLoader: true,
+      },
+    ],
+  },
   {
     describe: 'loader imported to another place',
     code: `

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-translate",
-  "version": "1.0.6",
+  "version": "1.0.7-canary.3",
   "description": "Tiny and powerful i18n tools (Next plugin + API) to translate your Next.js pages.",
   "license": "MIT",
   "keywords": [

diff --git a/src/DynamicNamespaces.tsx b/src/DynamicNamespaces.tsx
@@ -28,7 +28,7 @@ export default function DynamicNamespaces({
 
   useEffect(() => {
     loadNamespaces()
-  }, [])
+  }, [namespaces.join()])
 
   if (!loaded) return fallback || null
 

diff --git a/src/I18nProvider.tsx b/src/I18nProvider.tsx
@@ -1,4 +1,4 @@
-import React, { createContext, useContext, useMemo } from 'react'
+import React, { createContext, useContext } from 'react'
 import { useRouter } from 'next/router'
 import I18nContext from './_context'
 import transCore from './transCore'

diff --git a/src/plugin/index.ts b/src/plugin/index.ts
@@ -91,7 +91,7 @@ export default function nextTranslate(nextConfig: any = {}) {
         use: {
           loader: 'next-translate/plugin/loader',
           options: {
-            extensionsRgx: test,
+            extensionsRgx: restI18n.extensionsRgx || test,
             hasGetInitialPropsOnAppJs,
             hasAppJs: !!app,
             pagesPath: path.join(pagesPath, '/'),

diff --git a/src/plugin/loader.ts b/src/plugin/loader.ts
@@ -96,9 +96,6 @@ export default function loader(rawCode: string) {
     isGetStaticProps || isGetServerSideProps || isGetInitialProps
 
   if (isGetInitialProps || (!hasLoader && isWrapperWithExternalHOC)) {
-    console.warn(
-      `🚨 [next-translate] In Next 10.x.x there is an issue related to i18n and getInitialProps. We recommend to replace getInitialProps to getServerSideProps on ${page}. Issue: https://github.com/vercel/next.js/issues/18396`
-    )
     return templateWithHoc(rawCode, { typescript, hasLoadLocaleFrom })
   }
 

diff --git a/src/useTranslation.tsx b/src/useTranslation.tsx
@@ -1,4 +1,4 @@
-import { useContext, useMemo } from 'react'
+import { useContext } from 'react'
 import { I18n } from '.'
 import wrapTWithDefaultNs from './wrapTWithDefaultNs'
 import I18nContext from './_context'
@@ -7,9 +7,6 @@ export default function useTranslation(defaultNs?: string): I18n {
   const ctx = useContext(I18nContext)
   return {
     ...ctx,
-    t: useMemo(() => wrapTWithDefaultNs(ctx.t, defaultNs), [
-      ctx.lang,
-      defaultNs,
-    ]),
+    t: wrapTWithDefaultNs(ctx.t, defaultNs),
   }
 }