From 94c13c78dd8a6eb77337708cbceba49fbf82fb71 Mon Sep 17 00:00:00 2001 From: Aditya Pandey Date: Sat, 15 Jan 2022 12:18:22 +0530 Subject: [PATCH 01/87] Fix: Run web tests in parallel (#4024) * Fix TextDecoder missing from jsdom env * Refer babel-jest config from a file as much as possible * Remove --runInBand for web side * Revert "add textdecoder as global (#3611)" This reverts commit 228821d5545d909d556be10ba1ee9e0da7f9452e. * Add details and credit for custom web env * Add jest detail web jest setup file * Always run web tests in parallel * Fix tests: Don't expect --runInBand * Make api and web configs consistent Co-authored-by: Daniel Choudhury --- .../cli/src/commands/__tests__/test.test.js | 6 ------ packages/cli/src/commands/test.js | 1 - packages/internal/src/build/babel/api.ts | 4 ++-- .../testing/config/jest/api/apiBabelConfig.js | 18 ++++++++++++++++++ packages/testing/config/jest/api/index.js | 15 ++++++++------- .../testing/config/jest/jest-serial-runner.js | 13 +++++++++++++ .../config/jest/web/RedwoodWebJestEnv.js | 14 ++++++++++++++ packages/testing/config/jest/web/index.js | 15 +++++++-------- .../testing/config/jest/web/webBabelConfig.js | 3 +++ 9 files changed, 65 insertions(+), 24 deletions(-) create mode 100644 packages/testing/config/jest/api/apiBabelConfig.js create mode 100644 packages/testing/config/jest/jest-serial-runner.js create mode 100644 packages/testing/config/jest/web/RedwoodWebJestEnv.js create mode 100644 packages/testing/config/jest/web/webBabelConfig.js diff --git a/packages/cli/src/commands/__tests__/test.test.js b/packages/cli/src/commands/__tests__/test.test.js index 6e9ba3e6c2ac..75f28f1fbbe0 100644 --- a/packages/cli/src/commands/__tests__/test.test.js +++ b/packages/cli/src/commands/__tests__/test.test.js @@ -34,9 +34,6 @@ test('Creates/resets a test db when side has api, before calling jest', async () }) expect(execa.mock.results[1].value.cmd).toBe('yarn jest') - - // Api tests need to run sequentially for scenarios - expect(execa.mock.results[1].value.params).toContain('--runInBand') }) test('Runs tests for all available sides if no filter passed', async () => { @@ -65,9 +62,6 @@ test('Syncs or creates test database when the flag --db-push is set to true', as }) expect(execa.mock.results[1].value.cmd).toBe('yarn jest') - - // Api tests need to run sequentially for scenarios - expect(execa.mock.results[1].value.params).toContain('--runInBand') }) test('Skips test database sync/creation when the flag --db-push is set to false', async () => { diff --git a/packages/cli/src/commands/test.js b/packages/cli/src/commands/test.js index 8f11fbc7e068..32f482100fe1 100644 --- a/packages/cli/src/commands/test.js +++ b/packages/cli/src/commands/test.js @@ -103,7 +103,6 @@ export const handler = async ({ collectCoverage ? '--collectCoverage' : null, '--passWithNoTests', ...jestFilterArgs, - '--runInBand', // @TODO always run in band, even for web as we get babel errors https://github.com/redwoodjs/redwood/issues/3646 ].filter((flagOrValue) => flagOrValue !== null) // Filter out nulls, not booleans because user may have passed a --something false flag // If the user wants to watch, set the proper watch flag based on what kind of repo this is diff --git a/packages/internal/src/build/babel/api.ts b/packages/internal/src/build/babel/api.ts index f11a592c0018..cd938c55631e 100644 --- a/packages/internal/src/build/babel/api.ts +++ b/packages/internal/src/build/babel/api.ts @@ -161,7 +161,7 @@ export const getApiSideBabelConfigPath = () => { if (fs.existsSync(p)) { return p } else { - return false + return undefined } } @@ -169,7 +169,7 @@ export const getApiSideDefaultBabelConfig = () => { return { presets: getApiSideBabelPresets(), plugins: getApiSideBabelPlugins(), - configFile: getApiSideBabelConfigPath(), + extends: getApiSideBabelConfigPath(), babelrc: false, ignore: ['node_modules'], } diff --git a/packages/testing/config/jest/api/apiBabelConfig.js b/packages/testing/config/jest/api/apiBabelConfig.js new file mode 100644 index 000000000000..3432fd795118 --- /dev/null +++ b/packages/testing/config/jest/api/apiBabelConfig.js @@ -0,0 +1,18 @@ +const { + getApiSideDefaultBabelConfig, + getApiSideBabelPresets, + getApiSideBabelPlugins, +} = require('@redwoodjs/internal') + +// Since configFile and babelrc is already passed a level up, cleaning up these keys here. +// babelrc can not reside inside "extend"ed +// Ref: packages/testing/config/jest/api/index.js +const { babelrc: _b, ...defaultBabelConfig } = getApiSideDefaultBabelConfig() + +module.exports = { + ...defaultBabelConfig, + plugins: getApiSideBabelPlugins({ forJest: true }), + presets: getApiSideBabelPresets({ + presetEnv: true, // jest needs code transpiled + }), +} diff --git a/packages/testing/config/jest/api/index.js b/packages/testing/config/jest/api/index.js index b4d88c6edf00..7a0387fdf79a 100644 --- a/packages/testing/config/jest/api/index.js +++ b/packages/testing/config/jest/api/index.js @@ -3,15 +3,15 @@ const path = require('path') const { getPaths, getApiSideDefaultBabelConfig, - getApiSideBabelPresets, - getApiSideBabelPlugins, } = require('@redwoodjs/internal') const rwjsPaths = getPaths() const NODE_MODULES_PATH = path.join(rwjsPaths.base, 'node_modules') +const { babelrc } = getApiSideDefaultBabelConfig() module.exports = { roots: ['/src/'], + runner: path.join(__dirname, '../jest-serial-runner.js'), testEnvironment: path.join(__dirname, './RedwoodApiJestEnv.js'), displayName: { color: 'redBright', @@ -29,12 +29,13 @@ module.exports = { transform: { '\\.[jt]sx?$': [ 'babel-jest', + // When jest runs tests in parallel, it serializes the config before passing down options to babel + // that's why these must be serializable. So ideally, we should just pass reference to a + // configFile or "extends" a config. But we need a few other option only at root level, so we'll pass + // here and remove those keys inside "extend"ed config. { - ...getApiSideDefaultBabelConfig(), - plugins: getApiSideBabelPlugins({ forJest: true }), - presets: getApiSideBabelPresets({ - presetEnv: true, // jest needs code transpiled - }), + babelrc, // babelrc can not reside inside "extend"ed config, that's why we have it here + configFile: path.resolve(__dirname, './apiBabelConfig.js'), }, ], }, diff --git a/packages/testing/config/jest/jest-serial-runner.js b/packages/testing/config/jest/jest-serial-runner.js new file mode 100644 index 000000000000..95012fdbfb6e --- /dev/null +++ b/packages/testing/config/jest/jest-serial-runner.js @@ -0,0 +1,13 @@ +// Originally from https://github.com/gabrieli/jest-serial-runner/blob/master/index.js +// with fixed module export + +const TestRunner = require('jest-runner').default + +class SerialRunner extends TestRunner { + constructor(...attr) { + super(...attr) + this.isSerial = true + } +} + +module.exports = SerialRunner diff --git a/packages/testing/config/jest/web/RedwoodWebJestEnv.js b/packages/testing/config/jest/web/RedwoodWebJestEnv.js new file mode 100644 index 000000000000..d4523ed2784e --- /dev/null +++ b/packages/testing/config/jest/web/RedwoodWebJestEnv.js @@ -0,0 +1,14 @@ +const Environment = require('jest-environment-jsdom') + +// Due to issue: https://github.com/jsdom/jsdom/issues/2524 +// Fix from: https://github.com/jsdom/jsdom/issues/2524#issuecomment-736672511 +module.exports = class RedwoodWebJestEnv extends Environment { + async setup() { + await super.setup() + if (typeof this.global.TextEncoder === 'undefined') { + const { TextEncoder, TextDecoder } = require('util') + this.global.TextEncoder = TextEncoder + this.global.TextDecoder = TextDecoder + } + } +} diff --git a/packages/testing/config/jest/web/index.js b/packages/testing/config/jest/web/index.js index 2d1ac7cbdbff..b79f938529f5 100644 --- a/packages/testing/config/jest/web/index.js +++ b/packages/testing/config/jest/web/index.js @@ -1,17 +1,13 @@ const path = require('path') -const { TextDecoder } = require('util') -const { - getPaths, - getWebSideDefaultBabelConfig, -} = require('@redwoodjs/internal') +const { getPaths } = require('@redwoodjs/internal') const rwjsPaths = getPaths() const NODE_MODULES_PATH = path.join(rwjsPaths.base, 'node_modules') module.exports = { roots: ['/src/'], - testEnvironment: 'jest-environment-jsdom', + testEnvironment: path.join(__dirname, './RedwoodWebJestEnv.js'), displayName: { color: 'blueBright', name: 'web', @@ -20,7 +16,6 @@ module.exports = { __REDWOOD_API_URL: '', __REDWOOD_API_GRAPHQL_SERVER_PATH: '/', __REDWOOD__APP_TITLE: 'Redwood App', - TextDecoder, }, setupFilesAfterEnv: [path.resolve(__dirname, './jest.setup.js')], moduleNameMapper: { @@ -57,7 +52,11 @@ module.exports = { transform: { '\\.[jt]sx?$': [ 'babel-jest', - getWebSideDefaultBabelConfig({ forJest: true }), + // When jest runs tests in parallel, it serializes the config before passing down options to babel + // that's why these must be serializable. Passing the reference to a config instead. + { + configFile: path.resolve(__dirname, './webBabelConfig.js'), + }, ], }, } diff --git a/packages/testing/config/jest/web/webBabelConfig.js b/packages/testing/config/jest/web/webBabelConfig.js new file mode 100644 index 000000000000..e7d063338129 --- /dev/null +++ b/packages/testing/config/jest/web/webBabelConfig.js @@ -0,0 +1,3 @@ +const { getWebSideDefaultBabelConfig } = require('@redwoodjs/internal') + +module.exports = getWebSideDefaultBabelConfig({ forJest: true }) From e47983defe1af8237108d1d1dc7fc51699edd6ef Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 15 Jan 2022 09:54:53 +0000 Subject: [PATCH 02/87] Update storybook monorepo to v6.4.13 (#4160) Co-authored-by: Renovate Bot --- packages/testing/package.json | 8 +- yarn.lock | 752 +++++++++++++--------------------- 2 files changed, 283 insertions(+), 477 deletions(-) diff --git a/packages/testing/package.json b/packages/testing/package.json index 2a6184fe6dc8..d9d490fed60f 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -17,10 +17,10 @@ "@redwoodjs/internal": "0.41.0", "@redwoodjs/router": "0.41.0", "@redwoodjs/web": "0.41.0", - "@storybook/addon-a11y": "6.4.12", - "@storybook/builder-webpack5": "6.4.12", - "@storybook/manager-webpack5": "6.4.12", - "@storybook/react": "6.4.12", + "@storybook/addon-a11y": "6.4.13", + "@storybook/builder-webpack5": "6.4.13", + "@storybook/manager-webpack5": "6.4.13", + "@storybook/react": "6.4.13", "@testing-library/jest-dom": "5.16.1", "@testing-library/react": "12.1.2", "@testing-library/user-event": "13.5.0", diff --git a/yarn.lock b/yarn.lock index 232e038c4963..d56ed6086b44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -94,15 +94,6 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:7.10.4": - version: 7.10.4 - resolution: "@babel/code-frame@npm:7.10.4" - dependencies: - "@babel/highlight": ^7.10.4 - checksum: 69e0f52986a1f40231d891224f420436629b6678711b68c088e97b7bdba1607aeb5eb9cfb070275c433f0bf43c37c134845db80d1cdbf5ac88a69b0bdcce9402 - languageName: node - linkType: hard - "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.5.5, @babel/code-frame@npm:^7.8.3": version: 7.16.7 resolution: "@babel/code-frame@npm:7.16.7" @@ -493,7 +484,7 @@ __metadata: languageName: node linkType: hard -"@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.16.7": +"@babel/highlight@npm:^7.16.7": version: 7.16.7 resolution: "@babel/highlight@npm:7.16.7" dependencies: @@ -5773,10 +5764,10 @@ __metadata: "@redwoodjs/internal": 0.41.0 "@redwoodjs/router": 0.41.0 "@redwoodjs/web": 0.41.0 - "@storybook/addon-a11y": 6.4.12 - "@storybook/builder-webpack5": 6.4.12 - "@storybook/manager-webpack5": 6.4.12 - "@storybook/react": 6.4.12 + "@storybook/addon-a11y": 6.4.13 + "@storybook/builder-webpack5": 6.4.13 + "@storybook/manager-webpack5": 6.4.13 + "@storybook/react": 6.4.13 "@testing-library/jest-dom": 5.16.1 "@testing-library/react": 12.1.2 "@testing-library/user-event": 13.5.0 @@ -5864,18 +5855,18 @@ __metadata: languageName: node linkType: hard -"@storybook/addon-a11y@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/addon-a11y@npm:6.4.12" +"@storybook/addon-a11y@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/addon-a11y@npm:6.4.13" dependencies: - "@storybook/addons": 6.4.12 - "@storybook/api": 6.4.12 - "@storybook/channels": 6.4.12 - "@storybook/client-logger": 6.4.12 - "@storybook/components": 6.4.12 - "@storybook/core-events": 6.4.12 + "@storybook/addons": 6.4.13 + "@storybook/api": 6.4.13 + "@storybook/channels": 6.4.13 + "@storybook/client-logger": 6.4.13 + "@storybook/components": 6.4.13 + "@storybook/core-events": 6.4.13 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/theming": 6.4.12 + "@storybook/theming": 6.4.13 axe-core: ^4.2.0 core-js: ^3.8.2 global: ^4.4.0 @@ -5892,21 +5883,21 @@ __metadata: optional: true react-dom: optional: true - checksum: 9f321956cb892a96f050d96f4f4c05f774ac2534dde61456043e57f43ae4d79dc5e315ec5c35450c9c05913de5be8bf80c9be5c1fc133511fe9dece8c85a465e + checksum: e1fcb6be38d6c477876af027468c9f4dc293d341f5bffaa53018251171ef930a0fba6eb54cd4980df6d1a4394d245db9e927ae653f1a429cd2344371154671f5 languageName: node linkType: hard -"@storybook/addons@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/addons@npm:6.4.12" +"@storybook/addons@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/addons@npm:6.4.13" dependencies: - "@storybook/api": 6.4.12 - "@storybook/channels": 6.4.12 - "@storybook/client-logger": 6.4.12 - "@storybook/core-events": 6.4.12 + "@storybook/api": 6.4.13 + "@storybook/channels": 6.4.13 + "@storybook/client-logger": 6.4.13 + "@storybook/core-events": 6.4.13 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/router": 6.4.12 - "@storybook/theming": 6.4.12 + "@storybook/router": 6.4.13 + "@storybook/theming": 6.4.13 "@types/webpack-env": ^1.16.0 core-js: ^3.8.2 global: ^4.4.0 @@ -5914,21 +5905,21 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 - checksum: 042952966e8e58a7346ea5ca939581281c8ca60a00e3ec74b9a0131e1bf94d1e2b2311fa74d777bf2814e7b90326c40afbaa9ecd4f8d5f3f582c3784efb3a0ad + checksum: bf32e934fddd2822c210ff21d1c3738e3aaf12172158b8ca6db2661568af667daa4cdb77e59d8c211f435c9e12c56705a6eb30485dfa988a62299dc54dd4192b languageName: node linkType: hard -"@storybook/api@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/api@npm:6.4.12" +"@storybook/api@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/api@npm:6.4.13" dependencies: - "@storybook/channels": 6.4.12 - "@storybook/client-logger": 6.4.12 - "@storybook/core-events": 6.4.12 + "@storybook/channels": 6.4.13 + "@storybook/client-logger": 6.4.13 + "@storybook/core-events": 6.4.13 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/router": 6.4.12 + "@storybook/router": 6.4.13 "@storybook/semver": ^7.3.2 - "@storybook/theming": 6.4.12 + "@storybook/theming": 6.4.13 core-js: ^3.8.2 fast-deep-equal: ^3.1.3 global: ^4.4.0 @@ -5942,13 +5933,13 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 - checksum: 677321cd28bac095f17d0ba136f66b6cea666f55d61c16adbc2ab0db40c43c5f6e2d248de09e2ffd2b3e683cd4f815b37bb6d9165ad82c3ec3d4b2268ce3344a + checksum: 4edb06de7eda51df0909f3c837783f0ecf13fb949d317cec072e890734657ef49c3ffa852131f87f2bc4c09b17b7c22c4373fba7ab0a71df21fc0f42ae282e95 languageName: node linkType: hard -"@storybook/builder-webpack4@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/builder-webpack4@npm:6.4.12" +"@storybook/builder-webpack4@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/builder-webpack4@npm:6.4.13" dependencies: "@babel/core": ^7.12.10 "@babel/plugin-proposal-class-properties": ^7.12.1 @@ -5971,22 +5962,22 @@ __metadata: "@babel/preset-env": ^7.12.11 "@babel/preset-react": ^7.12.10 "@babel/preset-typescript": ^7.12.7 - "@storybook/addons": 6.4.12 - "@storybook/api": 6.4.12 - "@storybook/channel-postmessage": 6.4.12 - "@storybook/channels": 6.4.12 - "@storybook/client-api": 6.4.12 - "@storybook/client-logger": 6.4.12 - "@storybook/components": 6.4.12 - "@storybook/core-common": 6.4.12 - "@storybook/core-events": 6.4.12 - "@storybook/node-logger": 6.4.12 - "@storybook/preview-web": 6.4.12 - "@storybook/router": 6.4.12 + "@storybook/addons": 6.4.13 + "@storybook/api": 6.4.13 + "@storybook/channel-postmessage": 6.4.13 + "@storybook/channels": 6.4.13 + "@storybook/client-api": 6.4.13 + "@storybook/client-logger": 6.4.13 + "@storybook/components": 6.4.13 + "@storybook/core-common": 6.4.13 + "@storybook/core-events": 6.4.13 + "@storybook/node-logger": 6.4.13 + "@storybook/preview-web": 6.4.13 + "@storybook/router": 6.4.13 "@storybook/semver": ^7.3.2 - "@storybook/store": 6.4.12 - "@storybook/theming": 6.4.12 - "@storybook/ui": 6.4.12 + "@storybook/store": 6.4.13 + "@storybook/theming": 6.4.13 + "@storybook/ui": 6.4.13 "@types/node": ^14.0.10 "@types/webpack": ^4.41.26 autoprefixer: ^9.8.6 @@ -6008,7 +5999,6 @@ __metadata: postcss-flexbugs-fixes: ^4.2.1 postcss-loader: ^4.2.0 raw-loader: ^4.0.2 - react-dev-utils: ^11.0.4 stable: ^0.1.8 style-loader: ^1.3.0 terser-webpack-plugin: ^4.2.3 @@ -6026,13 +6016,13 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 4fb41f33e851a10d2cdcc9efeec54802ac2d86b4154caecd809448df963ae5386a6ca733673ee43c29951631292d755b7d050fa8244c888c4cfa5765ac05a5eb + checksum: 624e6a786c32c496c9c24be53bcaf01b7a29ad7e0c92cd63915e411aeca6de7f35aebc6a3ec7f7d6e5e5fd7658c2681f886bfe2d765b4ff0a7f23b1b9530cd0c languageName: node linkType: hard -"@storybook/builder-webpack5@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/builder-webpack5@npm:6.4.12" +"@storybook/builder-webpack5@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/builder-webpack5@npm:6.4.13" dependencies: "@babel/core": ^7.12.10 "@babel/plugin-proposal-class-properties": ^7.12.1 @@ -6054,21 +6044,21 @@ __metadata: "@babel/preset-env": ^7.12.11 "@babel/preset-react": ^7.12.10 "@babel/preset-typescript": ^7.12.7 - "@storybook/addons": 6.4.12 - "@storybook/api": 6.4.12 - "@storybook/channel-postmessage": 6.4.12 - "@storybook/channels": 6.4.12 - "@storybook/client-api": 6.4.12 - "@storybook/client-logger": 6.4.12 - "@storybook/components": 6.4.12 - "@storybook/core-common": 6.4.12 - "@storybook/core-events": 6.4.12 - "@storybook/node-logger": 6.4.12 - "@storybook/preview-web": 6.4.12 - "@storybook/router": 6.4.12 + "@storybook/addons": 6.4.13 + "@storybook/api": 6.4.13 + "@storybook/channel-postmessage": 6.4.13 + "@storybook/channels": 6.4.13 + "@storybook/client-api": 6.4.13 + "@storybook/client-logger": 6.4.13 + "@storybook/components": 6.4.13 + "@storybook/core-common": 6.4.13 + "@storybook/core-events": 6.4.13 + "@storybook/node-logger": 6.4.13 + "@storybook/preview-web": 6.4.13 + "@storybook/router": 6.4.13 "@storybook/semver": ^7.3.2 - "@storybook/store": 6.4.12 - "@storybook/theming": 6.4.12 + "@storybook/store": 6.4.13 + "@storybook/theming": 6.4.13 "@types/node": ^14.0.10 babel-loader: ^8.0.0 babel-plugin-macros: ^3.0.1 @@ -6081,7 +6071,6 @@ __metadata: glob-promise: ^3.4.0 html-webpack-plugin: ^5.0.0 path-browserify: ^1.0.1 - react-dev-utils: ^11.0.4 stable: ^0.1.8 style-loader: ^2.0.0 terser-webpack-plugin: ^5.0.3 @@ -6097,60 +6086,60 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 665cb1f3c3513ecf06745e34e5c71fd12645b3ff6f27c157ddbeb5f71e0c5fc318e0633511f2da8baf643dc0a20cba103b22cfdb721f7bfb64974c405c9eebf7 + checksum: 41033dd48ddc5800fb28c82816d36d7a7723f5ec258b14006df36b4e4b25eac46caf572cac258b80cd66e29a672738d3cb0368c9f3becff2fe0e6d5c709caa9d languageName: node linkType: hard -"@storybook/channel-postmessage@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/channel-postmessage@npm:6.4.12" +"@storybook/channel-postmessage@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/channel-postmessage@npm:6.4.13" dependencies: - "@storybook/channels": 6.4.12 - "@storybook/client-logger": 6.4.12 - "@storybook/core-events": 6.4.12 + "@storybook/channels": 6.4.13 + "@storybook/client-logger": 6.4.13 + "@storybook/core-events": 6.4.13 core-js: ^3.8.2 global: ^4.4.0 qs: ^6.10.0 telejson: ^5.3.2 - checksum: c62a968f4ca5fdbdb4c875c7b050ef8bc5828b06d5fe145a136816ea83fddf6ccee0fdfdea1f76542298984391ca07f6acb44bbb56042228daa513dedf2f77e8 + checksum: 824824220541efb20cfc0b7cd7fa72998512e68621d431d9f904f6c15769e81f11eff369f4704f5b0e5e102afc0bb38b054fc0c5d0f74aef61708c377fa05d8c languageName: node linkType: hard -"@storybook/channel-websocket@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/channel-websocket@npm:6.4.12" +"@storybook/channel-websocket@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/channel-websocket@npm:6.4.13" dependencies: - "@storybook/channels": 6.4.12 - "@storybook/client-logger": 6.4.12 + "@storybook/channels": 6.4.13 + "@storybook/client-logger": 6.4.13 core-js: ^3.8.2 global: ^4.4.0 telejson: ^5.3.2 - checksum: 1a04aae5a94382956204387a7dec3c12c7e006809c64cf730fd9eb9e0092e9e4493be6da6f92d132a447b0a112cd6ed223cc40751212f27296cbfe7b4791ca11 + checksum: 01f0f2217eb2443718691372fca9076f69c7fa92c625f549744bd3e57678fc6374376f1daa829b2603d5d439e237e2499a7d9dc66b6921ad5f546ff64f1ac74a languageName: node linkType: hard -"@storybook/channels@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/channels@npm:6.4.12" +"@storybook/channels@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/channels@npm:6.4.13" dependencies: core-js: ^3.8.2 ts-dedent: ^2.0.0 util-deprecate: ^1.0.2 - checksum: b956150ee2d07db6c61cdb0e7c1ba9ecdcb1417fce37a3710ac67d4edaa3fd7f89c025b80c9b84e9747b7cc9901304c966498ae4e67f6e10de94f6147a080773 + checksum: 82ab48dad0bf40f50886a6e14397002f45269b06fcd7112acc9cdee2241350ec9c372df4761da0853cc8d2dd66364608daa04ae96493a1fdde557cb005e77dda languageName: node linkType: hard -"@storybook/client-api@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/client-api@npm:6.4.12" +"@storybook/client-api@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/client-api@npm:6.4.13" dependencies: - "@storybook/addons": 6.4.12 - "@storybook/channel-postmessage": 6.4.12 - "@storybook/channels": 6.4.12 - "@storybook/client-logger": 6.4.12 - "@storybook/core-events": 6.4.12 + "@storybook/addons": 6.4.13 + "@storybook/channel-postmessage": 6.4.13 + "@storybook/channels": 6.4.13 + "@storybook/client-logger": 6.4.13 + "@storybook/core-events": 6.4.13 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/store": 6.4.12 + "@storybook/store": 6.4.13 "@types/qs": ^6.9.5 "@types/webpack-env": ^1.16.0 core-js: ^3.8.2 @@ -6167,28 +6156,28 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 - checksum: 83b1b3acbdb30cd67e5e17962c2143973eae37dc66b4777aec20750649874a881b981119113bad744d0fd58efc4c9e395a503ad8bad594a44a34aeb77db48eb0 + checksum: 32c0dd6011a3b27ef3d236a031ce16656feb381c5944e81ef1ed7f4443d5dd753c6cf91522c4ad521a3f5a0bd39ee904751ab06af36baac0e37a6c92f355ebd8 languageName: node linkType: hard -"@storybook/client-logger@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/client-logger@npm:6.4.12" +"@storybook/client-logger@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/client-logger@npm:6.4.13" dependencies: core-js: ^3.8.2 global: ^4.4.0 - checksum: 4047584a23a7c10b19cbb3d8275def9aafef7b7a435f57a59b7792199c64120425e912e94a7910070ea5d308f93cf8d93fdaf8a126573dad7b2f973f76c23902 + checksum: fae4c3185fb7f63da09d0ed20f4e1dc8666240b366a2e8bdb29ebcb879bdf9ca80d0cc08f40e71b26d561acc767140b2996c4358f4822d0320d2c27942bdf097 languageName: node linkType: hard -"@storybook/components@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/components@npm:6.4.12" +"@storybook/components@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/components@npm:6.4.13" dependencies: "@popperjs/core": ^2.6.0 - "@storybook/client-logger": 6.4.12 + "@storybook/client-logger": 6.4.13 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/theming": 6.4.12 + "@storybook/theming": 6.4.13 "@types/color-convert": ^2.0.0 "@types/overlayscrollbars": ^1.12.0 "@types/react-syntax-highlighter": 11.0.5 @@ -6212,24 +6201,24 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 - checksum: 02464f5450850be7a13aa1f85b35ad9b4b819da6ad5d01c8fae28b71d4e58c55fe44055d865431ed1f16d50f780af50e8f2c35b7056b2f50c7a4f04a810f1139 + checksum: 63252cb2a5fd85e9e571d2c853f6aa7ab328aaa5cff9a144ccaf1e37a5ba0d437747d108a2094d8586d5237129ddcb3c890dbf703fc3b5cc4caa25bfcda17215 languageName: node linkType: hard -"@storybook/core-client@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/core-client@npm:6.4.12" +"@storybook/core-client@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/core-client@npm:6.4.13" dependencies: - "@storybook/addons": 6.4.12 - "@storybook/channel-postmessage": 6.4.12 - "@storybook/channel-websocket": 6.4.12 - "@storybook/client-api": 6.4.12 - "@storybook/client-logger": 6.4.12 - "@storybook/core-events": 6.4.12 + "@storybook/addons": 6.4.13 + "@storybook/channel-postmessage": 6.4.13 + "@storybook/channel-websocket": 6.4.13 + "@storybook/client-api": 6.4.13 + "@storybook/client-logger": 6.4.13 + "@storybook/core-events": 6.4.13 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/preview-web": 6.4.12 - "@storybook/store": 6.4.12 - "@storybook/ui": 6.4.12 + "@storybook/preview-web": 6.4.13 + "@storybook/store": 6.4.13 + "@storybook/ui": 6.4.13 airbnb-js-shims: ^2.2.1 ansi-to-html: ^0.6.11 core-js: ^3.8.2 @@ -6247,13 +6236,13 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: ea7c9725eb7408d23dfe666a0732d6263978169be3c45eca6966983f25755c1d9b2e958291e030acf12a4b61ad8ff42be4ba7294b5db5e6c0b0d99092b8694b5 + checksum: 753dd5cb58ddd351a7aa29c52be5c66efac194991768b79ac9e9622c196d06879678d91c7c48eaabee60cad2f558b08bf1ad000cab22bc4f1b16e943a924c26c languageName: node linkType: hard -"@storybook/core-common@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/core-common@npm:6.4.12" +"@storybook/core-common@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/core-common@npm:6.4.13" dependencies: "@babel/core": ^7.12.10 "@babel/plugin-proposal-class-properties": ^7.12.1 @@ -6276,7 +6265,7 @@ __metadata: "@babel/preset-react": ^7.12.10 "@babel/preset-typescript": ^7.12.7 "@babel/register": ^7.12.1 - "@storybook/node-logger": 6.4.12 + "@storybook/node-logger": 6.4.13 "@storybook/semver": ^7.3.2 "@types/node": ^14.0.10 "@types/pretty-hrtime": ^1.0.0 @@ -6310,34 +6299,34 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 0b37d6be59baece27189781ff8e9b6410a22b45dcc5873abd9c80b4a201c703982a4ff542656a640ad832c6053f9d9cb7f85287b3e788ff4600d22106c162421 + checksum: a01a41d3072d6094878827dad0c5642e4dbc8094b961b67c551f54b2349457c39f448b22f397b0cb8bfa1162c52715888352cae92a4be022a8d64c57f4471c71 languageName: node linkType: hard -"@storybook/core-events@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/core-events@npm:6.4.12" +"@storybook/core-events@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/core-events@npm:6.4.13" dependencies: core-js: ^3.8.2 - checksum: 6fb904057e859e59bb2134ab1705a37d1ef481db087f6250133ee0099dc896203de6c96b2f3ead2fa385c365e7de7553eed2472251c4a9a32d3d3c347b17d32b + checksum: 19d6753052bcd1d770d4b5ccb257433691c6815e0896fcbb33e56ba3be6fe74755bf13ec1af1db4c46f87036e400be4a7647572c014e3daee109181407419a16 languageName: node linkType: hard -"@storybook/core-server@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/core-server@npm:6.4.12" +"@storybook/core-server@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/core-server@npm:6.4.13" dependencies: "@discoveryjs/json-ext": ^0.5.3 - "@storybook/builder-webpack4": 6.4.12 - "@storybook/core-client": 6.4.12 - "@storybook/core-common": 6.4.12 - "@storybook/core-events": 6.4.12 + "@storybook/builder-webpack4": 6.4.13 + "@storybook/core-client": 6.4.13 + "@storybook/core-common": 6.4.13 + "@storybook/core-events": 6.4.13 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/csf-tools": 6.4.12 - "@storybook/manager-webpack4": 6.4.12 - "@storybook/node-logger": 6.4.12 + "@storybook/csf-tools": 6.4.13 + "@storybook/manager-webpack4": 6.4.13 + "@storybook/node-logger": 6.4.13 "@storybook/semver": ^7.3.2 - "@storybook/store": 6.4.12 + "@storybook/store": 6.4.13 "@types/node": ^14.0.10 "@types/node-fetch": ^2.5.7 "@types/pretty-hrtime": ^1.0.0 @@ -6370,8 +6359,8 @@ __metadata: webpack: 4 ws: ^8.2.3 peerDependencies: - "@storybook/builder-webpack5": 6.4.12 - "@storybook/manager-webpack5": 6.4.12 + "@storybook/builder-webpack5": 6.4.13 + "@storybook/manager-webpack5": 6.4.13 react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 peerDependenciesMeta: @@ -6381,18 +6370,18 @@ __metadata: optional: true typescript: optional: true - checksum: e668872812ff7232d92cedd3a11c30bb48d279093f06d7770a9e108313bacf077e59c609253cb7f333bccb1387232baa49589e575d38d2441a5a31f7a6ea5dab + checksum: 5c11f7e7ba226cfdd47deb81a493e07e5f48b8960bf8f46605608abe2c3e971657e4f03726e7afdb5811a255786e639b7134ca646eb6d8e815b89d43e552b076 languageName: node linkType: hard -"@storybook/core@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/core@npm:6.4.12" +"@storybook/core@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/core@npm:6.4.13" dependencies: - "@storybook/core-client": 6.4.12 - "@storybook/core-server": 6.4.12 + "@storybook/core-client": 6.4.13 + "@storybook/core-server": 6.4.13 peerDependencies: - "@storybook/builder-webpack5": 6.4.12 + "@storybook/builder-webpack5": 6.4.13 react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 webpack: "*" @@ -6401,13 +6390,13 @@ __metadata: optional: true typescript: optional: true - checksum: 5532e831865afe9ec3e5bb5cdeb10fce2682ad31b0e5a3044c718f24f10e23a4ec08784ceab291c26fb3c1857653517706af5f5891359bb74f7e11a0482757f4 + checksum: 85f897e236616c1a9e34048e05f9f403c645d764468870f5dd629b9016a56c4c7129f84c7cb03aa712679b7d5389df5aa760cf03e4da4cb4961e68ebf228fa1d languageName: node linkType: hard -"@storybook/csf-tools@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/csf-tools@npm:6.4.12" +"@storybook/csf-tools@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/csf-tools@npm:6.4.13" dependencies: "@babel/core": ^7.12.10 "@babel/generator": ^7.12.11 @@ -6423,10 +6412,10 @@ __metadata: global: ^4.4.0 js-string-escape: ^1.0.1 lodash: ^4.17.21 - prettier: ^2.2.1 + prettier: <=2.3.0 regenerator-runtime: ^0.13.7 ts-dedent: ^2.0.0 - checksum: 1eb428a87794281fff8cfccceb7f57564d87fd649fbda4300758c86b9e5fbf2525338b7120e0796bcccebd46db7f748e9c9dd41fb8237b55e0a644426da40e81 + checksum: e38bdb1d1114f03996edf281afffde1907be7e1f51aca298579aab937b2aa037e139c5895a9b5ad5a50eeb8fcb0375aef2cfa94e409c866624d5d1ecb67082ed languageName: node linkType: hard @@ -6439,19 +6428,19 @@ __metadata: languageName: node linkType: hard -"@storybook/manager-webpack4@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/manager-webpack4@npm:6.4.12" +"@storybook/manager-webpack4@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/manager-webpack4@npm:6.4.13" dependencies: "@babel/core": ^7.12.10 "@babel/plugin-transform-template-literals": ^7.12.1 "@babel/preset-react": ^7.12.10 - "@storybook/addons": 6.4.12 - "@storybook/core-client": 6.4.12 - "@storybook/core-common": 6.4.12 - "@storybook/node-logger": 6.4.12 - "@storybook/theming": 6.4.12 - "@storybook/ui": 6.4.12 + "@storybook/addons": 6.4.13 + "@storybook/core-client": 6.4.13 + "@storybook/core-common": 6.4.13 + "@storybook/node-logger": 6.4.13 + "@storybook/theming": 6.4.13 + "@storybook/ui": 6.4.13 "@types/node": ^14.0.10 "@types/webpack": ^4.41.26 babel-loader: ^8.0.0 @@ -6485,23 +6474,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: b988b9e631cda8751a5347718f20ce28e587cc4f0bc4becd41729fd8589036d9b794ab11ab0ef6d9f0e24eff6589f30422581e3b13e4abdbedf4f28a85c388af + checksum: 3a1bc7ca481a75de9fe493aeee5a80628d9eaaa5d36757ed72d38c0a7afc09383f1386c8f760ef3e4cc3d006de403891290f8e3dc6d6db7756437e2f96ea1af1 languageName: node linkType: hard -"@storybook/manager-webpack5@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/manager-webpack5@npm:6.4.12" +"@storybook/manager-webpack5@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/manager-webpack5@npm:6.4.13" dependencies: "@babel/core": ^7.12.10 "@babel/plugin-transform-template-literals": ^7.12.1 "@babel/preset-react": ^7.12.10 - "@storybook/addons": 6.4.12 - "@storybook/core-client": 6.4.12 - "@storybook/core-common": 6.4.12 - "@storybook/node-logger": 6.4.12 - "@storybook/theming": 6.4.12 - "@storybook/ui": 6.4.12 + "@storybook/addons": 6.4.13 + "@storybook/core-client": 6.4.13 + "@storybook/core-common": 6.4.13 + "@storybook/node-logger": 6.4.13 + "@storybook/theming": 6.4.13 + "@storybook/ui": 6.4.13 "@types/node": ^14.0.10 babel-loader: ^8.0.0 case-sensitive-paths-webpack-plugin: ^2.3.0 @@ -6531,33 +6520,33 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 7db3402dae8e0a17d2ce74e76529a1a13e871775a133e6f733b60314e03846cc7736d8a5a71767b11e36db7a52b202c3e9aef0d0a427871cd4b4beba40fac58d + checksum: c95280abb12e3892613ae12649caca4382e4fe997f713aaa0e199f1931435eb636cb6a54fb3b1e39a8c72c03424cab0025ccc86ec79f0158d5764939b5efc721 languageName: node linkType: hard -"@storybook/node-logger@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/node-logger@npm:6.4.12" +"@storybook/node-logger@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/node-logger@npm:6.4.13" dependencies: "@types/npmlog": ^4.1.2 chalk: ^4.1.0 core-js: ^3.8.2 npmlog: ^5.0.1 pretty-hrtime: ^1.0.3 - checksum: 71ac16163290dc4a65b92ba9e995100d5174beead838adb1d10e1038078637e4e040e374a386bcaf908c46cc31aa1c275a25373d0dfafc6789c2ecd57e33330d + checksum: 3db39e4ea11f611ceceff71ac3ad4be39224019433d1d5142d7795ef235ae35378dd86f5c5d134a83e4db0a050028f34ec34eedc672f6a2beb54d3236c704497 languageName: node linkType: hard -"@storybook/preview-web@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/preview-web@npm:6.4.12" +"@storybook/preview-web@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/preview-web@npm:6.4.13" dependencies: - "@storybook/addons": 6.4.12 - "@storybook/channel-postmessage": 6.4.12 - "@storybook/client-logger": 6.4.12 - "@storybook/core-events": 6.4.12 + "@storybook/addons": 6.4.13 + "@storybook/channel-postmessage": 6.4.13 + "@storybook/client-logger": 6.4.13 + "@storybook/core-events": 6.4.13 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/store": 6.4.12 + "@storybook/store": 6.4.13 ansi-to-html: ^0.6.11 core-js: ^3.8.2 global: ^4.4.0 @@ -6571,7 +6560,7 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 - checksum: aeb9825808e94ec0ea630974344d95d15e93156b62ced8f1f82f1319275b384389a7f2c0033c0a30c60ec7f23980e79fe3dcedbaea56bbb2369821bea32b946b + checksum: 6b1d6468a2e18f4c6a048df83cf56726bcbc2327ae64ca00a8e58b56d2700daae215d38aa2f1ebdb4b5cf5011261ec2a007df44aa659c5effcfb9adf91f3620d languageName: node linkType: hard @@ -6593,21 +6582,21 @@ __metadata: languageName: node linkType: hard -"@storybook/react@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/react@npm:6.4.12" +"@storybook/react@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/react@npm:6.4.13" dependencies: "@babel/preset-flow": ^7.12.1 "@babel/preset-react": ^7.12.10 "@pmmmwh/react-refresh-webpack-plugin": ^0.5.1 - "@storybook/addons": 6.4.12 - "@storybook/core": 6.4.12 - "@storybook/core-common": 6.4.12 + "@storybook/addons": 6.4.13 + "@storybook/core": 6.4.13 + "@storybook/core-common": 6.4.13 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/node-logger": 6.4.12 + "@storybook/node-logger": 6.4.13 "@storybook/react-docgen-typescript-plugin": 1.0.2-canary.253f8c1.0 "@storybook/semver": ^7.3.2 - "@storybook/store": 6.4.12 + "@storybook/store": 6.4.13 "@types/webpack-env": ^1.16.0 babel-plugin-add-react-displayname: ^0.0.5 babel-plugin-named-asset-import: ^0.3.1 @@ -6616,8 +6605,7 @@ __metadata: global: ^4.4.0 lodash: ^4.17.21 prop-types: ^15.7.2 - react-dev-utils: ^11.0.4 - react-refresh: ^0.10.0 + react-refresh: ^0.11.0 read-pkg-up: ^7.0.1 regenerator-runtime: ^0.13.7 ts-dedent: ^2.0.0 @@ -6635,15 +6623,15 @@ __metadata: build-storybook: bin/build.js start-storybook: bin/index.js storybook-server: bin/index.js - checksum: c5083819a73fbda7bf05d8a59d1943e098467df89acbf0b35cd6ff42e7e813994c0f93896fcacd574d3dc036d69987dfcb39bc49043f7a51cb8f4eaeb576ad24 + checksum: 38590180bf619826ca6f0f1473bdee4f429b77e7a8139943017ef77bf48899d6ad6128bcde2297fc9559a1d8ac07d77ae1e4720ec984e54d183893dca234e856 languageName: node linkType: hard -"@storybook/router@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/router@npm:6.4.12" +"@storybook/router@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/router@npm:6.4.13" dependencies: - "@storybook/client-logger": 6.4.12 + "@storybook/client-logger": 6.4.13 core-js: ^3.8.2 fast-deep-equal: ^3.1.3 global: ^4.4.0 @@ -6657,7 +6645,7 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 - checksum: b3497231b799b6b00af8407c93c9290607890126988150bf496d926d455464956d157cc795c346963cd4d9f4b77bd99fcfcc27d92ed492a98eb3f61970f9c57b + checksum: 67278d5865e0a889901678275ee2b979e3612d255f57aa512577c1b617e65c6be2627064b891e3317ddb986095cb7d0ad27bb5edcccf0e1acdd73319e9ca3f10 languageName: node linkType: hard @@ -6673,13 +6661,13 @@ __metadata: languageName: node linkType: hard -"@storybook/store@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/store@npm:6.4.12" +"@storybook/store@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/store@npm:6.4.13" dependencies: - "@storybook/addons": 6.4.12 - "@storybook/client-logger": 6.4.12 - "@storybook/core-events": 6.4.12 + "@storybook/addons": 6.4.13 + "@storybook/client-logger": 6.4.13 + "@storybook/core-events": 6.4.13 "@storybook/csf": 0.0.2--canary.87bc651.0 core-js: ^3.8.2 fast-deep-equal: ^3.1.3 @@ -6695,18 +6683,18 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 - checksum: 265eb2a6caf0d912ee4ea057ae80a2b62595ef2e6295bb6391e268946c917fa8d978708130e10ce2f2b561e98f939b244e5a2b93ab16f726141f9a4ef0169b1d + checksum: 6f126bced4bb835f22bd7d371e23f1e3cce3aac968ec4e6d97a7b1597f58e802e75a7ad103e4c3fd03539df1efaa27e3f313b4be2020a22e8233815615ccd125 languageName: node linkType: hard -"@storybook/theming@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/theming@npm:6.4.12" +"@storybook/theming@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/theming@npm:6.4.13" dependencies: "@emotion/core": ^10.1.1 "@emotion/is-prop-valid": ^0.8.6 "@emotion/styled": ^10.0.27 - "@storybook/client-logger": 6.4.12 + "@storybook/client-logger": 6.4.13 core-js: ^3.8.2 deep-object-diff: ^1.1.0 emotion-theming: ^10.0.27 @@ -6718,24 +6706,24 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 - checksum: 74ee5bc73e225fed0e3fb6f93ce884c809b953c8ff8459e76d9f154d5365748353d2c873327fe4f41ffac84bfc3b89a0741b321af7e232e1973341db7f109f97 + checksum: aa2be4084ccc566d33c63e5aed107e73bfc7e62a91f67d681064b3e098853a8b1df7e3aef14394ee7be794794aa886a9a98b1f500b93672042653d7f99375e72 languageName: node linkType: hard -"@storybook/ui@npm:6.4.12": - version: 6.4.12 - resolution: "@storybook/ui@npm:6.4.12" +"@storybook/ui@npm:6.4.13": + version: 6.4.13 + resolution: "@storybook/ui@npm:6.4.13" dependencies: "@emotion/core": ^10.1.1 - "@storybook/addons": 6.4.12 - "@storybook/api": 6.4.12 - "@storybook/channels": 6.4.12 - "@storybook/client-logger": 6.4.12 - "@storybook/components": 6.4.12 - "@storybook/core-events": 6.4.12 - "@storybook/router": 6.4.12 + "@storybook/addons": 6.4.13 + "@storybook/api": 6.4.13 + "@storybook/channels": 6.4.13 + "@storybook/client-logger": 6.4.13 + "@storybook/components": 6.4.13 + "@storybook/core-events": 6.4.13 + "@storybook/router": 6.4.13 "@storybook/semver": ^7.3.2 - "@storybook/theming": 6.4.12 + "@storybook/theming": 6.4.13 copy-to-clipboard: ^3.3.1 core-js: ^3.8.2 core-js-pure: ^3.8.2 @@ -6757,7 +6745,7 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 - checksum: c456e61cb3acc9f5593008c58ca7fd1057fdac5ef9631404ddf2ac97cdb7d58ade61a0a3f5183990c6adadf0045032a21e5e2902ebe1be589c762034ebbefccd + checksum: f7e060eca39d97d6b8b182308a33e809a6e53a2821f3e366f6d732e8ed7c3363b15b4d46bb75b3ed740d2a0509bd9faadc39db5cd29590a81c5e87fbcaed1754 languageName: node linkType: hard @@ -8709,7 +8697,7 @@ __metadata: languageName: node linkType: hard -"address@npm:1.1.2, address@npm:^1.0.1": +"address@npm:^1.0.1": version: 1.1.2 resolution: "address@npm:1.1.2" checksum: 3ac908133d1d8cc52110473833718e82775428e73b4eb51b42cd7c7f571c7459c28c3c54592231efdcb96f6ed376eb490194e97c533df9e8efb910fa29a34e55 @@ -8947,7 +8935,7 @@ __metadata: languageName: node linkType: hard -"ansi-regex@npm:^5.0.0, ansi-regex@npm:^5.0.1": +"ansi-regex@npm:^5.0.1": version: 5.0.1 resolution: "ansi-regex@npm:5.0.1" checksum: 9a64bb8627b434ba9327b60c027742e5d17ac69277960d041898596271d992d4d52ba7267a63ca10232e29f6107fc8a835f6ce8d719b88c5f8493f8254813737 @@ -10411,20 +10399,6 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:4.14.2": - version: 4.14.2 - resolution: "browserslist@npm:4.14.2" - dependencies: - caniuse-lite: ^1.0.30001125 - electron-to-chromium: ^1.3.564 - escalade: ^3.0.2 - node-releases: ^1.1.61 - bin: - browserslist: cli.js - checksum: aacba943106bc58f1a3ccfa1bbb04af90f34fb492248d3111ca85368cfcdd09575783fa81d695b0ff67856eacd6970758bfe7fa456eec00afae01487800fd8f8 - languageName: node - linkType: hard - "browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.14.5, browserslist@npm:^4.16.0, browserslist@npm:^4.16.6, browserslist@npm:^4.17.5, browserslist@npm:^4.19.1": version: 4.19.1 resolution: "browserslist@npm:4.19.1" @@ -10832,7 +10806,7 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001125, caniuse-lite@npm:^1.0.30001286": +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001286": version: 1.0.30001295 resolution: "caniuse-lite@npm:1.0.30001295" checksum: cdea88a97b2c42ad63e597d73d1b437b0151141b5f2aa467633f85581ac2d053c8d726fda5cf5305af66687a48fc3ce0ee3d0baf66cad6cd4377c3981883bb58 @@ -10871,17 +10845,6 @@ __metadata: languageName: node linkType: hard -"chalk@npm:2.4.2, chalk@npm:^2.0.0, chalk@npm:^2.4.1": - version: 2.4.2 - resolution: "chalk@npm:2.4.2" - dependencies: - ansi-styles: ^3.2.1 - escape-string-regexp: ^1.0.5 - supports-color: ^5.3.0 - checksum: e6543f02ec877732e3a2d1c3c3323ddb4d39fbab687c23f526e25bd4c6a9bf3b83a696e8c769d078e04e5754921648f7821b2a2acfd16c550435fd630026e073 - languageName: node - linkType: hard - "chalk@npm:4.1.1": version: 4.1.1 resolution: "chalk@npm:4.1.1" @@ -10915,6 +10878,17 @@ __metadata: languageName: node linkType: hard +"chalk@npm:^2.0.0, chalk@npm:^2.4.1": + version: 2.4.2 + resolution: "chalk@npm:2.4.2" + dependencies: + ansi-styles: ^3.2.1 + escape-string-regexp: ^1.0.5 + supports-color: ^5.3.0 + checksum: e6543f02ec877732e3a2d1c3c3323ddb4d39fbab687c23f526e25bd4c6a9bf3b83a696e8c769d078e04e5754921648f7821b2a2acfd16c550435fd630026e073 + languageName: node + linkType: hard + "chalk@npm:^3.0.0": version: 3.0.0 resolution: "chalk@npm:3.0.0" @@ -13160,19 +13134,6 @@ __metadata: languageName: node linkType: hard -"detect-port-alt@npm:1.1.6": - version: 1.1.6 - resolution: "detect-port-alt@npm:1.1.6" - dependencies: - address: ^1.0.1 - debug: ^2.6.0 - bin: - detect: ./bin/detect-port - detect-port: ./bin/detect-port - checksum: 7269e6aef7b782d98c77505c07a7a0f5e2ee98a9607dc791035fc0192fc58aa03cc833fae605e10eaf239a2a5a55cd938e0bb141dea764ac6180ca082fd62b23 - languageName: node - linkType: hard - "detect-port@npm:^1.3.0": version: 1.3.0 resolution: "detect-port@npm:1.3.0" @@ -13549,7 +13510,7 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.3.564, electron-to-chromium@npm:^1.4.17": +"electron-to-chromium@npm:^1.4.17": version: 1.4.32 resolution: "electron-to-chromium@npm:1.4.32" checksum: 82a1c66a91f6d8101cbbe6d895540c47bd96f6554dccb1ef193a8c1058e8c120b419bdfa5b0497539b438462a8abc2227a0d3fab311ce538fc80c6832c0d0f4c @@ -14104,7 +14065,7 @@ __metadata: languageName: node linkType: hard -"escalade@npm:^3.0.2, escalade@npm:^3.1.1": +"escalade@npm:^3.1.1": version: 3.1.1 resolution: "escalade@npm:3.1.1" checksum: afd02e6ca91ffa813e1108b5e7756566173d6bc0d1eb951cb44d6b21702ec17c1cf116cfe75d4a2b02e05acb0b808a7a9387d0d1ca5cf9c04ad03a8445c3e46d @@ -14125,13 +14086,6 @@ __metadata: languageName: node linkType: hard -"escape-string-regexp@npm:2.0.0, escape-string-regexp@npm:^2.0.0": - version: 2.0.0 - resolution: "escape-string-regexp@npm:2.0.0" - checksum: 2530479fe8db57eace5e8646c9c2a9c80fa279614986d16dcc6bcaceb63ae77f05a851ba6c43756d816c61d7f4534baf56e3c705e3e0d884818a46808811c507 - languageName: node - linkType: hard - "escape-string-regexp@npm:4.0.0, escape-string-regexp@npm:^4.0.0": version: 4.0.0 resolution: "escape-string-regexp@npm:4.0.0" @@ -14146,6 +14100,13 @@ __metadata: languageName: node linkType: hard +"escape-string-regexp@npm:^2.0.0": + version: 2.0.0 + resolution: "escape-string-regexp@npm:2.0.0" + checksum: 2530479fe8db57eace5e8646c9c2a9c80fa279614986d16dcc6bcaceb63ae77f05a851ba6c43756d816c61d7f4534baf56e3c705e3e0d884818a46808811c507 + languageName: node + linkType: hard + "escodegen@npm:^2.0.0": version: 2.0.0 resolution: "escodegen@npm:2.0.0" @@ -14899,7 +14860,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:3.2.11, fast-glob@npm:^3.1.1, fast-glob@npm:^3.2.7, fast-glob@npm:^3.2.9": +"fast-glob@npm:3.2.11, fast-glob@npm:^3.2.7, fast-glob@npm:^3.2.9": version: 3.2.11 resolution: "fast-glob@npm:3.2.11" dependencies: @@ -15284,13 +15245,6 @@ __metadata: languageName: node linkType: hard -"filesize@npm:6.1.0": - version: 6.1.0 - resolution: "filesize@npm:6.1.0" - checksum: bb9c90268aa4b6eace09fbabcb1b7337bca636fd1a1281801c375497d327ad1d3b7b30d5d52285eb9f96907a788919d54b4020915ec7ae87aa0203676b83900a - languageName: node - linkType: hard - "fill-keys@npm:^1.0.2": version: 1.0.2 resolution: "fill-keys@npm:1.0.2" @@ -15395,16 +15349,6 @@ __metadata: languageName: node linkType: hard -"find-up@npm:4.1.0, find-up@npm:^4.0.0, find-up@npm:^4.1.0": - version: 4.1.0 - resolution: "find-up@npm:4.1.0" - dependencies: - locate-path: ^5.0.0 - path-exists: ^4.0.0 - checksum: 0406ee89ebeefa2d507feb07ec366bebd8a6167ae74aa4e34fb4c4abd06cf782a3ce26ae4194d70706f72182841733f00551c209fe575cb00bd92104056e78c1 - languageName: node - linkType: hard - "find-up@npm:5.0.0, find-up@npm:^5.0.0": version: 5.0.0 resolution: "find-up@npm:5.0.0" @@ -15433,6 +15377,16 @@ __metadata: languageName: node linkType: hard +"find-up@npm:^4.0.0, find-up@npm:^4.1.0": + version: 4.1.0 + resolution: "find-up@npm:4.1.0" + dependencies: + locate-path: ^5.0.0 + path-exists: ^4.0.0 + checksum: 0406ee89ebeefa2d507feb07ec366bebd8a6167ae74aa4e34fb4c4abd06cf782a3ce26ae4194d70706f72182841733f00551c209fe575cb00bd92104056e78c1 + languageName: node + linkType: hard + "findup-sync@npm:5.0.0": version: 5.0.0 resolution: "findup-sync@npm:5.0.0" @@ -15583,7 +15537,7 @@ __metadata: languageName: node linkType: hard -"fork-ts-checker-webpack-plugin@npm:4.1.6, fork-ts-checker-webpack-plugin@npm:^4.1.6": +"fork-ts-checker-webpack-plugin@npm:^4.1.6": version: 4.1.6 resolution: "fork-ts-checker-webpack-plugin@npm:4.1.6" dependencies: @@ -16270,15 +16224,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"global-modules@npm:2.0.0": - version: 2.0.0 - resolution: "global-modules@npm:2.0.0" - dependencies: - global-prefix: ^3.0.0 - checksum: 43b770fe24aa6028f4b9770ea583a47f39750be15cf6e2578f851e4ccc9e4fa674b8541928c0b09c21461ca0763f0d36e4068cec86c914b07fd6e388e66ba5b9 - languageName: node - linkType: hard - "global-modules@npm:^1.0.0": version: 1.0.0 resolution: "global-modules@npm:1.0.0" @@ -16303,17 +16248,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"global-prefix@npm:^3.0.0": - version: 3.0.0 - resolution: "global-prefix@npm:3.0.0" - dependencies: - ini: ^1.3.5 - kind-of: ^6.0.2 - which: ^1.3.1 - checksum: 510f489fb68d1cc7060f276541709a0ee6d41356ef852de48f7906c648ac223082a1cc8fce86725ca6c0e032bcdc1189ae77b4744a624b29c34a9d0ece498269 - languageName: node - linkType: hard - "global@npm:^4.4.0, global@npm:~4.4.0": version: 4.4.0 resolution: "global@npm:4.4.0" @@ -16349,20 +16283,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"globby@npm:11.0.1": - version: 11.0.1 - resolution: "globby@npm:11.0.1" - dependencies: - array-union: ^2.1.0 - dir-glob: ^3.0.1 - fast-glob: ^3.1.1 - ignore: ^5.1.4 - merge2: ^1.3.0 - slash: ^3.0.0 - checksum: b5966bb6e8fa88a02924a0ee71c619ad57b98660269ddecd5e939a42f4fc056e7958659bde539454e2deaeac79bbdeab01831783f05efd4b14305b5bfff44c09 - languageName: node - linkType: hard - "globby@npm:11.1.0, globby@npm:^11.0.1, globby@npm:^11.0.2, globby@npm:^11.0.3, globby@npm:^11.0.4": version: 11.1.0 resolution: "globby@npm:11.1.0" @@ -16649,16 +16569,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"gzip-size@npm:5.1.1": - version: 5.1.1 - resolution: "gzip-size@npm:5.1.1" - dependencies: - duplexer: ^0.1.1 - pify: ^4.0.1 - checksum: 1c346d3ab83b85687a9aa644928250b31e0fc42cf16ca152225a09465f7465b220849b3854b39a457681fabb37ab318b2c0f73be8991ecedf2073e082d1f6dd9 - languageName: node - linkType: hard - "gzip-size@npm:^6.0.0": version: 6.0.0 resolution: "gzip-size@npm:6.0.0" @@ -17483,7 +17393,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"ignore@npm:^5.1.4, ignore@npm:^5.1.8, ignore@npm:^5.2.0": +"ignore@npm:^5.1.8, ignore@npm:^5.2.0": version: 5.2.0 resolution: "ignore@npm:5.2.0" checksum: 7fb7b4c4c52c2555113ff968f8a83b8ac21b076282bfcb3f468c3fb429be69bd56222306c31de95dd452c647fc6ae24339b8047ebe3ef34c02591abfec58da01 @@ -17497,13 +17407,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"immer@npm:8.0.1": - version: 8.0.1 - resolution: "immer@npm:8.0.1" - checksum: 5bda1b1e382b08e5c88bf84b710050d20b87455cc52b90b00ae2208932132bea6d780e05ea1cf73757214b7916a3b1f8ce21702e7ef40d90d187c896bcadb43e - languageName: node - linkType: hard - "immutable@npm:~3.7.6": version: 3.7.6 resolution: "immutable@npm:3.7.6" @@ -17620,7 +17523,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"ini@npm:^1.3.2, ini@npm:^1.3.4, ini@npm:^1.3.5, ini@npm:~1.3.0": +"ini@npm:^1.3.2, ini@npm:^1.3.4, ini@npm:~1.3.0": version: 1.3.8 resolution: "ini@npm:1.3.8" checksum: ec93838d2328b619532e4f1ff05df7909760b6f66d9c9e2ded11e5c1897d6f2f9980c54dd638f88654b00919ce31e827040631eab0a3969e4d1abefa0719516a @@ -18273,13 +18176,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"is-root@npm:2.1.0": - version: 2.1.0 - resolution: "is-root@npm:2.1.0" - checksum: 83d3f5b052c3f28fbdbdf0d564bdd34fa14933f5694c78704f85cd1871255bc017fbe3fe2bc2fff2d227c6be5927ad2149b135c0a7c0060e7ac4e610d81a4f01 - languageName: node - linkType: hard - "is-set@npm:^2.0.2": version: 2.0.2 resolution: "is-set@npm:2.0.2" @@ -20047,17 +19943,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"loader-utils@npm:2.0.0": - version: 2.0.0 - resolution: "loader-utils@npm:2.0.0" - dependencies: - big.js: ^5.2.2 - emojis-list: ^3.0.0 - json5: ^2.1.2 - checksum: 206eda981e486a28536b8a142074e0e927aac4c1f61565b2be402f0434f783a6bb0cef241fabec32ce541f28633a85e0beb68abd8fe9227b76b66d717de40550 - languageName: node - linkType: hard - "loader-utils@npm:^1.2.3, loader-utils@npm:^1.4.0": version: 1.4.0 resolution: "loader-utils@npm:1.4.0" @@ -21675,13 +21560,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"node-releases@npm:^1.1.61": - version: 1.1.77 - resolution: "node-releases@npm:1.1.77" - checksum: e7477dd1201d32f2169988665f6e5b3b779f3c582decae4a1ab119dc8a8e3a28b3118c386b3c2e8c5a55c415066fe82c77e976979ad4e742ee14483d62f3f3a5 - languageName: node - linkType: hard - "node-releases@npm:^2.0.1": version: 2.0.1 resolution: "node-releases@npm:2.0.1" @@ -22266,7 +22144,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"open@npm:^7.0.2, open@npm:^7.0.3": +"open@npm:^7.0.3": version: 7.4.2 resolution: "open@npm:7.4.2" dependencies: @@ -23157,7 +23035,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"pkg-up@npm:3.1.0, pkg-up@npm:^3.1.0": +"pkg-up@npm:^3.1.0": version: 3.1.0 resolution: "pkg-up@npm:3.1.0" dependencies: @@ -23707,6 +23585,15 @@ fsevents@^1.2.7: languageName: node linkType: hard +"prettier@npm:<=2.3.0": + version: 2.3.0 + resolution: "prettier@npm:2.3.0" + bin: + prettier: bin-prettier.js + checksum: b9f434af2f25a37aad0b133894827e980885eb8bf317444c9dde0401ed2c7f463f9996d691f5ee5a0a4450ab46a894cd6557516b561e2522821522ce1f4c6668 + languageName: node + linkType: hard + "pretty-bytes@npm:5.6.0, pretty-bytes@npm:^5.6.0": version: 5.6.0 resolution: "pretty-bytes@npm:5.6.0" @@ -23889,16 +23776,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"prompts@npm:2.4.0": - version: 2.4.0 - resolution: "prompts@npm:2.4.0" - dependencies: - kleur: ^3.0.3 - sisteransi: ^1.0.5 - checksum: 9e64082a08c32bbb91e9507874034e8c21c924aabee9468699252cf16d8f6147d053494a3d67976bc59455bdf997ce82be0a7857f2a014ec3deb72dc956e1303 - languageName: node - linkType: hard - "prompts@npm:2.4.2, prompts@npm:^2.0.1, prompts@npm:^2.4.0": version: 2.4.2 resolution: "prompts@npm:2.4.2" @@ -24343,38 +24220,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"react-dev-utils@npm:^11.0.4": - version: 11.0.4 - resolution: "react-dev-utils@npm:11.0.4" - dependencies: - "@babel/code-frame": 7.10.4 - address: 1.1.2 - browserslist: 4.14.2 - chalk: 2.4.2 - cross-spawn: 7.0.3 - detect-port-alt: 1.1.6 - escape-string-regexp: 2.0.0 - filesize: 6.1.0 - find-up: 4.1.0 - fork-ts-checker-webpack-plugin: 4.1.6 - global-modules: 2.0.0 - globby: 11.0.1 - gzip-size: 5.1.1 - immer: 8.0.1 - is-root: 2.1.0 - loader-utils: 2.0.0 - open: ^7.0.2 - pkg-up: 3.1.0 - prompts: 2.4.0 - react-error-overlay: ^6.0.9 - recursive-readdir: 2.2.2 - shell-quote: 1.7.2 - strip-ansi: 6.0.0 - text-table: 0.2.0 - checksum: 3982f6a35035627b4465c8afd2f6db6a571b9e7b09c7d2f2e517de9cd48bb76778f4c692cdc99a26d2961d7dac371553fd7815ec0d2ec281927feeba60ce8a70 - languageName: node - linkType: hard - "react-docgen-typescript@npm:^2.0.0": version: 2.2.2 resolution: "react-docgen-typescript@npm:2.2.2" @@ -24430,13 +24275,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"react-error-overlay@npm:^6.0.9": - version: 6.0.10 - resolution: "react-error-overlay@npm:6.0.10" - checksum: 123dc3a6d079a190f94bb4138b5b970e9f592a614f411afd8045a9eab6107d1c750da3a756b19f012b53cd318bc2287cbe6a7ba683ba1d904821d9f7e5135472 - languageName: node - linkType: hard - "react-fast-compare@npm:^3.0.1, react-fast-compare@npm:^3.2.0": version: 3.2.0 resolution: "react-fast-compare@npm:3.2.0" @@ -24522,20 +24360,13 @@ fsevents@^1.2.7: languageName: node linkType: hard -"react-refresh@npm:0.11.0": +"react-refresh@npm:0.11.0, react-refresh@npm:^0.11.0": version: 0.11.0 resolution: "react-refresh@npm:0.11.0" checksum: cbb5616c7ba670bbd2f37ddadcdfefa66e727ea188e89733ccb8184d3b874631104b0bc016d5676a7ade4d9c79100b99b46b6ed10cd117ab5d1ddcbf8653a9f2 languageName: node linkType: hard -"react-refresh@npm:^0.10.0": - version: 0.10.0 - resolution: "react-refresh@npm:0.10.0" - checksum: 616e82bed3787bf4e55dcc1c9836f251b93523dd4b0ffb1c24c2dcf5d09f686fbf3cffc7d489cd7f12429f76ddf66eb431748fc07df56b18a888a7705cbc079e - languageName: node - linkType: hard - "react-router-dom@npm:^6.0.0": version: 6.2.1 resolution: "react-router-dom@npm:6.2.1" @@ -24871,15 +24702,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"recursive-readdir@npm:2.2.2": - version: 2.2.2 - resolution: "recursive-readdir@npm:2.2.2" - dependencies: - minimatch: 3.0.4 - checksum: 0137fab9e9f2a2784465a613a214f60cf76d62ce22c4237ac818c4e6d6ebb4c890d12b4547619dab843673dfa12ca4096baa32d64fdaed84793a544a02c2e1e1 - languageName: node - linkType: hard - "redent@npm:^3.0.0": version: 3.0.0 resolution: "redent@npm:3.0.0" @@ -26143,13 +25965,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"shell-quote@npm:1.7.2": - version: 1.7.2 - resolution: "shell-quote@npm:1.7.2" - checksum: 656aefdcdc394560ca091140a58b95e97f43d5e14bb60ff4a92556ca48841e49af6e837441e887c7890c7a86ae8542960c90e460a86799b68c53271784909edb - languageName: node - linkType: hard - "shell-quote@npm:1.7.3": version: 1.7.3 resolution: "shell-quote@npm:1.7.3" @@ -26997,15 +26812,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"strip-ansi@npm:6.0.0": - version: 6.0.0 - resolution: "strip-ansi@npm:6.0.0" - dependencies: - ansi-regex: ^5.0.0 - checksum: 85257c80250541cc0e65088c7dc768563bdbd1bf7120471d6d3a73cdc60e8149a50038c12a6fd4a30b674587f306ae42e2cc73ac3095daf193633daa0bd8f928 - languageName: node - linkType: hard - "strip-ansi@npm:6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": version: 6.0.1 resolution: "strip-ansi@npm:6.0.1" @@ -27669,7 +27475,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"text-table@npm:0.2.0, text-table@npm:^0.2.0": +"text-table@npm:^0.2.0": version: 0.2.0 resolution: "text-table@npm:0.2.0" checksum: 02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c From e18715ce95723f64b1524aefc848097e075ff5f9 Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Sat, 15 Jan 2022 22:45:39 +0000 Subject: [PATCH 03/87] Don't mask GraphQL errors when you're in the dev environment (#4166) --- packages/graphql-server/src/functions/graphql.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/graphql-server/src/functions/graphql.ts b/packages/graphql-server/src/functions/graphql.ts index e67e3e348774..f2d48e88952a 100644 --- a/packages/graphql-server/src/functions/graphql.ts +++ b/packages/graphql-server/src/functions/graphql.ts @@ -209,8 +209,10 @@ export const createGraphQLHandler = ({ // Must be "last" in plugin chain so can process any data added to results and extensions plugins.push(useRedwoodLogger(loggerConfig)) - // Prevent unexpected error messages from leaking to the GraphQL clients. - plugins.push(useMaskedErrors({ formatError, errorMessage: defaultError })) + // Prevent unexpected error messages from leaking to the GraphQL clients in prod. + if (!isDevEnv) { + plugins.push(useMaskedErrors({ formatError, errorMessage: defaultError })) + } const corsContext = createCorsContext(cors) From 76fd782df27600afee77b1c8ff51749e7ce01bfb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Jan 2022 00:53:19 +0000 Subject: [PATCH 04/87] Update dependency core-js to v3.20.3 (#4162) Co-authored-by: Renovate Bot --- package.json | 2 +- packages/cli/package.json | 2 +- packages/codemods/package.json | 2 +- packages/core/package.json | 2 +- packages/forms/package.json | 2 +- packages/graphql-server/package.json | 2 +- packages/internal/package.json | 2 +- packages/record/package.json | 2 +- packages/router/package.json | 2 +- packages/web/package.json | 2 +- yarn.lock | 28 ++++++++++++++-------------- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index d5e11e20053c..2099e5826a0f 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "babel-jest": "27.4.6", "babel-plugin-auto-import": "1.1.0", "babel-plugin-remove-code": "0.0.6", - "core-js": "3.20.2", + "core-js": "3.20.3", "cypress": "9.2.1", "cypress-wait-until": "1.7.2", "eslint": "8.6.0", diff --git a/packages/cli/package.json b/packages/cli/package.json index b208d3ec5555..acdaa95b566b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -27,7 +27,7 @@ "chalk": "4.1.2", "concurrently": "6.5.1", "configstore": "3.1.5", - "core-js": "3.20.2", + "core-js": "3.20.3", "cross-env": "7.0.3", "decamelize": "5.0.0", "dotenv-defaults": "3.0.0", diff --git a/packages/codemods/package.json b/packages/codemods/package.json index 8d443b932ded..dbdb180e10c4 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -13,7 +13,7 @@ "@babel/plugin-transform-typescript": "7.16.7", "@babel/runtime-corejs3": "7.16.7", "@vscode/ripgrep": "1.14.1", - "core-js": "3.20.2", + "core-js": "3.20.3", "deepmerge": "4.2.2", "fast-glob": "3.2.11", "findup-sync": "5.0.0", diff --git a/packages/core/package.json b/packages/core/package.json index 10abec9888b2..68e920c2a92a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -32,7 +32,7 @@ "babel-plugin-module-resolver": "4.1.0", "babel-timing": "0.9.1", "copy-webpack-plugin": "10.2.0", - "core-js": "3.20.2", + "core-js": "3.20.3", "css-loader": "6.5.1", "css-minimizer-webpack-plugin": "3.3.1", "dotenv-webpack": "7.0.3", diff --git a/packages/forms/package.json b/packages/forms/package.json index 53cd989cb94c..2aebb4151372 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -9,7 +9,7 @@ "license": "MIT", "dependencies": { "@types/pascalcase": "1.0.1", - "core-js": "3.20.2", + "core-js": "3.20.3", "pascalcase": "1.0.0", "react-hook-form": "7.24.0" }, diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index bf9261c401e6..d5398b34f317 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -19,7 +19,7 @@ "@graphql-tools/utils": "8.6.1", "@prisma/client": "3.8.1", "@redwoodjs/api": "0.41.0", - "core-js": "3.20.2", + "core-js": "3.20.3", "graphql": "16.2.0", "graphql-helix": "1.11.0", "graphql-playground-html": "1.6.30", diff --git a/packages/internal/package.json b/packages/internal/package.json index 06580b1b9d6c..ea9af331df75 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -33,7 +33,7 @@ "babel-plugin-graphql-tag": "3.3.0", "babel-plugin-polyfill-corejs3": "0.5.0", "chalk": "4.1.2", - "core-js": "3.20.2", + "core-js": "3.20.3", "deepmerge": "4.2.2", "esbuild": "0.14.11", "fast-glob": "3.2.11", diff --git a/packages/record/package.json b/packages/record/package.json index 3372419cc48d..af4a44c1f71d 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -10,7 +10,7 @@ "dependencies": { "@prisma/client": "3.8.1", "@prisma/sdk": "3.8.1", - "core-js": "3.20.2" + "core-js": "3.20.3" }, "repository": { "type": "git", diff --git a/packages/router/package.json b/packages/router/package.json index 0f1c572be7e0..213e946eb774 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -10,7 +10,7 @@ "dependencies": { "@reach/skip-nav": "0.16.0", "@redwoodjs/auth": "0.41.0", - "core-js": "3.20.2", + "core-js": "3.20.3", "lodash.isequal": "4.5.0" }, "repository": { diff --git a/packages/web/package.json b/packages/web/package.json index 6d835ed0a7d4..f382abc91e2b 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -13,7 +13,7 @@ "dependencies": { "@apollo/client": "3.5.7", "@redwoodjs/auth": "0.41.0", - "core-js": "3.20.2", + "core-js": "3.20.3", "graphql": "16.2.0", "proptypes": "1.1.0", "react-helmet-async": "1.2.2", diff --git a/yarn.lock b/yarn.lock index d56ed6086b44..faa1a101fa01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5414,7 +5414,7 @@ __metadata: chalk: 4.1.2 concurrently: 6.5.1 configstore: 3.1.5 - core-js: 3.20.2 + core-js: 3.20.3 cross-env: 7.0.3 decamelize: 5.0.0 dotenv-defaults: 3.0.0 @@ -5459,7 +5459,7 @@ __metadata: "@types/jscodeshift": 0.11.2 "@types/prettier": 2.4.3 "@vscode/ripgrep": 1.14.1 - core-js: 3.20.2 + core-js: 3.20.3 deepmerge: 4.2.2 fast-glob: 3.2.11 findup-sync: 5.0.0 @@ -5506,7 +5506,7 @@ __metadata: babel-plugin-module-resolver: 4.1.0 babel-timing: 0.9.1 copy-webpack-plugin: 10.2.0 - core-js: 3.20.2 + core-js: 3.20.3 css-loader: 6.5.1 css-minimizer-webpack-plugin: 3.3.1 dotenv-webpack: 7.0.3 @@ -5569,7 +5569,7 @@ __metadata: dependencies: "@babel/cli": 7.16.7 "@types/pascalcase": 1.0.1 - core-js: 3.20.2 + core-js: 3.20.3 jest: 27.4.7 pascalcase: 1.0.0 react-hook-form: 7.24.0 @@ -5600,7 +5600,7 @@ __metadata: "@types/lodash.omitby": 4.6.6 "@types/uuid": 8.3.4 aws-lambda: 1.0.7 - core-js: 3.20.2 + core-js: 3.20.3 graphql: 16.2.0 graphql-helix: 1.11.0 graphql-playground-html: 1.6.30 @@ -5642,7 +5642,7 @@ __metadata: babel-plugin-polyfill-corejs3: 0.5.0 babel-plugin-tester: 10.1.0 chalk: 4.1.2 - core-js: 3.20.2 + core-js: 3.20.3 deepmerge: 4.2.2 esbuild: 0.14.11 fast-glob: 3.2.11 @@ -5695,7 +5695,7 @@ __metadata: "@babel/cli": 7.16.7 "@prisma/client": 3.8.1 "@prisma/sdk": 3.8.1 - core-js: 3.20.2 + core-js: 3.20.3 jest: 27.4.7 languageName: unknown linkType: soft @@ -5708,7 +5708,7 @@ __metadata: "@reach/skip-nav": 0.16.0 "@redwoodjs/auth": 0.41.0 "@types/lodash.isequal": 4.5.5 - core-js: 3.20.2 + core-js: 3.20.3 jest: 27.4.7 lodash.isequal: 4.5.0 prop-types: 15.8.1 @@ -5797,7 +5797,7 @@ __metadata: "@babel/cli": 7.16.7 "@redwoodjs/auth": 0.41.0 "@types/react": 17.0.38 - core-js: 3.20.2 + core-js: 3.20.3 graphql: 16.2.0 jest: 27.4.7 proptypes: 1.1.0 @@ -11981,10 +11981,10 @@ __metadata: languageName: node linkType: hard -"core-js@npm:3.20.2, core-js@npm:^3.0.4, core-js@npm:^3.18.3, core-js@npm:^3.19.0, core-js@npm:^3.20.0, core-js@npm:^3.6.5, core-js@npm:^3.8.2": - version: 3.20.2 - resolution: "core-js@npm:3.20.2" - checksum: 3f2fcbf2fe096e79366c11e64c08583b48f428a20cdc96a6fd1630009a07bdfc352d97f956d8b8679b46b08cda80365e3600efca497fc54b52a311c1478d4152 +"core-js@npm:3.20.3, core-js@npm:^3.0.4, core-js@npm:^3.18.3, core-js@npm:^3.19.0, core-js@npm:^3.20.0, core-js@npm:^3.6.5, core-js@npm:^3.8.2": + version: 3.20.3 + resolution: "core-js@npm:3.20.3" + checksum: 7c53c1971572cc6bcfb89eef612d1602fdd97cc8872172ea64a73f5216c3ef43af472a40be76994cbf854b3fb11dd7e01bbbbad0177e0ec79e502c1d86b516fe languageName: node linkType: hard @@ -25365,7 +25365,7 @@ resolve@^2.0.0-next.3: babel-jest: 27.4.6 babel-plugin-auto-import: 1.1.0 babel-plugin-remove-code: 0.0.6 - core-js: 3.20.2 + core-js: 3.20.3 cypress: 9.2.1 cypress-wait-until: 1.7.2 eslint: 8.6.0 From 251f2b3a228dfac4c05cb3da6a68b5b9b15896e3 Mon Sep 17 00:00:00 2001 From: Dominic Saadi <32992335+jtoar@users.noreply.github.com> Date: Sun, 16 Jan 2022 20:02:58 -0800 Subject: [PATCH 05/87] remove projects beta automation (#4171) --- .../workflows/projects_beta_automation.yml | 80 ------------------- 1 file changed, 80 deletions(-) delete mode 100644 .github/workflows/projects_beta_automation.yml diff --git a/.github/workflows/projects_beta_automation.yml b/.github/workflows/projects_beta_automation.yml deleted file mode 100644 index 58652adedb3c..000000000000 --- a/.github/workflows/projects_beta_automation.yml +++ /dev/null @@ -1,80 +0,0 @@ -name: Projects Beta Automation - -on: - issues: - types: - - opened - pull_request_target: - types: - - opened - -jobs: - add_incoming_to_projects_beta: - runs-on: ubuntu-latest - - steps: - - name: Get project and status field IDs - env: - GITHUB_TOKEN: ${{ secrets.PROJECTS_BETA_AUTOMATION }} - run: | - gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='{ - organization(login: "redwoodjs") { - projectNext(number: 4) { - id - fields(first:20) { - nodes { - id - name - settings - } - } - } - } - }' > project_data.json - - echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV - echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name=="Status") | .id' project_data.json) >> $GITHUB_ENV - echo 'NEW_ISSUES_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name=="Status") | .settings | fromjson.options[] | select(.name=="New issues") | .id' project_data.json) >> $GITHUB_ENV - - - name: Set env var for issue - if: github.event_name == 'issues' - run: echo 'CONTENT_ID="${{ github.event.issue.node_id }}"' >> $GITHUB_ENV - - - name: Set env var for pull request - if: github.event_name == 'pull_request_target' - run: echo 'CONTENT_ID="${{ github.event.pull_request.node_id }}"' >> $GITHUB_ENV - - - name: Add to project - env: - GITHUB_TOKEN: ${{ secrets.PROJECTS_BETA_AUTOMATION }} - run: | - item_id="$(gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query=' - mutation($projectId: ID!, $contentId: ID!) { - addProjectNextItem(input: { projectId: $projectId, contentId: $contentId }) { - projectNextItem { - id - } - } - }' -f projectId=$PROJECT_ID -f contentId=$CONTENT_ID --jq '.data.addProjectNextItem.projectNextItem.id')" - - echo 'ITEM_ID='$item_id >> $GITHUB_ENV - - - name: Set status to "New issues" - env: - GITHUB_TOKEN: ${{ secrets.PROJECTS_BETA_AUTOMATION }} - run: | - gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query=' - mutation ($projectId: ID!, $itemId: ID!, $statusFieldId: ID!, $newIssuesOptionId: String!) { - updateProjectNextItemField( - input: { - projectId: $projectId - itemId: $itemId - fieldId: $statusFieldId - value: $newIssuesOptionId - } - ) { - projectNextItem { - id - } - } - }' -f projectId=$PROJECT_ID -f itemId=$ITEM_ID -f statusFieldId=$STATUS_FIELD_ID -f newIssuesOptionId=${{ env.NEW_ISSUES_OPTION_ID }} From da3befd97b6d4b4796fd01f491dfd283884e72c3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jan 2022 06:15:42 +0000 Subject: [PATCH 06/87] Update dependency eslint to v8.7.0 (#4168) Co-authored-by: Renovate Bot --- package.json | 2 +- packages/eslint-config/package.json | 2 +- yarn.lock | 33 +++++++++++++---------------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 2099e5826a0f..46758a53b75d 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "core-js": "3.20.3", "cypress": "9.2.1", "cypress-wait-until": "1.7.2", - "eslint": "8.6.0", + "eslint": "8.7.0", "fast-glob": "3.2.11", "jest": "27.4.7", "jscodeshift": "0.13.0", diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index fe88a36d3966..a7d8ffe1d9e8 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -10,7 +10,7 @@ "@redwoodjs/internal": "0.41.0", "@typescript-eslint/eslint-plugin": "5.9.1", "@typescript-eslint/parser": "5.9.1", - "eslint": "8.6.0", + "eslint": "8.7.0", "eslint-config-prettier": "8.3.0", "eslint-import-resolver-babel-module": "5.3.1", "eslint-plugin-babel": "5.3.1", diff --git a/yarn.lock b/yarn.lock index faa1a101fa01..9df6a54449a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5547,7 +5547,7 @@ __metadata: "@redwoodjs/internal": 0.41.0 "@typescript-eslint/eslint-plugin": 5.9.1 "@typescript-eslint/parser": 5.9.1 - eslint: 8.6.0 + eslint: 8.7.0 eslint-config-prettier: 8.3.0 eslint-import-resolver-babel-module: 5.3.1 eslint-plugin-babel: 5.3.1 @@ -13661,7 +13661,7 @@ __metadata: languageName: node linkType: hard -"enquirer@npm:2.3.6, enquirer@npm:^2.3.5, enquirer@npm:^2.3.6": +"enquirer@npm:2.3.6, enquirer@npm:^2.3.6": version: 2.3.6 resolution: "enquirer@npm:2.3.6" dependencies: @@ -14342,16 +14342,16 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.1.0": - version: 3.1.0 - resolution: "eslint-visitor-keys@npm:3.1.0" - checksum: ba23efd2a273cb5a0794ea76669cbe95892bed5d2e165e7744db6a81ede74f4239cf73d142016421d8297b72000486e4b41bba3078eccb9ef82ae0b7e06e9282 +"eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.1.0, eslint-visitor-keys@npm:^3.2.0": + version: 3.2.0 + resolution: "eslint-visitor-keys@npm:3.2.0" + checksum: e350bba5cf27070fab0545db8a44746e909366979c9822ff0290c7aaeb3683374b7ef749eecd39b6d84160b3520ec3ee3d720e1f9417ca205392161c19198fea languageName: node linkType: hard -"eslint@npm:8.6.0": - version: 8.6.0 - resolution: "eslint@npm:8.6.0" +"eslint@npm:8.7.0": + version: 8.7.0 + resolution: "eslint@npm:8.7.0" dependencies: "@eslint/eslintrc": ^1.0.5 "@humanwhocodes/config-array": ^0.9.2 @@ -14360,11 +14360,10 @@ __metadata: cross-spawn: ^7.0.2 debug: ^4.3.2 doctrine: ^3.0.0 - enquirer: ^2.3.5 escape-string-regexp: ^4.0.0 eslint-scope: ^7.1.0 eslint-utils: ^3.0.0 - eslint-visitor-keys: ^3.1.0 + eslint-visitor-keys: ^3.2.0 espree: ^9.3.0 esquery: ^1.4.0 esutils: ^2.0.2 @@ -14373,7 +14372,7 @@ __metadata: functional-red-black-tree: ^1.0.1 glob-parent: ^6.0.1 globals: ^13.6.0 - ignore: ^4.0.6 + ignore: ^5.2.0 import-fresh: ^3.0.0 imurmurhash: ^0.1.4 is-glob: ^4.0.0 @@ -14384,16 +14383,14 @@ __metadata: minimatch: ^3.0.4 natural-compare: ^1.4.0 optionator: ^0.9.1 - progress: ^2.0.0 regexpp: ^3.2.0 - semver: ^7.2.1 strip-ansi: ^6.0.1 strip-json-comments: ^3.1.0 text-table: ^0.2.0 v8-compile-cache: ^2.0.3 bin: eslint: bin/eslint.js - checksum: aae3a493ef73a8695a7e133dfae8d867edcc26b5e795d18c34b64ddd63018f0202941b2cf8572ce3ea284a4d93ea2547b1411e5b93693e96ed6acac1e146fb4c + checksum: 6071275e380fea99d060bf542a46b92d1aac1d483a1adeaf93f236c6896ee09a537b2cdaba26e4955d346207f4ffe5fc9d6f0a477e7b705aaa98c558d382ce3a languageName: node linkType: hard @@ -23704,7 +23701,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"progress@npm:2.0.3, progress@npm:^2.0.0": +"progress@npm:2.0.3": version: 2.0.3 resolution: "progress@npm:2.0.3" checksum: 1697e07cb1068055dbe9fe858d242368ff5d2073639e652b75a7eb1f2a1a8d4afd404d719de23c7b48481a6aa0040686310e2dac2f53d776daa2176d3f96369c @@ -25368,7 +25365,7 @@ resolve@^2.0.0-next.3: core-js: 3.20.3 cypress: 9.2.1 cypress-wait-until: 1.7.2 - eslint: 8.6.0 + eslint: 8.7.0 fast-glob: 3.2.11 jest: 27.4.7 jscodeshift: 0.13.0 @@ -25736,7 +25733,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"semver@npm:^7.1.1, semver@npm:^7.1.3, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5": +"semver@npm:^7.1.1, semver@npm:^7.1.3, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5": version: 7.3.5 resolution: "semver@npm:7.3.5" dependencies: From e3a083cd69c6c96ccf2afe22ce16984f693938b9 Mon Sep 17 00:00:00 2001 From: Aditya Pandey Date: Mon, 17 Jan 2022 16:56:39 +0530 Subject: [PATCH 07/87] Refactor `rw type-check` (#4086) Co-authored-by: Daniel Choudhury --- packages/cli/package.json | 2 +- .../src/commands/__tests__/type-check.test.js | 51 +++++--- packages/cli/src/commands/dev.js | 5 +- packages/cli/src/commands/type-check.js | 118 ++++++++---------- yarn.lock | 12 +- 5 files changed, 90 insertions(+), 98 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index acdaa95b566b..c3510fbeb5a5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -25,7 +25,7 @@ "boxen": "5.1.2", "camelcase": "6.3.0", "chalk": "4.1.2", - "concurrently": "6.5.1", + "concurrently": "7.0.0", "configstore": "3.1.5", "core-js": "3.20.3", "cross-env": "7.0.3", diff --git a/packages/cli/src/commands/__tests__/type-check.test.js b/packages/cli/src/commands/__tests__/type-check.test.js index bf7b2b33ade0..dcf15c2111ba 100644 --- a/packages/cli/src/commands/__tests__/type-check.test.js +++ b/packages/cli/src/commands/__tests__/type-check.test.js @@ -8,6 +8,15 @@ jest.mock('execa', () => }) ) +jest.mock('concurrently', () => + jest.fn((commands, options) => { + return { + commands, + options, + } + }) +) + let mockedRedwoodConfig = { api: {}, web: {}, @@ -35,6 +44,7 @@ jest.mock('../../lib', () => { import path from 'path' +import concurrently from 'concurrently' import execa from 'execa' import { runCommandTask } from '../../lib' @@ -51,23 +61,22 @@ test('Should run tsc commands correctly, in order', async () => { generate: true, }) - expect(execa.mock.results[0].value.cmd).toEqual('yarn rw g types') + const concurrentlyArgs = concurrently.mock.results[0].value - // Ensure tsc command run correctly for web side - expect(execa.mock.results[1].value.cmd).toEqual('yarn tsc') - expect(execa.mock.results[1].value.params).toContain('--noEmit') - expect(execa.mock.results[1].value.params).toContain('--skipLibCheck') - expect(execa.mock.results[1].value.options.cwd).toBe( - path.normalize('myBasePath/web') - ) + expect(execa.mock.results[0].value.cmd).toEqual('yarn rw-gen') // Ensure tsc command run correctly for web side - expect(execa.mock.results[2].value.cmd).toEqual('yarn tsc') - expect(execa.mock.results[2].value.params).toContain('--noEmit') - expect(execa.mock.results[2].value.params).toContain('--skipLibCheck') - expect(execa.mock.results[2].value.options.cwd).toBe( - path.normalize('myBasePath/api') - ) + expect(concurrentlyArgs.commands).toContainEqual({ + cwd: path.join('myBasePath', 'web'), + command: 'yarn -s tsc --noEmit --skipLibCheck', + }) + // Ensure tsc command run correctly for web side + expect(concurrentlyArgs.commands).toContainEqual({ + cwd: path.join('myBasePath', 'api'), + command: 'yarn -s tsc --noEmit --skipLibCheck', + }) + // Ensure we have raw sequential output from tsc + expect(concurrentlyArgs.options).toEqual({ group: true, raw: true }) }) test('Should generate prisma client', async () => { @@ -77,14 +86,16 @@ test('Should generate prisma client', async () => { generate: true, }) - expect(execa.mock.results[0].value.cmd).toEqual('yarn rw g types') + const concurrentlyArgs = concurrently.mock.results[0].value - // Ensure tsc command run correctly for api side - expect(execa.mock.results[1].value.cmd).toEqual('yarn tsc') + expect(execa.mock.results[0].value.cmd).toEqual('yarn rw-gen') + + // Ensure tsc command run correctly for web side + expect(concurrentlyArgs.commands).toContainEqual({ + cwd: path.join('myBasePath', 'api'), + command: 'yarn -s tsc --noEmit --skipLibCheck', + }) expect(runCommandTask.mock.results[0].value[0]).toEqual( 'yarn prisma generate --schema="../../__fixtures__/example-todo-main/api/prisma"' ) - expect(execa.mock.results[1].value.options.cwd).toBe( - path.normalize('myBasePath/api') - ) }) diff --git a/packages/cli/src/commands/dev.js b/packages/cli/src/commands/dev.js index bc04cc43cff3..f3d258b576bf 100644 --- a/packages/cli/src/commands/dev.js +++ b/packages/cli/src/commands/dev.js @@ -115,7 +115,7 @@ export const handler = async ({ } // TODO: Convert jobs to an array and supply cwd command. - concurrently( + const { result } = concurrently( Object.keys(jobs) .map((job) => { if (side.includes(job) || job === 'gen') { @@ -127,7 +127,8 @@ export const handler = async ({ prefix: '{name} |', timestampFormat: 'HH:mm:ss', } - ).catch((e) => { + ) + result.catch((e) => { if (typeof e?.message !== 'undefined') { console.error(c.error(e.message)) process.exit(1) diff --git a/packages/cli/src/commands/type-check.js b/packages/cli/src/commands/type-check.js index a8f1ec07d9e5..2bb098d6f6ce 100644 --- a/packages/cli/src/commands/type-check.js +++ b/packages/cli/src/commands/type-check.js @@ -1,8 +1,8 @@ import path from 'path' +import concurrently from 'concurrently' import execa from 'execa' import Listr from 'listr' -import VerboseRenderer from 'listr-verbose-renderer' import terminalLink from 'terminal-link' import { getProject } from '@redwoodjs/structure' @@ -47,82 +47,62 @@ export const builder = (yargs) => { } export const handler = async ({ sides, verbose, prisma, generate }) => { - const generateTasks = [ - { - title: 'Generating redwood types...', - enabled: () => generate, - task: () => { - return execa('yarn rw g types', [], { - stdio: verbose ? 'inherit' : 'ignore', - shell: true, - cwd: getPaths().base, - }) - }, - }, - { - title: 'Generating prisma client...', - task: () => { - return generatePrismaClient({ - verbose: true, - schema: getPaths().api.dbSchema, - }) - }, - enabled: () => prisma && generate, - skip: () => { - if (!sides.includes('api')) { - return 'Skipping, as no api side present' - } - }, - }, - ] - /** - * Check typings for the project directory : [web, api] + * Check types for the project directory : [web, api] */ - const typeChecks = sides.map((side) => { - const cwd = path.join(getPaths().base, side) - return { - title: `Checking "${side}"...`, - task: () => { - return execa('yarn tsc', ['--noEmit', '--skipLibCheck'], { - stdio: 'inherit', - shell: true, - cwd, - }) - }, + const typeCheck = async () => { + let conclusiveExitCode = 0 + + const tscForAllSides = sides.map((side) => { + const projectDir = path.join(getPaths().base, side) + // -s flag to suppress error output from yarn. For example yarn doc link on non-zero status. + // Since it'll be printed anyways after the whole execution. + return { + cwd: projectDir, + command: `yarn -s tsc --noEmit --skipLibCheck`, + } + }) + + const { result } = concurrently(tscForAllSides, { + group: true, + raw: true, + }) + try { + await result + } catch (err) { + if (err.length) { + // Non-null exit codes + const exitCodes = err.map((e) => e?.exitCode).filter(Boolean) + conclusiveExitCode = Math.max(...exitCodes) + } } - }) - // Approach here is used to run typechecking of web and api in parallel - const tasks = new Listr( - [ - { - title: 'Generating types...', - task: () => { - return new Listr(generateTasks, { - renderer: VerboseRenderer, - concurrent: true, - }) - }, - }, - { - title: 'Running type checks...', - task: () => { - return new Listr(typeChecks, { - renderer: VerboseRenderer, - concurrent: true, - }) + return conclusiveExitCode + } + + try { + if (generate && prisma) { + await generatePrismaClient({ + verbose: verbose, + schema: getPaths().api.dbSchema, + }) + } + if (generate) { + await new Listr([ + { + title: 'Generating types', + task: () => + execa('yarn rw-gen', { + shell: true, + stdio: verbose ? 'inherit' : 'ignore', + }), }, - }, - ], - { - renderer: verbose && VerboseRenderer, + ]).run() } - ) - try { - await tasks.run() + const exitCode = await typeCheck() + exitCode > 0 && process.exit(exitCode) } catch (e) { console.log(c.error(e.message)) process.exit(e?.exitCode || 1) diff --git a/yarn.lock b/yarn.lock index 9df6a54449a1..fcff7a7864dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5412,7 +5412,7 @@ __metadata: boxen: 5.1.2 camelcase: 6.3.0 chalk: 4.1.2 - concurrently: 6.5.1 + concurrently: 7.0.0 configstore: 3.1.5 core-js: 3.20.3 cross-env: 7.0.3 @@ -11658,9 +11658,9 @@ __metadata: languageName: node linkType: hard -"concurrently@npm:6.5.1": - version: 6.5.1 - resolution: "concurrently@npm:6.5.1" +"concurrently@npm:7.0.0": + version: 7.0.0 + resolution: "concurrently@npm:7.0.0" dependencies: chalk: ^4.1.0 date-fns: ^2.16.1 @@ -11671,8 +11671,8 @@ __metadata: tree-kill: ^1.2.2 yargs: ^16.2.0 bin: - concurrently: bin/concurrently.js - checksum: 4bc2eb5d8fa9a87d2241bc1f7830f5432fd52593944eed162567188f36d1f4219f336f72b5e6afee265547e8be1e54c8c893e5693d3874666a9ce5a7ffe4cc81 + concurrently: dist/bin/concurrently.js + checksum: 3dd5478a9307b086789ae179b234f0a0a75c38cfdaeff52f66c0598a117655b47275922d1f89bf36354c7005a58114e7ab74cf8e64e625668b862c7e94a18400 languageName: node linkType: hard From ebef82de5c7aa194e51f5af269dbc8cf6a460133 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jan 2022 13:31:21 +0000 Subject: [PATCH 08/87] Update dependency @types/node to v16.11.20 (#4172) Co-authored-by: Renovate Bot --- packages/structure/package.json | 2 +- packages/testing/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/structure/package.json b/packages/structure/package.json index 1627c4fdc4de..16f99fe138e4 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -41,7 +41,7 @@ "@types/fs-extra": "9.0.13", "@types/lodash": "4.14.178", "@types/lru-cache": "5.1.1", - "@types/node": "16.11.19", + "@types/node": "16.11.20", "@types/vscode": "1.63.1", "jest": "27.4.7", "typescript": "4.5.4" diff --git a/packages/testing/package.json b/packages/testing/package.json index d9d490fed60f..7dcb8ec1aa01 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -27,7 +27,7 @@ "@types/aws-lambda": "8.10.89", "@types/babel-core": "6.25.7", "@types/jest": "27.4.0", - "@types/node": "16.11.19", + "@types/node": "16.11.20", "@types/react": "17.0.38", "@types/react-dom": "17.0.11", "@types/webpack": "5.28.0", diff --git a/yarn.lock b/yarn.lock index fcff7a7864dd..4c2db9e3cc9f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5729,7 +5729,7 @@ __metadata: "@types/line-column": 1.0.0 "@types/lodash": 4.14.178 "@types/lru-cache": 5.1.1 - "@types/node": 16.11.19 + "@types/node": 16.11.20 "@types/vscode": 1.63.1 camelcase: 6.3.0 deepmerge: 4.2.2 @@ -5774,7 +5774,7 @@ __metadata: "@types/aws-lambda": 8.10.89 "@types/babel-core": 6.25.7 "@types/jest": 27.4.0 - "@types/node": 16.11.19 + "@types/node": 16.11.20 "@types/react": 17.0.38 "@types/react-dom": 17.0.11 "@types/webpack": 5.28.0 @@ -7615,10 +7615,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:16.11.19, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0": - version: 16.11.19 - resolution: "@types/node@npm:16.11.19" - checksum: fe2fd2f15b4683345a7a7546c89ea75283acfd70d17c91dd6a0c4b8d42ef587c5b6506b6022b1b0778a1d7758cb7d3532d1d2cd6d052a880e78a9a5d0d52db44 +"@types/node@npm:*, @types/node@npm:16.11.20, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0": + version: 16.11.20 + resolution: "@types/node@npm:16.11.20" + checksum: aeb6280d7a82851de2830524effbe20998866d8cd29dcc3eae77ae823938cb18793b9301785e0f1a30f2b87ffca2c7432ca58824b52f216e06bc647df3b690b8 languageName: node linkType: hard From 8ea45957dce5914594a6a6a2352267bf74a16e39 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jan 2022 13:48:25 +0000 Subject: [PATCH 09/87] Update dependency mini-css-extract-plugin to v2.5.0 (#4156) Co-authored-by: Renovate Bot --- packages/core/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 68e920c2a92a..10e7522bcfc5 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -44,7 +44,7 @@ "graphql-tag": "2.12.6", "html-webpack-plugin": "5.5.0", "lodash.escaperegexp": "4.1.2", - "mini-css-extract-plugin": "2.4.7", + "mini-css-extract-plugin": "2.5.1", "nodemon": "2.0.15", "null-loader": "4.0.1", "react-refresh": "0.11.0", diff --git a/yarn.lock b/yarn.lock index 4c2db9e3cc9f..1eb6e91d3db5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5518,7 +5518,7 @@ __metadata: graphql-tag: 2.12.6 html-webpack-plugin: 5.5.0 lodash.escaperegexp: 4.1.2 - mini-css-extract-plugin: 2.4.7 + mini-css-extract-plugin: 2.5.1 nodemon: 2.0.15 null-loader: 4.0.1 react-refresh: 0.11.0 @@ -20891,14 +20891,14 @@ fsevents@^1.2.7: languageName: node linkType: hard -"mini-css-extract-plugin@npm:2.4.7": - version: 2.4.7 - resolution: "mini-css-extract-plugin@npm:2.4.7" +"mini-css-extract-plugin@npm:2.5.1": + version: 2.5.1 + resolution: "mini-css-extract-plugin@npm:2.5.1" dependencies: schema-utils: ^4.0.0 peerDependencies: webpack: ^5.0.0 - checksum: 35b0995d3eac05ceb3b084d8af0fff4f5ecc5233ae178a94bf66dd14affe73bce4caced1a76ef9736f63cef693d17d73aa0f264c46c384d71dbc21e01913d424 + checksum: e3471b1623dc97960895046af82d55f0660f23a5e7bbbc3daa1ed62ca4a2b15ce2fa053a60102b774e30e62016d1adfdeb3c46d3be3074081e54efa90fe1bd9f languageName: node linkType: hard From ad4476f29f12682a3fc40b7ec6ba2b3206d79617 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jan 2022 16:32:33 +0000 Subject: [PATCH 10/87] Update dependency @types/jsonwebtoken to v8.5.8 (#4175) Co-authored-by: Renovate Bot --- packages/api/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 47f167b84d42..14c916da2762 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -29,7 +29,7 @@ "@babel/cli": "7.16.7", "@redwoodjs/auth": "0.41.0", "@types/crypto-js": "4.1.0", - "@types/jsonwebtoken": "8.5.7", + "@types/jsonwebtoken": "8.5.8", "@types/md5": "2.3.1", "aws-lambda": "1.0.7", "jest": "27.4.7", diff --git a/yarn.lock b/yarn.lock index 1eb6e91d3db5..a146c1845261 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5355,7 +5355,7 @@ __metadata: "@prisma/client": 3.8.1 "@redwoodjs/auth": 0.41.0 "@types/crypto-js": 4.1.0 - "@types/jsonwebtoken": 8.5.7 + "@types/jsonwebtoken": 8.5.8 "@types/md5": 2.3.1 aws-lambda: 1.0.7 crypto-js: 4.1.1 @@ -7428,12 +7428,12 @@ __metadata: languageName: node linkType: hard -"@types/jsonwebtoken@npm:8.5.7, @types/jsonwebtoken@npm:^8.3.3, @types/jsonwebtoken@npm:^8.5.0": - version: 8.5.7 - resolution: "@types/jsonwebtoken@npm:8.5.7" +"@types/jsonwebtoken@npm:8.5.8, @types/jsonwebtoken@npm:^8.3.3, @types/jsonwebtoken@npm:^8.5.0": + version: 8.5.8 + resolution: "@types/jsonwebtoken@npm:8.5.8" dependencies: "@types/node": "*" - checksum: 2ac24605cec5953231524c3b2a69807979300479652b4135eec79971f59af6c97c7d9136248896f1385f0cf8cdefcf147777340c8207e579b732030abb53274c + checksum: 78b614aa06cb83e6751680448b78daac36bc8f24f7f52b7922e01295ff4b6c2917973e9a359de4219fcc274813f3ae1edc864771dab6cb1de5b68ff8d3d5d611 languageName: node linkType: hard From aa0432d79d41737bcf32e6db01c96f228c3beba2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jan 2022 19:46:15 +0000 Subject: [PATCH 11/87] Update dependency supertokens-auth-react to v0.18.0 (#4173) Co-authored-by: Renovate Bot --- packages/auth/package.json | 2 +- yarn.lock | 119 ++++++++++++++++++++++++++++++++++--- 2 files changed, 111 insertions(+), 10 deletions(-) diff --git a/packages/auth/package.json b/packages/auth/package.json index 3d164ccadf8b..179398d247cd 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -25,7 +25,7 @@ "netlify-identity-widget": "1.9.2", "nhost-js-sdk": "3.1.0", "react": "17.0.2", - "supertokens-auth-react": "0.17.9", + "supertokens-auth-react": "0.18.0", "typescript": "4.5.4" }, "repository": { diff --git a/yarn.lock b/yarn.lock index a146c1845261..bbf2ca4ae57f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1657,7 +1657,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.16.7 resolution: "@babel/runtime@npm:7.16.7" dependencies: @@ -1844,7 +1844,7 @@ __metadata: languageName: node linkType: hard -"@emotion/cache@npm:^11.7.1": +"@emotion/cache@npm:^11.4.0, @emotion/cache@npm:^11.7.1": version: 11.7.1 resolution: "@emotion/cache@npm:11.7.1" dependencies: @@ -1914,7 +1914,7 @@ __metadata: languageName: node linkType: hard -"@emotion/react@npm:^11.4.1": +"@emotion/react@npm:^11.1.1, @emotion/react@npm:^11.4.1": version: 11.7.1 resolution: "@emotion/react@npm:11.7.1" dependencies: @@ -5392,7 +5392,7 @@ __metadata: netlify-identity-widget: 1.9.2 nhost-js-sdk: 3.1.0 react: 17.0.2 - supertokens-auth-react: 0.17.9 + supertokens-auth-react: 0.18.0 typescript: 4.5.4 languageName: unknown linkType: soft @@ -7740,6 +7740,15 @@ __metadata: languageName: node linkType: hard +"@types/react-transition-group@npm:^4.4.0": + version: 4.4.4 + resolution: "@types/react-transition-group@npm:4.4.4" + dependencies: + "@types/react": "*" + checksum: 0e593863c60550002bb7a5bf60dad719de78580017f87eadf32661d1870345a4ef22e2e37902e05d05955494f2c0cae5ef46510032005e8e969273eee0ae8519 + languageName: node + linkType: hard + "@types/react@npm:17.0.38": version: 17.0.38 resolution: "@types/react@npm:17.0.38" @@ -11174,7 +11183,7 @@ __metadata: languageName: node linkType: hard -"classnames@npm:^2.2.6": +"classnames@npm:^2.2.5, classnames@npm:^2.2.6": version: 2.3.1 resolution: "classnames@npm:2.3.1" checksum: e3b832219042802464e648c41c2e8be96c2c64d2522cfa22fbb5ec088418406c61ab351a682c077c07f691c8b00c9f0ee7939b20fabc6c23da69063252a4ab89 @@ -12044,6 +12053,13 @@ __metadata: languageName: node linkType: hard +"country-flag-icons@npm:^1.0.2": + version: 1.4.19 + resolution: "country-flag-icons@npm:1.4.19" + checksum: 7da6e1edcd86c1c3a9a506fb8e4ab07a6a6065618a3889609c0d94d13d8f05223a457c65bc19d382f3a8eefc5e0f2e206d47243fae7f78c357dedf5e9d504f93 + languageName: node + linkType: hard + "cp-file@npm:^7.0.0": version: 7.0.0 resolution: "cp-file@npm:7.0.0" @@ -13276,6 +13292,16 @@ __metadata: languageName: node linkType: hard +"dom-helpers@npm:^5.0.1": + version: 5.2.1 + resolution: "dom-helpers@npm:5.2.1" + dependencies: + "@babel/runtime": ^7.8.7 + csstype: ^3.0.2 + checksum: f735074d66dd759b36b158fa26e9d00c9388ee0e8c9b16af941c38f014a37fc80782de83afefd621681b19ac0501034b4f1c4a3bff5caa1b8667f0212b5e124c + languageName: node + linkType: hard + "dom-serializer@npm:^1.0.1, dom-serializer@npm:^1.3.2": version: 1.3.2 resolution: "dom-serializer@npm:1.3.2" @@ -17558,6 +17584,15 @@ fsevents@^1.2.7: languageName: node linkType: hard +"input-format@npm:^0.3.6": + version: 0.3.6 + resolution: "input-format@npm:0.3.6" + dependencies: + prop-types: ^15.7.2 + checksum: 896191866d4361132d6ee2f790debef0fbbd74a37de71b00e0a61461f9528b8176cc91f09b645e8752d3a960952e2ec79744fb0b2d0d7b6669c509cf02aa2b0c + languageName: node + linkType: hard + "inquirer@npm:^7.0.4, inquirer@npm:^7.3.3": version: 7.3.3 resolution: "inquirer@npm:7.3.3" @@ -19743,6 +19778,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"libphonenumber-js@npm:^1.9.43": + version: 1.9.44 + resolution: "libphonenumber-js@npm:1.9.44" + checksum: 613dda2c2f843e5836cc46c9abfb6fa86f60d39a2154c0d3eed434caf0f30b5e373f33553cf5f5be7d4da2546103d60667872d1b6c71ca47dbbd7675fb500361 + languageName: node + linkType: hard + "lie@npm:3.1.1": version: 3.1.1 resolution: "lie@npm:3.1.1" @@ -20652,6 +20694,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"memoize-one@npm:^5.0.0": + version: 5.2.1 + resolution: "memoize-one@npm:5.2.1" + checksum: fd22dbe9a978a2b4f30d6a491fc02fb90792432ad0dab840dc96c1734d2bd7c9cdeb6a26130ec60507eb43230559523615873168bcbe8fafab221c30b11d54c1 + languageName: node + linkType: hard + "memoizerific@npm:^1.11.3": version: 1.11.3 resolution: "memoizerific@npm:1.11.3" @@ -24330,6 +24379,22 @@ fsevents@^1.2.7: languageName: node linkType: hard +"react-phone-number-input@npm:^3.1.41": + version: 3.1.44 + resolution: "react-phone-number-input@npm:3.1.44" + dependencies: + classnames: ^2.2.5 + country-flag-icons: ^1.0.2 + input-format: ^0.3.6 + libphonenumber-js: ^1.9.43 + prop-types: ^15.7.2 + peerDependencies: + react: ">=0.16.8" + react-dom: ">=0.16.8" + checksum: f9f0153bc918c5dd589f864ddb8fc01188ba5b714f150e4a08a1853ce9186a7074970de4354daab6273f1cc0938505a3a7d4b645e8bac61abd5e08eb3b4683f5 + languageName: node + linkType: hard + "react-popper-tooltip@npm:^3.1.1": version: 3.1.1 resolution: "react-popper-tooltip@npm:3.1.1" @@ -24388,6 +24453,24 @@ fsevents@^1.2.7: languageName: node linkType: hard +"react-select@npm:^5.2.1": + version: 5.2.2 + resolution: "react-select@npm:5.2.2" + dependencies: + "@babel/runtime": ^7.12.0 + "@emotion/cache": ^11.4.0 + "@emotion/react": ^11.1.1 + "@types/react-transition-group": ^4.4.0 + memoize-one: ^5.0.0 + prop-types: ^15.6.0 + react-transition-group: ^4.3.0 + peerDependencies: + react: ^16.8.0 || ^17.0.0 + react-dom: ^16.8.0 || ^17.0.0 + checksum: e71411316fbdbdfa8215b83ad05214d3a43909caa7ee4da47307a7bfdf20e2e7571317c586771e8ee947c907a91e4a0ee75eec375b40572e28bc31230624c435 + languageName: node + linkType: hard + "react-shadow@npm:^19.0.2": version: 19.0.2 resolution: "react-shadow@npm:19.0.2" @@ -24442,6 +24525,21 @@ fsevents@^1.2.7: languageName: node linkType: hard +"react-transition-group@npm:^4.3.0": + version: 4.4.2 + resolution: "react-transition-group@npm:4.4.2" + dependencies: + "@babel/runtime": ^7.5.5 + dom-helpers: ^5.0.1 + loose-envify: ^1.4.0 + prop-types: ^15.6.2 + peerDependencies: + react: ">=16.6.0" + react-dom: ">=16.6.0" + checksum: afaf835854526065d246532714a3833a7c5fbcf21303e1479008ff6f1ec1ae44ecd151f74f357c60511a1e49de65cb9b81bf4d7858b9ee19e636b9a62a6daaa4 + languageName: node + linkType: hard + "react-universal-interface@npm:^0.6.2": version: 0.6.2 resolution: "react-universal-interface@npm:0.6.2" @@ -27003,19 +27101,22 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"supertokens-auth-react@npm:0.17.9": - version: 0.17.9 - resolution: "supertokens-auth-react@npm:0.17.9" +"supertokens-auth-react@npm:0.18.0": + version: 0.18.0 + resolution: "supertokens-auth-react@npm:0.18.0" dependencies: "@emotion/react": ^11.4.1 chroma-js: ^2.1.2 + libphonenumber-js: ^1.9.43 prop-types: "*" + react-phone-number-input: ^3.1.41 + react-select: ^5.2.1 react-shadow: ^19.0.2 supertokens-js-override: ^0.0.4 supertokens-website: ^10.0.4 peerDependencies: react: ">=16.8.0" - checksum: 01a06f4ee7b0cbabc10e249bd39bb976d8ce4d7dd36d259cb7de0b82d7f5b2bb5266494bcb13f783b93c3256668f1024e17a68c2bde69d1dd40a60a607673722 + checksum: 3470ee9fe67801183087729905a94bafaba6e1d0c2ec56dfdf5253dbb428799b765201dfc3dc7a6094267cea26413325f7eab5c930473ba428bf3a6577ef028e languageName: node linkType: hard From 0ae7a241cefbd1f9e25bbc94a7b23aed90221fe1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jan 2022 21:22:12 +0000 Subject: [PATCH 12/87] Update dependency @supabase/supabase-js to v1.29.2 (#4181) Co-authored-by: Renovate Bot --- packages/auth/package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/auth/package.json b/packages/auth/package.json index 179398d247cd..3f3a4a96425e 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -14,7 +14,7 @@ "@clerk/clerk-js": "2.6.1", "@clerk/clerk-sdk-node": "2.6.1", "@clerk/types": "1.21.0", - "@supabase/supabase-js": "1.29.1", + "@supabase/supabase-js": "1.29.2", "@types/netlify-identity-widget": "1.9.2", "@types/react": "17.0.38", "firebase": "9.6.3", diff --git a/yarn.lock b/yarn.lock index bbf2ca4ae57f..9d6f4801b3bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5381,7 +5381,7 @@ __metadata: "@clerk/clerk-js": 2.6.1 "@clerk/clerk-sdk-node": 2.6.1 "@clerk/types": 1.21.0 - "@supabase/supabase-js": 1.29.1 + "@supabase/supabase-js": 1.29.2 "@types/netlify-identity-widget": 1.9.2 "@types/react": 17.0.38 firebase: 9.6.3 @@ -6767,13 +6767,13 @@ __metadata: languageName: node linkType: hard -"@supabase/realtime-js@npm:^1.3.4": - version: 1.3.4 - resolution: "@supabase/realtime-js@npm:1.3.4" +"@supabase/realtime-js@npm:^1.3.5": + version: 1.3.5 + resolution: "@supabase/realtime-js@npm:1.3.5" dependencies: "@types/websocket": ^1.0.3 websocket: ^1.0.34 - checksum: 729c29ded9096ff28e35bf8bd466b340fa44e7ce8a85057902df7aadae2fa28007e056a94b4435e6f03e65c8088f3ffebe21119d90b93edb1d9aaad14dd76196 + checksum: 0b1374b4699a5848c9dd1c0e2121e946fd4d6b2cb7977c28ec3ad91c7d72ae47bd61d6a690adaec38ddf017b718bdddd86f2c196032331db25b6c9e4ef532514 languageName: node linkType: hard @@ -6786,15 +6786,15 @@ __metadata: languageName: node linkType: hard -"@supabase/supabase-js@npm:1.29.1": - version: 1.29.1 - resolution: "@supabase/supabase-js@npm:1.29.1" +"@supabase/supabase-js@npm:1.29.2": + version: 1.29.2 + resolution: "@supabase/supabase-js@npm:1.29.2" dependencies: "@supabase/gotrue-js": ^1.21.7 "@supabase/postgrest-js": ^0.35.0 - "@supabase/realtime-js": ^1.3.4 + "@supabase/realtime-js": ^1.3.5 "@supabase/storage-js": ^1.5.0 - checksum: 320d6316728b92f3c0bfe08a9625c4f6be113055a077e68f0fa40b36a5b9fdf2387ea0deb2e942d4c72d651876eddb42bded5239d440a4c426b4e0c0ba7487b8 + checksum: 6c0ede92c5c0a13d178b28e7fe2823d1ebbd6ecfd5048aed28907ff7d194315a8e49fb57d604386f73b32ab0a35d69ab7c9bd141ab24b794ea7841229b0a107a languageName: node linkType: hard From 69e47a91ebe9e21ce4b5ac478ece086bb181353e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jan 2022 23:58:32 +0000 Subject: [PATCH 13/87] Update dependency dotenv-defaults to v3.0.2 (#4178) Co-authored-by: Renovate Bot --- packages/cli/package.json | 2 +- packages/structure/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index c3510fbeb5a5..52d1f00a1cc3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -30,7 +30,7 @@ "core-js": "3.20.3", "cross-env": "7.0.3", "decamelize": "5.0.0", - "dotenv-defaults": "3.0.0", + "dotenv-defaults": "3.0.2", "envinfo": "7.8.1", "execa": "5.1.1", "fast-glob": "3.2.11", diff --git a/packages/structure/package.json b/packages/structure/package.json index 16f99fe138e4..5fbba41029df 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -14,7 +14,7 @@ "@types/line-column": "1.0.0", "camelcase": "6.3.0", "deepmerge": "4.2.2", - "dotenv-defaults": "3.0.0", + "dotenv-defaults": "3.0.2", "enquirer": "2.3.6", "findup-sync": "5.0.0", "graphql": "16.2.0", diff --git a/yarn.lock b/yarn.lock index 9d6f4801b3bd..d22b8a157215 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5417,7 +5417,7 @@ __metadata: core-js: 3.20.3 cross-env: 7.0.3 decamelize: 5.0.0 - dotenv-defaults: 3.0.0 + dotenv-defaults: 3.0.2 envinfo: 7.8.1 execa: 5.1.1 fast-glob: 3.2.11 @@ -5733,7 +5733,7 @@ __metadata: "@types/vscode": 1.63.1 camelcase: 6.3.0 deepmerge: 4.2.2 - dotenv-defaults: 3.0.0 + dotenv-defaults: 3.0.2 enquirer: 2.3.6 findup-sync: 5.0.0 graphql: 16.2.0 @@ -13400,12 +13400,12 @@ __metadata: languageName: node linkType: hard -"dotenv-defaults@npm:3.0.0": - version: 3.0.0 - resolution: "dotenv-defaults@npm:3.0.0" +"dotenv-defaults@npm:3.0.2": + version: 3.0.2 + resolution: "dotenv-defaults@npm:3.0.2" dependencies: dotenv: ^10.0.0 - checksum: e30f24bb807da691b75ef22ef1a0d62f07599a8a73263b6fff1f9b6c1f48b25812c6107e634346828868ee3107f0e0218b3fdc05627ad9e4d76fc6928f11da24 + checksum: 68163268a727685748a8762366237b6e4c6ae2f57b122ff5fe3ccc1994176b0d7c5de7c39af186eb5bf5b5a70bb86721d1d7db4a6ab62167727ba1b1dd895c98 languageName: node linkType: hard From ff42dd2d7af5c039cd2f55ef03336ebefa673b09 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 01:40:44 +0000 Subject: [PATCH 14/87] Update dependency mini-css-extract-plugin to v2.5.2 (#4183) Co-authored-by: Renovate Bot --- packages/core/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 10e7522bcfc5..86112643879c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -44,7 +44,7 @@ "graphql-tag": "2.12.6", "html-webpack-plugin": "5.5.0", "lodash.escaperegexp": "4.1.2", - "mini-css-extract-plugin": "2.5.1", + "mini-css-extract-plugin": "2.5.2", "nodemon": "2.0.15", "null-loader": "4.0.1", "react-refresh": "0.11.0", diff --git a/yarn.lock b/yarn.lock index d22b8a157215..1746f8f49058 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5518,7 +5518,7 @@ __metadata: graphql-tag: 2.12.6 html-webpack-plugin: 5.5.0 lodash.escaperegexp: 4.1.2 - mini-css-extract-plugin: 2.5.1 + mini-css-extract-plugin: 2.5.2 nodemon: 2.0.15 null-loader: 4.0.1 react-refresh: 0.11.0 @@ -20940,14 +20940,14 @@ fsevents@^1.2.7: languageName: node linkType: hard -"mini-css-extract-plugin@npm:2.5.1": - version: 2.5.1 - resolution: "mini-css-extract-plugin@npm:2.5.1" +"mini-css-extract-plugin@npm:2.5.2": + version: 2.5.2 + resolution: "mini-css-extract-plugin@npm:2.5.2" dependencies: schema-utils: ^4.0.0 peerDependencies: webpack: ^5.0.0 - checksum: e3471b1623dc97960895046af82d55f0660f23a5e7bbbc3daa1ed62ca4a2b15ce2fa053a60102b774e30e62016d1adfdeb3c46d3be3074081e54efa90fe1bd9f + checksum: 5b603da661739be6dd8c8868a94a81a3d3e0059d41bc888a80dbeae9328ca2870de93ffac74634ee7676ab52ae6d6920a6371adbe90cb1899cf9fba24a25485a languageName: node linkType: hard From bfc256ce3ed1560e8aa83ee7e1008ea8aa31efa0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 03:16:37 +0000 Subject: [PATCH 15/87] Update dependency supertokens-node to v8.5.0 (#4174) Co-authored-by: Renovate Bot --- packages/api/package.json | 2 +- yarn.lock | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 14c916da2762..07a871697ed2 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -33,7 +33,7 @@ "@types/md5": "2.3.1", "aws-lambda": "1.0.7", "jest": "27.4.7", - "supertokens-node": "8.4.0", + "supertokens-node": "8.5.0", "typescript": "4.5.4" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index 1746f8f49058..6580dbd514f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5365,7 +5365,7 @@ __metadata: md5: 2.3.0 pascalcase: 1.0.0 pino: 7.6.3 - supertokens-node: 8.4.0 + supertokens-node: 8.5.0 typescript: 4.5.4 uuid: 8.3.2 languageName: unknown @@ -19778,7 +19778,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"libphonenumber-js@npm:^1.9.43": +"libphonenumber-js@npm:^1.9.43, libphonenumber-js@npm:^1.9.44": version: 1.9.44 resolution: "libphonenumber-js@npm:1.9.44" checksum: 613dda2c2f843e5836cc46c9abfb6fa86f60d39a2154c0d3eed434caf0f30b5e373f33553cf5f5be7d4da2546103d60667872d1b6c71ca47dbbd7675fb500361 @@ -27127,9 +27127,9 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"supertokens-node@npm:8.4.0": - version: 8.4.0 - resolution: "supertokens-node@npm:8.4.0" +"supertokens-node@npm:8.5.0": + version: 8.5.0 + resolution: "supertokens-node@npm:8.5.0" dependencies: axios: 0.21.4 body-parser: 1.19.0 @@ -27138,10 +27138,11 @@ resolve@^2.0.0-next.3: jsonschema: 1.4.0 jsonwebtoken: ^8.5.1 jwks-rsa: ^2.0.5 + libphonenumber-js: ^1.9.44 psl: 1.8.0 supertokens-js-override: ^0.0.4 verify-apple-id-token: ^2.1.0 - checksum: a5d68bf26cad1953d35d7fc513eb397b5228986fedeaf7ed591af2945b2792ead7c414fb88ce998a63514d817ffe6e140fb042058d1efa5f80574e742f2c4890 + checksum: ad46681d0d0c0646cbb545935e668c5eaa4bbe244cc38a05f13c8b149f7eb384558ed18cad15c593255d0f79367f32e90d0dd4289109c05996d0dbfd1fa2c6d7 languageName: node linkType: hard From f9f96919b68a8dfbd6235ac108f80d165e4c5d0f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 05:58:15 +0000 Subject: [PATCH 16/87] Update typescript-eslint monorepo to v5.10.0 (#4182) Co-authored-by: Renovate Bot --- packages/eslint-config/package.json | 4 +- yarn.lock | 116 ++++++++++++++-------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index a7d8ffe1d9e8..ee0ed5c0459a 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -8,8 +8,8 @@ "@babel/eslint-parser": "7.16.5", "@babel/eslint-plugin": "7.16.5", "@redwoodjs/internal": "0.41.0", - "@typescript-eslint/eslint-plugin": "5.9.1", - "@typescript-eslint/parser": "5.9.1", + "@typescript-eslint/eslint-plugin": "5.10.0", + "@typescript-eslint/parser": "5.10.0", "eslint": "8.7.0", "eslint-config-prettier": "8.3.0", "eslint-import-resolver-babel-module": "5.3.1", diff --git a/yarn.lock b/yarn.lock index 6580dbd514f4..aa043512f264 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5545,8 +5545,8 @@ __metadata: "@babel/eslint-parser": 7.16.5 "@babel/eslint-plugin": 7.16.5 "@redwoodjs/internal": 0.41.0 - "@typescript-eslint/eslint-plugin": 5.9.1 - "@typescript-eslint/parser": 5.9.1 + "@typescript-eslint/eslint-plugin": 5.10.0 + "@typescript-eslint/parser": 5.10.0 eslint: 8.7.0 eslint-config-prettier: 8.3.0 eslint-import-resolver-babel-module: 5.3.1 @@ -8024,13 +8024,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:5.9.1": - version: 5.9.1 - resolution: "@typescript-eslint/eslint-plugin@npm:5.9.1" +"@typescript-eslint/eslint-plugin@npm:5.10.0": + version: 5.10.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.10.0" dependencies: - "@typescript-eslint/experimental-utils": 5.9.1 - "@typescript-eslint/scope-manager": 5.9.1 - "@typescript-eslint/type-utils": 5.9.1 + "@typescript-eslint/scope-manager": 5.10.0 + "@typescript-eslint/type-utils": 5.10.0 + "@typescript-eslint/utils": 5.10.0 debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 @@ -8043,58 +8043,42 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: e60b3ba531b9edaf74f9c59430faa8de5dc00461ba575a5f03221380318a201cd03e5beb4d2975cf14aa844db052f274ef1b8958293a1c7f213887c66107085b + checksum: c2637479058d32dd2fcae920bc7ab364d987744123f7f521cbdf58e46025de1bcdf1dc24913c51c3d2dae47cd6fa3f4b8f36c6faf209d4063309458c9bc161ae languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:5.9.1": - version: 5.9.1 - resolution: "@typescript-eslint/experimental-utils@npm:5.9.1" - dependencies: - "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.9.1 - "@typescript-eslint/types": 5.9.1 - "@typescript-eslint/typescript-estree": 5.9.1 - eslint-scope: ^5.1.1 - eslint-utils: ^3.0.0 - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: f04790da499ae503560970a6885cef6f18b37b2e15956df75238ea7ded09cb2d8634921ab7665b9e031eed2b5d22e1009c56faf7a60afa07917db8d7b5b3f421 - languageName: node - linkType: hard - -"@typescript-eslint/parser@npm:5.9.1": - version: 5.9.1 - resolution: "@typescript-eslint/parser@npm:5.9.1" +"@typescript-eslint/parser@npm:5.10.0": + version: 5.10.0 + resolution: "@typescript-eslint/parser@npm:5.10.0" dependencies: - "@typescript-eslint/scope-manager": 5.9.1 - "@typescript-eslint/types": 5.9.1 - "@typescript-eslint/typescript-estree": 5.9.1 + "@typescript-eslint/scope-manager": 5.10.0 + "@typescript-eslint/types": 5.10.0 + "@typescript-eslint/typescript-estree": 5.10.0 debug: ^4.3.2 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 94e647ac366d39df8fd70a1923d588ff52f329e790d35e5c09450beb4b1c7dd7e0954c0431eaf1628881ed4848e036c37a08080c2ed8c180e7edb1f458557f12 + checksum: 94f4b6dd31da03517326944b234bd29ff63204d452d303f2af25d003c7aea0daac70ec91883dd0d1ba3a6b7ff4b17b17cb325f5595f4871d76629f39f270b73f languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.9.1": - version: 5.9.1 - resolution: "@typescript-eslint/scope-manager@npm:5.9.1" +"@typescript-eslint/scope-manager@npm:5.10.0": + version: 5.10.0 + resolution: "@typescript-eslint/scope-manager@npm:5.10.0" dependencies: - "@typescript-eslint/types": 5.9.1 - "@typescript-eslint/visitor-keys": 5.9.1 - checksum: a712410da6505599b6cf3ceb9a933913a3bf63e71b89b9da975398cfb143fe7ccaf44e40909a34953091801ff8aed0600d7e72cccb09e8461beedc74af950811 + "@typescript-eslint/types": 5.10.0 + "@typescript-eslint/visitor-keys": 5.10.0 + checksum: 03c5f47df366225434068c896a6e871bf1d120cffca9d4090ad3c5d0d0fea7eadbb7d5795554ed6005b093db0a2b806cf669e99316db5dd24f183f343c965b2e languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.9.1": - version: 5.9.1 - resolution: "@typescript-eslint/type-utils@npm:5.9.1" +"@typescript-eslint/type-utils@npm:5.10.0": + version: 5.10.0 + resolution: "@typescript-eslint/type-utils@npm:5.10.0" dependencies: - "@typescript-eslint/experimental-utils": 5.9.1 + "@typescript-eslint/utils": 5.10.0 debug: ^4.3.2 tsutils: ^3.21.0 peerDependencies: @@ -8102,23 +8086,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: cae457151451e6b5e934051f0c6c8f376c8b82c448993bb69ac389b0d14d40eb00b97d630eaf0d4c6631d07b1a22189a2fedf8100dc097e350e5f7c43b48ff1f + checksum: 3a9d43e3e8806bbf5a25c4091c3d09c854414e31bbfe3beb932a14340605dc969c97b3a59058bc395d2c5ff8305ce2b70fcfb934bfdbe9ca85da1352ee926ab0 languageName: node linkType: hard -"@typescript-eslint/types@npm:5.9.1": - version: 5.9.1 - resolution: "@typescript-eslint/types@npm:5.9.1" - checksum: 98c640618edcc9db99a4cec9a657f1e76dd7331949c4a45e10e86e7a7e214863a7d83b71edfb20f11d161ea8d991c5ddb4d1c00e8c4974c1af72b51a784600c2 +"@typescript-eslint/types@npm:5.10.0": + version: 5.10.0 + resolution: "@typescript-eslint/types@npm:5.10.0" + checksum: 196c45dea8a79a45982a81b15f50f556ede2fa0c6ee8640047fa25d6921ef2e031a0fee044cce82504c584d15726529bc135cc1a0599965d47a26284d95f168e languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.9.1": - version: 5.9.1 - resolution: "@typescript-eslint/typescript-estree@npm:5.9.1" +"@typescript-eslint/typescript-estree@npm:5.10.0": + version: 5.10.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.10.0" dependencies: - "@typescript-eslint/types": 5.9.1 - "@typescript-eslint/visitor-keys": 5.9.1 + "@typescript-eslint/types": 5.10.0 + "@typescript-eslint/visitor-keys": 5.10.0 debug: ^4.3.2 globby: ^11.0.4 is-glob: ^4.0.3 @@ -8127,17 +8111,33 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 37f668a1b6fafcfea41d1abd059996c2a4f3440caeb7728fffe1a1767f1b79fabe00f5d57d963ad7f38b8200b8d8c069fb3b486077c40a0eac2c53df03d06df1 + checksum: 3f91dc21de484705d6e734032624abed4473768d74cf6001d94c21614e1c42518f9adf6ea6dd7b0a5dd7a6a3b781e0170a00d8ec3b552ffc2d8fe2e5aae3c455 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.9.1": - version: 5.9.1 - resolution: "@typescript-eslint/visitor-keys@npm:5.9.1" +"@typescript-eslint/utils@npm:5.10.0": + version: 5.10.0 + resolution: "@typescript-eslint/utils@npm:5.10.0" + dependencies: + "@types/json-schema": ^7.0.9 + "@typescript-eslint/scope-manager": 5.10.0 + "@typescript-eslint/types": 5.10.0 + "@typescript-eslint/typescript-estree": 5.10.0 + eslint-scope: ^5.1.1 + eslint-utils: ^3.0.0 + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + checksum: 6c84745ea90c6c2dce96c77ac12006d595368635647eb141bdab8d0a9d0c25c33d8e947d9321acc442f985e2aa55ed1bd099e7624cd3d586658dea49d964096f + languageName: node + linkType: hard + +"@typescript-eslint/visitor-keys@npm:5.10.0": + version: 5.10.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.10.0" dependencies: - "@typescript-eslint/types": 5.9.1 + "@typescript-eslint/types": 5.10.0 eslint-visitor-keys: ^3.0.0 - checksum: add2f083d1333fc9311776ee70f998b20e6137f00e4c36db619949ea52deb31d7fbe4b2617e7ac5c8dd09db2fba4e9d354419cc4d2e74072fa9fcfa641f63b56 + checksum: 895c84a0f5bb143f17dfa08ad1a484398aaa54975d55731d53fd7dbd15b0c70d341212fb82a8dc082a22b4282c3a8e8132ad8755dfd53483031649b77ec1cc27 languageName: node linkType: hard From b45c0130b567ff9dfa8cb908a68817e65b6c2428 Mon Sep 17 00:00:00 2001 From: Peter Colapietro Date: Tue, 18 Jan 2022 04:41:01 -0500 Subject: [PATCH 17/87] chore: add PropTypes (#4176) * chore: add PropTypes closes #4135 * Revert "chore: add PropTypes" This reverts commit 3217ec62f246b73599664137a9a8a5f48d4a1a41. * chore: temporarily disable "react/prop-types" closes #4135 Co-authored-by: Aditya Pandey --- packages/forms/src/index.tsx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/forms/src/index.tsx b/packages/forms/src/index.tsx index 63313f20f8a0..b713f061762a 100644 --- a/packages/forms/src/index.tsx +++ b/packages/forms/src/index.tsx @@ -1,3 +1,14 @@ +/** + * FIXME: + * Until an upstream dependency issue in "eslint-plugin-react" is resolved, + * disabling eslint rule "react/prop-types" is the recommended approach + * to resolve false positives in eslint. + * + * see: + * - https://github.com/yannickcr/eslint-plugin-react/issues/3140 + * - https://github.com/redwoodjs/redwood/pull/3762 + */ +/* eslint-disable react/prop-types */ /** * @module @redwoodjs/forms * From 17b4df50904fc40e40914a88432f93219aa7561e Mon Sep 17 00:00:00 2001 From: Daniel Choudhury Date: Tue, 18 Jan 2022 13:59:39 +0000 Subject: [PATCH 18/87] fix(generator): Fix incorrect TS page param type on scaffold (#4190) * fix(tests): Fix incorrect snapshots in page generator * One more update * Fix generaated id type in scaffold * Update snapshot --- .../__tests__/__snapshots__/page.test.js.snap | 86 ++++++++++++++++++- .../generate/page/__tests__/page.test.js | 16 ++-- .../__snapshots__/scaffoldNoNest.test.js.snap | 2 +- .../commands/generate/scaffold/scaffold.js | 1 - .../templates/pages/NamePage.tsx.template | 2 +- 5 files changed, 93 insertions(+), 14 deletions(-) diff --git a/packages/cli/src/commands/generate/page/__tests__/__snapshots__/page.test.js.snap b/packages/cli/src/commands/generate/page/__tests__/__snapshots__/page.test.js.snap index 42d6df74fba9..be8dd5e991fc 100644 --- a/packages/cli/src/commands/generate/page/__tests__/__snapshots__/page.test.js.snap +++ b/packages/cli/src/commands/generate/page/__tests__/__snapshots__/page.test.js.snap @@ -329,10 +329,88 @@ export default Routes", exports[`generates typescript pages 1`] = `undefined`; -exports[`generates typescript pages 2`] = `undefined`; +exports[`generates typescript pages 2`] = ` +"import TsFilesPage from './TsFilesPage' -exports[`generates typescript pages 3`] = `undefined`; +export const generated = () => { + return +} + +export default { title: 'Pages/TsFilesPage' } +" +`; + +exports[`generates typescript pages 3`] = ` +"import { render } from '@redwoodjs/testing/web' + +import TsFilesPage from './TsFilesPage' + +describe('TsFilesPage', () => { + it('renders successfully', () => { + expect(() => { + render() + }).not.toThrow() + }) +}) +" +`; + +exports[`generates typescript pages 4`] = ` +"import { Link, routes } from '@redwoodjs/router' +import { MetaTags } from '@redwoodjs/web' + +type TsParamFilesPageProps = { + id: string +} + +const TsParamFilesPage = ({ id }: TsParamFilesPageProps) => { + return ( + <> + + +

TsParamFilesPage

+

+ Find me in ./web/src/pages/TSParamFilesPage/TSParamFilesPage.tsx +

+

+ My default route is named tsParamFiles, link to me with \` + TsParamFiles 42\` +

+

The parameter passed to me is {id}

+ + ) +} + +export default TsParamFilesPage +" +`; -exports[`generates typescript pages 4`] = `undefined`; +exports[`generates typescript pages 5`] = ` +"import { Link, routes } from '@redwoodjs/router' +import { MetaTags } from '@redwoodjs/web' -exports[`generates typescript pages 5`] = `undefined`; +type TsParamTypeFilesPageProps = { + id: number +} + +const TsParamTypeFilesPage = ({ id }: TsParamTypeFilesPageProps) => { + return ( + <> + + +

TsParamTypeFilesPage

+

+ Find me in ./web/src/pages/TSParamTypeFilesPage/TSParamTypeFilesPage.tsx +

+

+ My default route is named tsParamTypeFiles, link to me with \` + TsParamTypeFiles 42\` +

+

The parameter passed to me is {id}

+ + ) +} + +export default TsParamTypeFilesPage +" +`; diff --git a/packages/cli/src/commands/generate/page/__tests__/page.test.js b/packages/cli/src/commands/generate/page/__tests__/page.test.js index 1305bff38493..1d9f95cfa1cb 100644 --- a/packages/cli/src/commands/generate/page/__tests__/page.test.js +++ b/packages/cli/src/commands/generate/page/__tests__/page.test.js @@ -112,9 +112,11 @@ beforeAll(() => { typescriptParamTypeFiles = page.files({ name: 'TSParamTypeFiles', typescript: true, - tests: true, - stories: true, - ...page.paramVariants(pathName('{id:Int}', 'typescript-param-with-type')), + tests: false, + stories: false, + ...page.paramVariants( + pathName('/bazinga-ts/{id:Int}', 'typescript-param-with-type') + ), }) }) @@ -446,7 +448,7 @@ test('generates typescript pages', () => { expect( typescriptFiles[ path.normalize( - '/path/to/project/web/src/pages/TsFilesPage/TsFilesPage.stories.tsx' + '/path/to/project/web/src/pages/TSFilesPage/TSFilesPage.stories.tsx' ) ] ).toMatchSnapshot() @@ -454,7 +456,7 @@ test('generates typescript pages', () => { expect( typescriptFiles[ path.normalize( - '/path/to/project/web/src/pages/TsFilesPage/TsFilesPage.test.tsx' + '/path/to/project/web/src/pages/TSFilesPage/TSFilesPage.test.tsx' ) ] ).toMatchSnapshot() @@ -462,7 +464,7 @@ test('generates typescript pages', () => { expect( typescriptParamFiles[ path.normalize( - '/path/to/project/web/src/pages/TsParamFilesPage/TsParamFilesPage.tsx' + '/path/to/project/web/src/pages/TSParamFilesPage/TSParamFilesPage.tsx' ) ] ).toMatchSnapshot() @@ -470,7 +472,7 @@ test('generates typescript pages', () => { expect( typescriptParamTypeFiles[ path.normalize( - '/path/to/project/web/src/pages/TsParamTypeFilesPage/TsParamTypeFilesPage.tsx' + '/path/to/project/web/src/pages/TSParamTypeFilesPage/TSParamTypeFilesPage.tsx' ) ] ).toMatchSnapshot() diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffoldNoNest.test.js.snap b/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffoldNoNest.test.js.snap index 7e8555244de5..78650aa0c69f 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffoldNoNest.test.js.snap +++ b/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffoldNoNest.test.js.snap @@ -1600,7 +1600,7 @@ exports[`in typescript mode creates a show page 1`] = ` "import PostCell from 'src/components/PostCell' type PostPageProps = { - id: Int + id: number } const PostPage = ({ id }: PostPageProps) => { diff --git a/packages/cli/src/commands/generate/scaffold/scaffold.js b/packages/cli/src/commands/generate/scaffold/scaffold.js index f7a0f3ca476c..0c957732a9f4 100644 --- a/packages/cli/src/commands/generate/scaffold/scaffold.js +++ b/packages/cli/src/commands/generate/scaffold/scaffold.js @@ -330,7 +330,6 @@ const pageFiles = async ( templatePath: path.join('pages', page), }), { - idType, idTsType, name, pascalScaffoldPath, diff --git a/packages/cli/src/commands/generate/scaffold/templates/pages/NamePage.tsx.template b/packages/cli/src/commands/generate/scaffold/templates/pages/NamePage.tsx.template index f167c51ec0cf..55f0a09f281f 100644 --- a/packages/cli/src/commands/generate/scaffold/templates/pages/NamePage.tsx.template +++ b/packages/cli/src/commands/generate/scaffold/templates/pages/NamePage.tsx.template @@ -1,7 +1,7 @@ import ${singularPascalName}Cell from '${importComponentNameCell}' type ${pascalName}PageProps = { - id: ${idType} + id: ${idTsType} } const ${singularPascalName}Page = ({ id }: ${pascalName}PageProps) => { From e47386cada869aef15a37cf54b73f5d1d4bb848f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 17:36:31 +0000 Subject: [PATCH 19/87] Update dependency chokidar to v3.5.3 (#4189) Co-authored-by: Renovate Bot --- packages/api-server/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/api-server/package.json b/packages/api-server/package.json index e25159f93f74..6996f41cc0b7 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -16,7 +16,7 @@ "@babel/plugin-transform-runtime": "7.16.7", "ansi-colors": "4.1.1", "chalk": "4.1.2", - "chokidar": "3.5.2", + "chokidar": "3.5.3", "fast-json-parse": "1.0.3", "fastify": "3.25.3", "fastify-http-proxy": "6.2.1", diff --git a/yarn.lock b/yarn.lock index aa043512f264..145a167d7e5b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5324,7 +5324,7 @@ __metadata: ansi-colors: 4.1.1 aws-lambda: 1.0.7 chalk: 4.1.2 - chokidar: 3.5.2 + chokidar: 3.5.3 fast-json-parse: 1.0.3 fastify: 3.25.3 fastify-http-proxy: 6.2.1 @@ -11061,9 +11061,9 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:3.5.2, chokidar@npm:^3.4.0, chokidar@npm:^3.4.1, chokidar@npm:^3.4.2, chokidar@npm:^3.5.2": - version: 3.5.2 - resolution: "chokidar@npm:3.5.2" +"chokidar@npm:3.5.3, chokidar@npm:^3.4.0, chokidar@npm:^3.4.1, chokidar@npm:^3.4.2, chokidar@npm:^3.5.2": + version: 3.5.3 + resolution: "chokidar@npm:3.5.3" dependencies: anymatch: ~3.1.2 braces: ~3.0.2 @@ -11076,7 +11076,7 @@ __metadata: dependenciesMeta: fsevents: optional: true - checksum: e7179a9dc4ce54c1ba660652319039b7ca0817a442dd05a45afcbdefcd4848b4276debfa9cf321798c2c567c6289da14dd48d9a1ee92056a7b526c554cffe129 + checksum: 1076953093e0707c882a92c66c0f56ba6187831aa51bb4de878c1fec59ae611a3bf02898f190efec8e77a086b8df61c2b2a3ea324642a0558bdf8ee6c5dc9ca1 languageName: node linkType: hard From daf1c101b78570c9f5746611c26353156c9d5d7e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 19:53:19 +0000 Subject: [PATCH 20/87] Update dependency @clerk/clerk-sdk-node to v2.6.2 (#4188) Co-authored-by: Renovate Bot --- packages/auth/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/auth/package.json b/packages/auth/package.json index 3f3a4a96425e..dff0d2ed0a90 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -12,7 +12,7 @@ "@azure/msal-browser": "2.21.0", "@babel/cli": "7.16.7", "@clerk/clerk-js": "2.6.1", - "@clerk/clerk-sdk-node": "2.6.1", + "@clerk/clerk-sdk-node": "2.6.2", "@clerk/types": "1.21.0", "@supabase/supabase-js": "1.29.2", "@types/netlify-identity-widget": "1.9.2", diff --git a/yarn.lock b/yarn.lock index 145a167d7e5b..60515401184f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1759,9 +1759,9 @@ __metadata: languageName: node linkType: hard -"@clerk/clerk-sdk-node@npm:2.6.1": - version: 2.6.1 - resolution: "@clerk/clerk-sdk-node@npm:2.6.1" +"@clerk/clerk-sdk-node@npm:2.6.2": + version: 2.6.2 + resolution: "@clerk/clerk-sdk-node@npm:2.6.2" dependencies: camelcase-keys: ^6.2.2 cookies: ^0.8.0 @@ -1771,7 +1771,7 @@ __metadata: jwks-rsa: ^2.0.4 snakecase-keys: ^3.2.1 tslib: ^2.3.1 - checksum: a73feb606c9fed7f27cf9df9a74bee748005af5da3afbc41a4a6d0098b88d745d88063aa71996cfe6d73ad2761d02ea1b694a26f198f5937ac4dcd2ec9b22106 + checksum: 2b2d3dd1dbf7d870ed977ae4761f5a5d4c959ac03f44fb09c446e101a4241a5ce3aaff0b5750f64a0e1f52fb07dd53a519d34b8a4c81280f00be5b27a790e450 languageName: node linkType: hard @@ -5379,7 +5379,7 @@ __metadata: "@azure/msal-browser": 2.21.0 "@babel/cli": 7.16.7 "@clerk/clerk-js": 2.6.1 - "@clerk/clerk-sdk-node": 2.6.1 + "@clerk/clerk-sdk-node": 2.6.2 "@clerk/types": 1.21.0 "@supabase/supabase-js": 1.29.2 "@types/netlify-identity-widget": 1.9.2 From 7c69ef6c5198ffeb10d7487f4d784096172caf03 Mon Sep 17 00:00:00 2001 From: Rob Cameron Date: Tue, 18 Jan 2022 13:14:40 -0800 Subject: [PATCH 21/87] Support generation of typescript dataMigrations (#4157) * Support generation of typescript dataMigrations Closes #3711 * Adds test * Run ts datamigrations * Add jsdoc types to datamigrate js template * Switch generate data-migration to snapshot tests * Data migrates can only be js and ts * Lint fix * Import test mocks Co-authored-by: Daniel Choudhury --- packages/cli/src/commands/dataMigrate/up.js | 4 +++- .../__snapshots__/dataMigration.test.js.snap | 21 +++++++++++++++++ .../__tests__/dataMigration.test.js | 14 +++++++---- .../__tests__/fixtures/dataMigration.js | 3 --- .../generate/dataMigration/dataMigration.js | 23 ++++++++++++------- .../templates/dataMigration.js.template | 4 ++++ .../templates/dataMigration.ts.template | 5 ++++ 7 files changed, 57 insertions(+), 17 deletions(-) create mode 100644 packages/cli/src/commands/generate/dataMigration/__tests__/__snapshots__/dataMigration.test.js.snap delete mode 100644 packages/cli/src/commands/generate/dataMigration/__tests__/fixtures/dataMigration.js create mode 100644 packages/cli/src/commands/generate/dataMigration/templates/dataMigration.ts.template diff --git a/packages/cli/src/commands/dataMigrate/up.js b/packages/cli/src/commands/dataMigrate/up.js index 2be574ac2d65..397c2fb61a17 100644 --- a/packages/cli/src/commands/dataMigrate/up.js +++ b/packages/cli/src/commands/dataMigrate/up.js @@ -26,6 +26,8 @@ const sortMigrations = (migrations) => { }) } +const SUPPORTED_EXTENSIONS = ['.js', '.ts'] + // Return the list of migrations that haven't run against the database yet const getMigrations = async (db) => { const basePath = path.join(getPaths().api.dataMigrations) @@ -37,7 +39,7 @@ const getMigrations = async (db) => { // gets all migrations present in the app const files = fs .readdirSync(basePath) - .filter((m) => path.extname(m) === '.js') + .filter((m) => SUPPORTED_EXTENSIONS.includes(path.extname(m))) .map((m) => { return { [m.split('-')[0]]: path.join(basePath, m), diff --git a/packages/cli/src/commands/generate/dataMigration/__tests__/__snapshots__/dataMigration.test.js.snap b/packages/cli/src/commands/generate/dataMigration/__tests__/__snapshots__/dataMigration.test.js.snap new file mode 100644 index 000000000000..c28192718940 --- /dev/null +++ b/packages/cli/src/commands/generate/dataMigration/__tests__/__snapshots__/dataMigration.test.js.snap @@ -0,0 +1,21 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`can generate a TS file with expected contents 1`] = ` +"import type { PrismaClient } from '@prisma/client' + +export default async ({ db }: { db: PrismaClient }) => { + // Migration here... +} +" +`; + +exports[`creates a JS file with expected contents 1`] = ` +"/** + * @typedef { import(\\"@prisma/client\\").PrismaClient } PrismaClient + * @param {{db: PrismaClient}} db + */ +export default async ({ db }) => { + // Migration here... +} +" +`; diff --git a/packages/cli/src/commands/generate/dataMigration/__tests__/dataMigration.test.js b/packages/cli/src/commands/generate/dataMigration/__tests__/dataMigration.test.js index 8468d2a656e8..3d32f32a0ab7 100644 --- a/packages/cli/src/commands/generate/dataMigration/__tests__/dataMigration.test.js +++ b/packages/cli/src/commands/generate/dataMigration/__tests__/dataMigration.test.js @@ -1,7 +1,7 @@ global.__dirname = __dirname import path from 'path' +import '../../../../lib/test' -import { loadGeneratorFixture } from '../../../../lib/test' import * as generator from '../dataMigration' const asyncForEach = async (array, callback) => { @@ -53,10 +53,14 @@ test('generates a file with a paramcase version of the passed name', async () => ) }) -test('creates a file with expected contents', async () => { +test('creates a JS file with expected contents', async () => { const files = await generator.files({ name: 'MoveUser' }) const filename = Object.keys(files)[0] - expect(files[filename]).toEqual( - loadGeneratorFixture('dataMigration', 'dataMigration.js') - ) + expect(files[filename]).toMatchSnapshot() +}) + +test('can generate a TS file with expected contents', async () => { + const files = await generator.files({ name: 'MoveUser', typescript: true }) + const filename = Object.keys(files)[0] + expect(files[filename]).toMatchSnapshot() }) diff --git a/packages/cli/src/commands/generate/dataMigration/__tests__/fixtures/dataMigration.js b/packages/cli/src/commands/generate/dataMigration/__tests__/fixtures/dataMigration.js deleted file mode 100644 index eae7a969899f..000000000000 --- a/packages/cli/src/commands/generate/dataMigration/__tests__/fixtures/dataMigration.js +++ /dev/null @@ -1,3 +0,0 @@ -export default async ({ db }) => { - // Migration here... -} diff --git a/packages/cli/src/commands/generate/dataMigration/dataMigration.js b/packages/cli/src/commands/generate/dataMigration/dataMigration.js index ec8c4447c200..8b7658deeeb6 100644 --- a/packages/cli/src/commands/generate/dataMigration/dataMigration.js +++ b/packages/cli/src/commands/generate/dataMigration/dataMigration.js @@ -7,6 +7,7 @@ import terminalLink from 'terminal-link' import { getPaths, writeFilesTask } from '../../../lib' import c from '../../../lib/colors' +import { yargsDefaults } from '../../generate' const POST_RUN_INSTRUCTIONS = `Next steps...\n\n ${c.warning( 'After writing your migration, you can run it with:' @@ -15,20 +16,21 @@ const POST_RUN_INSTRUCTIONS = `Next steps...\n\n ${c.warning( yarn rw dataMigrate up ` -const TEMPLATE_PATH = path.resolve( - __dirname, - 'templates', - 'dataMigration.js.template' -) +const TEMPLATE_PATHS = { + js: path.resolve(__dirname, 'templates', 'dataMigration.js.template'), + ts: path.resolve(__dirname, 'templates', 'dataMigration.ts.template'), +} -export const files = ({ name }) => { +export const files = ({ name, typescript }) => { const now = new Date().toISOString() const timestamp = now.split('.')[0].replace(/\D/g, '') - const outputFilename = `${timestamp}-${paramCase(name)}.js` + const basename = `${timestamp}-${paramCase(name)}` + const extension = typescript ? 'ts' : 'js' + const outputFilename = basename + '.' + extension const outputPath = path.join(getPaths().api.dataMigrations, outputFilename) return { - [outputPath]: fs.readFileSync(TEMPLATE_PATH).toString(), + [outputPath]: fs.readFileSync(TEMPLATE_PATHS[extension]).toString(), } } @@ -46,6 +48,11 @@ export const builder = (yargs) => { 'https://redwoodjs.com/reference/command-line-interface#generate-auth' )}` ) + + // Merge generator defaults in + Object.entries(yargsDefaults).forEach(([option, config]) => { + yargs.option(option, config) + }) } export const handler = async (args) => { diff --git a/packages/cli/src/commands/generate/dataMigration/templates/dataMigration.js.template b/packages/cli/src/commands/generate/dataMigration/templates/dataMigration.js.template index eae7a969899f..97c911ed07a4 100644 --- a/packages/cli/src/commands/generate/dataMigration/templates/dataMigration.js.template +++ b/packages/cli/src/commands/generate/dataMigration/templates/dataMigration.js.template @@ -1,3 +1,7 @@ +/** + * @typedef { import("@prisma/client").PrismaClient } PrismaClient + * @param {{db: PrismaClient}} db + */ export default async ({ db }) => { // Migration here... } diff --git a/packages/cli/src/commands/generate/dataMigration/templates/dataMigration.ts.template b/packages/cli/src/commands/generate/dataMigration/templates/dataMigration.ts.template new file mode 100644 index 000000000000..ee17f451c9f6 --- /dev/null +++ b/packages/cli/src/commands/generate/dataMigration/templates/dataMigration.ts.template @@ -0,0 +1,5 @@ +import type { PrismaClient } from '@prisma/client' + +export default async ({ db }: { db: PrismaClient }) => { + // Migration here... +} From 87a72be7b71d8891479c32ae5ab84c163564b03d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Jan 2022 00:50:19 +0000 Subject: [PATCH 22/87] Update dependency @types/aws-lambda to v8.10.90 (#4198) Co-authored-by: Renovate Bot --- packages/api-server/package.json | 2 +- packages/testing/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 6996f41cc0b7..8acd617e1cba 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -37,7 +37,7 @@ }, "devDependencies": { "@babel/cli": "7.16.7", - "@types/aws-lambda": "8.10.89", + "@types/aws-lambda": "8.10.90", "@types/lodash.escape": "4.0.6", "@types/qs": "6.9.7", "@types/split2": "3.2.1", diff --git a/packages/testing/package.json b/packages/testing/package.json index 7dcb8ec1aa01..279241010c85 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -24,7 +24,7 @@ "@testing-library/jest-dom": "5.16.1", "@testing-library/react": "12.1.2", "@testing-library/user-event": "13.5.0", - "@types/aws-lambda": "8.10.89", + "@types/aws-lambda": "8.10.90", "@types/babel-core": "6.25.7", "@types/jest": "27.4.0", "@types/node": "16.11.20", diff --git a/yarn.lock b/yarn.lock index 60515401184f..0d32343906fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5317,7 +5317,7 @@ __metadata: dependencies: "@babel/cli": 7.16.7 "@babel/plugin-transform-runtime": 7.16.7 - "@types/aws-lambda": 8.10.89 + "@types/aws-lambda": 8.10.90 "@types/lodash.escape": 4.0.6 "@types/qs": 6.9.7 "@types/split2": 3.2.1 @@ -5771,7 +5771,7 @@ __metadata: "@testing-library/jest-dom": 5.16.1 "@testing-library/react": 12.1.2 "@testing-library/user-event": 13.5.0 - "@types/aws-lambda": 8.10.89 + "@types/aws-lambda": 8.10.90 "@types/babel-core": 6.25.7 "@types/jest": 27.4.0 "@types/node": 16.11.20 @@ -6934,10 +6934,10 @@ __metadata: languageName: node linkType: hard -"@types/aws-lambda@npm:8.10.89, @types/aws-lambda@npm:^8.10.83": - version: 8.10.89 - resolution: "@types/aws-lambda@npm:8.10.89" - checksum: 579420ebde96a4dbb7fa60224355f4b69d55c53f3746d1384290a90d126d61ad9dae38d45a88ca0a45c546f56a16646d14c865bb43d5769088cc94a78c42e565 +"@types/aws-lambda@npm:8.10.90, @types/aws-lambda@npm:^8.10.83": + version: 8.10.90 + resolution: "@types/aws-lambda@npm:8.10.90" + checksum: 4312aa435e2bad9bb6c5f34dce00e34de14a239d56bd6826e931155723f8de3756a2d79c21ce5e5cbae7c75c34885ca6faa0e5d1828fa919c9871b2424d121ce languageName: node linkType: hard From 79b78ce9c6036085224a06e95018a35d504124d6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 18:00:37 -0800 Subject: [PATCH 23/87] Update dependency @types/node to v16.11.21 (#4199) Co-authored-by: Renovate Bot --- packages/structure/package.json | 2 +- packages/testing/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/structure/package.json b/packages/structure/package.json index 5fbba41029df..a07f9f51fe7f 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -41,7 +41,7 @@ "@types/fs-extra": "9.0.13", "@types/lodash": "4.14.178", "@types/lru-cache": "5.1.1", - "@types/node": "16.11.20", + "@types/node": "16.11.21", "@types/vscode": "1.63.1", "jest": "27.4.7", "typescript": "4.5.4" diff --git a/packages/testing/package.json b/packages/testing/package.json index 279241010c85..a85661e027d3 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -27,7 +27,7 @@ "@types/aws-lambda": "8.10.90", "@types/babel-core": "6.25.7", "@types/jest": "27.4.0", - "@types/node": "16.11.20", + "@types/node": "16.11.21", "@types/react": "17.0.38", "@types/react-dom": "17.0.11", "@types/webpack": "5.28.0", diff --git a/yarn.lock b/yarn.lock index 0d32343906fc..30e775b8c100 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5729,7 +5729,7 @@ __metadata: "@types/line-column": 1.0.0 "@types/lodash": 4.14.178 "@types/lru-cache": 5.1.1 - "@types/node": 16.11.20 + "@types/node": 16.11.21 "@types/vscode": 1.63.1 camelcase: 6.3.0 deepmerge: 4.2.2 @@ -5774,7 +5774,7 @@ __metadata: "@types/aws-lambda": 8.10.90 "@types/babel-core": 6.25.7 "@types/jest": 27.4.0 - "@types/node": 16.11.20 + "@types/node": 16.11.21 "@types/react": 17.0.38 "@types/react-dom": 17.0.11 "@types/webpack": 5.28.0 @@ -7615,10 +7615,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:16.11.20, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0": - version: 16.11.20 - resolution: "@types/node@npm:16.11.20" - checksum: aeb6280d7a82851de2830524effbe20998866d8cd29dcc3eae77ae823938cb18793b9301785e0f1a30f2b87ffca2c7432ca58824b52f216e06bc647df3b690b8 +"@types/node@npm:*, @types/node@npm:16.11.21, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0": + version: 16.11.21 + resolution: "@types/node@npm:16.11.21" + checksum: e5af56bf8fdfd24a15a427f407f9b0a225fec2e8b91e1fdc365fdd2ab8ca19b9cb4c9e0f37494f97c5dce9983c9589b8e746ecc9592066523ca05949dd9b1fbd languageName: node linkType: hard From f2ed23e1ba1d2b977717107c2be6bbfc38aa6a0b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 18:01:28 -0800 Subject: [PATCH 24/87] Update dependency supertokens-auth-react to v0.18.1 (#4197) Co-authored-by: Renovate Bot Co-authored-by: David Price --- packages/auth/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/auth/package.json b/packages/auth/package.json index dff0d2ed0a90..59f989c981d0 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -25,7 +25,7 @@ "netlify-identity-widget": "1.9.2", "nhost-js-sdk": "3.1.0", "react": "17.0.2", - "supertokens-auth-react": "0.18.0", + "supertokens-auth-react": "0.18.1", "typescript": "4.5.4" }, "repository": { diff --git a/yarn.lock b/yarn.lock index 30e775b8c100..c7f3c2baf1bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5392,7 +5392,7 @@ __metadata: netlify-identity-widget: 1.9.2 nhost-js-sdk: 3.1.0 react: 17.0.2 - supertokens-auth-react: 0.18.0 + supertokens-auth-react: 0.18.1 typescript: 4.5.4 languageName: unknown linkType: soft @@ -27101,9 +27101,9 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"supertokens-auth-react@npm:0.18.0": - version: 0.18.0 - resolution: "supertokens-auth-react@npm:0.18.0" +"supertokens-auth-react@npm:0.18.1": + version: 0.18.1 + resolution: "supertokens-auth-react@npm:0.18.1" dependencies: "@emotion/react": ^11.4.1 chroma-js: ^2.1.2 @@ -27116,7 +27116,7 @@ resolve@^2.0.0-next.3: supertokens-website: ^10.0.4 peerDependencies: react: ">=16.8.0" - checksum: 3470ee9fe67801183087729905a94bafaba6e1d0c2ec56dfdf5253dbb428799b765201dfc3dc7a6094267cea26413325f7eab5c930473ba428bf3a6577ef028e + checksum: ee39a61a7cdace971715d2cc8ed3929d3055f5d818ae7cb02a14a19f8bbf738f95ef75fc0fe72ea07b2298611abcfcc3e5a17d8104a63c8331ff532bac40d808 languageName: node linkType: hard From 416170f70ea5854f90cbbf786b2f6d81a26ee267 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 18:02:01 -0800 Subject: [PATCH 25/87] Update dependency css-minimizer-webpack-plugin to v3.4.1 (#4195) Co-authored-by: Renovate Bot Co-authored-by: David Price --- packages/core/package.json | 2 +- yarn.lock | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 86112643879c..c0e3b025ce39 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -34,7 +34,7 @@ "copy-webpack-plugin": "10.2.0", "core-js": "3.20.3", "css-loader": "6.5.1", - "css-minimizer-webpack-plugin": "3.3.1", + "css-minimizer-webpack-plugin": "3.4.1", "dotenv-webpack": "7.0.3", "esbuild": "0.14.11", "esbuild-loader": "2.18.0", diff --git a/yarn.lock b/yarn.lock index c7f3c2baf1bc..cdc4f0b1c932 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5508,7 +5508,7 @@ __metadata: copy-webpack-plugin: 10.2.0 core-js: 3.20.3 css-loader: 6.5.1 - css-minimizer-webpack-plugin: 3.3.1 + css-minimizer-webpack-plugin: 3.4.1 dotenv-webpack: 7.0.3 esbuild: 0.14.11 esbuild-loader: 2.18.0 @@ -12377,9 +12377,9 @@ __metadata: languageName: node linkType: hard -"css-minimizer-webpack-plugin@npm:3.3.1": - version: 3.3.1 - resolution: "css-minimizer-webpack-plugin@npm:3.3.1" +"css-minimizer-webpack-plugin@npm:3.4.1": + version: 3.4.1 + resolution: "css-minimizer-webpack-plugin@npm:3.4.1" dependencies: cssnano: ^5.0.6 jest-worker: ^27.0.2 @@ -12390,13 +12390,15 @@ __metadata: peerDependencies: webpack: ^5.0.0 peerDependenciesMeta: + "@parcel/css": + optional: true clean-css: optional: true csso: optional: true esbuild: optional: true - checksum: 2c6ae51043caa607ea71c30ef55e51e3882b6e3e9b5d687cceabb7459b9aceeb8e9b824d6e2bdf01584ba4cd4f4b5f2051a1f573bc12b43d6d0393139ea29abb + checksum: a6b749a136f7a62a173e576a10c8f2ada18013800a2698ede08dfdf6df6761b9ad24cabfce153ef4958ffcf8509e7b6a40c6ddffa6eb06f3624a97c17b825e06 languageName: node linkType: hard From 8b5634cc4f067e4bebd28a70430384a21aa7bccb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 18:03:13 -0800 Subject: [PATCH 26/87] Update dependency react-hook-form to v7.24.1 (#4191) Co-authored-by: Renovate Bot Co-authored-by: David Price --- packages/forms/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/forms/package.json b/packages/forms/package.json index 2aebb4151372..bcea571c9e3d 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -11,7 +11,7 @@ "@types/pascalcase": "1.0.1", "core-js": "3.20.3", "pascalcase": "1.0.0", - "react-hook-form": "7.24.0" + "react-hook-form": "7.24.1" }, "repository": { "type": "git", diff --git a/yarn.lock b/yarn.lock index cdc4f0b1c932..ae7ded7a521d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5572,7 +5572,7 @@ __metadata: core-js: 3.20.3 jest: 27.4.7 pascalcase: 1.0.0 - react-hook-form: 7.24.0 + react-hook-form: 7.24.1 typescript: 4.5.4 languageName: unknown linkType: soft @@ -24346,12 +24346,12 @@ fsevents@^1.2.7: languageName: node linkType: hard -"react-hook-form@npm:7.24.0": - version: 7.24.0 - resolution: "react-hook-form@npm:7.24.0" +"react-hook-form@npm:7.24.1": + version: 7.24.1 + resolution: "react-hook-form@npm:7.24.1" peerDependencies: react: ^16.8.0 || ^17 - checksum: 560e6bda0f8d96ccec9abe69f2bdb565a5273aa956ec7c1b28f49d999a644eba0ebe480541810cf37d97e8a35cffaa48123e2beac111912d70bd888daa068761 + checksum: fa7e07d224c1b7bccc33b2c15a6ce7944f61fda50af774e85e0368808d770bd9deb5a68243669a1381ada574945ffc0cc0327354843845dc6088ca7a6b567fda languageName: node linkType: hard From 5c9e4ee3a5c917cb68c77bae9b92946dacf50284 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 18:03:53 -0800 Subject: [PATCH 27/87] Update dependency dotenv-defaults to v5 (#4184) Co-authored-by: Renovate Bot Co-authored-by: David Price --- packages/cli/package.json | 2 +- packages/structure/package.json | 2 +- yarn.lock | 21 ++++++++++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 52d1f00a1cc3..f661368a4a55 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -30,7 +30,7 @@ "core-js": "3.20.3", "cross-env": "7.0.3", "decamelize": "5.0.0", - "dotenv-defaults": "3.0.2", + "dotenv-defaults": "5.0.0", "envinfo": "7.8.1", "execa": "5.1.1", "fast-glob": "3.2.11", diff --git a/packages/structure/package.json b/packages/structure/package.json index a07f9f51fe7f..534a6b44814b 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -14,7 +14,7 @@ "@types/line-column": "1.0.0", "camelcase": "6.3.0", "deepmerge": "4.2.2", - "dotenv-defaults": "3.0.2", + "dotenv-defaults": "5.0.0", "enquirer": "2.3.6", "findup-sync": "5.0.0", "graphql": "16.2.0", diff --git a/yarn.lock b/yarn.lock index ae7ded7a521d..99cdd6446ba8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5417,7 +5417,7 @@ __metadata: core-js: 3.20.3 cross-env: 7.0.3 decamelize: 5.0.0 - dotenv-defaults: 3.0.2 + dotenv-defaults: 5.0.0 envinfo: 7.8.1 execa: 5.1.1 fast-glob: 3.2.11 @@ -5733,7 +5733,7 @@ __metadata: "@types/vscode": 1.63.1 camelcase: 6.3.0 deepmerge: 4.2.2 - dotenv-defaults: 3.0.2 + dotenv-defaults: 5.0.0 enquirer: 2.3.6 findup-sync: 5.0.0 graphql: 16.2.0 @@ -13402,12 +13402,12 @@ __metadata: languageName: node linkType: hard -"dotenv-defaults@npm:3.0.2": - version: 3.0.2 - resolution: "dotenv-defaults@npm:3.0.2" +"dotenv-defaults@npm:5.0.0": + version: 5.0.0 + resolution: "dotenv-defaults@npm:5.0.0" dependencies: - dotenv: ^10.0.0 - checksum: 68163268a727685748a8762366237b6e4c6ae2f57b122ff5fe3ccc1994176b0d7c5de7c39af186eb5bf5b5a70bb86721d1d7db4a6ab62167727ba1b1dd895c98 + dotenv: ^14.0.0 + checksum: 4029be6d1623753b3209040d96a49faf5b750587b658c151545a318e763489e2d3cfade4b5f6c5240f5ea01facae50af01cb5fe721ed470b5e99afe5fc934652 languageName: node linkType: hard @@ -13445,6 +13445,13 @@ __metadata: languageName: node linkType: hard +"dotenv@npm:^14.0.0": + version: 14.2.0 + resolution: "dotenv@npm:14.2.0" + checksum: 17ef06618c3ae59152b94cf5b3633e82ae0989d4ce2ccf2b640cbde92c67e63a93ae191840904816f098fef78d81770548a19c221b8464059f35eaadf7f737fd + languageName: node + linkType: hard + "dotenv@npm:^8.0.0, dotenv@npm:^8.2.0": version: 8.6.0 resolution: "dotenv@npm:8.6.0" From 134379ca0ef5d93b39f6a6167c9595e482bc28f7 Mon Sep 17 00:00:00 2001 From: David Price Date: Tue, 18 Jan 2022 18:05:06 -0800 Subject: [PATCH 28/87] Revert "Don't mask GraphQL errors when you're in the dev environment (#4166)" (#4196) This reverts commit e18715ce95723f64b1524aefc848097e075ff5f9. --- packages/graphql-server/src/functions/graphql.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/graphql-server/src/functions/graphql.ts b/packages/graphql-server/src/functions/graphql.ts index f2d48e88952a..e67e3e348774 100644 --- a/packages/graphql-server/src/functions/graphql.ts +++ b/packages/graphql-server/src/functions/graphql.ts @@ -209,10 +209,8 @@ export const createGraphQLHandler = ({ // Must be "last" in plugin chain so can process any data added to results and extensions plugins.push(useRedwoodLogger(loggerConfig)) - // Prevent unexpected error messages from leaking to the GraphQL clients in prod. - if (!isDevEnv) { - plugins.push(useMaskedErrors({ formatError, errorMessage: defaultError })) - } + // Prevent unexpected error messages from leaking to the GraphQL clients. + plugins.push(useMaskedErrors({ formatError, errorMessage: defaultError })) const corsContext = createCorsContext(cors) From 1a1d00fa6d26789dca059bd2bc6e9d6a29d8fe24 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 19:02:53 -0800 Subject: [PATCH 29/87] Update dependency msw to v0.36.5 (#4200) Co-authored-by: Renovate Bot Co-authored-by: David Price --- packages/testing/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/testing/package.json b/packages/testing/package.json index a85661e027d3..daed978ca2cd 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -35,7 +35,7 @@ "babel-plugin-inline-react-svg": "2.0.1", "jest": "27.4.7", "jest-watch-typeahead": "1.0.0", - "msw": "0.36.4", + "msw": "0.36.5", "ts-toolbelt": "9.6.0", "whatwg-fetch": "3.6.2" }, diff --git a/yarn.lock b/yarn.lock index 99cdd6446ba8..02233af59c99 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5782,7 +5782,7 @@ __metadata: babel-plugin-inline-react-svg: 2.0.1 jest: 27.4.7 jest-watch-typeahead: 1.0.0 - msw: 0.36.4 + msw: 0.36.5 ts-toolbelt: 9.6.0 typescript: 4.5.4 whatwg-fetch: 3.6.2 @@ -21222,9 +21222,9 @@ fsevents@^1.2.7: languageName: node linkType: hard -"msw@npm:0.36.4": - version: 0.36.4 - resolution: "msw@npm:0.36.4" +"msw@npm:0.36.5": + version: 0.36.5 + resolution: "msw@npm:0.36.5" dependencies: "@mswjs/cookies": ^0.1.6 "@mswjs/interceptors": ^0.12.7 @@ -21248,7 +21248,7 @@ fsevents@^1.2.7: yargs: ^17.3.0 bin: msw: cli/index.js - checksum: 926ef2f56992bbe19bc3b0640bc064d15a265ed80f6ce0f912db3ca1e856697bb95a9bca8527b2217e88c1d74b9649af6522ab1c644bf80a9058c3bc683b4dd4 + checksum: fca1cd53cc40a75f4ad9701e5d9e8c85534ac6267c59106dd18ce9e803193b4debb0049f2bc7133f9f7eb1f9a7434c2bc5ccd876dc525e63a0d8fce62ed0fb1b languageName: node linkType: hard From 420d5ef94a2af675559f121610a6047d21ed3523 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 19:03:12 -0800 Subject: [PATCH 30/87] Update dependency cypress to v9.3.0 (#4201) Co-authored-by: Renovate Bot Co-authored-by: David Price --- package.json | 2 +- yarn.lock | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 46758a53b75d..47fe1b3c658a 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "babel-plugin-auto-import": "1.1.0", "babel-plugin-remove-code": "0.0.6", "core-js": "3.20.3", - "cypress": "9.2.1", + "cypress": "9.3.0", "cypress-wait-until": "1.7.2", "eslint": "8.7.0", "fast-glob": "3.2.11", diff --git a/yarn.lock b/yarn.lock index 02233af59c99..48028f5ee26b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7830,10 +7830,10 @@ __metadata: languageName: node linkType: hard -"@types/sinonjs__fake-timers@npm:^6.0.2": - version: 6.0.4 - resolution: "@types/sinonjs__fake-timers@npm:6.0.4" - checksum: ba880e2451a439d9696c9adbea1b163a4077cf3d48eb8282f1ec9b640c9f063d66df9af44ec73d35c64a2bb9cd780cff02de61043c3b0d501dbaa4280ad26d19 +"@types/sinonjs__fake-timers@npm:8.1.1": + version: 8.1.1 + resolution: "@types/sinonjs__fake-timers@npm:8.1.1" + checksum: e2e6c425a548177c0930c2f9b82d3951956c9701b9ebf59623d5ad2c3229c523d3c0d598e79fe7392a239657abd3dbe3676be0650ce438bcd1199ee3b617a4d7 languageName: node linkType: hard @@ -10167,7 +10167,7 @@ __metadata: languageName: node linkType: hard -"bluebird@npm:3.7.2, bluebird@npm:^3.3.5, bluebird@npm:^3.5.5": +"bluebird@npm:^3.3.5, bluebird@npm:^3.5.5, bluebird@npm:^3.7.2": version: 3.7.2 resolution: "bluebird@npm:3.7.2" checksum: 680de03adc54ff925eaa6c7bb9a47a0690e8b5de60f4792604aae8ed618c65e6b63a7893b57ca924beaf53eee69c5af4f8314148c08124c550fe1df1add897d2 @@ -10536,7 +10536,7 @@ __metadata: languageName: node linkType: hard -"buffer@npm:^5.2.1, buffer@npm:^5.5.0, buffer@npm:^5.7.0": +"buffer@npm:^5.2.1, buffer@npm:^5.5.0, buffer@npm:^5.6.0, buffer@npm:^5.7.0": version: 5.7.1 resolution: "buffer@npm:5.7.1" dependencies: @@ -12599,18 +12599,19 @@ __metadata: languageName: node linkType: hard -"cypress@npm:9.2.1": - version: 9.2.1 - resolution: "cypress@npm:9.2.1" +"cypress@npm:9.3.0": + version: 9.3.0 + resolution: "cypress@npm:9.3.0" dependencies: "@cypress/request": ^2.88.10 "@cypress/xvfb": ^1.2.4 "@types/node": ^14.14.31 - "@types/sinonjs__fake-timers": ^6.0.2 + "@types/sinonjs__fake-timers": 8.1.1 "@types/sizzle": ^2.3.2 arch: ^2.2.0 blob-util: ^2.0.2 - bluebird: 3.7.2 + bluebird: ^3.7.2 + buffer: ^5.6.0 cachedir: ^2.3.0 chalk: ^4.1.0 check-more-types: ^2.24.0 @@ -12646,7 +12647,7 @@ __metadata: yauzl: ^2.10.0 bin: cypress: bin/cypress - checksum: 8f900f63c94e958896e8c8c7169a6589d39051d94bfc042c85a4ba87933d013236db4b43c4c20358bcce05cb99280486e5816bb834681011dd57e8c4504cf54b + checksum: 557e0e66f8d95b789ce57277c6852350e9c67db758675739363c9571adbbb39e8ba484f7c1e465fddf62b9cd3e877a4352af5f22a6ea3f385ed67ffa10c34836 languageName: node linkType: hard @@ -25470,7 +25471,7 @@ resolve@^2.0.0-next.3: babel-plugin-auto-import: 1.1.0 babel-plugin-remove-code: 0.0.6 core-js: 3.20.3 - cypress: 9.2.1 + cypress: 9.3.0 cypress-wait-until: 1.7.2 eslint: 8.7.0 fast-glob: 3.2.11 From 7298e4710e268294c3cd24a46103937ceebae633 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Jan 2022 03:40:58 +0000 Subject: [PATCH 31/87] Update dependency fastify to v3.26.0 (#4202) Co-authored-by: Renovate Bot --- packages/api-server/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 8acd617e1cba..d23291baea4f 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -18,7 +18,7 @@ "chalk": "4.1.2", "chokidar": "3.5.3", "fast-json-parse": "1.0.3", - "fastify": "3.25.3", + "fastify": "3.26.0", "fastify-http-proxy": "6.2.1", "fastify-raw-body": "3.2.0", "fastify-static": "4.5.0", diff --git a/yarn.lock b/yarn.lock index 48028f5ee26b..1d8bc1d1b888 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5326,7 +5326,7 @@ __metadata: chalk: 4.1.2 chokidar: 3.5.3 fast-json-parse: 1.0.3 - fastify: 3.25.3 + fastify: 3.26.0 fastify-http-proxy: 6.2.1 fastify-raw-body: 3.2.0 fastify-static: 4.5.0 @@ -15093,9 +15093,9 @@ __metadata: languageName: node linkType: hard -"fastify@npm:3.25.3": - version: 3.25.3 - resolution: "fastify@npm:3.25.3" +"fastify@npm:3.26.0": + version: 3.26.0 + resolution: "fastify@npm:3.26.0" dependencies: "@fastify/ajv-compiler": ^1.0.0 abstract-logging: ^2.0.0 @@ -15112,7 +15112,7 @@ __metadata: secure-json-parse: ^2.0.0 semver: ^7.3.2 tiny-lru: ^7.0.0 - checksum: 734e259cbb358581d1b07fea02b522161ff88bc90372e9cd9fab3895ce13db49381d6bbd6e96106a080ef0315b96dd042e63f43bdeb1f9ccb7f1e8324b9298c1 + checksum: ded443d938c7e54c6fdeaca513000e9b7bff18a20e79b70fba00aa0b192b465dc61882034b525ac5ed8c0d923a1cbfbaa52b6a8e19172754ead1d5b6fcfaaf77 languageName: node linkType: hard From 3683cd3912e3398c4c8bd2a8f3121f10367b0dfb Mon Sep 17 00:00:00 2001 From: Peter Perlepes Date: Wed, 19 Jan 2022 05:48:47 +0200 Subject: [PATCH 32/87] fix: Update clerk-js to latest version (#4161) * fix: Update clerk-js to latest version * Minor changes on the handling of Clerk being null * upgrade @clerk/clerk-js 2.9.0 Co-authored-by: David Price --- packages/auth/package.json | 4 ++-- packages/auth/src/authClients/clerk.ts | 15 ++++++------- yarn.lock | 29 ++++++++++---------------- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/packages/auth/package.json b/packages/auth/package.json index 59f989c981d0..e7ec278e4eb6 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -11,9 +11,9 @@ "@auth0/auth0-spa-js": "1.19.4", "@azure/msal-browser": "2.21.0", "@babel/cli": "7.16.7", - "@clerk/clerk-js": "2.6.1", + "@clerk/clerk-js": "2.9.0", "@clerk/clerk-sdk-node": "2.6.2", - "@clerk/types": "1.21.0", + "@clerk/types": "1.22.0", "@supabase/supabase-js": "1.29.2", "@types/netlify-identity-widget": "1.9.2", "@types/react": "17.0.38", diff --git a/packages/auth/src/authClients/clerk.ts b/packages/auth/src/authClients/clerk.ts index 354216fdecd4..e1174db213da 100644 --- a/packages/auth/src/authClients/clerk.ts +++ b/packages/auth/src/authClients/clerk.ts @@ -1,8 +1,9 @@ -import { Clerk } from '@clerk/clerk-js' +import Clerk from '@clerk/clerk-js' import { UserResource as ClerkUserResource, SignInProps, SignUpProps, + SignOutCallback, } from '@clerk/types' import type { AuthClient } from '.' @@ -14,10 +15,10 @@ export type { Clerk } export type ClerkUser = ClerkUserResource & { roles: string[] | null } // In production, there is an issue where the AuthProvider sometimes captures -// Clerk as null (and then sends it over as () => null). This intercepts that +// Clerk as null. This intercepts that // issue and falls back to `window.Clerk` to access the client. -function clerkClient(propsClient: Clerk | (() => null)): Clerk | null { - if (!propsClient || (typeof propsClient === 'function' && !propsClient())) { +function clerkClient(propsClient: Clerk | null) { + if (!propsClient) { return window.Clerk ?? null } else { return propsClient @@ -30,16 +31,16 @@ export const clerk = (client: Clerk): AuthClientClerk => { client, login: async (options?: SignInProps) => clerkClient(client)?.openSignIn(options || {}), - logout: async () => new Promise((res) => clerkClient(client)?.signOut(res)), + logout: async (options?: SignOutCallback) => clerkClient(client)?.signOut(options), signup: async (options?: SignUpProps) => clerkClient(client)?.openSignUp(options || {}), // Clerk uses the session ID PLUS the __session cookie. - getToken: async () => clerkClient(client)?.session.id, + getToken: async () => clerkClient(client)?.session?.id || null, getUserMetadata: async () => { return clerkClient(client)?.user ? { ...clerkClient(client)?.user, - roles: clerkClient(client)?.user.publicMetadata?.['roles'] ?? [], + roles: clerkClient(client)?.user?.publicMetadata?.['roles'] ?? [], } : null }, diff --git a/yarn.lock b/yarn.lock index 1d8bc1d1b888..448d50d09292 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1739,11 +1739,11 @@ __metadata: languageName: node linkType: hard -"@clerk/clerk-js@npm:2.6.1": - version: 2.6.1 - resolution: "@clerk/clerk-js@npm:2.6.1" +"@clerk/clerk-js@npm:2.9.0": + version: 2.9.0 + resolution: "@clerk/clerk-js@npm:2.9.0" dependencies: - "@clerk/types": 1.19.0 + "@clerk/types": 1.22.0 "@popperjs/core": ^2.4.4 browser-tabs-lock: ^1.2.15 classnames: ^2.2.6 @@ -1755,7 +1755,7 @@ __metadata: react-dom: 16.13.1 react-popper: ^2.2.3 regenerator-runtime: ^0.13.7 - checksum: abf4f38a032b847d534925e4595133ec1de1b483d79acf60c209044c4b7974854aee138271974fffd4ca0efc4a00c2ddfa76c5359bd0c51c5142e3b91d95c60e + checksum: 08b1235495e2f1769298022eef4566be42f485222cab5600632e87c1158ae406a1d176029575d5bdc95a880ee0db9a28abab1d6d2ec846f86d779a048db61819 languageName: node linkType: hard @@ -1775,17 +1775,10 @@ __metadata: languageName: node linkType: hard -"@clerk/types@npm:1.19.0": - version: 1.19.0 - resolution: "@clerk/types@npm:1.19.0" - checksum: 3a5e828fde94c2930aee035764d5a6342f24e00c9ee469485ee5319d604c1306b691622ceb2e77f814d3a85833e9a9091ff41177bc771186ae5c099f56f5fc9b - languageName: node - linkType: hard - -"@clerk/types@npm:1.21.0": - version: 1.21.0 - resolution: "@clerk/types@npm:1.21.0" - checksum: 1a7dae9e6a821cd3437dda957150c120970be48a4f3817628fea425716ddcafb06febd47a5182d1acf7eedf1eeb1fc7167eb7f0f1c0ec9eb858161f4f0a4ffdc +"@clerk/types@npm:1.22.0": + version: 1.22.0 + resolution: "@clerk/types@npm:1.22.0" + checksum: 16009645239be467db08d586ba2a000c149d5e01a9bb0c2d5d01748c6b380fea771c35389b5ead2de14759bfedc4c71247bfa0ce393bfd7e98fdee3798637a6e languageName: node linkType: hard @@ -5378,9 +5371,9 @@ __metadata: "@auth0/auth0-spa-js": 1.19.4 "@azure/msal-browser": 2.21.0 "@babel/cli": 7.16.7 - "@clerk/clerk-js": 2.6.1 + "@clerk/clerk-js": 2.9.0 "@clerk/clerk-sdk-node": 2.6.2 - "@clerk/types": 1.21.0 + "@clerk/types": 1.22.0 "@supabase/supabase-js": 1.29.2 "@types/netlify-identity-widget": 1.9.2 "@types/react": 17.0.38 From 44c0b153a3c0bfbab2f070933f1da9278e681145 Mon Sep 17 00:00:00 2001 From: David Price Date: Tue, 18 Jan 2022 20:07:18 -0800 Subject: [PATCH 33/87] remove unused deps (#4203) --- packages/create-redwood-app/package.json | 3 - yarn.lock | 230 +---------------------- 2 files changed, 7 insertions(+), 226 deletions(-) diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index e257db841f04..f3973a2e7623 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -11,14 +11,11 @@ "@babel/node": "7.16.7", "@babel/runtime-corejs3": "7.16.7", "@redwoodjs/internal": "0.41.0", - "axios": "0.24.0", "chalk": "4.1.2", "check-node-version": "4.2.1", - "decompress": "4.2.1", "execa": "5.1.1", "fs-extra": "10.0.0", "listr": "0.14.3", - "tmp": "0.2.1", "yargs": "16.2.0" }, "repository": { diff --git a/yarn.lock b/yarn.lock index 448d50d09292..462f898de396 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9545,15 +9545,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:0.24.0": - version: 0.24.0 - resolution: "axios@npm:0.24.0" - dependencies: - follow-redirects: ^1.14.4 - checksum: d106561e761bf48633633073626eafb80289eb7c7c27f9fae4fb796939b6ecd2c9f63b596e3b3d872f7c0bec6b2fb117c58456d387e4ca2da7fc07c795a979c3 - languageName: node - linkType: hard - "axobject-query@npm:^2.2.0": version: 2.2.0 resolution: "axobject-query@npm:2.2.0" @@ -10125,16 +10116,6 @@ __metadata: languageName: node linkType: hard -"bl@npm:^1.0.0": - version: 1.2.3 - resolution: "bl@npm:1.2.3" - dependencies: - readable-stream: ^2.3.5 - safe-buffer: ^5.1.1 - checksum: ee6478864d3b1295614f269f3fbabeb2362a2f2fc7f8dc2f6c1f944a278d84e0572ecefd6d0b0736d7418763f98dc3b2738253191ea9e98e4b08de211cfac0a6 - languageName: node - linkType: hard - "bl@npm:^4.0.3, bl@npm:^4.1.0": version: 4.1.0 resolution: "bl@npm:4.1.0" @@ -10452,23 +10433,6 @@ __metadata: languageName: node linkType: hard -"buffer-alloc-unsafe@npm:^1.1.0": - version: 1.1.0 - resolution: "buffer-alloc-unsafe@npm:1.1.0" - checksum: 06b9298c9369621a830227c3797ceb3ff5535e323946d7b39a7398fed8b3243798259b3c85e287608c5aad35ccc551cec1a0a5190cc8f39652e8eee25697fc9c - languageName: node - linkType: hard - -"buffer-alloc@npm:^1.2.0": - version: 1.2.0 - resolution: "buffer-alloc@npm:1.2.0" - dependencies: - buffer-alloc-unsafe: ^1.1.0 - buffer-fill: ^1.0.0 - checksum: 09d87dd53996342ccfbeb2871257d8cdb25ce9ee2259adc95c6490200cd6e528c5fbae8f30bcc323fe8d8efb0fe541e4ac3bbe9ee3f81c6b7c4b27434cc02ab4 - languageName: node - linkType: hard - "buffer-crc32@npm:^0.2.1, buffer-crc32@npm:^0.2.13, buffer-crc32@npm:~0.2.3": version: 0.2.13 resolution: "buffer-crc32@npm:0.2.13" @@ -10483,13 +10447,6 @@ __metadata: languageName: node linkType: hard -"buffer-fill@npm:^1.0.0": - version: 1.0.0 - resolution: "buffer-fill@npm:1.0.0" - checksum: 55b5654fbbf2d7ceb4991bb537f5e5b5b5b9debca583fee416a74fcec47c16d9e7a90c15acd27577da7bd750b7fa6396e77e7c221e7af138b6d26242381c6e4d - languageName: node - linkType: hard - "buffer-from@npm:^1.0.0": version: 1.1.2 resolution: "buffer-from@npm:1.1.2" @@ -10529,7 +10486,7 @@ __metadata: languageName: node linkType: hard -"buffer@npm:^5.2.1, buffer@npm:^5.5.0, buffer@npm:^5.6.0, buffer@npm:^5.7.0": +"buffer@npm:^5.5.0, buffer@npm:^5.6.0, buffer@npm:^5.7.0": version: 5.7.1 resolution: "buffer@npm:5.7.1" dependencies: @@ -11499,7 +11456,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^2.19.0, commander@npm:^2.20.0, commander@npm:^2.20.3, commander@npm:^2.8.1": +"commander@npm:^2.19.0, commander@npm:^2.20.0, commander@npm:^2.20.3": version: 2.20.3 resolution: "commander@npm:2.20.3" checksum: 74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288 @@ -12149,15 +12106,12 @@ __metadata: "@babel/node": 7.16.7 "@babel/runtime-corejs3": 7.16.7 "@redwoodjs/internal": 0.41.0 - axios: 0.24.0 chalk: 4.1.2 check-node-version: 4.2.1 - decompress: 4.2.1 execa: 5.1.1 fs-extra: 10.0.0 jest: 27.4.7 listr: 0.14.3 - tmp: 0.2.1 typescript: 4.5.4 yargs: 16.2.0 bin: @@ -12839,69 +12793,6 @@ __metadata: languageName: node linkType: hard -"decompress-tar@npm:^4.0.0, decompress-tar@npm:^4.1.0, decompress-tar@npm:^4.1.1": - version: 4.1.1 - resolution: "decompress-tar@npm:4.1.1" - dependencies: - file-type: ^5.2.0 - is-stream: ^1.1.0 - tar-stream: ^1.5.2 - checksum: 92d86c5dfe2a89f9b5db584668f8ed2a3107339083872c7f78b5f7d55222d954545e018c10346a50991542ad6d1406128bf1c97a24f023810993a1dcfb3c3f21 - languageName: node - linkType: hard - -"decompress-tarbz2@npm:^4.0.0": - version: 4.1.1 - resolution: "decompress-tarbz2@npm:4.1.1" - dependencies: - decompress-tar: ^4.1.0 - file-type: ^6.1.0 - is-stream: ^1.1.0 - seek-bzip: ^1.0.5 - unbzip2-stream: ^1.0.9 - checksum: d5ab2c2435a53f45da8348ffdb5ae0a3ff8fec55948b7890a1c55413de4d1e539a22978e7dcd8bd3561985878c9778253fe146cbdea429f04fa4529abb57c54e - languageName: node - linkType: hard - -"decompress-targz@npm:^4.0.0": - version: 4.1.1 - resolution: "decompress-targz@npm:4.1.1" - dependencies: - decompress-tar: ^4.1.1 - file-type: ^5.2.0 - is-stream: ^1.1.0 - checksum: 42514fb2df6248c56b2b115494b7d1d046bc582e960354ba4faad5792f261782a61d17d9ef53845abe78c0f0ecafc195cb0754c00227fa0bd0642a1bfd8eafad - languageName: node - linkType: hard - -"decompress-unzip@npm:^4.0.1": - version: 4.0.1 - resolution: "decompress-unzip@npm:4.0.1" - dependencies: - file-type: ^3.8.0 - get-stream: ^2.2.0 - pify: ^2.3.0 - yauzl: ^2.4.2 - checksum: 896f88e1c23b59cdce022227a8910c06158bd4b296c21d61af7167bd50d00e9e4355b605bdbfd7ba75d46ad277d4f881cdd037aec7165a40ccd0ee4ef59443a8 - languageName: node - linkType: hard - -"decompress@npm:4.2.1": - version: 4.2.1 - resolution: "decompress@npm:4.2.1" - dependencies: - decompress-tar: ^4.0.0 - decompress-tarbz2: ^4.0.0 - decompress-targz: ^4.0.0 - decompress-unzip: ^4.0.1 - graceful-fs: ^4.1.10 - make-dir: ^1.0.0 - pify: ^2.3.0 - strip-dirs: ^2.0.0 - checksum: 6730279fa206aad04a8338a88ab49c596034c502b2d5f23a28d0a28290b82d9217f9e60c8b5739805474ca842fc856e08e2d64ed759f2118c2bcabe42fa9eece - languageName: node - linkType: hard - "dedent@npm:^0.7.0": version: 0.7.0 resolution: "dedent@npm:0.7.0" @@ -15243,27 +15134,6 @@ __metadata: languageName: node linkType: hard -"file-type@npm:^3.8.0": - version: 3.9.0 - resolution: "file-type@npm:3.9.0" - checksum: 7ae074b350c2300807a99d428600a8ee6b2ace901400898706a20ddc2c43c9abb7e05177ff55ed67a2fd26dfa9b91857b21ec9c0ab3202b9cabebc7e65900240 - languageName: node - linkType: hard - -"file-type@npm:^5.2.0": - version: 5.2.0 - resolution: "file-type@npm:5.2.0" - checksum: c16c2f4e484a838c12b63e08637277905f08aebb1afbc291086029210aea17ded5ed701c9a4588313446ae0c1da71566b58df9a9c758a1ec300c4f80b9713cbf - languageName: node - linkType: hard - -"file-type@npm:^6.1.0": - version: 6.2.0 - resolution: "file-type@npm:6.2.0" - checksum: 3d7fe85a10bd97ca0c35fd9a20d21f5b20849bbb70985d37c34475051433f3c6109c76a3e5893bff6773037b769be9730a2db762789ecf25def9b62a4c2ee953 - languageName: node - linkType: hard - "file-uri-to-path@npm:1.0.0": version: 1.0.0 resolution: "file-uri-to-path@npm:1.0.0" @@ -15522,7 +15392,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4": +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0": version: 1.14.6 resolution: "follow-redirects@npm:1.14.6" peerDependenciesMeta: @@ -16039,16 +15909,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"get-stream@npm:^2.2.0": - version: 2.3.1 - resolution: "get-stream@npm:2.3.1" - dependencies: - object-assign: ^4.0.1 - pinkie-promise: ^2.0.0 - checksum: 46c12f496e7edec688a1cc570fe7556ce91e91201fa7efb146853fb9f0a8f0b0bb9a02cf9d9e4e9d4e2097f98c83b09621d9034c25ca0cf80ae6f4dace9c3465 - languageName: node - linkType: hard - "get-stream@npm:^4.1.0": version: 4.1.0 resolution: "get-stream@npm:4.1.0" @@ -16460,7 +16320,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"graceful-fs@npm:^4.1.10, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.2, graceful-fs@npm:^4.2.3, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": +"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.2, graceful-fs@npm:^4.2.3, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.9 resolution: "graceful-fs@npm:4.2.9" checksum: 2a66760ce6677ca18a24a1ef15d440cfd970086446af1e78c9e9de083c48122d8bd9c3fdc37f8f80f34aae833fa0d9dd52725e75a1c3f433ddd34eece39e7376 @@ -18044,13 +17904,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"is-natural-number@npm:^4.0.1": - version: 4.0.1 - resolution: "is-natural-number@npm:4.0.1" - checksum: f05c544cb0ad39d4410e2ae2244282bf61918ebbb808b665436ffca4f6bbe908d3ae3a8d21fe143d302951f157d969986dd432098b63899561639fcd1ce1c280 - languageName: node - linkType: hard - "is-negative-zero@npm:^2.0.1": version: 2.0.2 resolution: "is-negative-zero@npm:2.0.2" @@ -21964,7 +21817,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": +"object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": version: 4.1.1 resolution: "object-assign@npm:4.1.1" checksum: 1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414 @@ -22973,22 +22826,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"pinkie-promise@npm:^2.0.0": - version: 2.0.1 - resolution: "pinkie-promise@npm:2.0.1" - dependencies: - pinkie: ^2.0.0 - checksum: 11b5e5ce2b090c573f8fad7b517cbca1bb9a247587306f05ae71aef6f9b2cd2b923c304aa9663c2409cfde27b367286179f1379bc4ec18a3fbf2bb0d473b160a - languageName: node - linkType: hard - -"pinkie@npm:^2.0.0": - version: 2.0.4 - resolution: "pinkie@npm:2.0.4" - checksum: 25228b08b5597da42dc384221aa0ce56ee0fbf32965db12ba838e2a9ca0193c2f0609c45551ee077ccd2060bf109137fdb185b00c6d7e0ed7e35006d20fdcbc6 - languageName: node - linkType: hard - "pino-abstract-transport@npm:v0.5.0": version: 0.5.0 resolution: "pino-abstract-transport@npm:0.5.0" @@ -24705,7 +24542,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"readable-stream@npm:1 || 2, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.0, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6": +"readable-stream@npm:1 || 2, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6": version: 2.3.7 resolution: "readable-stream@npm:2.3.7" dependencies: @@ -25740,18 +25577,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"seek-bzip@npm:^1.0.5": - version: 1.0.6 - resolution: "seek-bzip@npm:1.0.6" - dependencies: - commander: ^2.8.1 - bin: - seek-bunzip: bin/seek-bunzip - seek-table: bin/seek-bzip-table - checksum: e4019e4498bb725ff855603595c4116ca003674b13d29cb9ed9891b2ceec884ccf7c1cb5dba0d6b50fe6ce760a011078f5744efb79823f4ddb9decb1571e9912 - languageName: node - linkType: hard - "select-hose@npm:^2.0.0": version: 2.0.0 resolution: "select-hose@npm:2.0.0" @@ -26960,15 +26785,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"strip-dirs@npm:^2.0.0": - version: 2.1.0 - resolution: "strip-dirs@npm:2.1.0" - dependencies: - is-natural-number: ^4.0.1 - checksum: 073d6d08331ec2e87afc2c2535d7336fee1d63797384045e4ecb9908a5ac6615022ee000cc278d6bbc94147bed7350f7cf4657b6d18c377813f37e7ae329fb52 - languageName: node - linkType: hard - "strip-final-newline@npm:^2.0.0": version: 2.0.0 resolution: "strip-final-newline@npm:2.0.0" @@ -27314,21 +27130,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"tar-stream@npm:^1.5.2": - version: 1.6.2 - resolution: "tar-stream@npm:1.6.2" - dependencies: - bl: ^1.0.0 - buffer-alloc: ^1.2.0 - end-of-stream: ^1.0.0 - fs-constants: ^1.0.0 - readable-stream: ^2.3.0 - to-buffer: ^1.1.1 - xtend: ^4.0.0 - checksum: ab8528d2cc9ccd0906d1ce6d8089030b2c92a578c57645ff4971452c8c5388b34c7152c04ed64b8510d22a66ffaf0fee58bada7d6ab41ad1e816e31993d59cf3 - languageName: node - linkType: hard - "tar-stream@npm:^2.2.0": version: 2.2.0 resolution: "tar-stream@npm:2.2.0" @@ -27732,13 +27533,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"to-buffer@npm:^1.1.1": - version: 1.1.1 - resolution: "to-buffer@npm:1.1.1" - checksum: fb9fc6a0103f2b06e2e01c3d291586d0148759d5584f35d0973376434d1b58bd6ee5df9273f0bb1190eb2a5747c894bf49fed571325a7ac10208a48f31736439 - languageName: node - linkType: hard - "to-fast-properties@npm:^2.0.0": version: 2.0.0 resolution: "to-fast-properties@npm:2.0.0" @@ -28300,16 +28094,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"unbzip2-stream@npm:^1.0.9": - version: 1.4.3 - resolution: "unbzip2-stream@npm:1.4.3" - dependencies: - buffer: ^5.2.1 - through: ^2.3.8 - checksum: 2ea2048f3c9db3499316ccc1d95ff757017ccb6f46c812d7c42466247e3b863fb178864267482f7f178254214247779daf68e85f50bd7736c3c97ba2d58b910a - languageName: node - linkType: hard - "unc-path-regex@npm:^0.1.2": version: 0.1.2 resolution: "unc-path-regex@npm:0.1.2" @@ -30211,7 +29995,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"yauzl@npm:^2.10.0, yauzl@npm:^2.4.2": +"yauzl@npm:^2.10.0": version: 2.10.0 resolution: "yauzl@npm:2.10.0" dependencies: From 6ea764e533f9a5c2282a2958f158960a4e5a2c77 Mon Sep 17 00:00:00 2001 From: BBurnworth Date: Tue, 18 Jan 2022 22:07:42 -0600 Subject: [PATCH 34/87] Update CONTRIBUTING.md (#4165) * Update CONTRIBUTING.md Two quality of life improvements based on my recent efforts to get set up as a contributor. Working through the doc as a new contributor, I was confused when I got to this section. While reading through the four options it almost seemed like they blended together, and it was not clear that if I chose 1-3 that I should jump to the next section on integrating rwfw. This grouping change attempts to make it more clear that there are four separate options to choose from, that the functional test project may be the best option, and that you can skip to the next section if you choose not to use the functional test project. I do not think that I added any verbiage except updating the headers and TOC appropriately. Also, I added into the `yarn dev --cwd ` since it took me some trial and error to figure out how to use that correctly. * Apply suggestions from code review Co-authored-by: David Price --- CONTRIBUTING.md | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 856b41fb4e76..c0b5ea2f7087 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,8 @@ Before interacting with the Redwood community, please read and understand our [C - [Code Organization](#code-organization) - [Local Setup](#local-setup) - [Redwood Framework](#redwood-framework) - - [Redwood Project: Create a Functional Test Project](#redwood-project-create-a-functional-test-project) + - [Redwood Project: Options](#redwood-project-options) + - [Redwood Functional Test Project](#redwood-functional-test-project) - [Testing the Framework in Your Project](#testing-the-framework-in-your-project) - [Testing the CLI in Your Project](#testing-the-cli-in-your-project) - [Browser-based Setup](#browser-based-setup) @@ -49,16 +50,20 @@ cd redwood yarn install ``` -### Redwood Project: Create a Functional Test Project +### Redwood Project: Options You'll almost always want to test the functionality of your changes to the Redwood Framework in a Redwood Project. When it comes to getting a Redwood Project to test your changes out in, you have several options: - run `yarn create redwood-app ./redwood-project` - `git clone` the [RedwoodJS Tutorial Blog](https://github.com/redwoodjs/redwood-tutorial) - use a project you've already created -- run `yarn run build:test-project ` from the root of your local copy of the Redwood Framework to create a functional test project 👀 +- create a functional test project using `yarn run build:test-project ` 👀 -**Using the functional test project might be the fastest and easiest way to test your changes.** You can create a Redwood Project that contains a lot of functionality in just a few minutes. For example, here's a brief overview of all the things `yarn run build:test-project ` does. It... +**Using the functional test project might be the fastest and easiest way to test your changes.** + +#### Redwood Functional Test Project + +You can create a Redwood Project that contains a lot of functionality in just a few minutes. For example, here's a brief overview of all the things `yarn run build:test-project ` does. It... 1. installs using the `create-redwood-app` template in the current branch of your Redwood Framework 2. with the current `canary` version of Redwood Packages (with the option to use the `latest` stable version) @@ -66,9 +71,7 @@ You'll almost always want to test the functionality of your changes to the Redwo 4. then applies code mods from the [Redwood tutorial](https://learn.redwoodjs.com/docs/tutorial/welcome-to-redwood/) to add functionality and styling 5. and initializes a Prisma DB migration for SQLite -Unless you've already got a project with a lot of functionality, it'd take quite some to add all of this yourself. Moreover, testing your changes in a project that has a lot of functionality will increase your confidence in the changes you're making. - -But how do you actually test your changes in the Redwood Framework in your Redwood Project? With another command, this time in the root of your Redwood Project: `yarn rwfw`. +Run `yarn run build:test-project ` from the root of your local copy of the Redwood Framework to create a functional test project. > Besides ``, `build:test-project` takes a few other options as well: > @@ -88,6 +91,10 @@ But how do you actually test your changes in the Redwood Framework in your Redwo > yarn run build:test-project ~/my-repos/redwood-project --typescript --link > ``` +Unless you've already got a project with a lot of functionality, it'd take quite some to add all of this yourself. Moreover, testing your changes in a project that has a lot of functionality will increase your confidence in the changes you're making. + +But how do you actually test your changes in the Redwood Framework in your Redwood Project? With another command, this time in the root of your Redwood Project: `yarn rwfw`. + ### Testing the Framework in Your Project As you make changes to the Redwood Framework, you'll want to see your changes reflected "live" in a Redwood Project. Since we're always looking for ways to make contributing to Redwood easier, there are a few workflows we've come up with. The one you'll want to use is `yarn rwfw`. @@ -145,7 +152,7 @@ To do that, use the `--cwd` option to set the current working directory to your cd redwood yarn build cd packages/cli -yarn dev --cwd +yarn dev --cwd ``` `yarn dev` runs the CLI and `--cwd` makes the command run in your Redwood Project. If you make a change to the code, remember to rebuild the packages! From 09f41ad38cfc1d45dbc99536942ff11b7c2b4814 Mon Sep 17 00:00:00 2001 From: Daniel Choudhury Date: Wed, 19 Jan 2022 06:04:20 +0000 Subject: [PATCH 35/87] Test-Project: Update cell query names and add codemod for mocks (#4180) * Update cell query names and add codemod for mocks * Return the output of mock codemod * Rename post -> blogPost | Get mock transform working * Make the last test pass * Fix calling generators Co-authored-by: David Price --- tasks/test-project/codemods/blogPost.js | 42 +++++++++++++------ tasks/test-project/codemods/blogPostCell.js | 26 ++++++------ tasks/test-project/codemods/blogPostsCell.js | 15 +------ tasks/test-project/codemods/contactPage.js | 2 +- .../codemods/updateBlogPostMocks.js | 27 ++++++++++++ tasks/test-project/tasks.js | 30 +++++++++++-- tasks/test-project/util.js | 1 + 7 files changed, 100 insertions(+), 43 deletions(-) create mode 100644 tasks/test-project/codemods/updateBlogPostMocks.js diff --git a/tasks/test-project/codemods/blogPost.js b/tasks/test-project/codemods/blogPost.js index 84d0ae9e7d17..59d56104bec4 100644 --- a/tasks/test-project/codemods/blogPost.js +++ b/tasks/test-project/codemods/blogPost.js @@ -1,23 +1,38 @@ const body = `
-
-

- {new Intl.DateTimeFormat('en-US', { year: 'numeric', month: 'long', day: 'numeric' }).format(new Date(post.createdAt))} -

-

- {post.title} -

-
-
{post.body}
+{blogPost && ( + <> +
+

+ {new Intl.DateTimeFormat('en-US', { + year: 'numeric', + month: 'long', + day: 'numeric', + }).format(new Date(blogPost.createdAt))} +

+

+ + {blogPost.title} + +

+
+
+ {blogPost.body} +
+ +)}
` const propsInterface = ` -interface Props { - post: { id: string, title: string, body: string, createdAt: string } -} +interface Props extends FindBlogPostQuery {} ` +const typeImport = `import { FindBlogPostQuery } from 'types/graphql'` + export default (file, api) => { const j = api.jscodeshift const root = j(file.source) @@ -34,6 +49,7 @@ export default (file, api) => { if (file.path.endsWith('.tsx')) { root.find(j.VariableDeclaration).insertBefore(propsInterface) + root.find(j.ImportDeclaration).insertAfter(typeImport) // Convert "const BlogPost = () " // to "const BlogPost = ({ posts }: Props) " @@ -42,7 +58,7 @@ export default (file, api) => { .at(0) .replaceWith((nodePath) => { const { node } = nodePath - node.params = ['{ post }: Props'] + node.params = ['{ blogPost }: Props'] return node }) } diff --git a/tasks/test-project/codemods/blogPostCell.js b/tasks/test-project/codemods/blogPostCell.js index 850a79f16aad..569b1713552a 100644 --- a/tasks/test-project/codemods/blogPostCell.js +++ b/tasks/test-project/codemods/blogPostCell.js @@ -1,6 +1,6 @@ const query = ` - query BlogPostQuery($id: Int!) { - post(id: $id) { + query FindBlogPostQuery($id: Int!) { + blogPost: post(id: $id) { id title body @@ -8,7 +8,7 @@ const query = ` } } ` -const successBody = `` +const successBody = `` export default (file, api) => { const j = api.jscodeshift @@ -37,16 +37,16 @@ export default (file, api) => { return node }) - root - .find(j.Identifier, { - type: 'Identifier', - name: 'blogPost', - }) - .replaceWith((nodePath) => { - const { node } = nodePath - node.name = 'post' - return node - }) + // root + // .find(j.Identifier, { + // type: 'Identifier', + // name: 'blogPost', + // }) + // .replaceWith((nodePath) => { + // const { node } = nodePath + // node.name = 'post' + // return node + // }) return root .find(j.VariableDeclarator, { diff --git a/tasks/test-project/codemods/blogPostsCell.js b/tasks/test-project/codemods/blogPostsCell.js index 87b8ae4fd06f..2ac4a279cd3d 100644 --- a/tasks/test-project/codemods/blogPostsCell.js +++ b/tasks/test-project/codemods/blogPostsCell.js @@ -1,6 +1,6 @@ const query = ` query BlogPostsQuery { - posts { + blogPosts: posts { id title body @@ -9,7 +9,7 @@ const query = ` } ` const successBody = `
-{posts.map((post) => )} +{blogPosts.map((post) => )}
` export default (file, api) => { @@ -39,17 +39,6 @@ export default (file, api) => { return node }) - root - .find(j.Identifier, { - type: 'Identifier', - name: 'blogPosts', - }) - .replaceWith((nodePath) => { - const { node } = nodePath - node.name = 'posts' - return node - }) - return root .find(j.VariableDeclarator, { id: { diff --git a/tasks/test-project/codemods/contactPage.js b/tasks/test-project/codemods/contactPage.js index 6733a4affb9e..eb939b4a365e 100644 --- a/tasks/test-project/codemods/contactPage.js +++ b/tasks/test-project/codemods/contactPage.js @@ -1,6 +1,6 @@ const body = ` -
+