Skip to content

Commit

Permalink
Merge pull request #18102 from strapi/tests/drop16
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandrebodin committed Oct 18, 2023
2 parents 5326a28 + 196e541 commit e3b3a8b
Show file tree
Hide file tree
Showing 57 changed files with 71 additions and 69 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/BUG_REPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ https://github.com/strapi/strapi/blob/main/CONTRIBUTING.md#reporting-an-issue

### Required System information

<!-- Please ensure you are using the Node LTS version (v16 or v18 or v20) -->
<!-- Please ensure you are using the Node LTS version (v18 or v20) -->
<!-- Strapi v3 is no longer supported, please update to Strapi v4 -->
<!-- If you are reporting a frontend bug please provide error logs after setting STRAPI_ENFORCE_SOURCEMAPS=true in your .env -->
<!-- This environment variable makes frontend errors easier to read and trace -->
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/check-pr-status/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This action checks a PR labels, milestone and status to validate it is ready for

### Requirements

- The code is compatible with Node 16, 18, and 20
- The code is compatible with Node 18, and 20

### Dependencies

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/check-pr-status/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'PR Checker'
description: 'Check PR status for mergeability'
runs:
using: 'node16'
using: 'node20'
main: 'dist/index.js'
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- run: yarn
- run: ./scripts/pre-publish.sh --yes
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- run: yarn
- run: ./scripts/pre-publish.sh --yes
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/remove-dist-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- run: yarn
- run: ./scripts/remove-dist-tag.sh
env:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/skipped_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
steps:
- run: echo "Skipped"

Expand All @@ -62,7 +62,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
steps:
- run: echo "Skipped"

Expand All @@ -72,7 +72,7 @@ jobs:
name: '[CE] API Integration (postgres, node: ${{ matrix.node }})'
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
steps:
- run: echo "Skipped"

Expand All @@ -82,7 +82,7 @@ jobs:
name: '[CE] API Integration (mysql, node: ${{ matrix.node }})'
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
steps:
- run: echo "Skipped"

Expand All @@ -92,7 +92,7 @@ jobs:
name: '[CE] API Integration (mysql:5 , node: ${{ matrix.node }})'
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
steps:
- run: echo "Skipped"

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
name: '[CE] API Integration (postgres, node: ${{ matrix.node }}, shard: ${{ matrix.shard }})'
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
shard: [1/2, 2/2]
services:
postgres:
Expand Down Expand Up @@ -224,7 +224,7 @@ jobs:
name: '[CE] API Integration (mysql:latest, client: ${{ matrix.db_client }}, node: ${{ matrix.node }}, shard: ${{ matrix.shard }})'
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
db_client: ['mysql', 'mysql2']
shard: [1/2, 2/2]
services:
Expand Down Expand Up @@ -263,7 +263,7 @@ jobs:
name: '[CE] API Integration (mysql:5, client: ${{ matrix.db_client }} , node: ${{ matrix.node }}, shard: ${{ matrix.shard }})'
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
db_client: ['mysql', 'mysql2']
shard: [1/2, 2/2]
services:
Expand Down Expand Up @@ -301,7 +301,7 @@ jobs:
name: '[CE] API Integration (sqlite, client: ${{ matrix.sqlite_pkg }}, node: ${{ matrix.node }}, shard: ${{ matrix.shard }})'
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
sqlite_pkg: ['better-sqlite3', 'sqlite3']
shard: [1/2, 2/2]
steps:
Expand All @@ -328,7 +328,7 @@ jobs:
STRAPI_LICENSE: ${{ secrets.strapiLicense }}
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
shard: [1/2, 2/2]
services:
postgres:
Expand Down Expand Up @@ -371,7 +371,7 @@ jobs:
STRAPI_LICENSE: ${{ secrets.strapiLicense }}
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
db_client: ['mysql', 'mysql2']
shard: [1/2, 2/2]
services:
Expand Down Expand Up @@ -413,7 +413,7 @@ jobs:
STRAPI_LICENSE: ${{ secrets.strapiLicense }}
strategy:
matrix:
node: [16, 18, 20]
node: [18, 20]
sqlite_pkg: ['better-sqlite3', 'sqlite3']
shard: [1/2, 2/2]
steps:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
20
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The Strapi core team will review your pull request and either merge it, request

