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.

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

feat: improve next 14 support #3287

Merged
merged 14 commits into from
Dec 6, 2023
Merged
2 changes: 1 addition & 1 deletion .github/workflows/prerelease-tolgee-5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Build
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Build
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-examples-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'

- name: Read last commit
id: get-commit-message
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'

- name: Read last commit
id: get-commit-message
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Build
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/report-intermittent-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
fail-fast: false
matrix:
app: ${{ fromJson(needs.prepare.outputs.dirs) }}
node: [16, 18]
node: [18, 20]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down
2 changes: 1 addition & 1 deletion e2e/cypress/common/namespacesTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const namespacesTest = (
) =>
describe('translation methods test', () => {
before(() => {
cy.visit(url + '/translation-methods');
cy.visit(url);
cy.intercept('GET', '*', (req) => {
req.on('response', (res) => {
res.delay = 500;
Expand Down
2 changes: 1 addition & 1 deletion e2e/cypress/common/translationMethodsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const translationMethodsTest = (
) =>
describe('translation methods test', () => {
before(() => {
cy.visit(url + '/translation-methods');
cy.visit(url);
});

// run it twice, as it can behave differently
Expand Down
3 changes: 2 additions & 1 deletion e2e/cypress/e2e/next-app/dev.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import { exampleAppDevTest } from '../../common/exampleAppDevTest';

context('Next with app router in dev mode', { retries: 5 }, () => {
const url = 'http://localhost:8122';
const translationMethods = url + '/en/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is a key', count: 2 },
{ text: 'This is key with params value value2', count: 6 },
Expand Down
3 changes: 2 additions & 1 deletion e2e/cypress/e2e/next-app/prod.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ import { translationMethodsTest } from '../../common/translationMethodsTest';

context('Next with app router in prod mode', () => {
const url = 'http://localhost:8121';
const translationMethods = url + '/en/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is a key', count: 2 },
{ text: 'This is key with params value value2', count: 6 },
Expand Down
5 changes: 3 additions & 2 deletions e2e/cypress/e2e/next/dev.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import { namespacesTest } from '../../common/namespacesTest';

context('Next app in dev mode', { retries: 2 }, () => {
const url = 'http://localhost:8106';
const translationMethods = url + '/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is default', count: 2 },
{
Expand Down Expand Up @@ -39,7 +40,7 @@ context('Next app in dev mode', { retries: 2 }, () => {
});

namespacesTest(
url,
translationMethods,
{
en: [
{ text: 'This is a key in namespace', count: 2 },
Expand Down
5 changes: 3 additions & 2 deletions e2e/cypress/e2e/next/prod.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import { translationMethodsTest } from '../../common/translationMethodsTest';

context('React app in prod mode', () => {
const url = 'http://localhost:8107';
const translationMethods = url + '/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is default', count: 2 },
{
Expand Down Expand Up @@ -38,7 +39,7 @@ context('React app in prod mode', () => {
});

namespacesTest(
url,
translationMethods,
{
en: [
{ text: 'This is a key in namespace', count: 2 },
Expand Down
3 changes: 2 additions & 1 deletion e2e/cypress/e2e/ngx/dev.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import { namespacesNgxTest } from '../../common/namespacesNgxTest';

context('Angular app in dev mode', () => {
const url = 'http://localhost:8116/';
const translationMethods = url + '/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is default', count: 3 },
{
Expand Down
3 changes: 2 additions & 1 deletion e2e/cypress/e2e/ngx/prod.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import { translationMethodsTest } from '../../common/translationMethodsTest';
context('Angular app in prod mode', () => {
const url = 'http://localhost:8115/';

const translationMethods = url + '/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is default', count: 3 },
{
Expand Down
5 changes: 3 additions & 2 deletions e2e/cypress/e2e/react-i18next/dev.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import { namespacesTest } from '../../common/namespacesTest';

context('React i18next app in dev mode', () => {
const url = 'http://localhost:8118';
const translationMethods = url + '/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is default', count: 1 },
{
Expand All @@ -27,7 +28,7 @@ context('React i18next app in dev mode', () => {
},
],
});
namespacesTest(url, {
namespacesTest(translationMethods, {
en: [
{ text: 'This is a key in namespace', count: 1 },
{ text: 'This is a key', count: 1 },
Expand Down
5 changes: 3 additions & 2 deletions e2e/cypress/e2e/react-i18next/prod.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import { translationMethodsTest } from '../../common/translationMethodsTest';

context('React i18next app in prod mode', () => {
const url = 'http://localhost:8117';
const translationMethods = url + '/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is default', count: 1 },
{
Expand All @@ -26,7 +27,7 @@ context('React i18next app in prod mode', () => {
},
],
});
namespacesTest(url, {
namespacesTest(translationMethods, {
en: [
{ text: 'This is a key in namespace', count: 1 },
{ text: 'This is a key', count: 1 },
Expand Down
7 changes: 4 additions & 3 deletions e2e/cypress/e2e/react/dev.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import { namespacesTest } from '../../common/namespacesTest';

context('React app in dev mode', () => {
const url = 'http://localhost:8113';
const translationMethods = url + '/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is default', count: 2 },
{
Expand Down Expand Up @@ -38,7 +39,7 @@ context('React app in dev mode', () => {
},
],
});
namespacesTest(url, {
namespacesTest(translationMethods, {
en: [
{ text: 'This is a key in namespace', count: 2 },
{ text: 'This is a key', count: 1 },
Expand All @@ -53,7 +54,7 @@ context('React app in dev mode', () => {

describe('translation in translation', () => {
beforeEach(() => {
cy.visit(url + '/translation-methods');
cy.visit(translationMethods);
});

it('opens inner translation correctly', () => {
Expand Down
5 changes: 3 additions & 2 deletions e2e/cypress/e2e/react/prod.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import { translationMethodsTest } from '../../common/translationMethodsTest';

context('React app in prod mode', { retries: 5 }, () => {
const url = 'http://localhost:8102';
const translationMethods = url + '/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is default', count: 2 },
{
Expand Down Expand Up @@ -36,7 +37,7 @@ context('React app in prod mode', { retries: 5 }, () => {
},
],
});
namespacesTest(url, {
namespacesTest(translationMethods, {
en: [
{ text: 'This is a key in namespace', count: 2 },
{ text: 'This is a key', count: 1 },
Expand Down
5 changes: 3 additions & 2 deletions e2e/cypress/e2e/svelte/dev.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import { namespacesTest } from '../../common/namespacesTest';

context('Svelte app in dev mode', { retries: 3 }, () => {
const url = 'http://localhost:8110';
const translationMethods = url + '/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is default', count: 2 },
{
Expand All @@ -28,7 +29,7 @@ context('Svelte app in dev mode', { retries: 3 }, () => {
],
});

namespacesTest(url, {
namespacesTest(translationMethods, {
en: [
{ text: 'This is a key in namespace', count: 2 },
{ text: 'This is a key', count: 1 },
Expand Down
5 changes: 3 additions & 2 deletions e2e/cypress/e2e/svelte/prod.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import { translationMethodsTest } from '../../common/translationMethodsTest';
context('Svelte app in prod mode', () => {
const url = 'http://localhost:8109';

const translationMethods = url + '/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is default', count: 2 },
{
Expand All @@ -28,7 +29,7 @@ context('Svelte app in prod mode', () => {
],
});

namespacesTest(url, {
namespacesTest(translationMethods, {
en: [
{ text: 'This is a key in namespace', count: 2 },
{ text: 'This is a key', count: 1 },
Expand Down
3 changes: 2 additions & 1 deletion e2e/cypress/e2e/vue-i18next/dev.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import { exampleAppDevTest } from '../../common/exampleAppDevTest';

context('React i18next app in dev mode', () => {
const url = 'http://localhost:8120';
const translationMethods = url + '/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is default', count: 1 },
{
Expand Down
3 changes: 2 additions & 1 deletion e2e/cypress/e2e/vue-i18next/prod.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ import { translationMethodsTest } from '../../common/translationMethodsTest';

context('React i18next app in prod mode', () => {
const url = 'http://localhost:8119';
const translationMethods = url + '/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is default', count: 1 },
{
Expand Down
5 changes: 3 additions & 2 deletions e2e/cypress/e2e/vue/dev.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import { namespacesTest } from '../../common/namespacesTest';

context('Vue app in dev mode', () => {
const url = 'http://localhost:8112';
const translationMethods = url + '/translation-methods';
exampleAppTest(url);
translationMethodsTest(url, {
translationMethodsTest(translationMethods, {
en: [
{ text: 'This is default', count: 2 },
{
Expand All @@ -28,7 +29,7 @@ context('Vue app in dev mode', () => {
],
});

namespacesTest(url, {
namespacesTest(translationMethods, {
en: [
{ text: 'This is a key in namespace', count: 2 },
{ text: 'This is a key', count: 1 },
Expand Down
Loading