Skip to content

Commit

Permalink
feat: ✨ use pnpm catalog for versions
Browse files Browse the repository at this point in the history
  • Loading branch information
waitingallday committed Jan 15, 2025
1 parent 30b643a commit 28f4c6b
Show file tree
Hide file tree
Showing 29 changed files with 2,327 additions and 7,615 deletions.
6 changes: 3 additions & 3 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@v3
with:
version: 9.0.6
version: 10.0.0
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- name: Build Storybook
Expand All @@ -43,7 +43,7 @@ jobs:
env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
with:
version: 9.0.6
version: 10.0.0
run_install: true
- name: Install Node
uses: actions/setup-node@v4
Expand All @@ -66,7 +66,7 @@ jobs:
env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
with:
version: 9.0.6
version: 10.0.0
run_install: true
- name: Install Node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9.0.6
version: 10.0.0
run_install: false
- name: Install Node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9.0.6
version: 10.0.0
run_install: false
- name: Install Node
uses: actions/setup-node@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nuxt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9.0.6
version: 10.0.0
run_install: false
- name: Install Node
uses: actions/setup-node@v4
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9.0.6
version: 10.0.0

- name: Install Dependencies
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9.0.6
version: 10.0.0
run_install: false
- name: Install Node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9.0.6
version: 10.0.0
run_install: false
- name: Install Node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9.0.6
version: 10.0.0
run_install: false

- name: Install Node
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/webcomponents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9.0.6
version: 10.0.0
run_install: false

- name: Install Node
Expand Down
13 changes: 11 additions & 2 deletions docs/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@ import ViteYaml from '@modyfi/vite-plugin-yaml'
// https://v3.nuxtjs.org/docs/directory-structure/nuxt.config
export default defineNuxtConfig({
ssr: true,

modules: [
'@dpc-sdp/ripple-ui-core/nuxt',
'@dpc-sdp/ripple-ui-forms/nuxt',
'@nuxt/content',
'@nuxthq/studio'
],

github: {
repo: 'dpc-sdp/ripple-framework'
},

// https://content.nuxtjs.org
content: {
navigation: {
Expand All @@ -26,17 +29,21 @@ export default defineNuxtConfig({
preload: ['vue', 'bash', 'markdown']
}
},

vite: {
plugins: [ViteYaml()]
},

experimental: {
inlineSSRStyles: (id) => !id?.includes('entry')
},

nitro: {
prerender: {
ignore: ['/storybook']
}
},

// A change in nuxt 3.8.0 means we were getting errors whenever a type was imported without the 'type' keyword
// This is a temporary workaround until we can fix all the types
// TODO: Add 'type' keyword to all type imports
Expand All @@ -47,5 +54,7 @@ export default defineNuxtConfig({
verbatimModuleSyntax: false
}
}
}
})
},

