Skip to content

Commit

Permalink
Merge pull request #3233 from vuestorefront/v2-release/nuxt-2.5.2
Browse files Browse the repository at this point in the history
chore: release/nuxt 2.5.2
  • Loading branch information
Szymon-dziewonski authored Oct 9, 2024
2 parents 359ebb8 + 097c231 commit 77f8177
Show file tree
Hide file tree
Showing 27 changed files with 4,676 additions and 1,993 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ jobs:
- name: Pre-Cypress (build all dependencies)
run: yarn test:ci-pre:vue
- name: Cypress run
uses: cypress-io/github-action@v6.6.1
uses: cypress-io/github-action@v6.7.2
with:
browser: chrome
working-directory: apps/test/vue
Expand All @@ -155,7 +155,7 @@ jobs:
run: cd apps/test/vue; yarn generate-coverage
- name: SonarCloud Scan
if: ${{ env.SONAR_TOKEN_VUE }}
uses: SonarSource/sonarcloud-github-action@v2.1.1
uses: SonarSource/sonarcloud-github-action@v2.3.0
with:
projectBaseDir: packages/sfui/frameworks/vue
env:
Expand All @@ -179,7 +179,7 @@ jobs:
- name: Pre-Cypress (build all dependencies)
run: yarn test:ci-pre:react
- name: Cypress run
uses: cypress-io/github-action@v6.6.1
uses: cypress-io/github-action@v6.7.2
with:
browser: chrome
working-directory: apps/test/react
Expand All @@ -190,7 +190,7 @@ jobs:
run: cd apps/test/react; yarn generate-coverage
- name: SonarCloud Scan
if: ${{ env.SONAR_TOKEN_REACT }}
uses: SonarSource/sonarcloud-github-action@v2.1.1
uses: SonarSource/sonarcloud-github-action@v2.3.0
with:
projectBaseDir: packages/sfui/frameworks/react
env:
Expand All @@ -214,17 +214,17 @@ jobs:
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: yarn --immutable
- name: Set yarn config
run: |
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
- name: Bump package version
run: yarn changeset version --snapshot
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Build packages
run: yarn build:release
- name: Set yarn config
run: |
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
- name: Publish canary version
run: yarn workspaces foreach --no-private --from '@storefront-ui/*' npm publish --tag canary || true
env:
Expand All @@ -249,16 +249,16 @@ jobs:
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: yarn --immutable
- name: Set yarn config
run: |
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
- name: Save head commit message
id: commit_message
run: echo "result=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT
- name: Build packages
run: yarn build:release
- name: Set yarn config
run: |
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
- name: Publish release-candidate version
# If this is any `v2-release/**` branch AND last commit is made by changeset action and its commit message is with "ci: release (rc)", this happens only after merging changesets changelog PR
if: "${{ startsWith( github.event.pull_request.head.ref, 'v2-release' ) && contains( steps.commit_message.outputs.result, 'ci: version packages (rc)' ) }}"
Expand Down Expand Up @@ -287,13 +287,13 @@ jobs:
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: yarn --immutable
- name: Build packages
run: yarn build:release
- name: Set yarn config
run: |
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
- name: Build packages
run: yarn build:release
- name: Publish Production version package
run: yarn workspaces foreach --no-private --from '@storefront-ui/*' npm publish || true
env:
Expand Down Expand Up @@ -324,7 +324,7 @@ jobs:
with:
fetch-depth: 0
- name: GitGuardian scan
uses: GitGuardian/ggshield-action@v1.27.0
uses: GitGuardian/ggshield-action@v1.29.0
with:
args: -v
env:
Expand Down
362 changes: 181 additions & 181 deletions .yarn/releases/yarn-3.8.2.cjs → .yarn/releases/yarn-3.8.3.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: '@yarnpkg/plugin-workspace-tools'

