From abeafeba13d36093d8457bf0e9247091016119ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 17:12:50 +0000 Subject: [PATCH 1/4] Bump nanoid from 3.3.7 to 4.0.2 Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 4.0.2. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.7...4.0.2) --- updated-dependencies: - dependency-name: nanoid dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- designer/package.json | 2 +- model/package.json | 2 +- package-lock.json | 32 +++++++++++++++++++++++++------- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/designer/package.json b/designer/package.json index a6c400ea1..00d3241ff 100644 --- a/designer/package.json +++ b/designer/package.json @@ -59,7 +59,7 @@ "joi": "^17.13.3", "lodash": "^4.17.21", "luxon": "^3.4.4", - "nanoid": "^3.3.4", + "nanoid": "^4.0.2", "nunjucks": "^3.2.4", "pino": "^9.2.0", "prismjs": "^1.29.0", diff --git a/model/package.json b/model/package.json index 0febc87ed..fd894a9d6 100644 --- a/model/package.json +++ b/model/package.json @@ -25,7 +25,7 @@ }, "devDependencies": { "joi": "^17.13.3", - "nanoid": "^3.3.7" + "nanoid": "^4.0.2" }, "peerDependencies": { "joi": "^17.0.0", diff --git a/package-lock.json b/package-lock.json index 8a946a864..eba3c4484 100644 --- a/package-lock.json +++ b/package-lock.json @@ -110,7 +110,7 @@ "joi": "^17.13.3", "lodash": "^4.17.21", "luxon": "^3.4.4", - "nanoid": "^3.3.4", + "nanoid": "^4.0.2", "nunjucks": "^3.2.4", "pino": "^9.2.0", "prismjs": "^1.29.0", @@ -292,7 +292,7 @@ }, "devDependencies": { "joi": "^17.13.3", - "nanoid": "^3.3.7" + "nanoid": "^4.0.2" }, "engines": { "node": "^20.9.0", @@ -14419,9 +14419,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz", + "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==", "funding": [ { "type": "github", @@ -14429,10 +14429,10 @@ } ], "bin": { - "nanoid": "bin/nanoid.cjs" + "nanoid": "bin/nanoid.js" }, "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + "node": "^14 || ^16 || >=18" } }, "node_modules/natural-compare": { @@ -15769,6 +15769,24 @@ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true }, + "node_modules/postcss/node_modules/nanoid": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", From b5c8de31bd1c4d5b5914ef090b467f599a680bcb Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Tue, 2 Jul 2024 18:19:34 +0100 Subject: [PATCH 2/4] Remove nanoid from `@defra/forms-model` --- model/package.json | 6 ++---- model/src/utils/helpers.ts | 3 --- package-lock.json | 6 ++---- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/model/package.json b/model/package.json index fd894a9d6..d261cb7d9 100644 --- a/model/package.json +++ b/model/package.json @@ -24,12 +24,10 @@ "slug": "^9.1.0" }, "devDependencies": { - "joi": "^17.13.3", - "nanoid": "^4.0.2" + "joi": "^17.13.3" }, "peerDependencies": { - "joi": "^17.0.0", - "nanoid": "^3.0.0" + "joi": "^17.0.0" }, "engines": { "node": "^20.9.0", diff --git a/model/src/utils/helpers.ts b/model/src/utils/helpers.ts index 3d82e1dfa..06960838f 100644 --- a/model/src/utils/helpers.ts +++ b/model/src/utils/helpers.ts @@ -1,4 +1,3 @@ -import { customAlphabet } from 'nanoid' import slug from 'slug' export const serialiseAndDeserialise = (obj: T): T => { @@ -43,5 +42,3 @@ export function slugify(input = '') { const string = input.trim().replace(/[\s–—]/g, '-') return slug(string, { lower: true }) } - -export const nanoid = customAlphabet('0123456789_abcdefghijklmnopqrstuvwxyz', 6) diff --git a/package-lock.json b/package-lock.json index eba3c4484..3eb598dde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -291,16 +291,14 @@ "slug": "^9.1.0" }, "devDependencies": { - "joi": "^17.13.3", - "nanoid": "^4.0.2" + "joi": "^17.13.3" }, "engines": { "node": "^20.9.0", "npm": "^10.1.0" }, "peerDependencies": { - "joi": "^17.0.0", - "nanoid": "^3.0.0" + "joi": "^17.0.0" } }, "node_modules/@aashutoshrathi/word-wrap": { From 5576ba2bc6c2a835d77575a532fc30fef496932a Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Tue, 2 Jul 2024 18:34:03 +0100 Subject: [PATCH 3/4] Bump nanoid from 4.0.2 to 5.0.7 --- designer/package.json | 2 +- package-lock.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/designer/package.json b/designer/package.json index 00d3241ff..ee70df6bc 100644 --- a/designer/package.json +++ b/designer/package.json @@ -59,7 +59,7 @@ "joi": "^17.13.3", "lodash": "^4.17.21", "luxon": "^3.4.4", - "nanoid": "^4.0.2", + "nanoid": "^5.0.7", "nunjucks": "^3.2.4", "pino": "^9.2.0", "prismjs": "^1.29.0", diff --git a/package-lock.json b/package-lock.json index 3eb598dde..226eaca82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -110,7 +110,7 @@ "joi": "^17.13.3", "lodash": "^4.17.21", "luxon": "^3.4.4", - "nanoid": "^4.0.2", + "nanoid": "^5.0.7", "nunjucks": "^3.2.4", "pino": "^9.2.0", "prismjs": "^1.29.0", @@ -14417,9 +14417,9 @@ } }, "node_modules/nanoid": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz", - "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.0.7.tgz", + "integrity": "sha512-oLxFY2gd2IqnjcYyOXD8XGCftpGtZP2AbHbOkthDkvRywH5ayNtPVy9YlOPcHckXzbLTCHpkb7FB+yuxKV13pQ==", "funding": [ { "type": "github", @@ -14430,7 +14430,7 @@ "nanoid": "bin/nanoid.js" }, "engines": { - "node": "^14 || ^16 || >=18" + "node": "^18 || >=20" } }, "node_modules/natural-compare": { From 388f007adc12ff7b97ffe4e2c0e02da1f7246349 Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Tue, 2 Jul 2024 18:34:45 +0100 Subject: [PATCH 4/4] Mock nanoid (ESM only) for Jest --- designer/client/src/__mocks__/nanoid.js | 7 +++++++ designer/client/src/{components => }/__mocks__/tabbable.js | 0 2 files changed, 7 insertions(+) create mode 100644 designer/client/src/__mocks__/nanoid.js rename designer/client/src/{components => }/__mocks__/tabbable.js (100%) diff --git a/designer/client/src/__mocks__/nanoid.js b/designer/client/src/__mocks__/nanoid.js new file mode 100644 index 000000000..b4fab0173 --- /dev/null +++ b/designer/client/src/__mocks__/nanoid.js @@ -0,0 +1,7 @@ +export function customAlphabet() { + return () => 'mocked' +} + +export default { + customAlphabet +} diff --git a/designer/client/src/components/__mocks__/tabbable.js b/designer/client/src/__mocks__/tabbable.js similarity index 100% rename from designer/client/src/components/__mocks__/tabbable.js rename to designer/client/src/__mocks__/tabbable.js