From 25d4a917c99ceaab23ca0d2fe7a7ac7df60b3c9f Mon Sep 17 00:00:00 2001 From: seaerchin <44049504+seaerchin@users.noreply.github.com> Date: Thu, 11 Apr 2024 16:27:41 +0800 Subject: [PATCH 1/7] chore(mergify): enhance mergify (#1865) * chore(mergify): enhance mergify * fix(mergify): update workflow --- .github/mergify.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 4a65ccc16..054acfbb6 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -5,7 +5,7 @@ pull_request_rules: - check-success~=lint - check-success~=build - check-success~=test - - title~=Bump [^\s]+ from ([\d]+)\..+ to \1\. + - -dependabot-update-type = version-update:semver-major actions: review: type: APPROVE @@ -18,7 +18,8 @@ pull_request_rules: - check-success~=lint - check-success~=build - check-success~=test - - title~=^\[Snyk\] + - title~=^\[Snyk\]] + - base = develop actions: review: type: APPROVE From abf09e50e7ab7d6c456f7b86808c139118621967 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 08:28:16 +0000 Subject: [PATCH 2/7] chore(deps-dev): bump ip from 1.1.8 to 2.0.1 (#1839) Bumps [ip](https://github.com/indutny/node-ip) from 1.1.8 to 2.0.1. - [Commits](https://github.com/indutny/node-ip/compare/v1.1.8...v2.0.1) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0ca28c4d6..b75c44db7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9902,11 +9902,6 @@ "node": ">=8" } }, - "node_modules/@storybook/core-server/node_modules/ip": { - "version": "2.0.0", - "dev": true, - "license": "MIT" - }, "node_modules/@storybook/core-server/node_modules/lru-cache": { "version": "6.0.0", "dev": true, @@ -22262,6 +22257,12 @@ "loose-envify": "^1.0.0" } }, + "node_modules/ip": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", + "dev": true + }, "node_modules/ip-address": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", From b89e0267f07a5040e40800af520aecb775eecce2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:57:14 +0000 Subject: [PATCH 3/7] chore(deps): bump @tiptap/extension-table from 2.1.12 to 2.3.0 (#1872) Bumps [@tiptap/extension-table](https://github.com/ueberdosis/tiptap/tree/HEAD/packages/extension-table) from 2.1.12 to 2.3.0. - [Release notes](https://github.com/ueberdosis/tiptap/releases) - [Changelog](https://github.com/ueberdosis/tiptap/blob/main/packages/extension-table/CHANGELOG.md) - [Commits](https://github.com/ueberdosis/tiptap/commits/v2.3.0/packages/extension-table) --- updated-dependencies: - dependency-name: "@tiptap/extension-table" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index b75c44db7..4bfc755a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "@tiptap/extension-placeholder": "^2.1.12", "@tiptap/extension-subscript": "^2.2.4", "@tiptap/extension-superscript": "^2.2.4", - "@tiptap/extension-table": "^2.1.12", + "@tiptap/extension-table": "^2.3.0", "@tiptap/extension-table-cell": "^2.1.12", "@tiptap/extension-table-header": "^2.1.12", "@tiptap/extension-table-row": "^2.1.12", @@ -11458,9 +11458,9 @@ } }, "node_modules/@tiptap/extension-table": { - "version": "2.1.12", - "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-2.1.12.tgz", - "integrity": "sha512-q/DuKZ4j1ycRfuFdb9rBJ3MglGNxlM2BQ1csScX/BrVIsAQI5B8sdzy1BrIlepQ6DRu4DCzHcKMI8u4/edUSWA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-2.3.0.tgz", + "integrity": "sha512-1cU0C5LFyF7Nm8K2X6sntuunpLDE11XV8gV4ALbXv0FNKx2rG9Wq0tQlGHAjhYZMhWt386T21N7o13aMAov1GA==", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" diff --git a/package.json b/package.json index 95b35c139..6a7d82ed8 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@tiptap/extension-placeholder": "^2.1.12", "@tiptap/extension-subscript": "^2.2.4", "@tiptap/extension-superscript": "^2.2.4", - "@tiptap/extension-table": "^2.1.12", + "@tiptap/extension-table": "^2.3.0", "@tiptap/extension-table-cell": "^2.1.12", "@tiptap/extension-table-header": "^2.1.12", "@tiptap/extension-table-row": "^2.1.12", From 1267ad4d1fbe3d8578055979cc48f15e1954261c Mon Sep 17 00:00:00 2001 From: seaerchin <44049504+seaerchin@users.noreply.github.com> Date: Wed, 24 Apr 2024 19:08:38 +0800 Subject: [PATCH 4/7] fix(mergify): update snyk author to isomeradmin (#1876) * fix(mergify): update snyk author to isomeradmin * fix(mergify): update title --- .github/mergify.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 054acfbb6..e75ab64cf 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -14,11 +14,11 @@ pull_request_rules: - name: Approve and merge Snyk.io upgrades conditions: - - author=snyk-bot + - author=isomeradmin - check-success~=lint - check-success~=build - check-success~=test - - title~=^\[Snyk\]] + - title~=^\[Snyk\] - base = develop actions: review: From 794b2b28d4bba77095c3042a0f39b0a169b61f85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 16:48:42 +0800 Subject: [PATCH 5/7] chore(deps-dev): bump husky from 6.0.0 to 9.0.11 (#1873) Bumps [husky](https://github.com/typicode/husky) from 6.0.0 to 9.0.11. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v6.0.0...v9.0.11) --- updated-dependencies: - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 12 ++++++++---- package.json | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4bfc755a0..80ee556aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -164,7 +164,7 @@ "eslint-plugin-simple-import-sort": "^7.0.0", "eslint-plugin-storybook": "^0.6.12", "find-webpack": "^2.2.1", - "husky": "^6.0.0", + "husky": "^9.0.11", "invariant": "^2.2.4", "jest": "^29.5.0", "lint-staged": "^11.0.0", @@ -21833,11 +21833,15 @@ } }, "node_modules/husky": { - "version": "6.0.0", + "version": "9.0.11", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.11.tgz", + "integrity": "sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==", "dev": true, - "license": "MIT", "bin": { - "husky": "lib/bin.js" + "husky": "bin.mjs" + }, + "engines": { + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/typicode" diff --git a/package.json b/package.json index 6a7d82ed8..004b82c9b 100644 --- a/package.json +++ b/package.json @@ -212,7 +212,7 @@ "eslint-plugin-simple-import-sort": "^7.0.0", "eslint-plugin-storybook": "^0.6.12", "find-webpack": "^2.2.1", - "husky": "^6.0.0", + "husky": "^9.0.11", "invariant": "^2.2.4", "jest": "^29.5.0", "lint-staged": "^11.0.0", From c5a31a33a231576801f0ec7694a75cfa71cee6b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 14:15:38 +0000 Subject: [PATCH 6/7] chore(deps-dev): bump @storybook/addon-actions from 8.0.0 to 8.0.9 (#1877) Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/actions) from 8.0.0 to 8.0.9. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.0.9/code/addons/actions) --- updated-dependencies: - dependency-name: "@storybook/addon-actions" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 80ee556aa..b0e8734af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -122,7 +122,7 @@ "@jest/globals": "^27.0.3", "@mdx-js/react": "^2.3.0", "@playwright/test": "^1.41.1", - "@storybook/addon-actions": "^8.0.0", + "@storybook/addon-actions": "^8.0.9", "@storybook/addon-docs": "^7.0.24", "@storybook/addon-essentials": "^7.0.24", "@storybook/addon-links": "^7.0.24", @@ -8553,12 +8553,12 @@ } }, "node_modules/@storybook/addon-actions": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-8.0.0.tgz", - "integrity": "sha512-QXfnEWZt5k35cPYsLvxq505XrCgXujc4UEkky1lBtSMI9SLzlXZg3fC/lW0c0hiu2c0+zI+y4fj5vTE9AZJdjw==", + "version": "8.0.9", + "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-8.0.9.tgz", + "integrity": "sha512-+I3VTvlKdj8puHeS2tyaOVv9syDiNLneVZbTfqN+UDOK2i42NwvZr8PVwjTzMlEj9eePJdCZgiipz55xwts5bw==", "dev": true, "dependencies": { - "@storybook/core-events": "8.0.0", + "@storybook/core-events": "8.0.9", "@storybook/global": "^5.0.0", "@types/uuid": "^9.0.1", "dequal": "^2.0.2", @@ -8571,9 +8571,9 @@ } }, "node_modules/@storybook/addon-actions/node_modules/@storybook/core-events": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-8.0.0.tgz", - "integrity": "sha512-kkabj4V99gOTBW+y3HM/LTCDekglqb+lslZMamM+Ytxv1lCqCEOIR/OGfnYOyEaK4BLcx61Zp+fO30FZxtoT1w==", + "version": "8.0.9", + "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-8.0.9.tgz", + "integrity": "sha512-DxSUx7wG9Qe3OFUBnv3OrYq48J8UWNo2DUR5/JecJCtp3n++L4fAEW3J0IF5FfxpQDMQSp1yTNjZ2PaWCMd2ag==", "dev": true, "dependencies": { "ts-dedent": "^2.0.0" diff --git a/package.json b/package.json index 004b82c9b..4a60e7520 100644 --- a/package.json +++ b/package.json @@ -170,7 +170,7 @@ "@jest/globals": "^27.0.3", "@mdx-js/react": "^2.3.0", "@playwright/test": "^1.41.1", - "@storybook/addon-actions": "^8.0.0", + "@storybook/addon-actions": "^8.0.9", "@storybook/addon-docs": "^7.0.24", "@storybook/addon-essentials": "^7.0.24", "@storybook/addon-links": "^7.0.24", From 0e3139f2d3f6c2cf7abacb366e6d1d15f6d7b17e Mon Sep 17 00:00:00 2001 From: Harish V Date: Thu, 2 May 2024 14:35:27 +0800 Subject: [PATCH 7/7] chore: bump version to v0.85.0 --- CHANGELOG.md | 19 +++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a7ddad2d..758d4a9e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,32 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [v0.85.0](https://github.com/isomerpages/isomercms-frontend/compare/v0.85.0...v0.85.0) + +- chore(deps-dev): bump @storybook/addon-actions from 8.0.0 to 8.0.9 [`#1877`](https://github.com/isomerpages/isomercms-frontend/pull/1877) +- chore(deps-dev): bump husky from 6.0.0 to 9.0.11 [`#1873`](https://github.com/isomerpages/isomercms-frontend/pull/1873) +- fix(mergify): update snyk author to isomeradmin [`#1876`](https://github.com/isomerpages/isomercms-frontend/pull/1876) +- chore(deps): bump @tiptap/extension-table from 2.1.12 to 2.3.0 [`#1872`](https://github.com/isomerpages/isomercms-frontend/pull/1872) +- chore(deps-dev): bump ip from 1.1.8 to 2.0.1 [`#1839`](https://github.com/isomerpages/isomercms-frontend/pull/1839) +- chore(mergify): enhance mergify [`#1865`](https://github.com/isomerpages/isomercms-frontend/pull/1865) + +#### [v0.85.0](https://github.com/isomerpages/isomercms-frontend/compare/v0.84.0...v0.85.0) + +> 11 April 2024 + +- backport v0.84.0 [`#1869`](https://github.com/isomerpages/isomercms-frontend/pull/1869) +- chore: bump version to v0.85.0 [`f12d4f3`](https://github.com/isomerpages/isomercms-frontend/commit/f12d4f3d60087c9c3372c21f6b650574877e076e) + #### [v0.84.0](https://github.com/isomerpages/isomercms-frontend/compare/v0.83.0...v0.84.0) +> 28 March 2024 + - fix(package): update source masp [`#1867`](https://github.com/isomerpages/isomercms-frontend/pull/1867) - chore(package): update to use `release` command [`#1866`](https://github.com/isomerpages/isomercms-frontend/pull/1866) - chore(deps-dev): bump express from 4.18.2 to 4.19.2 [`#1864`](https://github.com/isomerpages/isomercms-frontend/pull/1864) - chore(deps-dev): bump webpack-dev-middleware from 5.3.3 to 5.3.4 [`#1863`](https://github.com/isomerpages/isomercms-frontend/pull/1863) - backport v0.83.0 [`#1861`](https://github.com/isomerpages/isomercms-frontend/pull/1861) +- chore: bump version to v0.84.0 [`fa8b47c`](https://github.com/isomerpages/isomercms-frontend/commit/fa8b47cc94b598ce52ec6b666d2786035fc4a448) #### [v0.83.0](https://github.com/isomerpages/isomercms-frontend/compare/v0.82.0...v0.83.0) diff --git a/package-lock.json b/package-lock.json index b0e8734af..b117bb367 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "isomercms-frontend", - "version": "0.84.0", + "version": "0.85.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "isomercms-frontend", - "version": "0.84.0", + "version": "0.85.0", "hasInstallScript": true, "dependencies": { "@braintree/sanitize-url": "^6.0.1", diff --git a/package.json b/package.json index 4a60e7520..557403246 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "isomercms-frontend", - "version": "0.84.0", + "version": "0.85.0", "private": true, "engines": { "node": ">=16.0.0"