Skip to content

Commit

Permalink
Update minimal node version to 14 (#2034)
Browse files Browse the repository at this point in the history
  • Loading branch information
const314 authored Sep 9, 2021
1 parent ef13902 commit 1eff755
Show file tree
Hide file tree
Showing 46 changed files with 1,280 additions and 1,322 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 @@ -27,7 +27,7 @@ If applicable, add screenshots to help explain your problem.

- OS: [e.g. iOS]
- Browser [e.g. chrome, safari, edge]
- Node.js Version [e.g. 12.18.3]
- Node.js Version [e.g. 14.17.5]
- ReSolve Version [e.g. 0.25.0]

**Additional context**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manual-cloud-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
- uses: actions/checkout@v2
ref: ${{ github.event.inputs.RESOLVE_REF }}

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '14'

- name: Install
run: |
Expand Down
21 changes: 10 additions & 11 deletions .github/workflows/pr-cra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '14'

- name: Cache root node_modules
uses: actions/cache@v2
Expand Down Expand Up @@ -66,9 +66,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '14'

- name: Cache root node_modules
uses: actions/cache@v2
Expand Down Expand Up @@ -119,9 +119,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '14'

- name: Cache root node_modules
uses: actions/cache@v2
Expand Down Expand Up @@ -172,9 +172,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '14'

- name: Cache root node_modules
uses: actions/cache@v2
Expand Down Expand Up @@ -229,9 +229,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '14'

- name: Cache root node_modules
uses: actions/cache@v2
Expand Down Expand Up @@ -279,4 +279,3 @@ jobs:
RESOLVE_E2E_TESTS_HEADLESS_MODE: true
DEBUG_LEVEL: error
run: yarn test:e2e:js

20 changes: 10 additions & 10 deletions .github/workflows/pr-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:

- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '14'

- name: Cache node_modules
uses: actions/cache@v2
Expand Down Expand Up @@ -106,9 +106,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '14'

- name: Cache node_modules
uses: actions/cache@v2
Expand Down Expand Up @@ -175,9 +175,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '14'

- name: Cache node_modules
uses: actions/cache@v2
Expand Down Expand Up @@ -239,9 +239,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '14'

- name: Cache node_modules
uses: actions/cache@v2
Expand Down Expand Up @@ -304,9 +304,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '14'

- name: Cache node_modules
uses: actions/cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
if: startsWith(github.event.head_commit.message, '<auto>') != true
runs-on: ubuntu-latest
steps:
- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '14'

- name: Build packages
run: |
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ reSolve is a full stack functional JavaScript framework.

### Installation

Make sure you have **NodeJS** version **12.18** or higher.
Make sure you have **NodeJS** version **14.17** or higher.

Use [create-resolve-app](packages/core/create-resolve-app) package to create a new reSolve application. The easiest way is to use [npx](https://www.npmjs.com/package/npx/v/1.1.1)

Expand Down Expand Up @@ -81,4 +81,3 @@ To get started with reSolve, see the [step-by-step tutorial](./docs/tutorial.md)
reSolve is developed by [Developer Express Inc.](https://devexpress.com)

![Analytics](https://ga-beacon.appspot.com/UA-118635726-1/readme.md?pixel)

6 changes: 3 additions & 3 deletions docs/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ Write side is optimized for writing, read side - for reading.

### Prerequisites

You need to have Node >=12.18 on you development machine and on the server.
You need to have Node >=14.17 on you development machine and on the server.
You can use [nvm](https://github.com/creationix/nvm#installation) (macOS/Linux) or [nvm-windows](https://github.com/coreybutler/nvm-windows#node-version-manager-nvm-for-windows) to switch Node versions between different projects.

Make sure you have Node, NPM, and NPX installed:

```sh
$ node --version
v12.18.0
v14.17.5
$ npx --version
6.1.0
6.14.14
```

### Getting Started
Expand Down
2 changes: 1 addition & 1 deletion examples/ts/hacker-news/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@types/isomorphic-fetch": "0.0.35",
"@types/jest": "26.0.23",
"@types/jsonwebtoken": "8.5.4",
"@types/node": "12.7.4",
"@types/node": "14.17.5",
"@types/passport-local": "1.0.34",
"@types/progress": "2.0.5",
"@types/react": "17.0.5",
Expand Down
2 changes: 1 addition & 1 deletion examples/ts/personal-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@resolve-js/module-admin": "0.31.10",
"@types/crypto-js": "4.0.2",
"@types/jest": "26.0.23",
"@types/node": "12.7.4",
"@types/node": "14.17.5",
"@types/react": "17.0.5",
"@types/react-dom": "17.0.5",
"@types/react-helmet": "6.1.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/ts/shopping-list-redux-hoc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@resolve-js/scripts": "0.31.10",
"@resolve-js/testing-tools": "0.31.10",
"@types/jest": "26.0.23",
"@types/node": "12.7.4",
"@types/node": "14.17.5",
"@types/react": "17.0.5",
"@types/react-dom": "17.0.5",
"@types/react-helmet": "6.1.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/ts/shopping-list-redux/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@resolve-js/scripts": "0.31.10",
"@resolve-js/testing-tools": "0.31.10",
"@types/jest": "26.0.23",
"@types/node": "12.7.4",
"@types/node": "14.17.5",
"@types/react": "17.0.5",
"@types/react-dom": "17.0.5",
"@types/react-helmet": "6.1.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/ts/shopping-list/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@resolve-js/scripts": "0.31.10",
"@resolve-js/testing-tools": "0.31.10",
"@types/jest": "26.0.23",
"@types/node": "12.7.4",
"@types/node": "14.17.5",
"@types/react": "17.0.5",
"@types/react-dom": "17.0.5",
"aws-sdk": "2.860.0",
Expand Down
3 changes: 2 additions & 1 deletion internal/helpers/get-babel-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const getBabelConfig = ({ sourceType, moduleType, moduleTarget }) => {
regenerator = false
helpers = false
targets = {
node: '12.18',
node: '14.17',
}
break
}
Expand Down Expand Up @@ -112,6 +112,7 @@ const getBabelConfig = ({ sourceType, moduleType, moduleTarget }) => {
['@babel/plugin-proposal-decorators', { legacy: true }],
['@babel/plugin-proposal-private-methods', { loose: false }],
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-nullish-coalescing-operator',
[
'@babel/plugin-transform-runtime',
{
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"validate-lock-file": "node validate-lock-file.js"
},
"resolutions": {
"**/@types/node": "12.7.4",
"**/@types/node": "14.17.5",
"@types/react": "17.0.5"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"ts-jest": "27.0.2"
},
"engines": {
"node": ">=12.18"
"node": ">=14.17"
},
"babelCompile": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/core/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"ts-jest": "^27.0.2"
},
"engines": {
"node": ">=12.18"
"node": ">=14.17"
},
"babelCompile": [
{
Expand Down
4 changes: 2 additions & 2 deletions packages/core/create-resolve-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@
"@types/adm-zip": "0.4.34",
"@types/command-line-args": "5.0.1",
"@types/jest": "26.0.23",
"@types/node": "12.7.4",
"@types/node": "14.17.5",
"@types/progress": "2.0.4",
"@types/validate-npm-package-name": "3.0.3",
"jest": "27.0.3",
"ts-jest": "^27.0.2"
},
"engines": {
"node": ">=12.18"
"node": ">=14.17"
},
"babelCompile": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@ describe('downloadResolveRepo', () => {
headers: { 'content-length': 100 },
}
mockResponse.on.mockImplementation((event, cb) => {
if (event === 'end') {
if (event === 'end' || event === 'error') {
cb()
} else if (event === 'error') {
cb(new Error('error'))
}
})
https.get = jest.fn().mockImplementation((url, callback) => {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/debug-levels/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
},
"devDependencies": {
"@types/debug": "4.1.5",
"@types/node": "12.7.4",
"@types/node": "14.17.5",
"jest": "27.0.3",
"uuid": "8.3.2"
},
"engines": {
"node": ">=12.18"
"node": ">=14.17"
},
"babelCompile": [
{
Expand Down
4 changes: 2 additions & 2 deletions packages/core/react-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@testing-library/react": "11.2.5",
"@testing-library/react-hooks": "5.1.0",
"@types/jest": "26.0.23",
"@types/node": "12.7.4",
"@types/node": "14.17.5",
"@types/react": "17.0.5",
"@types/react-dom": "17.0.5",
"jest": "27.0.3",
Expand All @@ -57,7 +57,7 @@
"react": "^17.0.1"
},
"engines": {
"node": ">=12.18"
"node": ">=14.17"
},
"babelCompile": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/core/redux/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"redux-saga": "^1.1.3"
},
"engines": {
"node": ">=12.18"
"node": ">=14.17"
},
"babelCompile": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/modules/module-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"sinon": "9.2.4"
},
"engines": {
"node": ">=12.18"
"node": ">=14.17"
},
"babelCompile": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/modules/module-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"sinon": "9.2.4"
},
"engines": {
"node": ">=12.18"
"node": ">=14.17"
},
"babelCompile": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/modules/module-comments/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"redux": "^4.0.5"
},
"engines": {
"node": ">=12.18"
"node": ">=14.17"
},
"babelCompile": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/modules/module-replication/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"jest": "27.0.3"
},
"engines": {
"node": ">=12.18"
"node": ">=14.17"
},
"babelCompile": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/modules/module-uploader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"jest": "27.0.3"
},
"engines": {
"node": ">=12.18"
"node": ">=14.17"
},
"babelCompile": [
{
Expand Down
Loading

0 comments on commit 1eff755

Please sign in to comment.