From 3fce1de436b3d56618dc29b3d1d314607db8f896 Mon Sep 17 00:00:00 2001 From: eps1lon Date: Wed, 30 Mar 2022 16:54:46 +0200 Subject: [PATCH] feat: Support stable React 18 release --- .github/workflows/validate.yml | 5 ++--- package.json | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index aafa6cad..45cc7d13 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -12,7 +12,7 @@ on: pull_request: {} jobs: main: - continue-on-error: ${{ matrix.react != 'current' }} + continue-on-error: ${{ matrix.react != 'latest' }} # ignore all-contributors PRs if: ${{ !contains(github.head_ref, 'all-contributors') }} strategy: @@ -20,7 +20,7 @@ jobs: matrix: # TODO: relax `'16.9.1'` to `16` once GitHub has 16.9.1 cached. 16.9.0 is broken due to https://github.com/nodejs/node/issues/40030 node: [12, 14, '16.9.1'] - react: [current, next, experimental] + react: [latest, next, experimental] runs-on: ubuntu-latest steps: - name: 🛑 Cancel Previous Runs @@ -47,7 +47,6 @@ jobs: # https://reactjs.org/blog/2019/10/22/react-release-channels.html#using-the-next-channel-for-integration-testing - name: ⚛️ Setup react run: npm install react@${{ matrix.react }} react-dom@${{ matrix.react }} - if: ${{ matrix.react != 'current' }} - name: ▶️ Run validate script run: npm run validate diff --git a/package.json b/package.json index 9b9d5ebf..49d1fa7a 100644 --- a/package.json +++ b/package.json @@ -54,14 +54,14 @@ "dotenv-cli": "^4.0.0", "kcd-scripts": "^11.1.0", "npm-run-all": "^4.1.5", - "react": "18.0.0-rc.1", - "react-dom": "18.0.0-rc.1", + "react": "^18.0.0", + "react-dom": "^18.0.0", "rimraf": "^3.0.2", "typescript": "^4.1.2" }, "peerDependencies": { - "react": "18.0.0-rc.1", - "react-dom": "18.0.0-rc.1" + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "eslintConfig": { "extends": "./node_modules/kcd-scripts/eslint.js",