compatibilityDate: '2025-01-16'
})
18 changes: 9 additions & 9 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
"@dpc-sdp/ripple-ui-core": "workspace:*",
"@dpc-sdp/ripple-ui-forms": "workspace:*",
"@dpc-sdp/stylelint-config-ripple": "workspace:*",
"@modyfi/vite-plugin-yaml": "^1.0.4",
"@nuxt/content": "^2.12.0",
"highlight.js": "^11.7.0",
"iframe-resizer": "^4.3.6",
"nuxt": "^3.10.0"
"@modyfi/vite-plugin-yaml": "catalog:",
"@nuxt/content": "catalog:",
"highlight.js": "catalog:",
"iframe-resizer": "catalog:",
"nuxt": "catalog:"
},
"devDependencies": {
"@iconify/vue": "^4.1.0",
"@nuxt/content": "^2.12.0",
"@nuxthq/studio": "^1.0.0",
"@types/iframe-resizer": "^3.5.9"
"@iconify/vue": "catalog:",
"@nuxt/content": "catalog:",
"@nuxthq/studio": "catalog:",
"@types/iframe-resizer": "catalog:"
}
}
8 changes: 4 additions & 4 deletions examples/nuxt-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
"devDependencies": {
"@dpc-sdp/ripple-test-utils": "workspace:*",
"@dpc-sdp/ripple-tide-api": "workspace:*",
"@nuxt/devtools": "^0.6.7",
"cypress": "13.6.6",
"node-fetch-native": "^1.4.1",
"nuxt": "3.13.2"
"@nuxt/devtools": "catalog:",
"cypress": "catalog:",
"node-fetch-native": "catalog:",
"nuxt": "catalog:"
}
}
32 changes: 16 additions & 16 deletions examples/vue-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
"dependencies": {
"@dpc-sdp/ripple-ui-core": "workspace:*",
"@dpc-sdp/stylelint-config-ripple": "workspace:*",
"vue": "^3.4.21",
"vue-router": "^4.1.5"
"vue": "catalog:",
"vue-router": "catalog:"
},
"devDependencies": {
"@cypress/vite-dev-server": "^5.0.5",
"@cypress/vue": "^5.0.5",
"@rushstack/eslint-patch": "^1.2.0",
"@types/node": "^18.15.10",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-prettier": "^9.0.0",
"@vue/eslint-config-typescript": "^11.0.2",
"@vue/tsconfig": "^0.1.3",
"cypress": "^13.6.6",
"eslint": "^8.36.0",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-vue": "^9.10.0",
"prettier": "^3.3.0",
"typescript": "^5.0.2"
"@cypress/vite-dev-server": "catalog:",
"@cypress/vue": "catalog:",
"@rushstack/eslint-patch": "catalog:",
"@types/node": "catalog:",
"@vitejs/plugin-vue": "catalog:",
"@vue/eslint-config-prettier": "catalog:",
"@vue/eslint-config-typescript": "catalog:",
"@vue/tsconfig": "catalog:",
"cypress": "catalog:",
"eslint": "catalog:",
"eslint-plugin-cypress": "catalog:",
"eslint-plugin-vue": "catalog:",
"prettier": "catalog:",
"typescript": "catalog:"
}
}
78 changes: 39 additions & 39 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@9.0.6",
"packageManager": "pnpm@10.0.0+sha512.b8fef5494bd3fe4cbd4edabd0745df2ee5be3e4b0b8b08fa643aa3e4c6702ccc0f00d68fa8a8c9858a735a0032485a44990ed2810526c875e416f001b17df12b",
"license": "Apache-2.0",
"repository": "https://github.com/dpc-sdp/ripple-framework",
"scripts": {
Expand Down Expand Up @@ -43,53 +43,53 @@
"generate:component": "nuxt-ripple add component ./packages/ripple-ui-core/src/components"
},
"devDependencies": {
"@awmottaz/prettier-plugin-void-html": "^1.7.0",
"@babel/core": "^7.26.0",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-runtime": "^7.25.9",
"@babel/preset-env": "^7.26.0",
"@bahmutov/cypress-esbuild-preprocessor": "^2.2.4",
"@commitlint/cli": "^19.6.1",
"@commitlint/config-conventional": "^19.6.0",
"@cypress/vite-dev-server": "^6.0.0",
"@awmottaz/prettier-plugin-void-html": "catalog:",
"@babel/core": "catalog:",
"@babel/plugin-syntax-dynamic-import": "catalog:",
"@babel/plugin-transform-runtime": "catalog:",
"@babel/preset-env": "catalog:",
"@bahmutov/cypress-esbuild-preprocessor": "catalog:",
"@commitlint/cli": "catalog:",
"@commitlint/config-conventional": "catalog:",
"@cypress/vite-dev-server": "catalog:",
"@dpc-sdp/eslint-config-ripple": "workspace:*",
"@dpc-sdp/ripple-ui-core": "workspace:*",
"@dpc-sdp/ripple-ui-forms": "workspace:*",
"@dpc-sdp/stylelint-config-ripple": "workspace:*",
"@jest/globals": "^29.7.0",
"@lerna-lite/cli": "^3.11.0",
"@lerna-lite/publish": "^3.11.0",
"@lerna-lite/version": "^3.11.0",
"@types/jest": "^29.5.14",
"babel-core": "7.0.0-bridge.0",
"babel-jest": "^29.7.0",
"babel-loader": "^9.2.1",
"babel-plugin-dynamic-import-node": "^2.3.3",
"babel-plugin-require-context-hook": "^1.0.0",
"babel-plugin-syntax-jsx": "^6.18.0",
"babel-plugin-transform-vue-jsx": "^3.7.0",
"changelogen": "^0.5.7",
"cypress": "13.17.0",
"eslint": "^8.36.0",
"husky": "^9.1.7",
"hygen": "^6.2.11",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"postcss-nested": "^7.0.2",
"postcss-normalize": "^13.0.1",
"postcss-preset-env": "^10.1.3",
"start-server-and-test": "^2.0.9",
"stylelint": "^15.10.2",
"ts-jest": "^29.2.5"
"@jest/globals": "catalog:",
"@lerna-lite/cli": "catalog:",
"@lerna-lite/publish": "catalog:",
"@lerna-lite/version": "catalog:",
"@types/jest": "catalog:",
"babel-core": "catalog:",
"babel-jest": "catalog:",
"babel-loader": "catalog:",
"babel-plugin-dynamic-import-node": "catalog:",
"babel-plugin-require-context-hook": "catalog:",
"babel-plugin-syntax-jsx": "catalog:",
"babel-plugin-transform-vue-jsx": "catalog:",
"changelogen": "catalog:",
"cypress": "catalog:",
"eslint": "catalog:",
"husky": "catalog:",
"hygen": "catalog:",
"jest": "catalog:",
"jest-environment-jsdom": "catalog:",
"postcss-nested": "catalog:",
"postcss-normalize": "catalog:",
"postcss-preset-env": "catalog:",
"start-server-and-test": "catalog:",
"stylelint": "catalog:",
"ts-jest": "catalog:"
},
"engines": {
"node": "^18.15.0 || ^20.9.0",
"pnpm": "^9.0.6"
"pnpm": "^10.0.0"
},
"dependencies": {
"@vue/vue3-jest": "^29.2.6",
"rimraf": "^6.0.1",
"typescript": "5.7.3"
"@vue/vue3-jest": "catalog:",
"rimraf": "catalog:",
"typescript": "catalog:"
},
"pnpm": {
"overrides": {
Expand Down
18 changes: 8 additions & 10 deletions packages/eslint-config-ripple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,18 @@
"exports": {
".": "./index.js"
},
"files": [
"index.js"
],
"files": ["index.js"],
"dependencies": {
"@nuxt/eslint-config": "0.1.1",
"@typescript-eslint/eslint-plugin": "^6.2.0",
"@typescript-eslint/parser": "^6.2.0",
"vue-eslint-parser": "^9.3.1"
"@nuxt/eslint-config": "catalog:",
"@typescript-eslint/eslint-plugin": "catalog:",
"@typescript-eslint/parser": "catalog:",
"vue-eslint-parser": "catalog:"
},
"devDependencies": {
"eslint": "^8.45.0",
"eslint-junit": "^1.0.1"
"eslint": "catalog:",
"eslint-junit": "catalog:"
},
"peerDependencies": {
"eslint": "^8.45.0"
"eslint": "catalog:"
}
}
6 changes: 3 additions & 3 deletions packages/nuxt-ripple-analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
},
"dependencies": {
"@dpc-sdp/ripple-ui-core": "workspace:*",
"@gtm-support/core": "^2.0.0",
"@newrelic/browser-agent": "^1.273.0"
"@gtm-support/core": "catalog:",
"@newrelic/browser-agent": "catalog:"
},
"devDependencies": {
"@dpc-sdp/nuxt-ripple": "workspace:*",
Expand All @@ -27,6 +27,6 @@
"@dpc-sdp/ripple-tide-topic": "workspace:*",
"@dpc-sdp/ripple-ui-core": "workspace:*",
"@dpc-sdp/ripple-ui-forms": "workspace:*",
"@nuxt/eslint-config": "^0.1.1"
"@nuxt/eslint-config": "catalog:"
}
}
Loading

0 comments on commit 28f4c6b

Please sign in to comment.