Skip to content

Commit

Permalink
bump to 18
Browse files Browse the repository at this point in the history
  • Loading branch information
jtoar committed Apr 25, 2023
1 parent 99f27ce commit 81fd851
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 32 deletions.
44 changes: 18 additions & 26 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

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

- run: yarn install
working-directory: ./.github/actions/only_doc_changes
Expand All @@ -42,7 +42,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- run: yarn install
working-directory: ./tasks/check

Expand All @@ -62,20 +62,19 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
node-version: [16, 18]
fail-fast: true
name: 🏗 Build, lint, test / ${{ matrix.os }} / node ${{ matrix.node-version }} latest
name: 🏗 Build, lint, test / ${{ matrix.os }} / node 18 latest
runs-on: ${{ matrix.os }}
steps:
- name: Remove the tsc problem matcher if not ubuntu-latest, node 16
if: (matrix.os == 'ubuntu-latest' && matrix.node-version == '16') == false
- name: Remove the tsc problem matcher if not ubuntu-latest
if: matrix.os != 'ubuntu-latest'
run: echo "echo "::remove-matcher owner=tsc::""

- uses: actions/checkout@v3
- name: 🧶 Set up job
uses: ./.github/actions/set-up-job
with:
node-version: ${{ matrix.node-version }}
node-version: 18

- name: 🔨 Build
run: yarn build
Expand All @@ -97,8 +96,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
node-version: [16, 18]
name: 🏗 Build, lint, test / ${{ matrix.os }} / node ${{ matrix.node-version }} latest
name: 🏗 Build, lint, test / ${{ matrix.os }} / node 18 latest
runs-on: ${{ matrix.os }}
steps:
- run: echo "Only doc changes"
Expand All @@ -108,16 +106,15 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node-version: [16, 18]
fail-fast: true
name: 🌲 Tutorial E2E / ${{ matrix.os }} / node ${{ matrix.node-version }} latest
name: 🌲 Tutorial E2E / ${{ matrix.os }} / node 18 latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: 🧶 Set up job
uses: ./.github/actions/set-up-job
with:
node-version: ${{ matrix.node-version }}
node-version: 18

- name: 📁 Create a temporary directory
id: createpath
Expand Down Expand Up @@ -155,7 +152,7 @@ jobs:
env: true
browser: chrome
record: false
wait-on: ${{ matrix.node-version == 18 && 'http://[::1]:8910' || 'http://localhost:8910' }}
wait-on: 'http://[::1]:8910'
working-directory: ./tasks/e2e
spec: |
cypress/e2e/01-tutorial/*.cy.js
Expand All @@ -167,8 +164,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node-version: [16, 18]
name: 🌲 Tutorial E2E / ${{ matrix.os }} / node ${{ matrix.node-version }} latest
name: 🌲 Tutorial E2E / ${{ matrix.os }} / node 18 latest
runs-on: ${{ matrix.os }}
steps:
- run: echo "Only doc changes"
Expand All @@ -178,9 +174,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
node-version: [16, 18]
fail-fast: true
name: 👀 Smoke test / ${{ matrix.os }} / node ${{ matrix.node-version }} latest
name: 👀 Smoke test / ${{ matrix.os }} / node 18 latest
runs-on: ${{ matrix.os }}
env:
REDWOOD_CI: 1
Expand All @@ -192,7 +187,7 @@ jobs:
- name: 🧶 Set up job
uses: ./.github/actions/set-up-job
with:
node-version: ${{ matrix.node-version }}
node-version: 18

- name: 🌲 Setup test project
id: setup_test_project
Expand Down Expand Up @@ -220,7 +215,7 @@ jobs:
env:
PROJECT_PATH: ${{ steps.setup_test_project.outputs.test_project_path }}
REDWOOD_DISABLE_TELEMETRY: 1
RECORD_REPLAY_METADATA_TEST_RUN_TITLE: Smoke test / ${{ matrix.os }} / node ${{ matrix.node-version }} latest
RECORD_REPLAY_METADATA_TEST_RUN_TITLE: Smoke test / ${{ matrix.os }} / node 18 latest
RECORD_REPLAY_TEST_METRICS: 1

- name: Run `rw info`
Expand Down Expand Up @@ -319,8 +314,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
node-version: [16, 18]
name: 👀 Smoke test / ${{ matrix.os }} / node ${{ matrix.node-version }} latest
name: 👀 Smoke test / ${{ matrix.os }} / node 18 latest
runs-on: ${{ matrix.os }}
steps:
- run: echo "Only doc changes"
Expand All @@ -330,9 +324,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
node-version: [16.20.0, 18]
fail-fast: true
name: 🔭 Telemetry check / ${{ matrix.os }} / node ${{ matrix.node-version }} latest
name: 🔭 Telemetry check / ${{ matrix.os }} / node 18 latest
runs-on: ${{ matrix.os }}
env:
REDWOOD_REDIRECT_TELEMETRY: "http://127.0.0.1:48619" # Random port
Expand All @@ -341,7 +334,7 @@ jobs:
- name: 🧶 Set up job
uses: ./.github/actions/set-up-job
with:
node-version: ${{ matrix.node-version }}
node-version: 18

- name: 🔨 Build
run: yarn build
Expand All @@ -360,8 +353,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
node-version: [16.20.0, 18]
name: 🔭 Telemetry check / ${{ matrix.os }} / node ${{ matrix.node-version }} latest
name: 🔭 Telemetry check / ${{ matrix.os }} / node 18 latest
runs-on: ${{ matrix.os }}
steps:
- run: echo "Only doc changes"
2 changes: 1 addition & 1 deletion __fixtures__/test-project/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"root": true
},
"engines": {
"node": ">=16.20 <=18.x",
"node": ">=18.16",
"yarn": ">=1.15"
},
"prisma": {
Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const path = require('path')

const packageJSON = require(path.join(__dirname, 'package.json'))

const TARGETS_NODE = '16.20'
const TARGETS_NODE = '18.16'

// Run `npx browserslist "defaults, not IE 11, not IE_Mob 11"` to see a list
// of target browsers.
Expand Down
2 changes: 1 addition & 1 deletion packages/create-redwood-app/template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"root": true
},
"engines": {
"node": ">=16.20 <=18.x",
"node": ">=18.16",
"yarn": ">=1.15"
},
"prisma": {
Expand Down
1 change: 0 additions & 1 deletion packages/internal/src/__tests__/build_api.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,6 @@ test('core-js polyfill list', () => {
expect(list).toMatchInlineSnapshot(`
[
"es.regexp.flags",
"es.typed-array.set",
"esnext.array.last-index",
"esnext.array.last-item",
"esnext.composite-key",
Expand Down
2 changes: 1 addition & 1 deletion packages/internal/src/build/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const transpileApi = (files: string[], options = {}) => {
absWorkingDir: rwjsPaths.api.base,
entryPoints: files,
platform: 'node',
target: 'node16',
target: 'node18',
format: 'cjs',
bundle: false,
outdir: rwjsPaths.api.dist,
Expand Down
2 changes: 1 addition & 1 deletion packages/internal/src/build/babel/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
getCommonPlugins,
} from './common'

export const TARGETS_NODE = '16.20'
export const TARGETS_NODE = '18.16'
// Warning! Use the minor core-js version: "corejs: '3.6'", instead of "corejs: 3",
// because we want to include the features added in the minor version.
// https://github.com/zloirock/core-js/blob/master/README.md#babelpreset-env
Expand Down

0 comments on commit 81fd851

Please sign in to comment.