From d68841106d9889590db055dded2c0ab83f2c823c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 22:54:37 +0800 Subject: [PATCH 1/5] chore(deps-dev): bump webpack-dev-middleware from 5.3.3 to 5.3.4 (#1863) Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases) - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4) --- updated-dependencies: - dependency-name: webpack-dev-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3696784ae..29de983f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39575,9 +39575,10 @@ } }, "node_modules/webpack-dev-middleware": { - "version": "6.1.1", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.2.tgz", + "integrity": "sha512-Wu+EHmX326YPYUpQLKmKbTyZZJIB8/n6R09pTmB03kJmnMsVPTo9COzHZFr01txwaCAuZvfBJE4ZCHRcKs5JaQ==", "dev": true, - "license": "MIT", "dependencies": { "colorette": "^2.0.10", "memfs": "^3.4.12", @@ -39737,9 +39738,10 @@ } }, "node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": { - "version": "5.3.3", + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", + "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", "dev": true, - "license": "MIT", "dependencies": { "colorette": "^2.0.10", "memfs": "^3.4.3", From 5c03999efe0a87b91cbf4b7d17722f0ccfa78967 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 23:31:49 +0800 Subject: [PATCH 2/5] chore(deps-dev): bump express from 4.18.2 to 4.19.2 (#1864) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 51 ++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 29de983f0..aa2f4a12f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14519,12 +14519,13 @@ "license": "MIT" }, "node_modules/body-parser": { - "version": "1.20.1", + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", "dev": true, - "license": "MIT", "dependencies": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", @@ -14532,7 +14533,7 @@ "iconv-lite": "0.4.24", "on-finished": "2.4.1", "qs": "6.11.0", - "raw-body": "2.5.1", + "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -14543,21 +14544,24 @@ }, "node_modules/body-parser/node_modules/debug": { "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true }, "node_modules/body-parser/node_modules/qs": { "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.4" }, @@ -14949,8 +14953,9 @@ }, "node_modules/bytes": { "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -15998,8 +16003,9 @@ }, "node_modules/content-type": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -16014,9 +16020,10 @@ "license": "MIT" }, "node_modules/cookie": { - "version": "0.5.0", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -19357,16 +19364,17 @@ } }, "node_modules/express": { - "version": "4.18.2", + "version": "4.19.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", + "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", "dev": true, - "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.1", + "body-parser": "1.20.2", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.5.0", + "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -27998,8 +28006,9 @@ }, "node_modules/media-typer": { "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -32380,9 +32389,10 @@ } }, "node_modules/raw-body": { - "version": "2.5.1", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dev": true, - "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -38486,8 +38496,9 @@ }, "node_modules/type-is": { "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "dev": true, - "license": "MIT", "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" From f19489a9d78f004101af6dff0c7ba3951ed18fb2 Mon Sep 17 00:00:00 2001 From: seaerchin <44049504+seaerchin@users.noreply.github.com> Date: Thu, 28 Mar 2024 10:26:42 +0800 Subject: [PATCH 3/5] chore(package): update to use `release` command (#1866) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 844345677..1f3fae58c 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "dev": "source .env && react-scripts start", "build": "react-scripts build", "build:netlify": "CI=false npm run build && npm run sourcemaps:upload", - "release": "npm version $npm_config_isomer_update && git push --tags", + "release": "bash scripts/release_prep.sh", "test": "craco test", "test:playwright": "source .env && npm run reset-e2e && npx playwright test --ui", "test:ci": "node scripts/run-e2e.js run", From adebee225a686dc95da5fb8bf875cab62b94b2b4 Mon Sep 17 00:00:00 2001 From: seaerchin <44049504+seaerchin@users.noreply.github.com> Date: Thu, 28 Mar 2024 10:27:01 +0800 Subject: [PATCH 4/5] fix(package): update source masp (#1867) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1f3fae58c..bc682b59c 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,7 @@ "storybook": "source .env && REACT_APP_ENV=test && storybook dev -p 6006", "build-storybook": "REACT_APP_ENV=test && storybook build", "chromatic": "npx chromatic --project-token=$CHROMATIC_PROJECT_TOKEN", - "sourcemaps:upload": "npx datadog-ci sourcemaps upload ./build --service=isomercms-frontend --release-version=$REACT_APP_VERSION --minified-path-prefix=$REACT_APP_URL" + "sourcemaps:upload": "npx datadog-ci sourcemaps upload ./build --service=isomer --release-version=$REACT_APP_VERSION --minified-path-prefix=$REACT_APP_URL" }, "eslintConfig": { "extends": "react-app", From fa8b47cc94b598ce52ec6b666d2786035fc4a448 Mon Sep 17 00:00:00 2001 From: Kishore <42832651+kishore03109@users.noreply.github.com> Date: Thu, 28 Mar 2024 11:02:54 +0800 Subject: [PATCH 5/5] chore: bump version to v0.84.0 --- CHANGELOG.md | 11 ++++++++--- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffce029ae..3a7ddad2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,14 +4,19 @@ 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.83.0](https://github.com/isomerpages/isomercms-frontend/compare/v0.83.0...v0.83.0) +#### [v0.84.0](https://github.com/isomerpages/isomercms-frontend/compare/v0.83.0...v0.84.0) -- fix(media): update routes [`#1862`](https://github.com/isomerpages/isomercms-frontend/pull/1862) +- 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) #### [v0.83.0](https://github.com/isomerpages/isomercms-frontend/compare/v0.82.0...v0.83.0) > 21 March 2024 +- fix(media): update routes [`#1862`](https://github.com/isomerpages/isomercms-frontend/pull/1862) - Test/repo privatisation [`#1342`](https://github.com/isomerpages/isomercms-frontend/pull/1342) - fix(resourceModal): sane default permalink [`#1858`](https://github.com/isomerpages/isomercms-frontend/pull/1858) - fix(routeselector/resourceroom): remove accidental comments + fix typo [`#1859`](https://github.com/isomerpages/isomercms-frontend/pull/1859) @@ -34,7 +39,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - chore(deps): bump the npm_and_yarn group group with 2 updates [`#1842`](https://github.com/isomerpages/isomercms-frontend/pull/1842) - chore(deps-dev): bump @storybook/addon-actions from 7.1.1 to 8.0.0 [`#1841`](https://github.com/isomerpages/isomercms-frontend/pull/1841) - backport v0.82.0 [`#1846`](https://github.com/isomerpages/isomercms-frontend/pull/1846) -- chore: bump version to v0.83.0 [`f981939`](https://github.com/isomerpages/isomercms-frontend/commit/f9819395c2078f3c21e639c7fc68d40abae4c9dc) +- chore: bump version to v0.83.0 [`8edeeee`](https://github.com/isomerpages/isomercms-frontend/commit/8edeeee1e456220721c40de1351eb1c253a1fc9c) #### [v0.82.0](https://github.com/isomerpages/isomercms-frontend/compare/v0.81.0...v0.82.0) diff --git a/package-lock.json b/package-lock.json index aa2f4a12f..0ca28c4d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "isomercms-frontend", - "version": "0.83.0", + "version": "0.84.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "isomercms-frontend", - "version": "0.83.0", + "version": "0.84.0", "hasInstallScript": true, "dependencies": { "@braintree/sanitize-url": "^6.0.1", diff --git a/package.json b/package.json index bc682b59c..95b35c139 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "isomercms-frontend", - "version": "0.83.0", + "version": "0.84.0", "private": true, "engines": { "node": ">=16.0.0"