## Contribution Prerequisites

- You have [Node.js](https://nodejs.org/en/) at version >= v16 and <= v20 and [Yarn](https://yarnpkg.com/en/) at v1.2.0+ installed.
- You have [Node.js](https://nodejs.org/en/) at version >= v18 and <= v20 and [Yarn](https://yarnpkg.com/en/) at v1.2.0+ installed.
- You are familiar with [Git](https://git-scm.com).

**Before submitting your pull request** make sure the following requirements are fulfilled:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ Strapi only supports maintenance and LTS versions of Node.js. Please refer to th

| Strapi Version | Recommended | Minimum |
| --------------- | ----------- | ------- |
| 4.14.5 and up | 20.x | 18.x |
| 4.11.0 and up | 18.x | 16.x |
| 4.3.9 to 4.10.x | 18.x | 14.x |
| 4.0.x to 4.3.8 | 16.x | 14.x |
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/docs/01-core/strapi/commands/plugin/01-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ The command sequence can be visualised as follows:

There are three different runtimes available for plugins:

- `node` which equates to a `node16` target
- `node` which equates to a `node18` target
- `web` which equates to a `esnext` target
- `*` (universal) which equates to `["last 3 major versions", "Firefox ESR", "last 2 Opera versions", "not dead", "node 16.0.0"]`
- `*` (universal) which equates to `["last 3 major versions", "Firefox ESR", "last 2 Opera versions", "not dead", "node 18.0.0"]`

The `node` and `web` targets are specifically used for the export maps with they keys `./strapi-server` and `./strapi-admin` respectively.
Any other export map values will be transpiled to the universal target. The universal target can be overwritten by adding the `browserslist`
Expand Down
2 changes: 1 addition & 1 deletion e2e/app-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"better-sqlite3": "8.6.0"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
},
"license": "MIT"
Expand Down
2 changes: 1 addition & 1 deletion examples/getstarted/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"styled-components": "5.3.3"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
},
"strapi": {
Expand Down
2 changes: 1 addition & 1 deletion examples/kitchensink-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"styled-components": "5.3.3"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
},
"strapi": {
Expand Down
2 changes: 1 addition & 1 deletion examples/kitchensink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"styled-components": "5.3.3"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
},
"strapi": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
},
"packageManager": "yarn@3.6.4",
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/admin-test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@
"@testing-library/jest-dom": "^5.16.5"
},
"engines": {
"node": ">=16.0.0 <=20.x.x"
"node": ">=18.0.0 <=20.x.x"
}
}
2 changes: 1 addition & 1 deletion packages/cli/create-strapi-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"tsconfig": "4.14.4"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/cli/create-strapi-starter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"tsconfig": "4.14.4"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/core/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
"@strapi/strapi": "^4.3.4"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
},
"nx": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/content-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"qs": "6.11.1"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
},
"strapi": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/content-type-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"styled-components": "5.3.3"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
},
"strapi": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/data-transfer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"@strapi/strapi": "^4.14.4"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/core/database/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"tsconfig": "4.14.4"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/core/email/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"styled-components": "5.3.3"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
},
"strapi": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/helper-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"styled-components": "^5.3.3"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
},
"nx": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/permissions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"tsconfig": "4.14.4"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
}
}
1 change: 1 addition & 0 deletions packages/core/strapi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ Strapi only supports maintenance and LTS versions of Node.js. Please refer to th

| Strapi Version | Recommended | Minimum |
| --------------- | ----------- | ------- |
| 4.14.5 and up | 20.x | 18.x |
| 4.11.0 and up | 18.x | 16.x |
| 4.3.9 to 4.10.x | 18.x | 14.x |
| 4.0.x to 4.3.8 | 16.x | 14.x |
Expand Down
2 changes: 1 addition & 1 deletion packages/core/strapi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
"typescript": "5.2.2"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
},
"nx": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"typescript": "5.2.2"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/core/upload/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"styled-components": "5.3.3"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
},
"strapi": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"tsconfig": "4.14.4"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
"node": ">=18.0.0 <=20.x.x",
"npm": ">=6.0.0"
}
}

0 comments on commit e3b3a8b

Please sign in to comment.