yarnPath: .yarn/releases/yarn-3.8.2.cjs
yarnPath: .yarn/releases/yarn-3.8.3.cjs
29 changes: 14 additions & 15 deletions apps/docs/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,32 @@
"serve": "PORT=80 node .output/server/index.mjs"
},
"devDependencies": {
"@microsoft/api-documenter": "^7.24.2",
"@microsoft/api-extractor": "7.44.1",
"@microsoft/api-documenter": "^7.25.9",
"@microsoft/api-extractor": "^7.47.4",
"@types/node": "^20.12.7",
"nuxt": "^3.11.2",
"nuxt-gtag": "^2.0.5"
"nuxt": "^3.13.2",
"nuxt-gtag": "^3.0.1"
},
"dependencies": {
"@microsoft/api-extractor-model": "^7.28.14",
"@microsoft/tsdoc": "^0.14.2",
"@microsoft/api-extractor-model": "^7.29.4",
"@microsoft/tsdoc": "^0.15.0",
"@nuxt/content": "^2.12.1",
"@nuxtjs/algolia": "^1.10.2",
"@nuxtjs/color-mode": "^3.4.1",
"@nuxtjs/color-mode": "^3.4.2",
"@nuxtjs/seo": "^2.0.0-rc.10",
"@nuxtjs/tailwindcss": "^6.12.0",
"@nuxtjs/tailwindcss": "^6.12.1",
"@storefront-ui/typography": "^2.6.1",
"@storefront-ui/vue": "^2.6.4",
"@tailwindcss/typography": "^0.5.13",
"@vueuse/integrations": "^10.9.0",
"@vueuse/nuxt": "^10.9.0",
"@vueuse/integrations": "^10.11.0",
"@vueuse/nuxt": "^10.11.0",
"focus-trap": "^7.5.4",
"marked": "^12.0.2",
"marked": "^13.0.3",
"nuxt-content-assets": "^1.4.3",
"nuxt-icon": "^0.6.10",
"sf-docs-base": "^1.2.6",
"unstorage": "^1.10.1",
"vite-svg-loader": "^5.1.0",
"vue": "^3.4.27"
"sf-docs-base": "^1.3.1",
"unstorage": "^1.10.2",
"vite-svg-loader": "^5.1.0"
},
"resolutions": {
"@storefront-ui/eslint-config": "workspace:*",
Expand Down
12 changes: 6 additions & 6 deletions apps/preview/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
"@storefront-ui/preview-shared": "workspace:*",
"classnames": "^2.5.1",
"lodash-es": "^4.17.21",
"next": "^14.2.3",
"next": "^14.2.5",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-transition-group": "^4.4.5",
"react-use": "^17.5.0",
"react-use": "^17.5.1",
"swr": "^2.2.5"
},
"devDependencies": {
"@frsource/autoresize-textarea": "^2.0.68",
"@frsource/autoresize-textarea": "^2.0.87",
"@storefront-ui/eslint-config": "workspace:*",
"@storefront-ui/example-style": "workspace:*",
"@storefront-ui/react": "workspace:*",
Expand All @@ -38,11 +38,11 @@
"@types/react": "^18.0.28",
"@types/react-dom": "^18.0.11",
"@types/react-transition-group": "^4.4.5",
"glob-promise": "^6.0.2",
"glob-promise": "^6.0.7",
"prettier": "^3.0.0",
"rimraf": "^5.0.0",
"rimraf": "^6.0.1",
"string-replace-loader": "^3.1.0",
"tailwindcss": "^3.4.3",
"tailwindcss": "^3.4.7",
"ts-loader": "^9.4.2"
}
}
10 changes: 5 additions & 5 deletions apps/preview/nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"prettier": "prettier --log-level warn --no-error-on-unmatched-pattern \"**/*.{js,ts,vue}\""
},
"devDependencies": {
"@frsource/autoresize-textarea": "^2.0.68",
"@frsource/autoresize-textarea": "^2.0.87",
"@nuxtjs/eslint-config-typescript": "^12.1.0",
"@nuxtjs/tailwindcss": "^6.12.0",
"@nuxtjs/tailwindcss": "^6.12.1",
"@storefront-ui/eslint-config": "workspace:*",
"@storefront-ui/example-style": "workspace:*",
"@storefront-ui/nuxt": "workspace:*",
Expand All @@ -25,14 +25,14 @@
"@storefront-ui/vue": "workspace:*",
"@tailwindcss/typography": "^0.5.13",
"@types/lodash-es": "^4.17.12",
"@vueuse/core": "^10.9.0",
"@vueuse/core": "^10.11.0",
"autoprefixer": "^10.4.19",
"eslint": "^8.34.0",
"eslint-plugin-nuxt": "^4.0.0",
"nuxt": "^3.11.2",
"nuxt": "^3.13.2",
"postcss": "^8.4.21",
"prettier": "^3.0.0",
"sass": "^1.75.0",
"sass": "^1.77.8",
"sass-loader": "^14.2.1"
},
"dependencies": {
Expand Down
10 changes: 5 additions & 5 deletions apps/test/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@tailwindcss/typography": "^0.5.13",
"@types/react": "^18.0.28",
"@types/react-dom": "^18.0.11",
"@vitejs/plugin-react": "^4.3.0",
"@vitejs/plugin-react": "^4.3.1",
"autoprefixer": "^10.4.19",
"chokidar-cli": "^3.0.0",
"concurrently": "^8.2.2",
Expand All @@ -47,10 +47,10 @@
"nyc": "^15.1.0",
"postcss": "^8.4.21",
"postcss-import": "^15.1.0",
"rimraf": "^5.0.0",
"tailwindcss": "^3.4.3",
"typescript": "^5.4.5",
"vite": "^5.2.1",
"rimraf": "^6.0.1",
"tailwindcss": "^3.4.7",
"typescript": "^5.5.4",
"vite": "^5.3.5",
"vite-plugin-istanbul": "^4.0.1"
}
}
14 changes: 7 additions & 7 deletions apps/test/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@storefront-ui/vue": "workspace:*",
"@tailwindcss/typography": "^0.5.13",
"@types/node": "^20.12.7",
"@vitejs/plugin-vue": "^5.0.4",
"@vitejs/plugin-vue": "^5.1.1",
"@vue/tsconfig": "^0.1.3",
"autoprefixer": "^10.4.19",
"chokidar-cli": "^3.0.0",
Expand All @@ -48,12 +48,12 @@
"nyc": "^15.1.0",
"postcss": "^8.4.21",
"postcss-import": "^15.1.0",
"rimraf": "^4.1.2",
"sass": "^1.75.0",
"tailwindcss": "^3.4.3",
"typescript": "^5.4.5",
"vite": "^5.2.1",
"rimraf": "^6.0.1",
"sass": "^1.77.8",
"tailwindcss": "^3.4.7",
"typescript": "^5.5.4",
"vite": "^5.3.5",
"vite-plugin-istanbul": "^4.0.0",
"vue-tsc": "^2.0.16"
"vue-tsc": "^2.0.29"
}
}
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,26 +65,26 @@
"@vue-storefront/prettier-config": "^2.0.0-rc.1",
"commitizen": "^4.2.5",
"concurrently": "^8.2.2",
"husky": "^9.0.11",
"husky": "^9.1.4",
"hygen": "^6.2.8",
"mdast-util-to-string": "^4.0.0",
"prettier": "latest",
"remark-parse": "^11.0.0",
"remark-stringify": "^11.0.0",
"rimraf": "^5.0.0",
"rimraf": "^6.0.1",
"rollup-plugin-preserve-directives": "^0.4.0",
"tailwindcss": "^3.4.3",
"turbo": "latest",
"typescript": "^5.4.5",
"unified": "^11.0.4",
"tailwindcss": "^3.4.7",
"turbo": "^2.0.9",
"typescript": "^5.5.4",
"unified": "^11.0.5",
"wait-on": "^7.0.1"
},
"engines": {
"npm": ">=8.19.1",
"yarn": ">=1.22.19",
"node": ">=16.0.0"
},
"packageManager": "[email protected].2",
"packageManager": "[email protected].3",
"config": {
"commitizen": {
"path": "cz-conventional-changelog",
Expand Down
2 changes: 1 addition & 1 deletion packages/config/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@vue-storefront/eslint-config": "^3.0.0",
"@vue-storefront/eslint-config": "^3.1.3",
"@vue/eslint-config-standard": "^8.0.1",
"eslint": "^8.34.0",
"eslint-config-airbnb": "^19.0.4",
Expand Down
11 changes: 6 additions & 5 deletions packages/config/example-style/controls.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
&--collapsed {
height: 32px;
}

.heading {
padding: 4px 10px;
flex-grow: 1;
Expand Down Expand Up @@ -105,10 +105,6 @@


.switch {
&-wrapper {
display: flex;
align-items: center;
}
position: relative;
display: inline-block;
width: 60px;
Expand All @@ -128,6 +124,11 @@
}
}

&-wrapper {
display: flex;
align-items: center;
}

.slider {
background-color: rgb(212 212 216);
position: absolute;
Expand Down
4 changes: 2 additions & 2 deletions packages/config/tailwind/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"url": "https://github.com/vuestorefront/storefront-ui/issues"
},
"devDependencies": {
"typescript": "^5.4.5",
"vite": "^5.2.1",
"typescript": "^5.5.4",
"vite": "^5.3.5",
"vite-plugin-dts": "^3.9.1"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/config/tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"build:test-utils": "vite build"
},
"devDependencies": {
"typescript": "^5.4.5",
"vite": "^5.2.1",
"typescript": "^5.5.4",
"vite": "^5.3.5",
"vite-plugin-dts": "^3.9.1"
}
}
6 changes: 6 additions & 0 deletions packages/sfui/frameworks/nuxt/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @storefront-ui/nuxt

## 2.5.3

### Patch Changes

- [#3232](https://github.com/vuestorefront/storefront-ui/pull/3232) [`30bfa9a`](https://github.com/vuestorefront/storefront-ui/commit/30bfa9a327a0da0adb02bfda26a756e75ff80c83) Thanks [@Szymon-dziewonski](https://github.com/Szymon-dziewonski)! - [CHANGED] Migrate nuxt module to newest version `@nuxtjs/[email protected]` enabling HMR

## 2.5.2

### Patch Changes
Expand Down
Loading

0 comments on commit 77f8177

Please sign in to comment.