From 78eb3530ca078e74a7ec011f09bd6a713f3cc686 Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Wed, 6 Jul 2022 21:18:51 +0100 Subject: [PATCH 01/22] [minor] Makes the error message a bit clearer when a navigation url is crashing your app (#5882) --- packages/router/src/__tests__/util.test.ts | 6 ++++-- packages/router/src/util.ts | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/router/src/__tests__/util.test.ts b/packages/router/src/__tests__/util.test.ts index 8a60887324b3..694d54702ef2 100644 --- a/packages/router/src/__tests__/util.test.ts +++ b/packages/router/src/__tests__/util.test.ts @@ -312,7 +312,7 @@ describe('flattenSearchParams', () => { describe('replaceParams', () => { it('throws an error on missing params', () => { expect(() => replaceParams('/tags/{tag}', {})).toThrowError( - "Missing parameter 'tag' for route '/tags/{tag}'." + "Missing parameter 'tag' for route '/tags/{tag}' when generating a navigation URL." ) }) @@ -348,7 +348,9 @@ describe('replaceParams', () => { expect(() => replaceParams('/undef/{undef}', { undef: undefined }) - ).toThrowError("Missing parameter 'undef' for route '/undef/{undef}'.") + ).toThrowError( + "Missing parameter 'undef' for route '/undef/{undef}' when generating a navigation URL." + ) }) it('handles typed params', () => { diff --git a/packages/router/src/util.ts b/packages/router/src/util.ts index 7df314f717de..ebbe62177d9f 100644 --- a/packages/router/src/util.ts +++ b/packages/router/src/util.ts @@ -235,7 +235,9 @@ export const replaceParams = ( if (value !== undefined) { path = path.replace(match, value as string) } else { - throw new Error(`Missing parameter '${name}' for route '${route}'.`) + throw new Error( + `Missing parameter '${name}' for route '${route}' when generating a navigation URL.` + ) } }) From 77b1768c1cb8c41108be27ffc19738258789d185 Mon Sep 17 00:00:00 2001 From: Rob Cameron Date: Wed, 6 Jul 2022 14:20:33 -0700 Subject: [PATCH 02/22] Set ENV var to change test database setup command (#5883) * Set ENV var to change test database setup command * Adds docs * Use array elements for all command parts --- docs/docs/testing.md | 22 +++++++++++++-- .../testing/config/jest/api/jest-preset.js | 27 ++++++++++--------- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/docs/docs/testing.md b/docs/docs/testing.md index bc464e630ea8..e2d8efc09f0e 100644 --- a/docs/docs/testing.md +++ b/docs/docs/testing.md @@ -1239,9 +1239,27 @@ To simplify Service testing, rather than mess with your development database, Re If you're using Postgres or MySQL locally you'll want to set that env var to your connection string for a test database in those services. -> Does anyone else find it confusing that the software itself is called a "database", but the container that actually holds your data is also called a "database," and you can have multiple databases (containers) within one instance of a database (software)? +:::info + +Does anyone else find it confusing that the software itself is called a "database", but the container that actually holds your data is also called a "database," and you can have multiple databases (containers) within one instance of a database (software)? + +::: + +When you start your test suite you may notice some output from Prisma talking about migrating the database. Redwood will automatically run `yarn rw prisma db push` against your test database to make sure it's up-to-date. + +:::caution What if I have custom migration SQL? -When you start your test suite you may notice some output from Prisma talking about migrating the database. Redwood will automatically run `yarn rw prisma migrate dev` against your test database to make sure it's up-to-date. +The `prisma db push` command only restores a snapshot of the current database schema (so that it runs as fast as possible). **It does not actually run migrations in sequence.** This can cause a [problem](https://github.com/redwoodjs/redwood/issues/5818) if you have certain database configuration that *must* occur as a result of the SQL statements inside the migration files. + +In order to preserve those statements in your test database, you can set an additional ENV var which will use the command `yarn rw prisma migrate reset` instead. This will run each migration in sequence against your test database. The tradeoff is that starting your test suite will take a little longer depending on how many migrations you have: + +```.env title=/.env +TEST_DATABASE_STRATEGY=reset +``` + +Set the variable to `push`, or remove it completely, and it will use the default behavior of running `yarn rw prisma db push`. + +::: ### Writing Service Tests diff --git a/packages/testing/config/jest/api/jest-preset.js b/packages/testing/config/jest/api/jest-preset.js index d63841297a01..7488cb2ae010 100644 --- a/packages/testing/config/jest/api/jest-preset.js +++ b/packages/testing/config/jest/api/jest-preset.js @@ -9,7 +9,7 @@ const rwjsPaths = getPaths() const NODE_MODULES_PATH = path.join(rwjsPaths.base, 'node_modules') const { babelrc } = getApiSideDefaultBabelConfig() -// @NOTE: is there a better way we could implmenet this? +// @NOTE: is there a better way we could implement this? if (process.env.SKIP_DB_PUSH !== '1') { const process = require('process') const path = require('path') @@ -19,19 +19,20 @@ if (process.env.SKIP_DB_PUSH !== '1') { const cacheDirDb = `file:${path.join(__dirname, '.redwood', 'test.db')}` process.env.DATABASE_URL = process.env.TEST_DATABASE_URL || cacheDirDb + const command = + process.env.TEST_DATABASE_STRATEGY === 'reset' + ? ['prisma', 'migrate', 'reset', '--force', '--skip-seed'] + : ['prisma', 'db', 'push', '--force-reset', '--accept-data-loss'] + const execa = require('execa') - execa.sync( - `yarn rw`, - ['prisma db push', '--force-reset', '--accept-data-loss'], - { - cwd: rwjsPaths.api.base, - stdio: 'inherit', - shell: true, - env: { - DATABASE_URL: process.env.DATABASE_URL, - }, - } - ) + execa.sync(`yarn rw`, command, { + cwd: rwjsPaths.api.base, + stdio: 'inherit', + shell: true, + env: { + DATABASE_URL: process.env.DATABASE_URL, + }, + }) // If its been reset once, we don't need to re-run it for every test process.env.SKIP_DB_PUSH = '1' From 45b16d8bf1f7375b805daa97e204a631c97cc0da Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Jul 2022 23:59:36 +0000 Subject: [PATCH 03/22] chore(deps): update dependency firebase to v9.8.4 (#5879) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/auth/package.json | 2 +- yarn.lock | 404 ++++++++++++++++++------------------- 2 files changed, 203 insertions(+), 203 deletions(-) diff --git a/packages/auth/package.json b/packages/auth/package.json index aa78a974f4aa..682090322c6d 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -38,7 +38,7 @@ "@supabase/supabase-js": "1.35.4", "@types/netlify-identity-widget": "1.9.3", "@types/react": "17.0.47", - "firebase": "9.8.3", + "firebase": "9.8.4", "firebase-admin": "10.2.0", "gotrue-js": "0.9.29", "jest": "27.5.1", diff --git a/yarn.lock b/yarn.lock index 07d52e3fb2c6..23715c696d81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2502,18 +2502,18 @@ __metadata: languageName: node linkType: hard -"@firebase/analytics-compat@npm:0.1.11": - version: 0.1.11 - resolution: "@firebase/analytics-compat@npm:0.1.11" +"@firebase/analytics-compat@npm:0.1.12": + version: 0.1.12 + resolution: "@firebase/analytics-compat@npm:0.1.12" dependencies: - "@firebase/analytics": 0.7.10 + "@firebase/analytics": 0.7.11 "@firebase/analytics-types": 0.7.0 - "@firebase/component": 0.5.15 - "@firebase/util": 1.6.1 + "@firebase/component": 0.5.16 + "@firebase/util": 1.6.2 tslib: ^2.1.0 peerDependencies: "@firebase/app-compat": 0.x - checksum: 0a965ac4acddfd65fd66fd192b0c6525722fa6a5920adaf09b9f6eb4e8809834c99f2a078afba81e76d99ede251efbb731553aee841dfb01a2f9779d288527f8 + checksum: 60d03c1e650cd7ed701cbd99d1971e5957b10020b48da9d8995316f27d64001544253543df11564fbbe72e46b144e5b5d922f21b10c3787fe09251d66c935af4 languageName: node linkType: hard @@ -2524,34 +2524,34 @@ __metadata: languageName: node linkType: hard -"@firebase/analytics@npm:0.7.10": - version: 0.7.10 - resolution: "@firebase/analytics@npm:0.7.10" +"@firebase/analytics@npm:0.7.11": + version: 0.7.11 + resolution: "@firebase/analytics@npm:0.7.11" dependencies: - "@firebase/component": 0.5.15 - "@firebase/installations": 0.5.10 + "@firebase/component": 0.5.16 + "@firebase/installations": 0.5.11 "@firebase/logger": 0.3.3 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 tslib: ^2.1.0 peerDependencies: "@firebase/app": 0.x - checksum: 94e175156594d9c7c3affb52ea3c3ddaf2b10f46eb213cc5de4bdf1875fc7df6a041e373d6b2ec4ab13019391527f89d295c03bc48c5ce4a42154a0b31bfbc5e + checksum: e2eff08849ffd24ac0f7e81ec161230d7c25d0c240aa1a26724aef7c4dc3a5f2edfcd30d10cf37fd99acc893cecdbe6905899c160f0aa59384effeeb878a53f6 languageName: node linkType: hard -"@firebase/app-check-compat@npm:0.2.9": - version: 0.2.9 - resolution: "@firebase/app-check-compat@npm:0.2.9" +"@firebase/app-check-compat@npm:0.2.10": + version: 0.2.10 + resolution: "@firebase/app-check-compat@npm:0.2.10" dependencies: - "@firebase/app-check": 0.5.9 + "@firebase/app-check": 0.5.10 "@firebase/app-check-types": 0.4.0 - "@firebase/component": 0.5.15 + "@firebase/component": 0.5.16 "@firebase/logger": 0.3.3 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 tslib: ^2.1.0 peerDependencies: "@firebase/app-compat": 0.x - checksum: a96f44ab1727e14c33cd0d059239cab245eed4b3071224ae0815945f4c8f90577682d06b51432b0b4ff5cf12ce050294147ae3fa8d9e59d70cdb5086b90a9a92 + checksum: d5f3110804c9d8c5377399117d167f6a78abcd5e556c2ea7403255a3bc9be1be5d97328a65eed5fda26849d720697b483a35aa835154366af23b1ddef7648c55 languageName: node linkType: hard @@ -2569,30 +2569,30 @@ __metadata: languageName: node linkType: hard -"@firebase/app-check@npm:0.5.9": - version: 0.5.9 - resolution: "@firebase/app-check@npm:0.5.9" +"@firebase/app-check@npm:0.5.10": + version: 0.5.10 + resolution: "@firebase/app-check@npm:0.5.10" dependencies: - "@firebase/component": 0.5.15 + "@firebase/component": 0.5.16 "@firebase/logger": 0.3.3 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 tslib: ^2.1.0 peerDependencies: "@firebase/app": 0.x - checksum: 6cad0acc5e8fb04dae52675d92a358884bf3cc3e02efef3b3745cfb892fa9241b90ba6a60d69bbc50b50b01336b8661c9b053e51078c4349a6542a2d3650b90f + checksum: 234af8afab6066e6ec3f869675dbce11288c6ec1851538932c34230b44f5cfcfbdd86c669414b5a6cbf8d67cef845dbd6f4461af053501b00041ee076b218f12 languageName: node linkType: hard -"@firebase/app-compat@npm:0.1.27": - version: 0.1.27 - resolution: "@firebase/app-compat@npm:0.1.27" +"@firebase/app-compat@npm:0.1.28": + version: 0.1.28 + resolution: "@firebase/app-compat@npm:0.1.28" dependencies: - "@firebase/app": 0.7.26 - "@firebase/component": 0.5.15 + "@firebase/app": 0.7.27 + "@firebase/component": 0.5.16 "@firebase/logger": 0.3.3 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 tslib: ^2.1.0 - checksum: de50ca1a13a2cd6f0d82afe568ccef2b68a9896573be41f38420923ea1110704ea4cd49736f354383e1378f5709c02accd850893dd44e50da1dc3a27943f515e + checksum: 476e5a651e5e57b82493886e1b92177ea23ba216ef07f830cacc912d70a03559575f1bf75767709f51ca4c2b42ac0177292358aecacec9649d48c144d589c44d languageName: node linkType: hard @@ -2603,33 +2603,33 @@ __metadata: languageName: node linkType: hard -"@firebase/app@npm:0.7.26": - version: 0.7.26 - resolution: "@firebase/app@npm:0.7.26" +"@firebase/app@npm:0.7.27": + version: 0.7.27 + resolution: "@firebase/app@npm:0.7.27" dependencies: - "@firebase/component": 0.5.15 + "@firebase/component": 0.5.16 "@firebase/logger": 0.3.3 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 idb: 7.0.1 tslib: ^2.1.0 - checksum: 393e7ef06018b1c728dfee3516e608d24a5cb0779d5f70d91a1a05e36e043e9b15d9dc99125fcb427d09a8308f6f06b70dc1e99220885555dcd400ee38e7f364 + checksum: e99497087ac99258e3785c87f208f18bd5ca2b2eb0adf6420bd01ec0e0b924edfc3f96e220466258effd8c9e37e20b14b9ea03ec0abc75265ff8a165ebdd0422 languageName: node linkType: hard -"@firebase/auth-compat@npm:0.2.16": - version: 0.2.16 - resolution: "@firebase/auth-compat@npm:0.2.16" +"@firebase/auth-compat@npm:0.2.17": + version: 0.2.17 + resolution: "@firebase/auth-compat@npm:0.2.17" dependencies: - "@firebase/auth": 0.20.3 + "@firebase/auth": 0.20.4 "@firebase/auth-types": 0.11.0 - "@firebase/component": 0.5.15 - "@firebase/util": 1.6.1 + "@firebase/component": 0.5.16 + "@firebase/util": 1.6.2 node-fetch: 2.6.7 selenium-webdriver: 4.1.2 tslib: ^2.1.0 peerDependencies: "@firebase/app-compat": 0.x - checksum: bca9775b3768681cd089c0066d05884124f7c4c9f1def505c6e46d1457e64295c20850cdcf3a5d2820ab8086002dd8a56852e296c886a6e44533c355a323912a + checksum: f619ec430cc0b6d061cc001f9bbcbbc8824b743ed660c6680c75d22097f7ea68bc4a40a564697f8468f2876e0d858126c172db470756736df987fdab39592d74 languageName: node linkType: hard @@ -2653,19 +2653,19 @@ __metadata: languageName: node linkType: hard -"@firebase/auth@npm:0.20.3": - version: 0.20.3 - resolution: "@firebase/auth@npm:0.20.3" +"@firebase/auth@npm:0.20.4": + version: 0.20.4 + resolution: "@firebase/auth@npm:0.20.4" dependencies: - "@firebase/component": 0.5.15 + "@firebase/component": 0.5.16 "@firebase/logger": 0.3.3 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 node-fetch: 2.6.7 selenium-webdriver: 4.1.2 tslib: ^2.1.0 peerDependencies: "@firebase/app": 0.x - checksum: 7f65d0b4bd7557044d5ac823c18c1a6e67021148c1472883fc7c2d73f2b9d76a4544c9a0ca4f25e03f8d7d4af0a7261139c2f1639353cf246329985bb2b9b304 + checksum: 4ca320b44b0c3c4c99f21fe98ed4a49386addaecbc6182fb6a17b64c707ffb3b26454a4d71dd4133745d33879d29b4e832867ea4afe34b10d215b39cb23ea473 languageName: node linkType: hard @@ -2679,27 +2679,27 @@ __metadata: languageName: node linkType: hard -"@firebase/component@npm:0.5.15": - version: 0.5.15 - resolution: "@firebase/component@npm:0.5.15" +"@firebase/component@npm:0.5.16": + version: 0.5.16 + resolution: "@firebase/component@npm:0.5.16" dependencies: - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 tslib: ^2.1.0 - checksum: 5bf23560cb3b7071024512dabea14c3dd95e2085d5d99c1f1eccc67ff1dfd8f561c2c9dfdbff30883c21a6c92e822bf4cadce4613b25911a9cac0c83a5d869e6 + checksum: d6893591c6f215deb6a0a5c4676a1dc8785712260fcd622b92269a3f5ddd1aea4096ec7b769ddd4d57d9a9525bffd99e58b7cfc751af57143ffd3f7e33e48961 languageName: node linkType: hard -"@firebase/database-compat@npm:0.2.1": - version: 0.2.1 - resolution: "@firebase/database-compat@npm:0.2.1" +"@firebase/database-compat@npm:0.2.2": + version: 0.2.2 + resolution: "@firebase/database-compat@npm:0.2.2" dependencies: - "@firebase/component": 0.5.15 - "@firebase/database": 0.13.1 - "@firebase/database-types": 0.9.9 + "@firebase/component": 0.5.16 + "@firebase/database": 0.13.2 + "@firebase/database-types": 0.9.10 "@firebase/logger": 0.3.3 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 tslib: ^2.1.0 - checksum: 309c8115d53991cb073682f47c67ab6bd8d83b7a8608354c26f3d664efdd46f16b38193b875eeb93cedf8a004749ec18c76f5075cc6f4d7c326010ee9d55caba + checksum: fc9df431600bcb466e8434073c50978f778c12cd3b44c78565946792832dabec66c3658768ef244b66f5e9c7e716314488c2dffd1786182f1ff4b327e1c50091 languageName: node linkType: hard @@ -2719,23 +2719,23 @@ __metadata: languageName: node linkType: hard -"@firebase/database-types@npm:0.9.7": - version: 0.9.7 - resolution: "@firebase/database-types@npm:0.9.7" +"@firebase/database-types@npm:0.9.10, @firebase/database-types@npm:^0.9.7": + version: 0.9.10 + resolution: "@firebase/database-types@npm:0.9.10" dependencies: "@firebase/app-types": 0.7.0 - "@firebase/util": 1.5.2 - checksum: 3fd5f184596e065bb8a21ac127e9d1045f303e81338ac2144ec319cdf1ccda3da8d4d0c0d6ff0e419e5c8342632c7556b3c9838fe55ede787ca4c43cfe853645 + "@firebase/util": 1.6.2 + checksum: 4451e2037cbb28b8e639b0e687e37e06bd5e2aee397236abb6a1c91ad434f5187384323a9e8c5472eb399eee8d98a31ac78712e407fa6298f52233b56980a881 languageName: node linkType: hard -"@firebase/database-types@npm:0.9.9, @firebase/database-types@npm:^0.9.7": - version: 0.9.9 - resolution: "@firebase/database-types@npm:0.9.9" +"@firebase/database-types@npm:0.9.7": + version: 0.9.7 + resolution: "@firebase/database-types@npm:0.9.7" dependencies: "@firebase/app-types": 0.7.0 - "@firebase/util": 1.6.1 - checksum: 152f342d99e146fe23cf1f695fa658c0359b7df14c5f7e12569390b8ec5e2b2eb6f042565fc06d198944ec616275c812f6d327e87dda41b820e43575dbbd5116 + "@firebase/util": 1.5.2 + checksum: 3fd5f184596e065bb8a21ac127e9d1045f303e81338ac2144ec319cdf1ccda3da8d4d0c0d6ff0e419e5c8342632c7556b3c9838fe55ede787ca4c43cfe853645 languageName: node linkType: hard @@ -2753,32 +2753,32 @@ __metadata: languageName: node linkType: hard -"@firebase/database@npm:0.13.1": - version: 0.13.1 - resolution: "@firebase/database@npm:0.13.1" +"@firebase/database@npm:0.13.2": + version: 0.13.2 + resolution: "@firebase/database@npm:0.13.2" dependencies: "@firebase/auth-interop-types": 0.1.6 - "@firebase/component": 0.5.15 + "@firebase/component": 0.5.16 "@firebase/logger": 0.3.3 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 faye-websocket: 0.11.4 tslib: ^2.1.0 - checksum: 642c558828d244b58fc5b6edebda47e1dcce3b65e00fc1416b7687197e5294f66ffa58364b9386b4ff987a7faf0c454ef2266af9129e67ec0223e79ee5a21a87 + checksum: 8006db0eae8d2036878d59cf84e06dd7c08cb1f5db146ba96553d9b80366253a1e76efae1bc4aca70be6907774f967939e1bfd22c83f8396d9a19ef8ec28b135 languageName: node linkType: hard -"@firebase/firestore-compat@npm:0.1.19": - version: 0.1.19 - resolution: "@firebase/firestore-compat@npm:0.1.19" +"@firebase/firestore-compat@npm:0.1.20": + version: 0.1.20 + resolution: "@firebase/firestore-compat@npm:0.1.20" dependencies: - "@firebase/component": 0.5.15 - "@firebase/firestore": 3.4.10 + "@firebase/component": 0.5.16 + "@firebase/firestore": 3.4.11 "@firebase/firestore-types": 2.5.0 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 tslib: ^2.1.0 peerDependencies: "@firebase/app-compat": 0.x - checksum: 369ed8a44b3bade5efdd90bc6121aca91cc1507f29bc503ad841768db7ac7871c962ac268b38c66e6478e73a798c3b839535bdac216dbb6ca9897c3fe2cc0e0c + checksum: 6ecc575aab5927fd40413a8305335c8a97d98e7a66d912586ceb643ada496d47103fe01d54fbef52f06d341cb0a1f3e8617d515b8227c1267bd2d486e260a9aa languageName: node linkType: hard @@ -2792,13 +2792,13 @@ __metadata: languageName: node linkType: hard -"@firebase/firestore@npm:3.4.10": - version: 3.4.10 - resolution: "@firebase/firestore@npm:3.4.10" +"@firebase/firestore@npm:3.4.11": + version: 3.4.11 + resolution: "@firebase/firestore@npm:3.4.11" dependencies: - "@firebase/component": 0.5.15 + "@firebase/component": 0.5.16 "@firebase/logger": 0.3.3 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 "@firebase/webchannel-wrapper": 0.6.2 "@grpc/grpc-js": ^1.3.2 "@grpc/proto-loader": ^0.6.0 @@ -2806,22 +2806,22 @@ __metadata: tslib: ^2.1.0 peerDependencies: "@firebase/app": 0.x - checksum: 6af7f905774fd41c34a27a45aacbd8f2991c0642b2df9675c35034d43c96e797a9e039172df0f56a7cc5d74e6cf0f6b3b880c80557b09c7ae363235dfa83bef2 + checksum: 2b4bdd6d878eb1e5aa7be1814e0c40a49805baa4e88d1e4ab3a246d62101970c52b9d9895b2eb83c7303eb7d8d0468f8f17391f094f991ddc4b6a4d88dcdf9ec languageName: node linkType: hard -"@firebase/functions-compat@npm:0.2.2": - version: 0.2.2 - resolution: "@firebase/functions-compat@npm:0.2.2" +"@firebase/functions-compat@npm:0.2.3": + version: 0.2.3 + resolution: "@firebase/functions-compat@npm:0.2.3" dependencies: - "@firebase/component": 0.5.15 - "@firebase/functions": 0.8.2 + "@firebase/component": 0.5.16 + "@firebase/functions": 0.8.3 "@firebase/functions-types": 0.5.0 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 tslib: ^2.1.0 peerDependencies: "@firebase/app-compat": 0.x - checksum: a3d73ebb036861560ab9d68c79c857843ab8a95ff0b62530ae79820cde53dd78f6395087a4b52f092e41b7a603050e28c5b4a4554d1ca33cd221369c97e2f632 + checksum: 83c34129da793d0bed48f60bf8e36591328b540d0e4e1cfa802a1302df7104d8caff6a0470cd4a28bdcff641ac38817c3ed1dbc83a7cf025ddc9ea27bd51cd08 languageName: node linkType: hard @@ -2832,34 +2832,34 @@ __metadata: languageName: node linkType: hard -"@firebase/functions@npm:0.8.2": - version: 0.8.2 - resolution: "@firebase/functions@npm:0.8.2" +"@firebase/functions@npm:0.8.3": + version: 0.8.3 + resolution: "@firebase/functions@npm:0.8.3" dependencies: "@firebase/app-check-interop-types": 0.1.0 "@firebase/auth-interop-types": 0.1.6 - "@firebase/component": 0.5.15 + "@firebase/component": 0.5.16 "@firebase/messaging-interop-types": 0.1.0 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 node-fetch: 2.6.7 tslib: ^2.1.0 peerDependencies: "@firebase/app": 0.x - checksum: ef1ce8688a7defe3a11c05a835a26fb031291eb4ded29557d84522164c4ab298cd983b0b092210a953053817fe4474fce81a988eaf89875e84b8cf15f6d97c11 + checksum: 9718ae9cb8152e5dce2678babff0442becdb1eaca0641ae81d865b77d4e06e88040a940dfe4b8cb215f71329ca5fe8c119b08a4ad4f8ba6f4a99d5b8dcfecefa languageName: node linkType: hard -"@firebase/installations@npm:0.5.10": - version: 0.5.10 - resolution: "@firebase/installations@npm:0.5.10" +"@firebase/installations@npm:0.5.11": + version: 0.5.11 + resolution: "@firebase/installations@npm:0.5.11" dependencies: - "@firebase/component": 0.5.15 - "@firebase/util": 1.6.1 + "@firebase/component": 0.5.16 + "@firebase/util": 1.6.2 idb: 7.0.1 tslib: ^2.1.0 peerDependencies: "@firebase/app": 0.x - checksum: 10071aad0123e738279aa062bbbc794b7b120aad3a25e6926d99a04d9bac9591b5bdf2cbf27da5d2b7d17efa30c7c58d1cc3d1b8bc3e07beeae97b6e88f74c72 + checksum: 633ade702b65476311969ba0647f6f044365fe571cca4b09e25e8a92c1c2237f26f1471bcf746c77b9b1ed9c988dd4e84a165e0c23268c98abb5113fdeed85e4 languageName: node linkType: hard @@ -2881,17 +2881,17 @@ __metadata: languageName: node linkType: hard -"@firebase/messaging-compat@npm:0.1.14": - version: 0.1.14 - resolution: "@firebase/messaging-compat@npm:0.1.14" +"@firebase/messaging-compat@npm:0.1.15": + version: 0.1.15 + resolution: "@firebase/messaging-compat@npm:0.1.15" dependencies: - "@firebase/component": 0.5.15 - "@firebase/messaging": 0.9.14 - "@firebase/util": 1.6.1 + "@firebase/component": 0.5.16 + "@firebase/messaging": 0.9.15 + "@firebase/util": 1.6.2 tslib: ^2.1.0 peerDependencies: "@firebase/app-compat": 0.x - checksum: d25be39c4875585115901eac3d33953d342a87971e494608a1b1f8f23b1173c98cab5d686b69b3453381b7f0232feb99345cd525e5b02e44924f35d4cfb413b0 + checksum: 2bda82a3553ee84c1991028d07b1e651a7fe67b767d3fea7a8dcba506da82f48746ef4c465e05e720ea4049084658e8fa1498c4fe229847209c2246df140d858 languageName: node linkType: hard @@ -2902,35 +2902,35 @@ __metadata: languageName: node linkType: hard -"@firebase/messaging@npm:0.9.14": - version: 0.9.14 - resolution: "@firebase/messaging@npm:0.9.14" +"@firebase/messaging@npm:0.9.15": + version: 0.9.15 + resolution: "@firebase/messaging@npm:0.9.15" dependencies: - "@firebase/component": 0.5.15 - "@firebase/installations": 0.5.10 + "@firebase/component": 0.5.16 + "@firebase/installations": 0.5.11 "@firebase/messaging-interop-types": 0.1.0 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 idb: 7.0.1 tslib: ^2.1.0 peerDependencies: "@firebase/app": 0.x - checksum: 2d7dbbab9f7ce71115bcd4db7369b9bf74c08a8aedb65ebfb05c8fa2290a079bb9826323e2b0053e71655a5a7be067e250aaeea1ce048ca0095dc48663c285a7 + checksum: 8d0972277c1fba598fa26ec7bad0ac1c839f300e495d08652c12abeddf4289237b024843c0ee9833ef6eb9354206e38ce92819841fd3c2ec6adadf439657e2a0 languageName: node linkType: hard -"@firebase/performance-compat@npm:0.1.10": - version: 0.1.10 - resolution: "@firebase/performance-compat@npm:0.1.10" +"@firebase/performance-compat@npm:0.1.11": + version: 0.1.11 + resolution: "@firebase/performance-compat@npm:0.1.11" dependencies: - "@firebase/component": 0.5.15 + "@firebase/component": 0.5.16 "@firebase/logger": 0.3.3 - "@firebase/performance": 0.5.10 + "@firebase/performance": 0.5.11 "@firebase/performance-types": 0.1.0 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 tslib: ^2.1.0 peerDependencies: "@firebase/app-compat": 0.x - checksum: 65153a1863513f4ac4f4512a708eb349ae96f4b9b69710a9f169369f742414362f06b5309a93158cae756b5a9c53f31ed36f4b1427b5f4c567c34a18f7841281 + checksum: 7e7b1c2b5581cda6857e867210139f3c30ca8e6530df2fc2bdc31c26858ef677c9cc51aea60aaff4dcf62bdde11ad938ae86f9b51ab7a50acd008f127b1f0c7d languageName: node linkType: hard @@ -2941,18 +2941,18 @@ __metadata: languageName: node linkType: hard -"@firebase/performance@npm:0.5.10": - version: 0.5.10 - resolution: "@firebase/performance@npm:0.5.10" +"@firebase/performance@npm:0.5.11": + version: 0.5.11 + resolution: "@firebase/performance@npm:0.5.11" dependencies: - "@firebase/component": 0.5.15 - "@firebase/installations": 0.5.10 + "@firebase/component": 0.5.16 + "@firebase/installations": 0.5.11 "@firebase/logger": 0.3.3 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 tslib: ^2.1.0 peerDependencies: "@firebase/app": 0.x - checksum: d418cc88a7a98e9ae8fcae8fb4f117dc87b7799e8682bc5e40c6595a203ef21de0d25f29b1b5f5f9a3d8cf8c295839b32f9e9056560037ad6fa5302ce99efe32 + checksum: d83e459334cf4393a1192a4a1faed5d53a63f30ba4930552bb8713497257b647272deb812c5cf97ef21207035c3c35bdf8e3a41abfa049e735dde72ff372ed5d languageName: node linkType: hard @@ -2967,19 +2967,19 @@ __metadata: languageName: node linkType: hard -"@firebase/remote-config-compat@npm:0.1.10": - version: 0.1.10 - resolution: "@firebase/remote-config-compat@npm:0.1.10" +"@firebase/remote-config-compat@npm:0.1.11": + version: 0.1.11 + resolution: "@firebase/remote-config-compat@npm:0.1.11" dependencies: - "@firebase/component": 0.5.15 + "@firebase/component": 0.5.16 "@firebase/logger": 0.3.3 - "@firebase/remote-config": 0.3.9 + "@firebase/remote-config": 0.3.10 "@firebase/remote-config-types": 0.2.0 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 tslib: ^2.1.0 peerDependencies: "@firebase/app-compat": 0.x - checksum: 63f4792915179eb09186ae314ae6e6259319f4b92e6d8c85478a65a5e8bc0eed2fbca779dfb41950bddd3fe25a39f653019d473dd355f19e679b4bb5978489b1 + checksum: f38ce7d57ac4371adbc4fcba4e4cfcba0ed56173e22de505a86eac3514bb551a831d2e6c96a691a03678cb2984351a743d0a348797e50d2f0a8195a34aaeadd4 languageName: node linkType: hard @@ -2990,33 +2990,33 @@ __metadata: languageName: node linkType: hard -"@firebase/remote-config@npm:0.3.9": - version: 0.3.9 - resolution: "@firebase/remote-config@npm:0.3.9" +"@firebase/remote-config@npm:0.3.10": + version: 0.3.10 + resolution: "@firebase/remote-config@npm:0.3.10" dependencies: - "@firebase/component": 0.5.15 - "@firebase/installations": 0.5.10 + "@firebase/component": 0.5.16 + "@firebase/installations": 0.5.11 "@firebase/logger": 0.3.3 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 tslib: ^2.1.0 peerDependencies: "@firebase/app": 0.x - checksum: 538cf7ab64a343655f1c49d0e6720a0cfa4d76bbf9c7bb70c3d958603b39d591f48fb4ace43e740ae416b28c1073b5fef042e78fb2898e87360488634126c9a3 + checksum: de2fc8a02a114268cafa65f4bb54867896943843c8f6d4d1c791dd885ba05f2df45eac2379cb4cb0e609a9ff38abf82b89b64e8bdf96449029522f4ae3d2805c languageName: node linkType: hard -"@firebase/storage-compat@npm:0.1.15": - version: 0.1.15 - resolution: "@firebase/storage-compat@npm:0.1.15" +"@firebase/storage-compat@npm:0.1.16": + version: 0.1.16 + resolution: "@firebase/storage-compat@npm:0.1.16" dependencies: - "@firebase/component": 0.5.15 - "@firebase/storage": 0.9.7 + "@firebase/component": 0.5.16 + "@firebase/storage": 0.9.8 "@firebase/storage-types": 0.6.0 - "@firebase/util": 1.6.1 + "@firebase/util": 1.6.2 tslib: ^2.1.0 peerDependencies: "@firebase/app-compat": 0.x - checksum: 5f951a5f4df7c31e79d0502188d7de7240a011d563b21ba9172686169752eee936b75a31fa1099c9f86fbd083e1e23c13aab865079588d7279bac91358bcfc9b + checksum: 332740ea58496f54a1cbcf101570a7760b4b135fa67ca5cdff2f5bf91ab09160c62d5456e6476f1056fbbf7cf4befdef403f5c36465f3c940f0cfd3402e61e02 languageName: node linkType: hard @@ -3030,17 +3030,17 @@ __metadata: languageName: node linkType: hard -"@firebase/storage@npm:0.9.7": - version: 0.9.7 - resolution: "@firebase/storage@npm:0.9.7" +"@firebase/storage@npm:0.9.8": + version: 0.9.8 + resolution: "@firebase/storage@npm:0.9.8" dependencies: - "@firebase/component": 0.5.15 - "@firebase/util": 1.6.1 + "@firebase/component": 0.5.16 + "@firebase/util": 1.6.2 node-fetch: 2.6.7 tslib: ^2.1.0 peerDependencies: "@firebase/app": 0.x - checksum: eff3c588b9efa58d78c85ccd7579c67ba242ba24c734a527debe7997f92f88fc0892a0447b81ee9c03fc3c4dacb185b2c75a5fb689e300893346570ef47181c0 + checksum: 7d343168dbbd7f47bde85ff39d3bac974d85e495216985ed6063193b00c0f475a87cbce97201d9bca9f888e8a02dac66368ea7251911c3df39578ea3cd0519d6 languageName: node linkType: hard @@ -3053,12 +3053,12 @@ __metadata: languageName: node linkType: hard -"@firebase/util@npm:1.6.1": - version: 1.6.1 - resolution: "@firebase/util@npm:1.6.1" +"@firebase/util@npm:1.6.2": + version: 1.6.2 + resolution: "@firebase/util@npm:1.6.2" dependencies: tslib: ^2.1.0 - checksum: 646d69a465fc46830f93bad6dd55d18c7bd0d17080230738a21cb2f561ec85767ab01013d9c4d688773998a9f79bfb058e266ccd21f628c42c9c01600a6c7970 + checksum: c29385f44fbfd51fb461f09bc3e63ba8481cdfdbd612d28cd576c120c34bb19003bd60fd38d463d563bf69e2f6a81b36fe2e4de01fa1858b8454c4eb5ef3dde3 languageName: node linkType: hard @@ -5983,7 +5983,7 @@ __metadata: "@types/netlify-identity-widget": 1.9.3 "@types/react": 17.0.47 core-js: 3.23.3 - firebase: 9.8.3 + firebase: 9.8.4 firebase-admin: 10.2.0 gotrue-js: 0.9.29 jest: 27.5.1 @@ -16550,37 +16550,37 @@ __metadata: languageName: node linkType: hard -"firebase@npm:9.8.3": - version: 9.8.3 - resolution: "firebase@npm:9.8.3" +"firebase@npm:9.8.4": + version: 9.8.4 + resolution: "firebase@npm:9.8.4" dependencies: - "@firebase/analytics": 0.7.10 - "@firebase/analytics-compat": 0.1.11 - "@firebase/app": 0.7.26 - "@firebase/app-check": 0.5.9 - "@firebase/app-check-compat": 0.2.9 - "@firebase/app-compat": 0.1.27 + "@firebase/analytics": 0.7.11 + "@firebase/analytics-compat": 0.1.12 + "@firebase/app": 0.7.27 + "@firebase/app-check": 0.5.10 + "@firebase/app-check-compat": 0.2.10 + "@firebase/app-compat": 0.1.28 "@firebase/app-types": 0.7.0 - "@firebase/auth": 0.20.3 - "@firebase/auth-compat": 0.2.16 - "@firebase/database": 0.13.1 - "@firebase/database-compat": 0.2.1 - "@firebase/firestore": 3.4.10 - "@firebase/firestore-compat": 0.1.19 - "@firebase/functions": 0.8.2 - "@firebase/functions-compat": 0.2.2 - "@firebase/installations": 0.5.10 - "@firebase/messaging": 0.9.14 - "@firebase/messaging-compat": 0.1.14 - "@firebase/performance": 0.5.10 - "@firebase/performance-compat": 0.1.10 + "@firebase/auth": 0.20.4 + "@firebase/auth-compat": 0.2.17 + "@firebase/database": 0.13.2 + "@firebase/database-compat": 0.2.2 + "@firebase/firestore": 3.4.11 + "@firebase/firestore-compat": 0.1.20 + "@firebase/functions": 0.8.3 + "@firebase/functions-compat": 0.2.3 + "@firebase/installations": 0.5.11 + "@firebase/messaging": 0.9.15 + "@firebase/messaging-compat": 0.1.15 + "@firebase/performance": 0.5.11 + "@firebase/performance-compat": 0.1.11 "@firebase/polyfill": 0.3.36 - "@firebase/remote-config": 0.3.9 - "@firebase/remote-config-compat": 0.1.10 - "@firebase/storage": 0.9.7 - "@firebase/storage-compat": 0.1.15 - "@firebase/util": 1.6.1 - checksum: 560a3100874e8470a6e2a4a76331856a5064695fd645bc41f9616b209b090f49e5498ddd98439985739d7c125408e78926a6aab0fb75d4209b6cbaa8227eaec7 + "@firebase/remote-config": 0.3.10 + "@firebase/remote-config-compat": 0.1.11 + "@firebase/storage": 0.9.8 + "@firebase/storage-compat": 0.1.16 + "@firebase/util": 1.6.2 + checksum: ff404bca510570edc136211d22169f94109d23bc5b055f162bf03471ab14590c4fef746256116db7a8cf0cd425abb0d271621220c6e1df90c706939584f1c7b7 languageName: node linkType: hard From d17f92982f13eebc154e915a3077ad0149b1540a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Jul 2022 10:40:24 +0900 Subject: [PATCH 04/22] chore(deps): update dependency nodemon to v2.0.19 (#5884) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- packages/core/package.json | 2 +- packages/forms/package.json | 2 +- packages/web/package.json | 2 +- yarn.lock | 107 ++++++++---------------------------- 5 files changed, 28 insertions(+), 87 deletions(-) diff --git a/package.json b/package.json index d59030e070e6..6635d668a4c5 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "msw": "0.40.2", "ncp": "2.0.0", "node-notifier": "10.0.1", - "nodemon": "2.0.16", + "nodemon": "2.0.19", "npm-packlist": "5.1.0", "octokit": "1.7.2", "ora": "5.4.1", diff --git a/packages/core/package.json b/packages/core/package.json index f93a3890eeb9..455a8dd2f06b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -72,7 +72,7 @@ "html-webpack-plugin": "5.5.0", "lodash.escaperegexp": "4.1.2", "mini-css-extract-plugin": "2.6.0", - "nodemon": "2.0.16", + "nodemon": "2.0.19", "null-loader": "4.0.1", "react-refresh": "0.13.0", "rimraf": "3.0.2", diff --git a/packages/forms/package.json b/packages/forms/package.json index c2984dde9e46..1e209d4202a3 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -39,7 +39,7 @@ "@types/testing-library__jest-dom": "5.14.5", "graphql": "16.5.0", "jest": "27.5.1", - "nodemon": "2.0.16", + "nodemon": "2.0.19", "react": "17.0.2", "react-dom": "17.0.2", "typescript": "4.7.3" diff --git a/packages/web/package.json b/packages/web/package.json index 1a6762146b71..a766acc612a0 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -57,7 +57,7 @@ "@types/react-dom": "17.0.17", "@types/testing-library__jest-dom": "5.14.5", "jest": "27.5.1", - "nodemon": "2.0.16", + "nodemon": "2.0.19", "prop-types": "15.8.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 23715c696d81..eb9b0f9aff2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6126,7 +6126,7 @@ __metadata: jest: 27.5.1 lodash.escaperegexp: 4.1.2 mini-css-extract-plugin: 2.6.0 - nodemon: 2.0.16 + nodemon: 2.0.19 null-loader: 4.0.1 react-refresh: 0.13.0 rimraf: 3.0.2 @@ -6202,7 +6202,7 @@ __metadata: core-js: 3.23.3 graphql: 16.5.0 jest: 27.5.1 - nodemon: 2.0.16 + nodemon: 2.0.19 pascalcase: 1.0.0 react: 17.0.2 react-dom: 17.0.2 @@ -6489,7 +6489,7 @@ __metadata: graphql: 16.5.0 graphql-tag: 2.12.6 jest: 27.5.1 - nodemon: 2.0.16 + nodemon: 2.0.19 prop-types: 15.8.1 react: 17.0.2 react-dom: 17.0.2 @@ -11322,7 +11322,7 @@ __metadata: languageName: node linkType: hard -"boxen@npm:5.1.2, boxen@npm:^5.0.0, boxen@npm:^5.1.2": +"boxen@npm:5.1.2, boxen@npm:^5.1.2": version: 5.1.2 resolution: "boxen@npm:5.1.2" dependencies: @@ -12797,7 +12797,7 @@ __metadata: languageName: node linkType: hard -"configstore@npm:^5.0.0, configstore@npm:^5.0.1": +"configstore@npm:^5.0.0": version: 5.0.1 resolution: "configstore@npm:5.0.1" dependencies: @@ -15224,13 +15224,6 @@ __metadata: languageName: node linkType: hard -"escape-goat@npm:^2.0.0": - version: 2.1.1 - resolution: "escape-goat@npm:2.1.1" - checksum: fc0ad656f89c05e86a9641a21bdc5ea37b258714c057430b68a834854fa3e5770cda7d41756108863fc68b1e36a0946463017b7553ac39eaaf64815be07816fc - languageName: node - linkType: hard - "escape-html@npm:~1.0.3": version: 1.0.3 resolution: "escape-html@npm:1.0.3" @@ -17875,7 +17868,7 @@ __metadata: languageName: node linkType: hard -"has-yarn@npm:2.1.0, has-yarn@npm:^2.1.0": +"has-yarn@npm:2.1.0": version: 2.1.0 resolution: "has-yarn@npm:2.1.0" checksum: b5cab61b4129c2fc0474045b59705371b7f5ddf2aab8ba8725011e52269f017e06f75059a2c8a1d8011e9779c2885ad987263cfc6d1280f611c396b45fd5d74a @@ -18574,13 +18567,6 @@ __metadata: languageName: node linkType: hard -"import-lazy@npm:^2.1.0": - version: 2.1.0 - resolution: "import-lazy@npm:2.1.0" - checksum: c5e5f507d26ee23c5b2ed64577155810361ac37863b322cae0c17f16b6a8cdd15adf370288384ddd95ef9de05602fb8d87bf76ff835190eb037333c84db8062c - languageName: node - linkType: hard - "import-local@npm:^3.0.2": version: 3.1.0 resolution: "import-local@npm:3.1.0" @@ -19161,7 +19147,7 @@ __metadata: languageName: node linkType: hard -"is-installed-globally@npm:^0.4.0, is-installed-globally@npm:~0.4.0": +"is-installed-globally@npm:~0.4.0": version: 0.4.0 resolution: "is-installed-globally@npm:0.4.0" dependencies: @@ -19215,13 +19201,6 @@ __metadata: languageName: node linkType: hard -"is-npm@npm:^5.0.0": - version: 5.0.0 - resolution: "is-npm@npm:5.0.0" - checksum: 8ded3ae1119bbbda22395fe1c64d2d79d3b3baeb2635c90f9a9dca4b8ce19a67b55fda178269b63421b257b361892fd545807fb5ac212f06776f544d9fcc3ab0 - languageName: node - linkType: hard - "is-number-object@npm:^1.0.4": version: 1.0.6 resolution: "is-number-object@npm:1.0.6" @@ -19546,13 +19525,6 @@ __metadata: languageName: node linkType: hard -"is-yarn-global@npm:^0.3.0": - version: 0.3.0 - resolution: "is-yarn-global@npm:0.3.0" - checksum: 9f1ab6f28e6e7961c4b97e564791d1decf2886a0dbe9b92b2176d76156adbb42b4c06c0f33d7107b270c207cbcfe0b2293b7cc4a0ec6774ac6d37af9503d51e1 - languageName: node - linkType: hard - "isarray@npm:1.0.0, isarray@npm:^1.0.0, isarray@npm:~1.0.0": version: 1.0.0 resolution: "isarray@npm:1.0.0" @@ -20948,7 +20920,7 @@ __metadata: languageName: node linkType: hard -"latest-version@npm:5.1.0, latest-version@npm:^5.1.0": +"latest-version@npm:5.1.0": version: 5.1.0 resolution: "latest-version@npm:5.1.0" dependencies: @@ -23043,9 +23015,9 @@ __metadata: languageName: node linkType: hard -"nodemon@npm:2.0.16": - version: 2.0.16 - resolution: "nodemon@npm:2.0.16" +"nodemon@npm:2.0.19": + version: 2.0.19 + resolution: "nodemon@npm:2.0.19" dependencies: chokidar: ^3.5.2 debug: ^3.2.7 @@ -23053,13 +23025,13 @@ __metadata: minimatch: ^3.0.4 pstree.remy: ^1.1.8 semver: ^5.7.1 + simple-update-notifier: ^1.0.7 supports-color: ^5.5.0 touch: ^3.1.0 undefsafe: ^2.0.5 - update-notifier: ^5.1.0 bin: nodemon: bin/nodemon.js - checksum: e3b6d9813500c9dd810026e27264c1a306167f6c5e5bf2a3d3b2d7d1c7cefbd9466238f5d4b1d9c8a397d0839cf9670048b3d410b950bba7557eb2f528894099 + checksum: 53ccc2cf92bce69046399173b23e281a04be62d59ac6e6689cbb0f5ada83673720e52795abe74113bffabb47078632a198b877e458f7b3f8756186d26dcf729c languageName: node linkType: hard @@ -25555,15 +25527,6 @@ __metadata: languageName: node linkType: hard -"pupa@npm:^2.1.1": - version: 2.1.1 - resolution: "pupa@npm:2.1.1" - dependencies: - escape-goat: ^2.0.0 - checksum: d2346324780ebae4be847cad052b830e004d816851dd4750fc73faa6cd360f443e358f6b1c83641fd4c904c6055dcb545807f55259a20a52ad86d9477746c724 - languageName: node - linkType: hard - "pvtsutils@npm:^1.2.0, pvtsutils@npm:^1.2.1": version: 1.2.1 resolution: "pvtsutils@npm:1.2.1" @@ -27042,7 +27005,7 @@ __metadata: msw: 0.40.2 ncp: 2.0.0 node-notifier: 10.0.1 - nodemon: 2.0.16 + nodemon: 2.0.19 npm-packlist: 5.1.0 octokit: 1.7.2 ora: 5.4.1 @@ -27365,15 +27328,6 @@ __metadata: languageName: node linkType: hard -"semver-diff@npm:^3.1.1": - version: 3.1.1 - resolution: "semver-diff@npm:3.1.1" - dependencies: - semver: ^6.3.0 - checksum: 7d350f1450b9577d538ef866a9bc4cd97bfbf1f1d92070291495a31d0ec3aa808e826c223e5454ea9877cc06eaa886ffd71bb3a1f331b44bc210f9ff525c68d2 - languageName: node - linkType: hard - "semver-store@npm:^0.3.0": version: 0.3.0 resolution: "semver-store@npm:0.3.0" @@ -27390,7 +27344,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.0.0": +"semver@npm:7.0.0, semver@npm:~7.0.0": version: 7.0.0 resolution: "semver@npm:7.0.0" bin: @@ -27703,6 +27657,15 @@ __metadata: languageName: node linkType: hard +"simple-update-notifier@npm:^1.0.7": + version: 1.0.7 + resolution: "simple-update-notifier@npm:1.0.7" + dependencies: + semver: ~7.0.0 + checksum: a1c536a037818f45128cbeb96e89d11c8a241f13eb2a301b95c4b78a563e1b652a7d2213d3c111383babac2bcbef7b04e6b33e7ae48023d5f660f4d44e7ecfbe + languageName: node + linkType: hard + "sirv@npm:^1.0.7": version: 1.0.19 resolution: "sirv@npm:1.0.19" @@ -30248,28 +30211,6 @@ __metadata: languageName: node linkType: hard -"update-notifier@npm:^5.1.0": - version: 5.1.0 - resolution: "update-notifier@npm:5.1.0" - dependencies: - boxen: ^5.0.0 - chalk: ^4.1.0 - configstore: ^5.0.1 - has-yarn: ^2.1.0 - import-lazy: ^2.1.0 - is-ci: ^2.0.0 - is-installed-globally: ^0.4.0 - is-npm: ^5.0.0 - is-yarn-global: ^0.3.0 - latest-version: ^5.1.0 - pupa: ^2.1.1 - semver: ^7.3.4 - semver-diff: ^3.1.1 - xdg-basedir: ^4.0.0 - checksum: 0dde6db5ac1e5244e1f8bf5b26895a0d53c00797ea2bdbc1302623dd1aecab5cfb88b4f324d482cbd4c8b089464383d8c83db64dec5798ec0136820e22478e47 - languageName: node - linkType: hard - "upper-case-first@npm:^2.0.2": version: 2.0.2 resolution: "upper-case-first@npm:2.0.2" From 4ad9258fa5a060252975afadb7488202b0bde43d Mon Sep 17 00:00:00 2001 From: Philzen Date: Thu, 7 Jul 2022 08:22:09 +0200 Subject: [PATCH 05/22] Bump framer motion version to 6.* as recommended (#5870) According to https://v1.chakra-ui.com/guides/getting-started/redwoodjs-guide#manual this is the correct version for Chakra UI 1.8.8 --- packages/cli/src/commands/setup/ui/libraries/chakra-ui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js b/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js index f3532e337da9..30aed26923a1 100644 --- a/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js +++ b/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js @@ -31,7 +31,7 @@ export async function handler({ force, install }) { '@chakra-ui/react@^1', '@emotion/react@^11', '@emotion/styled@^11', - 'framer-motion@^4', + 'framer-motion@^6', ] const tasks = new Listr([ From 92b3516b1bd0f64e23b81842b072fc6685d7a1fc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Jul 2022 13:26:32 +0000 Subject: [PATCH 06/22] chore(deps): update dependency npm-packlist to v5.1.1 (#5885) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 6635d668a4c5..0aea833ab166 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "ncp": "2.0.0", "node-notifier": "10.0.1", "nodemon": "2.0.19", - "npm-packlist": "5.1.0", + "npm-packlist": "5.1.1", "octokit": "1.7.2", "ora": "5.4.1", "prompts": "2.4.2", diff --git a/yarn.lock b/yarn.lock index eb9b0f9aff2a..10bf58a39c10 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23182,9 +23182,9 @@ __metadata: languageName: node linkType: hard -"npm-packlist@npm:5.1.0": - version: 5.1.0 - resolution: "npm-packlist@npm:5.1.0" +"npm-packlist@npm:5.1.1": + version: 5.1.1 + resolution: "npm-packlist@npm:5.1.1" dependencies: glob: ^8.0.1 ignore-walk: ^5.0.1 @@ -23192,7 +23192,7 @@ __metadata: npm-normalize-package-bin: ^1.0.1 bin: npm-packlist: bin/index.js - checksum: cdf2355280e46b523f78e59ab394572dfe38f1772c4d366ee17a1658cee34a581c2e7d325baa74f3528e0d63914446d0542b3b3aeb2cfe12588c91117c74e97b + checksum: 8d9845883722931576e8eb10ef779407ecfe7d3aec696af76fb3ccbee776560c214ef87bad3615f98bdf0bab759a3a0e5667932cd2c29e14d2a37de22ddf601c languageName: node linkType: hard @@ -27006,7 +27006,7 @@ __metadata: ncp: 2.0.0 node-notifier: 10.0.1 nodemon: 2.0.19 - npm-packlist: 5.1.0 + npm-packlist: 5.1.1 octokit: 1.7.2 ora: 5.4.1 prompts: 2.4.2 From 9db899e43d1bed488f8e2aefe2af3f659aed52b8 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Thu, 7 Jul 2022 17:25:10 +0200 Subject: [PATCH 07/22] Make Form generic for better TS support (#5867) --- packages/forms/package.json | 2 +- packages/forms/src/FormError.tsx | 2 +- packages/forms/src/index.tsx | 101 +++++++++++++++++-------------- yarn.lock | 10 +-- 4 files changed, 63 insertions(+), 52 deletions(-) diff --git a/packages/forms/package.json b/packages/forms/package.json index 1e209d4202a3..b55ab6f567aa 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -24,7 +24,7 @@ "@babel/runtime-corejs3": "7.16.7", "core-js": "3.23.3", "pascalcase": "1.0.0", - "react-hook-form": "7.33.0" + "react-hook-form": "7.33.1" }, "devDependencies": { "@babel/cli": "7.16.7", diff --git a/packages/forms/src/FormError.tsx b/packages/forms/src/FormError.tsx index 18d6071b4bb4..7cf8665fd900 100644 --- a/packages/forms/src/FormError.tsx +++ b/packages/forms/src/FormError.tsx @@ -12,7 +12,7 @@ interface ServerError extends Error { result: Record } -interface RWGqlError { +export interface RWGqlError { message: string graphQLErrors: ReadonlyArray networkError: Error | ServerParseError | ServerError | null diff --git a/packages/forms/src/index.tsx b/packages/forms/src/index.tsx index 323932d68add..f9e322bd93e5 100644 --- a/packages/forms/src/index.tsx +++ b/packages/forms/src/index.tsx @@ -58,7 +58,7 @@ import { UseFormProps, } from 'react-hook-form' -import FormError from './FormError' +import FormError, { RWGqlError } from './FormError' /** * We slightly extend `react-hook-form`'s `RegisterOptions` to make working with GraphQL easier. @@ -484,19 +484,20 @@ interface ServerErrorsContextProps { const ServerErrorsContext = React.createContext({} as ServerErrorsContextProps) -export interface FormProps +export interface FormProps extends Omit, 'onSubmit'> { error?: any /** * The methods returned by `useForm`. - * This props's only necessary if you've called `useForm` yourself to get access to one of it's functions, like `reset`. + * This prop is only necessary if you've called `useForm` yourself to get + * access to one of its functions, like `reset`. * * @example * - * ```javascript - * const formMethods = useForm() + * ```typescript + * const formMethods = useForm() * - * const onSubmit = (data) => { + * const onSubmit = (data: FormData) => { * sendDataToServer(data) * formMethods.reset() * } @@ -506,7 +507,7 @@ export interface FormProps * ) * ``` */ - formMethods?: UseFormReturn + formMethods?: UseFormReturn /** * Configures how React Hook Form performs validation, among other things. * @@ -518,50 +519,59 @@ export interface FormProps * * @see {@link https://react-hook-form.com/api/useform} */ - config?: UseFormProps - onSubmit?: ( - value: Record, - event?: React.BaseSyntheticEvent - ) => void + config?: UseFormProps + onSubmit?: (value: TFieldValues, event?: React.BaseSyntheticEvent) => void } /** * Renders a `
` with the required context. */ -const Form = forwardRef( - ( - { - config, - error: errorProps, - formMethods: propFormMethods, - onSubmit, - children, - ...rest - }: FormProps, - ref: ForwardedRef - ) => { - const hookFormMethods = useForm(config) - const formMethods = propFormMethods || hookFormMethods +function FormInner( + { + config, + error: errorProps, + formMethods: propFormMethods, + onSubmit, + children, + ...rest + }: FormProps, + ref: ForwardedRef +) { + const hookFormMethods = useForm(config) + const formMethods = propFormMethods || hookFormMethods - return ( - - onSubmit?.(data, event) - )} + return ( + + onSubmit?.(data, event) + )} + > + - - {children} - - - ) - } -) + {children} + + + ) +} + +// Sorry about the `as` type assertion (type cast) here. Normally I'd redeclare +// forwardRef to only return a plain function, allowing us to use TypeScript's +// Higher-order Function Type Inference. But that gives us problems with the +// ForwardRefExoticComponent type we use for our InputComponents. So instead +// of changing that type (because it's correct) I use a type assertion here. +// forwardRef is notoriously difficult to use with UI component libs. +// Chakra-UI also says: +// > To be honest, the forwardRef type is quite complex [...] I'd recommend +// > that you cast the type +// https://github.com/chakra-ui/chakra-ui/issues/4528#issuecomment-902566185 +const Form = forwardRef(FormInner) as ( + props: FormProps & React.RefAttributes +) => React.ReactElement | null export interface LabelProps extends Pick, @@ -621,7 +631,7 @@ const DEFAULT_MESSAGES = { * * @example Displaying a validation error message with `` * - * `` doesnt render (i.e. returns `null`) when there's no error on ``. + * `` doesn't render (i.e. returns `null`) when there's no error on ``. * * ```jsx *