Skip to content

Commit

Permalink
chore: bump dependencies (#295)
Browse files Browse the repository at this point in the history
* chore: bump dependencies

* chore: revert i18n plugin update

* chore: new patch after update, related changesets/changesets#1047

* chore: add changeset
  • Loading branch information
patzick authored Jun 29, 2023
1 parent 59b8ae9 commit 23a0a53
Show file tree
Hide file tree
Showing 21 changed files with 887 additions and 717 deletions.
17 changes: 17 additions & 0 deletions .changeset/famous-forks-unite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
"eslint-config-shopware": patch
"@shopware/api-client": patch
"vue-demo-store": patch
"vue-vite-blank": patch
"@shopware-pwa/nuxt3-module": patch
"@shopware-pwa/composables-next": patch
"@shopware-pwa/vue3-plugin": patch
"vue-blank": patch
"@shopware-pwa/cms-base": patch
"@shopware/api-gen": patch
"shopware-astro": patch
"@shopware-pwa/typer": patch
"docs": patch
---

bump dependencies
3 changes: 2 additions & 1 deletion .tazerc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"install": true,
"recursive": true,
"packageMode": {
"axios": "ignore"
"axios": "ignore",
"@types/node": "ignore"
}
}
2 changes: 1 addition & 1 deletion apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@types/markdown-it": "^12.2.3",
"@types/node": "^18.16.18",
"@vitejs/plugin-vue": "^4.2.3",
"typescript": "^5.1.3"
"typescript": "^5.1.6"
},
"pnpm": {
"peerDependencyRules": {
Expand Down
4 changes: 2 additions & 2 deletions examples/example-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
},
"devDependencies": {
"@vitejs/plugin-vue": "^4.2.3",
"typescript": "^5.1.3",
"typescript": "^5.1.6",
"vite": "^4.3.9",
"vue-tsc": "^1.8.1"
"vue-tsc": "^1.8.3"
}
}
12 changes: 6 additions & 6 deletions examples/modal-teleport/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
"postinstall": "nuxt prepare"
},
"devDependencies": {
"@nuxt/devtools": "^0.6.3",
"@nuxt/devtools": "^0.6.4",
"@nuxt/types": "^2.17.0",
"@nuxt/typescript-build": "^3.0.1",
"@nuxtjs/eslint-config-typescript": "^12.0.0",
"@unocss/nuxt": "^0.53.3",
"@unocss/reset": "^0.53.3",
"@unocss/nuxt": "^0.53.4",
"@unocss/reset": "^0.53.4",
"eslint": "^8.43.0",
"nuxt": "^3.6.0",
"unocss": "^0.53.3"
"nuxt": "^3.6.1",
"unocss": "^0.53.4"
},
"dependencies": {
"@vueuse/nuxt": "^10.2.0",
"@vueuse/nuxt": "^10.2.1",
"vue": "^3.3.4"
}
}
6 changes: 3 additions & 3 deletions examples/new-api-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
},
"devDependencies": {
"@vitejs/plugin-vue": "^4.2.3",
"typescript": "^5.0.4",
"vite": "^4.3.8",
"vue-tsc": "^1.6.5"
"typescript": "^5.1.6",
"vite": "^4.3.9",
"vue-tsc": "^1.8.3"
}
}
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"devDependencies": {
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.26.1",
"@changesets/cli": "^2.26.2",
"@microsoft/api-documenter": "^7.22.21",
"@microsoft/api-extractor": "^7.36.0",
"@microsoft/tsdoc": "^0.14.2",
Expand All @@ -35,12 +35,12 @@
"dotenv-cli": "^7.2.1",
"globby": "^13.2.0",
"husky": "^8.0.3",
"lint-staged": "^13.2.2",
"lint-staged": "^13.2.3",
"prettier": "^2.8.8",
"taze": "^0.10.2",
"taze": "^0.11.0",
"turbo": "^1.10.6",
"typedoc": "^0.24.8",
"vercel": "^30.2.3"
"vercel": "^31.0.1"
},
"engines": {
"node": "^16.x || ^18.x"
Expand All @@ -50,7 +50,7 @@
"prettier --write"
]
},
"packageManager": "[email protected].4",
"packageManager": "[email protected].5",
"pnpm": {
"overrides": {
"yaml@2": "^2.2.2",
Expand All @@ -65,12 +65,13 @@
]
},
"patchedDependencies": {
"@changesets/[email protected]": "patches/@[email protected]"
"@changesets/[email protected]": "patches/@[email protected]",
"@changesets/[email protected]": "patches/@[email protected]"
},
"allowNonAppliedPatches": true,
"auditConfig": {
"ignoreCves": [
"CVE-2023-28155"
"CVE-2023-26115"
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/api-client-next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
"test:watch": "vitest"
},
"devDependencies": {
"@types/prettier": "^2.7.2",
"@types/prettier": "^2.7.3",
"@vitest/coverage-c8": "^0.32.2",
"eslint-config-shopware": "workspace:*",
"prettier": "^2.8.8",
"tsconfig": "workspace:*",
"vitest": "^0.32.2"
},
"dependencies": {
"ofetch": "^1.0.1"
"ofetch": "^1.1.1"
}
}
6 changes: 3 additions & 3 deletions packages/api-gen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"test:watch": "vitest"
},
"devDependencies": {
"@types/prettier": "^2.7.2",
"@types/prettier": "^2.7.3",
"@types/yargs": "^17.0.24",
"@vitest/coverage-c8": "^0.32.2",
"eslint-config-shopware": "workspace:*",
Expand All @@ -44,10 +44,10 @@
"vitest": "^0.32.2"
},
"dependencies": {
"ofetch": "^1.0.1",
"ofetch": "^1.1.1",
"openapi-typescript": "^6.2.8",
"prettier": "^2.8.8",
"semver": "^7.3.8",
"semver": "^7.5.3",
"yargs": "^17.7.2"
}
}
8 changes: 4 additions & 4 deletions packages/cms-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"test": "echo \"Warn: no test specified yet\""
},
"dependencies": {
"@nuxt/kit": "^3.6.0",
"@nuxt/kit": "^3.6.1",
"@shopware-pwa/api-client": "workspace:*",
"@shopware-pwa/composables-next": "workspace:*",
"@shopware-pwa/helpers-next": "workspace:*",
Expand All @@ -51,15 +51,15 @@
"html-to-ast": "^0.0.6"
},
"devDependencies": {
"@nuxt/schema": "^3.6.0",
"@nuxt/schema": "^3.6.1",
"@shopware-pwa/types": "workspace:*",
"@vue/eslint-config-typescript": "^11.0.3",
"eslint-config-shopware": "workspace:*",
"eslint-plugin-vue": "^9.15.1",
"tsconfig": "workspace:*",
"typescript": "^5.1.3",
"typescript": "^5.1.6",
"unbuild": "^1.2.1",
"vue-eslint-parser": "^9.3.1",
"vue-tsc": "^1.8.1"
"vue-tsc": "^1.8.3"
}
}
4 changes: 2 additions & 2 deletions packages/composables/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"dependencies": {
"@shopware-pwa/api-client": "workspace:*",
"@shopware-pwa/helpers-next": "workspace:*",
"@vueuse/core": "^10.2.0",
"@vueuse/core": "^10.2.1",
"scule": "^1.0.0"
},
"devDependencies": {
Expand All @@ -50,7 +50,7 @@
"eslint-config-shopware": "workspace:*",
"happy-dom": "^9.20.3",
"tsconfig": "workspace:*",
"typescript": "^5.1.3",
"typescript": "^5.1.6",
"unbuild": "^1.2.1",
"vitest": "^0.32.2",
"vue": "^3.3.4"
Expand Down
6 changes: 3 additions & 3 deletions packages/eslint-config-shopware/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"main": "index.js",
"license": "MIT",
"dependencies": {
"@typescript-eslint/eslint-plugin": "^5.60.0",
"@typescript-eslint/parser": "^5.60.0",
"@typescript-eslint/eslint-plugin": "^5.60.1",
"@typescript-eslint/parser": "^5.60.1",
"eslint": "^8.43.0",
"eslint-config-prettier": "^8.8.0",
"typescript": "^5.1.3"
"typescript": "^5.1.6"
}
}
8 changes: 4 additions & 4 deletions packages/nuxt3-module/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@
"test": "echo \"Warn: no test specified yet\""
},
"dependencies": {
"@nuxt/kit": "^3.6.0",
"@nuxt/kit": "^3.6.1",
"@shopware-pwa/api-client": "workspace:*",
"@shopware-pwa/composables-next": "workspace:*",
"js-cookie": "^3.0.5"
},
"devDependencies": {
"@nuxt/devtools": "^0.6.3",
"@nuxt/schema": "^3.6.0",
"@nuxt/devtools": "^0.6.4",
"@nuxt/schema": "^3.6.1",
"eslint-config-shopware": "workspace:*",
"tsconfig": "workspace:*",
"typescript": "^5.1.3",
"typescript": "^5.1.6",
"unbuild": "^1.2.1"
}
}
2 changes: 1 addition & 1 deletion packages/typer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"intermock": "^0.2.5",
"ts-dox": "^0.1.0",
"typedoc": "^0.24.8",
"typescript": "^5.1.3",
"typescript": "^5.1.6",
"vinyl": "^3.0.0",
"vite-plugin-dts": "^2.3.0",
"vitest": "^0.32.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/vue3-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"build": "tsc && vite build"
},
"devDependencies": {
"typescript": "^5.1.3",
"typescript": "^5.1.6",
"vite": "^4.3.9",
"vite-dts": "^1.0.4"
},
Expand Down
103 changes: 103 additions & 0 deletions patches/@[email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
diff --git a/dist/apply-release-plan.cjs.dev.js b/dist/apply-release-plan.cjs.dev.js
index a537ba7a436f047f4c372117d7851932bc4c6bce..3754e9ee1d1c076d5ded2f919dfb626f69bc164c 100644
--- a/dist/apply-release-plan.cjs.dev.js
+++ b/dist/apply-release-plan.cjs.dev.js
@@ -13,6 +13,7 @@ var getVersionRangeType = require('@changesets/get-version-range-type');
var Range = require('semver/classes/range');
var semverPrerelease = require('semver/functions/prerelease');
var semverSatisfies = require('semver/functions/satisfies');
+var semverValidRange = require("semver/ranges/valid");
var startCase = require('lodash.startcase');

function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -25,6 +26,7 @@ var prettier__default = /*#__PURE__*/_interopDefault(prettier);
var getVersionRangeType__default = /*#__PURE__*/_interopDefault(getVersionRangeType);
var Range__default = /*#__PURE__*/_interopDefault(Range);
var semverPrerelease__default = /*#__PURE__*/_interopDefault(semverPrerelease);
+var semverValidRange__default = /*#__PURE__*/ _interopDefault(semverValidRange);
var semverSatisfies__default = /*#__PURE__*/_interopDefault(semverSatisfies);
var startCase__default = /*#__PURE__*/_interopDefault(startCase);

@@ -168,13 +170,16 @@ function versionPackage(release, versionsToUpdate, {
depCurrentVersion = workspaceDepVersion;
}

- if ( // an empty string is the normalised version of x/X/*
+ if (
+ semverValidRange__default.default(depCurrentVersion) !== null &&
+ // an empty string is the normalised version of x/X/*
// we don't want to change these versions because they will match
// any version and if someone makes the range that
// they probably want it to stay like that...
- new Range__default['default'](depCurrentVersion).range !== "" || // ...unless the current version of a dependency is a prerelease (which doesn't satisfy x/X/*)
+ (new Range__default['default'](depCurrentVersion).range !== "" || // ...unless the current version of a dependency is a prerelease (which doesn't satisfy x/X/*)
// leaving those as is would leave the package in a non-installable state (wrong dep versions would get installed)
- semverPrerelease__default['default'](version) !== null) {
+ semverPrerelease__default['default'](version) !== null
+ )) {
let newNewRange = snapshot ? version : `${getVersionRangeType__default['default'](depCurrentVersion)}${version}`;
if (usesWorkspaceRange) newNewRange = `workspace:${newNewRange}`;
deps[name] = newNewRange;
diff --git a/dist/apply-release-plan.cjs.prod.js b/dist/apply-release-plan.cjs.prod.js
index 41b2127a84124c660742df42eacc80e9d44b3c8c..81b9ecdaed20ba8b59d5a7a8c9ecb50f9b270ef5 100644
--- a/dist/apply-release-plan.cjs.prod.js
+++ b/dist/apply-release-plan.cjs.prod.js
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
value: !0
});

-var config = require("@changesets/config"), git = require("@changesets/git"), resolveFrom = require("resolve-from"), detectIndent = require("detect-indent"), fs = require("fs-extra"), path = require("path"), prettier = require("prettier"), getVersionRangeType = require("@changesets/get-version-range-type"), Range = require("semver/classes/range"), semverPrerelease = require("semver/functions/prerelease"), semverSatisfies = require("semver/functions/satisfies"), startCase = require("lodash.startcase");
+var config = require("@changesets/config"), git = require("@changesets/git"), resolveFrom = require("resolve-from"), detectIndent = require("detect-indent"), fs = require("fs-extra"), path = require("path"), prettier = require("prettier"), getVersionRangeType = require("@changesets/get-version-range-type"), Range = require("semver/classes/range"), semverPrerelease = require("semver/functions/prerelease"), semverValidRange = require("semver/ranges/valid"), semverSatisfies = require("semver/functions/satisfies"), startCase = require("lodash.startcase");

function _interopDefault(e) {
return e && e.__esModule ? e : {
@@ -12,7 +12,7 @@ function _interopDefault(e) {
};
}

-var resolveFrom__default = _interopDefault(resolveFrom), detectIndent__default = _interopDefault(detectIndent), fs__default = _interopDefault(fs), path__default = _interopDefault(path), prettier__default = _interopDefault(prettier), getVersionRangeType__default = _interopDefault(getVersionRangeType), Range__default = _interopDefault(Range), semverPrerelease__default = _interopDefault(semverPrerelease), semverSatisfies__default = _interopDefault(semverSatisfies), startCase__default = _interopDefault(startCase);
+var resolveFrom__default = _interopDefault(resolveFrom), detectIndent__default = _interopDefault(detectIndent), fs__default = _interopDefault(fs), path__default = _interopDefault(path), prettier__default = _interopDefault(prettier), getVersionRangeType__default = _interopDefault(getVersionRangeType), Range__default = _interopDefault(Range), semverPrerelease__default = _interopDefault(semverPrerelease), semverValidRange__default = _interopDefault(semverValidRange), semverSatisfies__default = _interopDefault(semverSatisfies), startCase__default = _interopDefault(startCase);

function _defineProperty(obj, key, value) {
return key in obj ? Object.defineProperty(obj, key, {
@@ -88,7 +88,7 @@ function versionPackage(release, versionsToUpdate, {updateInternalDependencies:
if ("*" === workspaceDepVersion || "^" === workspaceDepVersion || "~" === workspaceDepVersion) continue;
depCurrentVersion = workspaceDepVersion;
}
- if ("" !== new Range__default.default(depCurrentVersion).range || null !== semverPrerelease__default.default(version)) {
+ if (semverValidRange__default.default(depCurrentVersion) !== null && ("" !== new Range__default.default(depCurrentVersion).range || null !== semverPrerelease__default.default(version))) {
let newNewRange = snapshot ? version : `${getVersionRangeType__default.default(depCurrentVersion)}${version}`;
usesWorkspaceRange && (newNewRange = "workspace:" + newNewRange), deps[name] = newNewRange;
}
diff --git a/dist/apply-release-plan.esm.js b/dist/apply-release-plan.esm.js
index 68be505362cd3ab36ab8fc1ba0f7956065678671..c2a2be92fa69c1d650fa7311b2c01557900ffad4 100644
--- a/dist/apply-release-plan.esm.js
+++ b/dist/apply-release-plan.esm.js
@@ -9,6 +9,7 @@ import getVersionRangeType from '@changesets/get-version-range-type';
import Range from 'semver/classes/range';
import semverPrerelease from 'semver/functions/prerelease';
import semverSatisfies from 'semver/functions/satisfies';
+import semverValidRange from "semver/ranges/valid";
import startCase from 'lodash.startcase';

function _defineProperty(obj, key, value) {
@@ -151,13 +152,16 @@ function versionPackage(release, versionsToUpdate, {
depCurrentVersion = workspaceDepVersion;
}

- if ( // an empty string is the normalised version of x/X/*
+ if (
+ semverValidRange(depCurrentVersion) !== null &&
+ // an empty string is the normalised version of x/X/*
// we don't want to change these versions because they will match
// any version and if someone makes the range that
// they probably want it to stay like that...
- new Range(depCurrentVersion).range !== "" || // ...unless the current version of a dependency is a prerelease (which doesn't satisfy x/X/*)
+ (new Range(depCurrentVersion).range !== "" || // ...unless the current version of a dependency is a prerelease (which doesn't satisfy x/X/*)
// leaving those as is would leave the package in a non-installable state (wrong dep versions would get installed)
- semverPrerelease(version) !== null) {
+ semverPrerelease(version) !== null
+ )) {
let newNewRange = snapshot ? version : `${getVersionRangeType(depCurrentVersion)}${version}`;
if (usesWorkspaceRange) newNewRange = `workspace:${newNewRange}`;
deps[name] = newNewRange;
Loading

2 comments on commit 23a0a53

@vercel
Copy link

@vercel vercel bot commented on 23a0a53 Jun 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

frontends-demo – ./templates/vue-demo-store

frontends-demo.vercel.app
frontends-demo-shopware-frontends.vercel.app
frontends-demo-git-main-shopware-frontends.vercel.app

@vercel
Copy link

@vercel vercel bot commented on 23a0a53 Jun 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.