Skip to content

Commit

Permalink
Merge pull request #1144 from dpc-sdp/task/update-node-20
Browse files Browse the repository at this point in the history
Update to Node 20
  • Loading branch information
dylankelly authored May 3, 2024
2 parents 445cacf + 7f5fa43 commit cb45547
Show file tree
Hide file tree
Showing 44 changed files with 20,016 additions and 16,017 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.6.2
version: 9.0.6
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- name: Build Storybook
Expand All @@ -43,12 +43,12 @@ jobs:
env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
with:
version: 8.6.2
version: 9.0.6
run_install: true
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: 'pnpm'
- name: Cypress component tests
uses: cypress-io/github-action@v6
Expand All @@ -66,12 +66,12 @@ jobs:
env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
with:
version: 8.6.2
version: 9.0.6
run_install: true
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: 'pnpm'

- name: Cypress component tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.6.2
version: 9.0.6
run_install: false
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: 'pnpm'
- name: Install Dependencies
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.6.2
version: 9.0.6
run_install: false
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: 'pnpm'
- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nuxt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.6.2
version: 9.0.6
run_install: false
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: 'pnpm'
- name: Install Dependencies
env:
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.6.2
version: 9.0.6

- name: Install Dependencies
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.6.2
version: 9.0.6
run_install: false
- name: Install Node
uses: actions/setup-node@v3
with:
registry-url: 'https://npm.pkg.github.com/'
node-version: 18
node-version: 20
cache: 'pnpm'
scope: '@dpc-sdp'
- name: Install Dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.6.2
version: 9.0.6
run_install: false
- name: Install Node
uses: actions/setup-node@v3
with:
registry-url: 'https://npm.pkg.github.com/'
node-version: 18
node-version: 20
cache: 'pnpm'
scope: '@dpc-sdp'
- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/studio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
name: Install pnpm
id: pnpm-install
with:
version: 8.6.2
version: 9.0.6

- uses: actions/setup-node@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/vue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.6.2
version: 9.0.6
run_install: false

- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: 'pnpm'

- name: Install Dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/webcomponents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.6.2
version: 9.0.6
run_install: false

- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: 'pnpm'

- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/hydrogen
lts/iron
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"@dpc-sdp/ripple-test-utils",
"@dpc-sdp/nuxt-ripple-analytics",
"eslint-config-ripple",
"@dpc-sdp/ripple-ui-maps"
"@dpc-sdp/ripple-ui-maps",
"ripple-storybook"
],
"cSpell.words": [
"colour",
Expand Down
1 change: 0 additions & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"private": true,
"name": "docs",
"packageManager": "[email protected]",
"version": "2.1.0-alpha.76",
"scripts": {
"build": "nuxt build",
Expand Down
1 change: 0 additions & 1 deletion examples/nuxt-app/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"packageManager": "[email protected]",
"name": "nuxt-app",
"description": "Example Nuxt application for SDP",
"version": "2.1.0-alpha.77",
Expand Down
3 changes: 1 addition & 2 deletions examples/vue-app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"private": true,
"name": "vue-app",
"packageManager": "[email protected]",
"version": "2.1.0-alpha.76",
"license": "Apache-2.0",
"scripts": {
Expand All @@ -25,7 +24,7 @@
"@cypress/vue": "^5.0.5",
"@rushstack/eslint-patch": "^1.2.0",
"@types/node": "^18.15.10",
"@vitejs/plugin-vue": "^4.1.0",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-prettier": "^7.1.0",
"@vue/eslint-config-typescript": "^11.0.2",
"@vue/tsconfig": "^0.1.3",
Expand Down
1 change: 0 additions & 1 deletion examples/webcomponents/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "webcomponents",
"private": true,
"packageManager": "[email protected]",
"license": "Apache-2.0",
"version": "2.1.0-alpha.76",
"scripts": {
Expand Down
15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ripple",
"private": true,
"version": "2.0.0",
"packageManager": "pnpm@8.6.2",
"packageManager": "pnpm@9.0.6",
"license": "Apache-2.0",
"repository": "https://github.com/dpc-sdp/ripple-framework",
"scripts": {
Expand Down Expand Up @@ -82,27 +82,26 @@
"typescript": "^5.0.2"
},
"engines": {
"node": "^16.11.0 || ^18.15.0 || ^20.9.0",
"pnpm": "^8.6.2 || ^10.1.0"
"node": "^18.15.0 || ^20.9.0",
"pnpm": "^9.0.6"
},
"dependencies": {
"@vue/vue3-jest": "^29.2.3",
"rimraf": "^4.4.1",
"vue-jest": "^3.0.7"
"rimraf": "^4.4.1"
},
"pnpm": {
"overrides": {
"@types/react": "file:./stub/types__react",
"[email protected]>chalk": "5.2.0",
"cypress": "13.6.6",
"glob-parent@<5.1.2": "~6.0.2",
"json5@<2.2.2": "~2.2.2",
"nth-check@<2.1.1": "~2.1.1",
"postcss@<8.4.21": "~8.4.21",
"trim@<1.0.1": "~1.0.1",
"trim-newlines@<3.0.1": "~3.0.1",
"vite-plugin-svg-icons>postcss": "~8.4.21",
"xml2js@<0.5.0": "~0.5.0"
"xml2js@<0.5.0": "~0.5.0",
"postcss@<8.4.31": ">=8.4.31",
"sharp@<0.32.6": ">=0.32.6"
},
"patchedDependencies": {
"[email protected]": "patches/[email protected]"
Expand Down
1 change: 0 additions & 1 deletion packages/eslint-config-ripple/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"packageManager": "[email protected]",
"name": "@dpc-sdp/eslint-config-ripple",
"description": "ESLint config for Ripple projects",
"version": "2.8.2",
Expand Down
1 change: 0 additions & 1 deletion packages/nuxt-ripple-analytics/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"packageManager": "[email protected]",
"name": "@dpc-sdp/nuxt-ripple-analytics",
"description": "Nuxt module for handling event tracking.",
"version": "2.8.2",
Expand Down
1 change: 0 additions & 1 deletion packages/nuxt-ripple-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"packageManager": "[email protected]",
"name": "@dpc-sdp/nuxt-ripple-cli",
"description": "A CLI for simplifying common setup and scaffolding tasks",
"version": "2.8.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
to: package.json
---
{
"packageManager": "[email protected]",
"name": "@dpc-sdp/<%= h.changeCase.kebabCase(name) %>",
"description": "Ripple UI Core component library",
"version": "2.1.1",
Expand Down Expand Up @@ -55,7 +54,7 @@ to: package.json
},
"devDependencies": {
"@dpc-sdp/ripple-tide-api": "workspace:*",
"@vitejs/plugin-vue": "^4.1.0",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/compiler-sfc": "^3.2.47",
"autoprefixer": "^10.4.14",
"chromatic": "^6.17.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
with:
always-auth: true
registry-url: 'https://npm.pkg.github.com/'
node-version: 18
node-version: 20
scope: '@dpc-sdp'
- name: Install Dependencies
run: npm ci
Expand All @@ -31,7 +31,7 @@ jobs:
with:
always-auth: true
registry-url: 'https://npm.pkg.github.com/'
node-version: 18
node-version: 20
scope: '@dpc-sdp'
- name: Cypress run
uses: cypress-io/github-action@v6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/setup-node@v3
with:
registry-url: 'https://npm.pkg.github.com/'
node-version: 18
node-version: 20
- name: Set Git credentials
run: |
git config --global user.email "sdp.devs@dpc.vic.gov.au"
Expand Down
1 change: 0 additions & 1 deletion packages/nuxt-ripple-preview/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"packageManager": "[email protected]",
"name": "@dpc-sdp/nuxt-ripple-preview",
"description": "Adds support for drupal preview links in Ripple frontend sites",
"version": "2.8.2",
Expand Down
1 change: 0 additions & 1 deletion packages/nuxt-ripple/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"packageManager": "[email protected]",
"name": "@dpc-sdp/nuxt-ripple",
"description": "Nuxt module for integrating Ripple and Tide",
"version": "2.8.2",
Expand Down
3 changes: 1 addition & 2 deletions packages/ripple-storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"packageManager": "[email protected]",
"name": "ripple-storybook",
"description": "Ripple Storybook instance",
"version": "2.8.2",
Expand Down Expand Up @@ -31,7 +30,7 @@
"http-server": "^14.1.1",
"jest-axe": "^8.0.0",
"storybook": "^7.6.10",
"wait-on": "^7.0.1"
"wait-on": "^7.2.0"
},
"dependencies": {
"@dpc-sdp/ripple-ui-core": "workspace:*",
Expand Down
1 change: 0 additions & 1 deletion packages/ripple-test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"packageManager": "[email protected]",
"name": "@dpc-sdp/ripple-test-utils",
"description": "Test utils for Ripple sites",
"version": "2.8.2",
Expand Down
3 changes: 1 addition & 2 deletions packages/ripple-test-utils/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"compilerOptions": {
"target": "esnext",
"module": "esnext",
"module": "Node16",
"moduleResolution": "Node16",
"rootDir": "./src",
"outDir": "./dist",
Expand Down
1 change: 0 additions & 1 deletion packages/ripple-tide-api/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"packageManager": "[email protected]",
"name": "@dpc-sdp/ripple-tide-api",
"description": "Ripple API endpoints for Tide Drupal backend",
"version": "2.8.2",
Expand Down
1 change: 0 additions & 1 deletion packages/ripple-tide-event/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"packageManager": "[email protected]",
"name": "@dpc-sdp/ripple-tide-event",
"description": "Ripple mappings and components for Tide Event Content type",
"version": "2.8.2",
Expand Down
1 change: 0 additions & 1 deletion packages/ripple-tide-grant/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"packageManager": "[email protected]",
"name": "@dpc-sdp/ripple-tide-grant",
"description": "Ripple mappings and components for Tide Grant Content type",
"version": "2.8.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { useRuntimeConfig } from '#imports'
import { FormKitSchemaNode } from '@formkit/core'
import { $fetch } from 'ohmyfetch'
import { $fetch } from 'ofetch'
import { computed, nextTick, ref, watch } from 'vue'
import { RplFormAlert } from '@dpc-sdp/ripple-ui-forms'
Expand Down
Loading

0 comments on commit cb45547

Please sign in to comment.