From f9f934acda8eae30b6f718cf8cd06a8aca6cd403 Mon Sep 17 00:00:00 2001 From: Peter Colapietro Date: Mon, 2 May 2022 10:34:24 -0400 Subject: [PATCH 01/14] =?UTF-8?q?chore(story=F0=9F=93=97):=20extract=20MSW?= =?UTF-8?q?=20logic=20into=20a=20loader=20(#4919)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Yann Braga --- packages/testing/config/storybook/preview.js | 2 + .../testing/src/web/StorybookProvider.tsx | 41 +++++++------------ 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/packages/testing/config/storybook/preview.js b/packages/testing/config/storybook/preview.js index 2d7fd01341eb..72a6f33d7296 100644 --- a/packages/testing/config/storybook/preview.js +++ b/packages/testing/config/storybook/preview.js @@ -6,6 +6,7 @@ const { merge } = require('webpack-merge') // booting up the mock server workers, and mocking the router. const { StorybookProvider, + MockingLoader, } = require('@redwoodjs/testing/dist/web/StorybookProvider') // Import the user's default CSS file @@ -18,6 +19,7 @@ const baseConfig = { (storyFn, { id }) => React.createElement(StorybookProvider, { storyFn, id }), ], + loaders: [MockingLoader], } const userConfig = require('~__REDWOOD__USER_STORYBOOK_PREVIEW_CONFIG') diff --git a/packages/testing/src/web/StorybookProvider.tsx b/packages/testing/src/web/StorybookProvider.tsx index 052918667a27..737d460767a5 100644 --- a/packages/testing/src/web/StorybookProvider.tsx +++ b/packages/testing/src/web/StorybookProvider.tsx @@ -4,35 +4,24 @@ import * as React from 'react' import { MockProviders } from './MockProviders' import { setupRequestHandlers, startMSW, mockCurrentUser } from './mockRequests' -export const StorybookProvider: React.FunctionComponent<{ - storyFn: () => ReactNode | ReactPortal - id: string -}> = ({ storyFn, id }) => { - const [loading, setLoading] = React.useState(true) - - React.useEffect(() => { - const init = async () => { - // Import all the `*.mock.*` files. - const reqs = require.context( - '~__REDWOOD__USER_WEB_SRC', - true, - /.+(mock).(js|ts)$/ - ) - reqs.keys().forEach((r) => { - reqs(r) - }) +export const MockingLoader = async () => { + const reqs = require.context( + '~__REDWOOD__USER_WEB_SRC', + true, + /.+(mock).(js|ts)$/ + ) + reqs.keys().forEach(reqs) - await startMSW('browsers') - setupRequestHandlers() - setLoading(false) - } - init() - }, [id]) + await startMSW('browsers') + setupRequestHandlers() - if (loading) { - return null - } + return {} +} +export const StorybookProvider: React.FunctionComponent<{ + storyFn: () => ReactNode | ReactPortal + id: string +}> = ({ storyFn }) => { // default to a non-existent user at the beginning of each story mockCurrentUser(null) From 6809d3eccbfdedb77a363d8c05fafbd39de9500a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 17:09:51 +0900 Subject: [PATCH 02/14] fix(deps): update dependency cross-undici-fetch to v0.3.3 (#5378) * fix(deps): update dependency cross-undici-fetch to v0.3.3 * upgrade @graphql-yoga/common Co-authored-by: Renovate Bot Co-authored-by: Dominic Saadi <32992335+jtoar@users.noreply.github.com> --- packages/api/package.json | 2 +- packages/codemods/package.json | 2 +- packages/graphql-server/package.json | 4 +- packages/prerender/package.json | 2 +- packages/telemetry/package.json | 2 +- yarn.lock | 139 ++++++++++++++------------- 6 files changed, 79 insertions(+), 72 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 678bf4b57893..843fd3dd4da7 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -32,7 +32,7 @@ "dependencies": { "@babel/runtime-corejs3": "7.16.7", "@prisma/client": "3.12.0", - "cross-undici-fetch": "0.3.0", + "cross-undici-fetch": "0.3.3", "crypto-js": "4.1.1", "humanize-string": "2.1.0", "jsonwebtoken": "8.5.1", diff --git a/packages/codemods/package.json b/packages/codemods/package.json index 59de7e2b04b5..2908f6eee5d2 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -28,7 +28,7 @@ "@babel/runtime-corejs3": "7.16.7", "@vscode/ripgrep": "1.14.2", "core-js": "3.22.2", - "cross-undici-fetch": "0.3.0", + "cross-undici-fetch": "0.3.3", "deepmerge": "4.2.2", "fast-glob": "3.2.11", "findup-sync": "5.0.0", diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 3ee6897f5e24..98fbd08ac303 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -30,11 +30,11 @@ "@graphql-tools/merge": "8.2.10", "@graphql-tools/schema": "8.3.10", "@graphql-tools/utils": "8.6.9", - "@graphql-yoga/common": "2.3.0", + "@graphql-yoga/common": "2.4.0", "@prisma/client": "3.12.0", "@redwoodjs/api": "1.2.0", "core-js": "3.22.2", - "cross-undici-fetch": "0.3.0", + "cross-undici-fetch": "0.3.3", "graphql": "16.3.0", "graphql-scalars": "1.17.0", "graphql-tag": "2.12.6", diff --git a/packages/prerender/package.json b/packages/prerender/package.json index b5e8c5a7583d..acef8a6346fa 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -31,7 +31,7 @@ "@redwoodjs/web": "1.2.0", "babel-plugin-ignore-html-and-css-imports": "0.1.0", "cheerio": "1.0.0-rc.10", - "cross-undici-fetch": "0.3.0", + "cross-undici-fetch": "0.3.3", "mime-types": "2.1.35" }, "devDependencies": { diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 301d0c7377bc..556dc4cb09be 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -30,7 +30,7 @@ "@redwoodjs/internal": "1.2.0", "@redwoodjs/structure": "1.2.0", "ci-info": "3.3.0", - "cross-undici-fetch": "0.3.0", + "cross-undici-fetch": "0.3.3", "envinfo": "7.8.1", "systeminformation": "5.11.13", "uuid": "8.3.2", diff --git a/yarn.lock b/yarn.lock index 451dae40c439..f6043d9438db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3629,9 +3629,9 @@ __metadata: languageName: node linkType: hard -"@graphql-yoga/common@npm:2.3.0": - version: 2.3.0 - resolution: "@graphql-yoga/common@npm:2.3.0" +"@graphql-yoga/common@npm:2.4.0": + version: 2.4.0 + resolution: "@graphql-yoga/common@npm:2.4.0" dependencies: "@envelop/core": ^2.0.0 "@envelop/disable-introspection": ^3.0.0 @@ -3641,12 +3641,12 @@ __metadata: "@graphql-tools/utils": ^8.6.0 "@graphql-typed-document-node/core": ^3.1.1 "@graphql-yoga/subscription": 2.0.0 - cross-undici-fetch: ^0.2.5 + cross-undici-fetch: ^0.3.0 dset: ^3.1.1 tslib: ^2.3.1 peerDependencies: graphql: ^15.2.0 || ^16.0.0 - checksum: ee748e513ad4b59b6bd3cef4d897c2c4e79ac37537f477785eb32f33b79521539c5791deee8bc7ff04cda87862adc10544f183c3c1496a876bf20a61b37bcc18 + checksum: d2adede9444c3d175b28d7290a7fd0548a06aed30df67ea6906479c70cd84dfde3aed5fa6edfb4b395b945ea2228b6ad13b16c959d887918268a98d39c023ce9 languageName: node linkType: hard @@ -5803,7 +5803,7 @@ __metadata: languageName: node linkType: hard -"@redwoodjs/api-server@1.1.1, @redwoodjs/api-server@workspace:packages/api-server": +"@redwoodjs/api-server@1.2.0, @redwoodjs/api-server@workspace:packages/api-server": version: 0.0.0-use.local resolution: "@redwoodjs/api-server@workspace:packages/api-server" dependencies: @@ -5840,7 +5840,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/api@1.1.1, @redwoodjs/api@workspace:packages/api": +"@redwoodjs/api@1.2.0, @redwoodjs/api@workspace:packages/api": version: 0.0.0-use.local resolution: "@redwoodjs/api@workspace:packages/api" dependencies: @@ -5848,13 +5848,13 @@ __metadata: "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 "@prisma/client": 3.12.0 - "@redwoodjs/auth": 1.1.1 + "@redwoodjs/auth": 1.2.0 "@types/crypto-js": 4.1.1 "@types/jsonwebtoken": 8.5.8 "@types/md5": 2.3.2 "@types/split2": 3.2.1 aws-lambda: 1.0.7 - cross-undici-fetch: 0.3.0 + cross-undici-fetch: 0.3.3 crypto-js: 4.1.1 humanize-string: 2.1.0 jest: 27.5.1 @@ -5886,7 +5886,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/auth@1.1.1, @redwoodjs/auth@workspace:packages/auth": +"@redwoodjs/auth@1.2.0, @redwoodjs/auth@workspace:packages/auth": version: 0.0.0-use.local resolution: "@redwoodjs/auth@workspace:packages/auth" dependencies: @@ -5913,18 +5913,18 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/cli@1.1.1, @redwoodjs/cli@workspace:packages/cli": +"@redwoodjs/cli@1.2.0, @redwoodjs/cli@workspace:packages/cli": version: 0.0.0-use.local resolution: "@redwoodjs/cli@workspace:packages/cli" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@prisma/sdk": 3.12.0 - "@redwoodjs/api-server": 1.1.1 - "@redwoodjs/internal": 1.1.1 - "@redwoodjs/prerender": 1.1.1 - "@redwoodjs/structure": 1.1.1 - "@redwoodjs/telemetry": 1.1.1 + "@redwoodjs/api-server": 1.2.0 + "@redwoodjs/internal": 1.2.0 + "@redwoodjs/prerender": 1.2.0 + "@redwoodjs/structure": 1.2.0 + "@redwoodjs/telemetry": 1.2.0 "@types/listr": 0.14.4 boxen: 5.1.2 camelcase: 6.3.0 @@ -5977,7 +5977,7 @@ __metadata: "@types/prettier": 2.6.0 "@vscode/ripgrep": 1.14.2 core-js: 3.22.2 - cross-undici-fetch: 0.3.0 + cross-undici-fetch: 0.3.3 deepmerge: 4.2.2 fast-glob: 3.2.11 findup-sync: 5.0.0 @@ -6012,10 +6012,10 @@ __metadata: "@babel/preset-typescript": 7.16.7 "@babel/runtime-corejs3": 7.16.7 "@pmmmwh/react-refresh-webpack-plugin": 0.5.5 - "@redwoodjs/cli": 1.1.1 - "@redwoodjs/eslint-config": 1.1.1 - "@redwoodjs/internal": 1.1.1 - "@redwoodjs/testing": 1.1.1 + "@redwoodjs/cli": 1.2.0 + "@redwoodjs/eslint-config": 1.2.0 + "@redwoodjs/internal": 1.2.0 + "@redwoodjs/testing": 1.2.0 "@types/rimraf": 3.0.2 babel-loader: 8.2.3 babel-plugin-auto-import: 1.1.0 @@ -6068,7 +6068,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/eslint-config@1.1.1, @redwoodjs/eslint-config@workspace:packages/eslint-config": +"@redwoodjs/eslint-config@1.2.0, @redwoodjs/eslint-config@workspace:packages/eslint-config": version: 0.0.0-use.local resolution: "@redwoodjs/eslint-config@workspace:packages/eslint-config" dependencies: @@ -6076,7 +6076,7 @@ __metadata: "@babel/core": 7.16.7 "@babel/eslint-parser": 7.16.5 "@babel/eslint-plugin": 7.16.5 - "@redwoodjs/internal": 1.1.1 + "@redwoodjs/internal": 1.2.0 "@typescript-eslint/eslint-plugin": 5.20.0 "@typescript-eslint/parser": 5.20.0 eslint: 8.13.0 @@ -6123,7 +6123,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/graphql-server@1.1.1, @redwoodjs/graphql-server@workspace:packages/graphql-server": +"@redwoodjs/graphql-server@1.2.0, @redwoodjs/graphql-server@workspace:packages/graphql-server": version: 0.0.0-use.local resolution: "@redwoodjs/graphql-server@workspace:packages/graphql-server" dependencies: @@ -6139,16 +6139,16 @@ __metadata: "@graphql-tools/merge": 8.2.10 "@graphql-tools/schema": 8.3.10 "@graphql-tools/utils": 8.6.9 - "@graphql-yoga/common": 2.3.0 + "@graphql-yoga/common": 2.4.0 "@prisma/client": 3.12.0 - "@redwoodjs/api": 1.1.1 - "@redwoodjs/auth": 1.1.1 + "@redwoodjs/api": 1.2.0 + "@redwoodjs/auth": 1.2.0 "@types/lodash.merge": 4.6.7 "@types/lodash.omitby": 4.6.7 "@types/uuid": 8.3.4 aws-lambda: 1.0.7 core-js: 3.22.2 - cross-undici-fetch: 0.3.0 + cross-undici-fetch: 0.3.3 graphql: 16.3.0 graphql-scalars: 1.17.0 graphql-tag: 2.12.6 @@ -6160,7 +6160,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/internal@1.1.1, @redwoodjs/internal@workspace:packages/internal": +"@redwoodjs/internal@1.2.0, @redwoodjs/internal@workspace:packages/internal": version: 0.0.0-use.local resolution: "@redwoodjs/internal@workspace:packages/internal" dependencies: @@ -6178,7 +6178,7 @@ __metadata: "@graphql-codegen/typescript-operations": 2.3.5 "@graphql-codegen/typescript-react-apollo": 3.2.11 "@graphql-codegen/typescript-resolvers": 2.6.1 - "@redwoodjs/graphql-server": 1.1.1 + "@redwoodjs/graphql-server": 1.2.0 "@types/babel-plugin-tester": 9.0.4 "@types/babel__core": 7.1.19 "@types/findup-sync": 4.0.2 @@ -6211,22 +6211,22 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/prerender@1.1.1, @redwoodjs/prerender@workspace:packages/prerender": +"@redwoodjs/prerender@1.2.0, @redwoodjs/prerender@workspace:packages/prerender": version: 0.0.0-use.local resolution: "@redwoodjs/prerender@workspace:packages/prerender" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 - "@redwoodjs/auth": 1.1.1 - "@redwoodjs/internal": 1.1.1 - "@redwoodjs/router": 1.1.1 - "@redwoodjs/structure": 1.1.1 - "@redwoodjs/web": 1.1.1 + "@redwoodjs/auth": 1.2.0 + "@redwoodjs/internal": 1.2.0 + "@redwoodjs/router": 1.2.0 + "@redwoodjs/structure": 1.2.0 + "@redwoodjs/web": 1.2.0 "@types/mime-types": 2.1.1 babel-plugin-ignore-html-and-css-imports: 0.1.0 babel-plugin-tester: 10.1.0 cheerio: 1.0.0-rc.10 - cross-undici-fetch: 0.3.0 + cross-undici-fetch: 0.3.3 jest: 27.5.1 mime-types: 2.1.35 typescript: 4.6.3 @@ -6250,14 +6250,14 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/router@1.1.1, @redwoodjs/router@workspace:packages/router": +"@redwoodjs/router@1.2.0, @redwoodjs/router@workspace:packages/router": version: 0.0.0-use.local resolution: "@redwoodjs/router@workspace:packages/router" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@reach/skip-nav": 0.16.0 - "@redwoodjs/auth": 1.1.1 + "@redwoodjs/auth": 1.2.0 "@types/lodash.isequal": 4.5.6 core-js: 3.22.2 jest: 27.5.1 @@ -6269,14 +6269,14 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/structure@1.1.1, @redwoodjs/structure@workspace:packages/structure": +"@redwoodjs/structure@1.2.0, @redwoodjs/structure@workspace:packages/structure": version: 0.0.0-use.local resolution: "@redwoodjs/structure@workspace:packages/structure" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@prisma/sdk": 3.12.0 - "@redwoodjs/internal": 1.1.1 + "@redwoodjs/internal": 1.2.0 "@types/fs-extra": 9.0.13 "@types/line-column": 1.0.0 "@types/lodash": 4.14.182 @@ -6306,20 +6306,20 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/telemetry@1.1.1, @redwoodjs/telemetry@workspace:packages/telemetry": +"@redwoodjs/telemetry@1.2.0, @redwoodjs/telemetry@workspace:packages/telemetry": version: 0.0.0-use.local resolution: "@redwoodjs/telemetry@workspace:packages/telemetry" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/internal": 1.1.1 - "@redwoodjs/structure": 1.1.1 + "@redwoodjs/internal": 1.2.0 + "@redwoodjs/structure": 1.2.0 "@types/envinfo": 7.8.1 "@types/uuid": 8.3.4 "@types/yargs": 16.0.4 ci-info: 3.3.0 - cross-undici-fetch: 0.3.0 + cross-undici-fetch: 0.3.3 envinfo: 7.8.1 jest: 27.5.1 systeminformation: 5.11.13 @@ -6328,17 +6328,17 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/testing@1.1.1, @redwoodjs/testing@workspace:packages/testing": +"@redwoodjs/testing@1.2.0, @redwoodjs/testing@workspace:packages/testing": version: 0.0.0-use.local resolution: "@redwoodjs/testing@workspace:packages/testing" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 - "@redwoodjs/auth": 1.1.1 - "@redwoodjs/graphql-server": 1.1.1 - "@redwoodjs/internal": 1.1.1 - "@redwoodjs/router": 1.1.1 - "@redwoodjs/web": 1.1.1 + "@redwoodjs/auth": 1.2.0 + "@redwoodjs/graphql-server": 1.2.0 + "@redwoodjs/internal": 1.2.0 + "@redwoodjs/router": 1.2.0 + "@redwoodjs/web": 1.2.0 "@storybook/addon-a11y": 6.4.22 "@storybook/addon-essentials": 6.4.22 "@storybook/builder-webpack5": 6.4.22 @@ -6365,7 +6365,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/web@1.1.1, @redwoodjs/web@workspace:packages/web": +"@redwoodjs/web@1.2.0, @redwoodjs/web@workspace:packages/web": version: 0.0.0-use.local resolution: "@redwoodjs/web@workspace:packages/web" dependencies: @@ -6373,7 +6373,7 @@ __metadata: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/auth": 1.1.1 + "@redwoodjs/auth": 1.2.0 "@testing-library/jest-dom": 5.16.4 "@testing-library/react": 12.1.5 "@types/react": 17.0.44 @@ -13151,8 +13151,8 @@ __metadata: "@babel/core": 7.16.7 "@babel/node": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/internal": 1.1.1 - "@redwoodjs/telemetry": 1.1.1 + "@redwoodjs/internal": 1.2.0 + "@redwoodjs/telemetry": 1.2.0 chalk: 4.1.2 check-node-version: 4.2.1 execa: 5.1.1 @@ -13230,17 +13230,17 @@ __metadata: languageName: node linkType: hard -"cross-undici-fetch@npm:0.3.0": - version: 0.3.0 - resolution: "cross-undici-fetch@npm:0.3.0" +"cross-undici-fetch@npm:0.3.3": + version: 0.3.3 + resolution: "cross-undici-fetch@npm:0.3.3" dependencies: abort-controller: ^3.0.0 form-data-encoder: ^1.7.1 formdata-node: ^4.3.1 node-fetch: ^2.6.7 - undici: ^5.0.0 + undici: ^5.1.0 web-streams-polyfill: ^3.2.0 - checksum: e2c6b9740023fe24caa7baf07a7a16d81667fe40bf4532d5a57075ae6f3de0633f7dcfed1a55e4f7b89d4560f2a04506a4f333206fc51b32ef71ddaca3bdb76c + checksum: 9f1288056082fa9ce9bf775ef71f9f99fffe7d93906a845912062bfece6169ddbfc9a40838f5dce54df28cfcd3e8d40bd20d0c9e3f1607668c1fd088a6f44f00 languageName: node linkType: hard @@ -13258,17 +13258,17 @@ __metadata: languageName: node linkType: hard -"cross-undici-fetch@npm:^0.2.5": - version: 0.2.5 - resolution: "cross-undici-fetch@npm:0.2.5" +"cross-undici-fetch@npm:^0.3.0": + version: 0.3.6 + resolution: "cross-undici-fetch@npm:0.3.6" dependencies: abort-controller: ^3.0.0 form-data-encoder: ^1.7.1 formdata-node: ^4.3.1 node-fetch: ^2.6.7 - undici: ^5.0.0 + undici: ^5.1.0 web-streams-polyfill: ^3.2.0 - checksum: b009abcdbe637c36255de7a9d9d0a0038287fcc307a8767648d9100a1c36dc2a1f419b1dc9cf2cd8aaa0c61a52506b01d06d02cef5a2f9b959b7e97c9599d587 + checksum: 092d4f4f6d7aa541a53cf3edd4eb32c9a1ab137431b5ef6b7305c2725b2825e5d70099707e19c1f85b48ea28df3701df2d751cddc0e6479044e81eab62bca169 languageName: node linkType: hard @@ -29794,7 +29794,7 @@ __metadata: languageName: node linkType: hard -"undici@npm:5.0.0, undici@npm:^5.0.0": +"undici@npm:5.0.0": version: 5.0.0 resolution: "undici@npm:5.0.0" checksum: 381cff91b1c937edab4672e16d0aeeda6ba432aba7e958a9e5bc8bc1b8c0a5527919a82f4ae73d7bf7ee43e6b2ac28292c2fdefaaf6e69d4f7b3a1223cf5fd15 @@ -29808,6 +29808,13 @@ __metadata: languageName: node linkType: hard +"undici@npm:^5.0.0, undici@npm:^5.1.0": + version: 5.1.1 + resolution: "undici@npm:5.1.1" + checksum: 7902dffe78f913501b88a7bf1244d9d4b0bbfea3f81ff7c0a175d9f0e19616190432786d430aa2dc382455b0aa88f5844d6d753deec5573b4606358f7bf13de1 + languageName: node + linkType: hard + "unfetch@npm:^4.2.0": version: 4.2.0 resolution: "unfetch@npm:4.2.0" From 71c0967f097a589cb9940bd96725ffcc3607eec1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 20:17:34 +0900 Subject: [PATCH 03/14] fix(deps): update dependency cross-undici-fetch to v0.3.5 (#5398) --- packages/api/package.json | 2 +- packages/codemods/package.json | 2 +- packages/graphql-server/package.json | 2 +- packages/prerender/package.json | 2 +- packages/telemetry/package.json | 2 +- yarn.lock | 18 +++++++++--------- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 843fd3dd4da7..85e9a881a663 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -32,7 +32,7 @@ "dependencies": { "@babel/runtime-corejs3": "7.16.7", "@prisma/client": "3.12.0", - "cross-undici-fetch": "0.3.3", + "cross-undici-fetch": "0.3.5", "crypto-js": "4.1.1", "humanize-string": "2.1.0", "jsonwebtoken": "8.5.1", diff --git a/packages/codemods/package.json b/packages/codemods/package.json index 2908f6eee5d2..a7119f0c6246 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -28,7 +28,7 @@ "@babel/runtime-corejs3": "7.16.7", "@vscode/ripgrep": "1.14.2", "core-js": "3.22.2", - "cross-undici-fetch": "0.3.3", + "cross-undici-fetch": "0.3.5", "deepmerge": "4.2.2", "fast-glob": "3.2.11", "findup-sync": "5.0.0", diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 98fbd08ac303..c3f95e9b1a99 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -34,7 +34,7 @@ "@prisma/client": "3.12.0", "@redwoodjs/api": "1.2.0", "core-js": "3.22.2", - "cross-undici-fetch": "0.3.3", + "cross-undici-fetch": "0.3.5", "graphql": "16.3.0", "graphql-scalars": "1.17.0", "graphql-tag": "2.12.6", diff --git a/packages/prerender/package.json b/packages/prerender/package.json index acef8a6346fa..be1a3c4b961a 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -31,7 +31,7 @@ "@redwoodjs/web": "1.2.0", "babel-plugin-ignore-html-and-css-imports": "0.1.0", "cheerio": "1.0.0-rc.10", - "cross-undici-fetch": "0.3.3", + "cross-undici-fetch": "0.3.5", "mime-types": "2.1.35" }, "devDependencies": { diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 556dc4cb09be..026275a1189f 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -30,7 +30,7 @@ "@redwoodjs/internal": "1.2.0", "@redwoodjs/structure": "1.2.0", "ci-info": "3.3.0", - "cross-undici-fetch": "0.3.3", + "cross-undici-fetch": "0.3.5", "envinfo": "7.8.1", "systeminformation": "5.11.13", "uuid": "8.3.2", diff --git a/yarn.lock b/yarn.lock index f6043d9438db..4e89d44db3cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5854,7 +5854,7 @@ __metadata: "@types/md5": 2.3.2 "@types/split2": 3.2.1 aws-lambda: 1.0.7 - cross-undici-fetch: 0.3.3 + cross-undici-fetch: 0.3.5 crypto-js: 4.1.1 humanize-string: 2.1.0 jest: 27.5.1 @@ -5977,7 +5977,7 @@ __metadata: "@types/prettier": 2.6.0 "@vscode/ripgrep": 1.14.2 core-js: 3.22.2 - cross-undici-fetch: 0.3.3 + cross-undici-fetch: 0.3.5 deepmerge: 4.2.2 fast-glob: 3.2.11 findup-sync: 5.0.0 @@ -6148,7 +6148,7 @@ __metadata: "@types/uuid": 8.3.4 aws-lambda: 1.0.7 core-js: 3.22.2 - cross-undici-fetch: 0.3.3 + cross-undici-fetch: 0.3.5 graphql: 16.3.0 graphql-scalars: 1.17.0 graphql-tag: 2.12.6 @@ -6226,7 +6226,7 @@ __metadata: babel-plugin-ignore-html-and-css-imports: 0.1.0 babel-plugin-tester: 10.1.0 cheerio: 1.0.0-rc.10 - cross-undici-fetch: 0.3.3 + cross-undici-fetch: 0.3.5 jest: 27.5.1 mime-types: 2.1.35 typescript: 4.6.3 @@ -6319,7 +6319,7 @@ __metadata: "@types/uuid": 8.3.4 "@types/yargs": 16.0.4 ci-info: 3.3.0 - cross-undici-fetch: 0.3.3 + cross-undici-fetch: 0.3.5 envinfo: 7.8.1 jest: 27.5.1 systeminformation: 5.11.13 @@ -13230,9 +13230,9 @@ __metadata: languageName: node linkType: hard -"cross-undici-fetch@npm:0.3.3": - version: 0.3.3 - resolution: "cross-undici-fetch@npm:0.3.3" +"cross-undici-fetch@npm:0.3.5": + version: 0.3.5 + resolution: "cross-undici-fetch@npm:0.3.5" dependencies: abort-controller: ^3.0.0 form-data-encoder: ^1.7.1 @@ -13240,7 +13240,7 @@ __metadata: node-fetch: ^2.6.7 undici: ^5.1.0 web-streams-polyfill: ^3.2.0 - checksum: 9f1288056082fa9ce9bf775ef71f9f99fffe7d93906a845912062bfece6169ddbfc9a40838f5dce54df28cfcd3e8d40bd20d0c9e3f1607668c1fd088a6f44f00 + checksum: 1707586888f71e47601d29703f9169b74b9fb6826962f0b5e31822a63a618d8022b9b4a99b68cbf9132bdc715ecbdd3a35a6794bed25afeee5d8139eb3758bb3 languageName: node linkType: hard From 986a1c37eca2dcc3fbd216251ac13de4de7b6176 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 21:39:43 +0900 Subject: [PATCH 04/14] fix(deps): update dependency cross-undici-fetch to v0.3.6 (#5402) Co-authored-by: Renovate Bot Co-authored-by: Dominic Saadi <32992335+jtoar@users.noreply.github.com> --- packages/api/package.json | 2 +- packages/codemods/package.json | 2 +- packages/graphql-server/package.json | 2 +- packages/prerender/package.json | 2 +- packages/telemetry/package.json | 2 +- yarn.lock | 32 ++++++++-------------------- 6 files changed, 14 insertions(+), 28 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 85e9a881a663..6346caddf7f4 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -32,7 +32,7 @@ "dependencies": { "@babel/runtime-corejs3": "7.16.7", "@prisma/client": "3.12.0", - "cross-undici-fetch": "0.3.5", + "cross-undici-fetch": "0.3.6", "crypto-js": "4.1.1", "humanize-string": "2.1.0", "jsonwebtoken": "8.5.1", diff --git a/packages/codemods/package.json b/packages/codemods/package.json index a7119f0c6246..2c06a6efbbca 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -28,7 +28,7 @@ "@babel/runtime-corejs3": "7.16.7", "@vscode/ripgrep": "1.14.2", "core-js": "3.22.2", - "cross-undici-fetch": "0.3.5", + "cross-undici-fetch": "0.3.6", "deepmerge": "4.2.2", "fast-glob": "3.2.11", "findup-sync": "5.0.0", diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index c3f95e9b1a99..1b9647cff388 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -34,7 +34,7 @@ "@prisma/client": "3.12.0", "@redwoodjs/api": "1.2.0", "core-js": "3.22.2", - "cross-undici-fetch": "0.3.5", + "cross-undici-fetch": "0.3.6", "graphql": "16.3.0", "graphql-scalars": "1.17.0", "graphql-tag": "2.12.6", diff --git a/packages/prerender/package.json b/packages/prerender/package.json index be1a3c4b961a..76fafea57435 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -31,7 +31,7 @@ "@redwoodjs/web": "1.2.0", "babel-plugin-ignore-html-and-css-imports": "0.1.0", "cheerio": "1.0.0-rc.10", - "cross-undici-fetch": "0.3.5", + "cross-undici-fetch": "0.3.6", "mime-types": "2.1.35" }, "devDependencies": { diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 026275a1189f..68e33744aec1 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -30,7 +30,7 @@ "@redwoodjs/internal": "1.2.0", "@redwoodjs/structure": "1.2.0", "ci-info": "3.3.0", - "cross-undici-fetch": "0.3.5", + "cross-undici-fetch": "0.3.6", "envinfo": "7.8.1", "systeminformation": "5.11.13", "uuid": "8.3.2", diff --git a/yarn.lock b/yarn.lock index 4e89d44db3cf..2a61c5f8c27c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5854,7 +5854,7 @@ __metadata: "@types/md5": 2.3.2 "@types/split2": 3.2.1 aws-lambda: 1.0.7 - cross-undici-fetch: 0.3.5 + cross-undici-fetch: 0.3.6 crypto-js: 4.1.1 humanize-string: 2.1.0 jest: 27.5.1 @@ -5977,7 +5977,7 @@ __metadata: "@types/prettier": 2.6.0 "@vscode/ripgrep": 1.14.2 core-js: 3.22.2 - cross-undici-fetch: 0.3.5 + cross-undici-fetch: 0.3.6 deepmerge: 4.2.2 fast-glob: 3.2.11 findup-sync: 5.0.0 @@ -6148,7 +6148,7 @@ __metadata: "@types/uuid": 8.3.4 aws-lambda: 1.0.7 core-js: 3.22.2 - cross-undici-fetch: 0.3.5 + cross-undici-fetch: 0.3.6 graphql: 16.3.0 graphql-scalars: 1.17.0 graphql-tag: 2.12.6 @@ -6226,7 +6226,7 @@ __metadata: babel-plugin-ignore-html-and-css-imports: 0.1.0 babel-plugin-tester: 10.1.0 cheerio: 1.0.0-rc.10 - cross-undici-fetch: 0.3.5 + cross-undici-fetch: 0.3.6 jest: 27.5.1 mime-types: 2.1.35 typescript: 4.6.3 @@ -6319,7 +6319,7 @@ __metadata: "@types/uuid": 8.3.4 "@types/yargs": 16.0.4 ci-info: 3.3.0 - cross-undici-fetch: 0.3.5 + cross-undici-fetch: 0.3.6 envinfo: 7.8.1 jest: 27.5.1 systeminformation: 5.11.13 @@ -13230,9 +13230,9 @@ __metadata: languageName: node linkType: hard -"cross-undici-fetch@npm:0.3.5": - version: 0.3.5 - resolution: "cross-undici-fetch@npm:0.3.5" +"cross-undici-fetch@npm:0.3.6, cross-undici-fetch@npm:^0.3.0": + version: 0.3.6 + resolution: "cross-undici-fetch@npm:0.3.6" dependencies: abort-controller: ^3.0.0 form-data-encoder: ^1.7.1 @@ -13240,7 +13240,7 @@ __metadata: node-fetch: ^2.6.7 undici: ^5.1.0 web-streams-polyfill: ^3.2.0 - checksum: 1707586888f71e47601d29703f9169b74b9fb6826962f0b5e31822a63a618d8022b9b4a99b68cbf9132bdc715ecbdd3a35a6794bed25afeee5d8139eb3758bb3 + checksum: 092d4f4f6d7aa541a53cf3edd4eb32c9a1ab137431b5ef6b7305c2725b2825e5d70099707e19c1f85b48ea28df3701df2d751cddc0e6479044e81eab62bca169 languageName: node linkType: hard @@ -13258,20 +13258,6 @@ __metadata: languageName: node linkType: hard -"cross-undici-fetch@npm:^0.3.0": - version: 0.3.6 - resolution: "cross-undici-fetch@npm:0.3.6" - dependencies: - abort-controller: ^3.0.0 - form-data-encoder: ^1.7.1 - formdata-node: ^4.3.1 - node-fetch: ^2.6.7 - undici: ^5.1.0 - web-streams-polyfill: ^3.2.0 - checksum: 092d4f4f6d7aa541a53cf3edd4eb32c9a1ab137431b5ef6b7305c2725b2825e5d70099707e19c1f85b48ea28df3701df2d751cddc0e6479044e81eab62bca169 - languageName: node - linkType: hard - "crypt@npm:0.0.2": version: 0.0.2 resolution: "crypt@npm:0.0.2" From 38b6ce639dc2d70f525bd6ed3ce67706c292dd5f Mon Sep 17 00:00:00 2001 From: Dominic Saadi <32992335+jtoar@users.noreply.github.com> Date: Tue, 3 May 2022 02:00:00 +0900 Subject: [PATCH 05/14] v1.2.1 --- __fixtures__/test-project/api/package.json | 4 ++-- __fixtures__/test-project/package.json | 2 +- __fixtures__/test-project/web/package.json | 8 ++++---- lerna.json | 2 +- packages/api-server/package.json | 2 +- packages/api/package.json | 4 ++-- packages/auth/package.json | 2 +- packages/cli/package.json | 12 ++++++------ packages/codemods/package.json | 2 +- packages/core/package.json | 10 +++++----- packages/create-redwood-app/package.json | 6 +++--- .../create-redwood-app/template/api/package.json | 4 ++-- packages/create-redwood-app/template/package.json | 2 +- .../create-redwood-app/template/web/package.json | 6 +++--- packages/eslint-config/package.json | 4 ++-- packages/forms/package.json | 2 +- packages/graphql-server/package.json | 6 +++--- packages/internal/package.json | 4 ++-- packages/prerender/package.json | 12 ++++++------ packages/record/package.json | 2 +- packages/router/package.json | 4 ++-- packages/structure/package.json | 4 ++-- packages/telemetry/package.json | 6 +++--- packages/testing/package.json | 12 ++++++------ packages/web/package.json | 4 ++-- 25 files changed, 63 insertions(+), 63 deletions(-) diff --git a/__fixtures__/test-project/api/package.json b/__fixtures__/test-project/api/package.json index 848e4ca06206..0c658a9fc339 100644 --- a/__fixtures__/test-project/api/package.json +++ b/__fixtures__/test-project/api/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "@redwoodjs/api": "1.2.0", - "@redwoodjs/graphql-server": "1.2.0" + "@redwoodjs/api": "1.2.1", + "@redwoodjs/graphql-server": "1.2.1" } } diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json index 5826c22fca70..126c4e3990f7 100644 --- a/__fixtures__/test-project/package.json +++ b/__fixtures__/test-project/package.json @@ -8,7 +8,7 @@ ] }, "devDependencies": { - "@redwoodjs/core": "1.2.0", + "@redwoodjs/core": "1.2.1", "autoprefixer": "^10.4.4", "postcss": "^8.4.12", "postcss-loader": "^6.2.1", diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json index 134992b0b206..669a22e2960d 100644 --- a/__fixtures__/test-project/web/package.json +++ b/__fixtures__/test-project/web/package.json @@ -13,10 +13,10 @@ ] }, "dependencies": { - "@redwoodjs/auth": "1.2.0", - "@redwoodjs/forms": "1.2.0", - "@redwoodjs/router": "1.2.0", - "@redwoodjs/web": "1.2.0", + "@redwoodjs/auth": "1.2.1", + "@redwoodjs/forms": "1.2.1", + "@redwoodjs/router": "1.2.1", + "@redwoodjs/web": "1.2.1", "prop-types": "15.8.1", "react": "17.0.2", "react-dom": "17.0.2" diff --git a/lerna.json b/lerna.json index f19b630b092b..06c5cbcc98e5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.0", + "version": "1.2.1", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 213b37fde6d9..f0e6dfe3c949 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/api-server", - "version": "1.2.0", + "version": "1.2.1", "description": "Redwood's HTTP server for Serverless Functions", "repository": { "type": "git", diff --git a/packages/api/package.json b/packages/api/package.json index 6346caddf7f4..cf6ee81ddef8 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/api", - "version": "1.2.0", + "version": "1.2.1", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -46,7 +46,7 @@ "devDependencies": { "@babel/cli": "7.16.7", "@babel/core": "7.16.7", - "@redwoodjs/auth": "1.2.0", + "@redwoodjs/auth": "1.2.1", "@types/crypto-js": "4.1.1", "@types/jsonwebtoken": "8.5.8", "@types/md5": "2.3.2", diff --git a/packages/auth/package.json b/packages/auth/package.json index f7246c96b839..8376c18b1c8f 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth", - "version": "1.2.0", + "version": "1.2.1", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/cli/package.json b/packages/cli/package.json index a6d8683b3a9c..36d420ccc5c2 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/cli", - "version": "1.2.0", + "version": "1.2.1", "description": "The Redwood Command Line", "repository": { "type": "git", @@ -29,11 +29,11 @@ }, "dependencies": { "@prisma/sdk": "3.12.0", - "@redwoodjs/api-server": "1.2.0", - "@redwoodjs/internal": "1.2.0", - "@redwoodjs/prerender": "1.2.0", - "@redwoodjs/structure": "1.2.0", - "@redwoodjs/telemetry": "1.2.0", + "@redwoodjs/api-server": "1.2.1", + "@redwoodjs/internal": "1.2.1", + "@redwoodjs/prerender": "1.2.1", + "@redwoodjs/structure": "1.2.1", + "@redwoodjs/telemetry": "1.2.1", "boxen": "5.1.2", "camelcase": "6.3.0", "chalk": "4.1.2", diff --git a/packages/codemods/package.json b/packages/codemods/package.json index 2c06a6efbbca..78c68b5372ed 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/codemods", - "version": "1.2.0", + "version": "1.2.1", "description": "Codemods to ease upgrading a RedwoodJS Project", "repository": { "type": "git", diff --git a/packages/core/package.json b/packages/core/package.json index 8592948253f7..fba76b0f4561 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/core", - "version": "1.2.0", + "version": "1.2.1", "description": "Foundational packages and config required to build RedwoodJS.", "repository": { "type": "git", @@ -46,10 +46,10 @@ "@babel/preset-typescript": "7.16.7", "@babel/runtime-corejs3": "7.16.7", "@pmmmwh/react-refresh-webpack-plugin": "0.5.5", - "@redwoodjs/cli": "1.2.0", - "@redwoodjs/eslint-config": "1.2.0", - "@redwoodjs/internal": "1.2.0", - "@redwoodjs/testing": "1.2.0", + "@redwoodjs/cli": "1.2.1", + "@redwoodjs/eslint-config": "1.2.1", + "@redwoodjs/internal": "1.2.1", + "@redwoodjs/testing": "1.2.1", "babel-loader": "8.2.3", "babel-plugin-auto-import": "1.1.0", "babel-plugin-graphql-tag": "3.3.0", diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index 2557d87231b7..9181ba72d1d9 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -1,6 +1,6 @@ { "name": "create-redwood-app", - "version": "1.2.0", + "version": "1.2.1", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -24,8 +24,8 @@ "@babel/core": "7.16.7", "@babel/node": "7.16.7", "@babel/runtime-corejs3": "7.16.7", - "@redwoodjs/internal": "1.2.0", - "@redwoodjs/telemetry": "1.2.0", + "@redwoodjs/internal": "1.2.1", + "@redwoodjs/telemetry": "1.2.1", "chalk": "4.1.2", "check-node-version": "4.2.1", "execa": "5.1.1", diff --git a/packages/create-redwood-app/template/api/package.json b/packages/create-redwood-app/template/api/package.json index 848e4ca06206..0c658a9fc339 100644 --- a/packages/create-redwood-app/template/api/package.json +++ b/packages/create-redwood-app/template/api/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "@redwoodjs/api": "1.2.0", - "@redwoodjs/graphql-server": "1.2.0" + "@redwoodjs/api": "1.2.1", + "@redwoodjs/graphql-server": "1.2.1" } } diff --git a/packages/create-redwood-app/template/package.json b/packages/create-redwood-app/template/package.json index 52a946f09cd4..9df9a82548ee 100644 --- a/packages/create-redwood-app/template/package.json +++ b/packages/create-redwood-app/template/package.json @@ -8,7 +8,7 @@ ] }, "devDependencies": { - "@redwoodjs/core": "1.2.0" + "@redwoodjs/core": "1.2.1" }, "eslintConfig": { "extends": "@redwoodjs/eslint-config", diff --git a/packages/create-redwood-app/template/web/package.json b/packages/create-redwood-app/template/web/package.json index 8c42b5563ae6..2a2d6c568918 100644 --- a/packages/create-redwood-app/template/web/package.json +++ b/packages/create-redwood-app/template/web/package.json @@ -13,9 +13,9 @@ ] }, "dependencies": { - "@redwoodjs/forms": "1.2.0", - "@redwoodjs/router": "1.2.0", - "@redwoodjs/web": "1.2.0", + "@redwoodjs/forms": "1.2.1", + "@redwoodjs/router": "1.2.1", + "@redwoodjs/web": "1.2.1", "prop-types": "15.8.1", "react": "17.0.2", "react-dom": "17.0.2" diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 014d4262eac2..d94d55ada540 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/eslint-config", - "version": "1.2.0", + "version": "1.2.1", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -15,7 +15,7 @@ "@babel/core": "7.16.7", "@babel/eslint-parser": "7.16.5", "@babel/eslint-plugin": "7.16.5", - "@redwoodjs/internal": "1.2.0", + "@redwoodjs/internal": "1.2.1", "@typescript-eslint/eslint-plugin": "5.20.0", "@typescript-eslint/parser": "5.20.0", "eslint": "8.13.0", diff --git a/packages/forms/package.json b/packages/forms/package.json index 5e9c17571525..2f4a31856071 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/forms", - "version": "1.2.0", + "version": "1.2.1", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 1b9647cff388..4c5342df4f90 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/graphql-server", - "version": "1.2.0", + "version": "1.2.1", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -32,7 +32,7 @@ "@graphql-tools/utils": "8.6.9", "@graphql-yoga/common": "2.4.0", "@prisma/client": "3.12.0", - "@redwoodjs/api": "1.2.0", + "@redwoodjs/api": "1.2.1", "core-js": "3.22.2", "cross-undici-fetch": "0.3.6", "graphql": "16.3.0", @@ -47,7 +47,7 @@ "@babel/core": "7.16.7", "@envelop/testing": "4.3.1", "@envelop/types": "2.0.0", - "@redwoodjs/auth": "1.2.0", + "@redwoodjs/auth": "1.2.1", "@types/lodash.merge": "4.6.7", "@types/lodash.omitby": "4.6.7", "@types/uuid": "8.3.4", diff --git a/packages/internal/package.json b/packages/internal/package.json index 488b1355fa46..2c86a32bf35c 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/internal", - "version": "1.2.0", + "version": "1.2.1", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -40,7 +40,7 @@ "@graphql-codegen/typescript-operations": "2.3.5", "@graphql-codegen/typescript-react-apollo": "3.2.11", "@graphql-codegen/typescript-resolvers": "2.6.1", - "@redwoodjs/graphql-server": "1.2.0", + "@redwoodjs/graphql-server": "1.2.1", "babel-plugin-graphql-tag": "3.3.0", "babel-plugin-polyfill-corejs3": "0.5.0", "chalk": "4.1.2", diff --git a/packages/prerender/package.json b/packages/prerender/package.json index 76fafea57435..ce15e47b35f9 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/prerender", - "version": "1.2.0", + "version": "1.2.1", "description": "RedwoodJS prerender", "repository": { "type": "git", @@ -24,11 +24,11 @@ "test:watch": "yarn test --watch" }, "dependencies": { - "@redwoodjs/auth": "1.2.0", - "@redwoodjs/internal": "1.2.0", - "@redwoodjs/router": "1.2.0", - "@redwoodjs/structure": "1.2.0", - "@redwoodjs/web": "1.2.0", + "@redwoodjs/auth": "1.2.1", + "@redwoodjs/internal": "1.2.1", + "@redwoodjs/router": "1.2.1", + "@redwoodjs/structure": "1.2.1", + "@redwoodjs/web": "1.2.1", "babel-plugin-ignore-html-and-css-imports": "0.1.0", "cheerio": "1.0.0-rc.10", "cross-undici-fetch": "0.3.6", diff --git a/packages/record/package.json b/packages/record/package.json index 19c74d11808d..11f93c571e42 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/record", - "version": "1.2.0", + "version": "1.2.1", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/router/package.json b/packages/router/package.json index 98d76cd8f944..7c3a93b01c73 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/router", - "version": "1.2.0", + "version": "1.2.1", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -23,7 +23,7 @@ }, "dependencies": { "@reach/skip-nav": "0.16.0", - "@redwoodjs/auth": "1.2.0", + "@redwoodjs/auth": "1.2.1", "core-js": "3.22.2", "lodash.isequal": "4.5.0" }, diff --git a/packages/structure/package.json b/packages/structure/package.json index 5afe4268bac1..929524179134 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/structure", - "version": "1.2.0", + "version": "1.2.1", "description": "noun: the arrangement of and relations between the parts or elements of something complex", "repository": { "type": "git", @@ -31,7 +31,7 @@ }, "dependencies": { "@prisma/sdk": "3.12.0", - "@redwoodjs/internal": "1.2.0", + "@redwoodjs/internal": "1.2.1", "@types/line-column": "1.0.0", "camelcase": "6.3.0", "deepmerge": "4.2.2", diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 68e33744aec1..eab3cb8f04e4 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/telemetry", - "version": "1.2.0", + "version": "1.2.1", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -27,8 +27,8 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.16.7", - "@redwoodjs/internal": "1.2.0", - "@redwoodjs/structure": "1.2.0", + "@redwoodjs/internal": "1.2.1", + "@redwoodjs/structure": "1.2.1", "ci-info": "3.3.0", "cross-undici-fetch": "0.3.6", "envinfo": "7.8.1", diff --git a/packages/testing/package.json b/packages/testing/package.json index 770a7a23b667..931034bf48f0 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/testing", - "version": "1.2.0", + "version": "1.2.1", "description": "Tools, wrappers and configuration for testing a Redwood project.", "repository": { "type": "git", @@ -26,11 +26,11 @@ "test:watch": "yarn test --watch" }, "dependencies": { - "@redwoodjs/auth": "1.2.0", - "@redwoodjs/graphql-server": "1.2.0", - "@redwoodjs/internal": "1.2.0", - "@redwoodjs/router": "1.2.0", - "@redwoodjs/web": "1.2.0", + "@redwoodjs/auth": "1.2.1", + "@redwoodjs/graphql-server": "1.2.1", + "@redwoodjs/internal": "1.2.1", + "@redwoodjs/router": "1.2.1", + "@redwoodjs/web": "1.2.1", "@storybook/addon-a11y": "6.4.22", "@storybook/addon-essentials": "6.4.22", "@storybook/builder-webpack5": "6.4.22", diff --git a/packages/web/package.json b/packages/web/package.json index 9995e3cd1293..b0ac239dcbe9 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/web", - "version": "1.2.0", + "version": "1.2.1", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -38,7 +38,7 @@ "dependencies": { "@apollo/client": "3.5.10", "@babel/runtime-corejs3": "7.16.7", - "@redwoodjs/auth": "1.2.0", + "@redwoodjs/auth": "1.2.1", "graphql": "16.3.0", "graphql-tag": "2.12.6", "react-helmet-async": "1.3.0", From b8877d86aaa30daf3a5d44ee360531d12f4fa3c8 Mon Sep 17 00:00:00 2001 From: Dominic Saadi <32992335+jtoar@users.noreply.github.com> Date: Tue, 3 May 2022 02:30:09 +0900 Subject: [PATCH 06/14] Update yarn.lock --- yarn.lock | 100 ++++++++++++++++++++++++------------------------------ 1 file changed, 44 insertions(+), 56 deletions(-) diff --git a/yarn.lock b/yarn.lock index e92ea9d61d12..324b00f4d40c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5865,7 +5865,7 @@ __metadata: languageName: node linkType: hard -"@redwoodjs/api-server@1.2.0, @redwoodjs/api-server@workspace:packages/api-server": +"@redwoodjs/api-server@1.2.1, @redwoodjs/api-server@workspace:packages/api-server": version: 0.0.0-use.local resolution: "@redwoodjs/api-server@workspace:packages/api-server" dependencies: @@ -5902,7 +5902,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/api@1.2.0, @redwoodjs/api@workspace:packages/api": +"@redwoodjs/api@1.2.1, @redwoodjs/api@workspace:packages/api": version: 0.0.0-use.local resolution: "@redwoodjs/api@workspace:packages/api" dependencies: @@ -5910,7 +5910,7 @@ __metadata: "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 "@prisma/client": 3.13.0 - "@redwoodjs/auth": 1.2.0 + "@redwoodjs/auth": 1.2.1 "@types/crypto-js": 4.1.1 "@types/jsonwebtoken": 8.5.8 "@types/md5": 2.3.2 @@ -5948,7 +5948,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/auth@1.2.0, @redwoodjs/auth@workspace:packages/auth": +"@redwoodjs/auth@1.2.1, @redwoodjs/auth@workspace:packages/auth": version: 0.0.0-use.local resolution: "@redwoodjs/auth@workspace:packages/auth" dependencies: @@ -5975,18 +5975,18 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/cli@1.2.0, @redwoodjs/cli@workspace:packages/cli": +"@redwoodjs/cli@1.2.1, @redwoodjs/cli@workspace:packages/cli": version: 0.0.0-use.local resolution: "@redwoodjs/cli@workspace:packages/cli" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@prisma/sdk": 3.13.0 - "@redwoodjs/api-server": 1.2.0 - "@redwoodjs/internal": 1.2.0 - "@redwoodjs/prerender": 1.2.0 - "@redwoodjs/structure": 1.2.0 - "@redwoodjs/telemetry": 1.2.0 + "@redwoodjs/api-server": 1.2.1 + "@redwoodjs/internal": 1.2.1 + "@redwoodjs/prerender": 1.2.1 + "@redwoodjs/structure": 1.2.1 + "@redwoodjs/telemetry": 1.2.1 "@types/listr": 0.14.4 boxen: 5.1.2 camelcase: 6.3.0 @@ -6074,10 +6074,10 @@ __metadata: "@babel/preset-typescript": 7.16.7 "@babel/runtime-corejs3": 7.16.7 "@pmmmwh/react-refresh-webpack-plugin": 0.5.5 - "@redwoodjs/cli": 1.2.0 - "@redwoodjs/eslint-config": 1.2.0 - "@redwoodjs/internal": 1.2.0 - "@redwoodjs/testing": 1.2.0 + "@redwoodjs/cli": 1.2.1 + "@redwoodjs/eslint-config": 1.2.1 + "@redwoodjs/internal": 1.2.1 + "@redwoodjs/testing": 1.2.1 "@types/rimraf": 3.0.2 babel-loader: 8.2.3 babel-plugin-auto-import: 1.1.0 @@ -6130,7 +6130,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/eslint-config@1.2.0, @redwoodjs/eslint-config@workspace:packages/eslint-config": +"@redwoodjs/eslint-config@1.2.1, @redwoodjs/eslint-config@workspace:packages/eslint-config": version: 0.0.0-use.local resolution: "@redwoodjs/eslint-config@workspace:packages/eslint-config" dependencies: @@ -6138,7 +6138,7 @@ __metadata: "@babel/core": 7.16.7 "@babel/eslint-parser": 7.16.5 "@babel/eslint-plugin": 7.16.5 - "@redwoodjs/internal": 1.2.0 + "@redwoodjs/internal": 1.2.1 "@typescript-eslint/eslint-plugin": 5.21.0 "@typescript-eslint/parser": 5.21.0 eslint: 8.14.0 @@ -6185,7 +6185,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/graphql-server@1.2.0, @redwoodjs/graphql-server@workspace:packages/graphql-server": +"@redwoodjs/graphql-server@1.2.1, @redwoodjs/graphql-server@workspace:packages/graphql-server": version: 0.0.0-use.local resolution: "@redwoodjs/graphql-server@workspace:packages/graphql-server" dependencies: @@ -6203,8 +6203,8 @@ __metadata: "@graphql-tools/utils": 8.6.9 "@graphql-yoga/common": 2.4.0 "@prisma/client": 3.13.0 - "@redwoodjs/api": 1.2.0 - "@redwoodjs/auth": 1.2.0 + "@redwoodjs/api": 1.2.1 + "@redwoodjs/auth": 1.2.1 "@types/lodash.merge": 4.6.7 "@types/lodash.omitby": 4.6.7 "@types/uuid": 8.3.4 @@ -6212,7 +6212,6 @@ __metadata: core-js: 3.22.3 cross-undici-fetch: 0.3.6 graphql: 16.4.0 - graphql-scalars: 1.17.0 graphql-tag: 2.12.6 jest: 27.5.1 lodash.merge: 4.6.2 @@ -6222,7 +6221,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/internal@1.2.0, @redwoodjs/internal@workspace:packages/internal": +"@redwoodjs/internal@1.2.1, @redwoodjs/internal@workspace:packages/internal": version: 0.0.0-use.local resolution: "@redwoodjs/internal@workspace:packages/internal" dependencies: @@ -6240,7 +6239,7 @@ __metadata: "@graphql-codegen/typescript-operations": 2.3.5 "@graphql-codegen/typescript-react-apollo": 3.2.11 "@graphql-codegen/typescript-resolvers": 2.6.1 - "@redwoodjs/graphql-server": 1.2.0 + "@redwoodjs/graphql-server": 1.2.1 "@types/babel-plugin-tester": 9.0.4 "@types/babel__core": 7.1.19 "@types/findup-sync": 4.0.2 @@ -6273,17 +6272,17 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/prerender@1.2.0, @redwoodjs/prerender@workspace:packages/prerender": +"@redwoodjs/prerender@1.2.1, @redwoodjs/prerender@workspace:packages/prerender": version: 0.0.0-use.local resolution: "@redwoodjs/prerender@workspace:packages/prerender" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 - "@redwoodjs/auth": 1.2.0 - "@redwoodjs/internal": 1.2.0 - "@redwoodjs/router": 1.2.0 - "@redwoodjs/structure": 1.2.0 - "@redwoodjs/web": 1.2.0 + "@redwoodjs/auth": 1.2.1 + "@redwoodjs/internal": 1.2.1 + "@redwoodjs/router": 1.2.1 + "@redwoodjs/structure": 1.2.1 + "@redwoodjs/web": 1.2.1 "@types/mime-types": 2.1.1 babel-plugin-ignore-html-and-css-imports: 0.1.0 babel-plugin-tester: 10.1.0 @@ -6312,14 +6311,14 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/router@1.2.0, @redwoodjs/router@workspace:packages/router": +"@redwoodjs/router@1.2.1, @redwoodjs/router@workspace:packages/router": version: 0.0.0-use.local resolution: "@redwoodjs/router@workspace:packages/router" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@reach/skip-nav": 0.16.0 - "@redwoodjs/auth": 1.2.0 + "@redwoodjs/auth": 1.2.1 "@types/lodash.isequal": 4.5.6 core-js: 3.22.3 jest: 27.5.1 @@ -6331,14 +6330,14 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/structure@1.2.0, @redwoodjs/structure@workspace:packages/structure": +"@redwoodjs/structure@1.2.1, @redwoodjs/structure@workspace:packages/structure": version: 0.0.0-use.local resolution: "@redwoodjs/structure@workspace:packages/structure" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@prisma/sdk": 3.13.0 - "@redwoodjs/internal": 1.2.0 + "@redwoodjs/internal": 1.2.1 "@types/fs-extra": 9.0.13 "@types/line-column": 1.0.0 "@types/lodash": 4.14.182 @@ -6368,15 +6367,15 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/telemetry@1.2.0, @redwoodjs/telemetry@workspace:packages/telemetry": +"@redwoodjs/telemetry@1.2.1, @redwoodjs/telemetry@workspace:packages/telemetry": version: 0.0.0-use.local resolution: "@redwoodjs/telemetry@workspace:packages/telemetry" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/internal": 1.2.0 - "@redwoodjs/structure": 1.2.0 + "@redwoodjs/internal": 1.2.1 + "@redwoodjs/structure": 1.2.1 "@types/envinfo": 7.8.1 "@types/uuid": 8.3.4 "@types/yargs": 16.0.4 @@ -6390,17 +6389,17 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/testing@1.2.0, @redwoodjs/testing@workspace:packages/testing": +"@redwoodjs/testing@1.2.1, @redwoodjs/testing@workspace:packages/testing": version: 0.0.0-use.local resolution: "@redwoodjs/testing@workspace:packages/testing" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 - "@redwoodjs/auth": 1.2.0 - "@redwoodjs/graphql-server": 1.2.0 - "@redwoodjs/internal": 1.2.0 - "@redwoodjs/router": 1.2.0 - "@redwoodjs/web": 1.2.0 + "@redwoodjs/auth": 1.2.1 + "@redwoodjs/graphql-server": 1.2.1 + "@redwoodjs/internal": 1.2.1 + "@redwoodjs/router": 1.2.1 + "@redwoodjs/web": 1.2.1 "@storybook/addon-a11y": 6.4.22 "@storybook/addon-essentials": 6.4.22 "@storybook/builder-webpack5": 6.4.22 @@ -6427,7 +6426,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/web@1.2.0, @redwoodjs/web@workspace:packages/web": +"@redwoodjs/web@1.2.1, @redwoodjs/web@workspace:packages/web": version: 0.0.0-use.local resolution: "@redwoodjs/web@workspace:packages/web" dependencies: @@ -6435,7 +6434,7 @@ __metadata: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/auth": 1.2.0 + "@redwoodjs/auth": 1.2.1 "@testing-library/jest-dom": 5.16.4 "@testing-library/react": 12.1.5 "@types/react": 17.0.44 @@ -13249,8 +13248,8 @@ __metadata: "@babel/core": 7.16.7 "@babel/node": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/internal": 1.2.0 - "@redwoodjs/telemetry": 1.2.0 + "@redwoodjs/internal": 1.2.1 + "@redwoodjs/telemetry": 1.2.1 chalk: 4.1.2 check-node-version: 4.2.1 execa: 5.1.1 @@ -17642,17 +17641,6 @@ __metadata: languageName: node linkType: hard -"graphql-scalars@npm:1.17.0": - version: 1.17.0 - resolution: "graphql-scalars@npm:1.17.0" - dependencies: - tslib: ~2.3.0 - peerDependencies: - graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 - checksum: a0ed295b265fa235027c84a665eb5cf8cd289c5896c11f8630287837bea4aaed72bc0f1cf026b01a1f5b6c9390620fa7a51a3ff74fedd909ebc68415082576d5 - languageName: node - linkType: hard - "graphql-sse@npm:^1.0.1": version: 1.0.6 resolution: "graphql-sse@npm:1.0.6" From 976c82436c57441c1b459845b587bc44dce593ae Mon Sep 17 00:00:00 2001 From: Dominic Saadi <32992335+jtoar@users.noreply.github.com> Date: Tue, 3 May 2022 03:11:53 +0900 Subject: [PATCH 07/14] Add graphql-scalars to graphql-server (#5408) --- packages/graphql-server/package.json | 1 + yarn.lock | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 3f9f26ae503e..53d4cedfdec0 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -36,6 +36,7 @@ "core-js": "3.22.3", "cross-undici-fetch": "0.3.6", "graphql": "16.4.0", + "graphql-scalars": "1.17.0", "graphql-tag": "2.12.6", "lodash.merge": "4.6.2", "lodash.omitby": "4.6.0", diff --git a/yarn.lock b/yarn.lock index 324b00f4d40c..38d25f892881 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6212,6 +6212,7 @@ __metadata: core-js: 3.22.3 cross-undici-fetch: 0.3.6 graphql: 16.4.0 + graphql-scalars: 1.17.0 graphql-tag: 2.12.6 jest: 27.5.1 lodash.merge: 4.6.2 @@ -17641,6 +17642,17 @@ __metadata: languageName: node linkType: hard +"graphql-scalars@npm:1.17.0": + version: 1.17.0 + resolution: "graphql-scalars@npm:1.17.0" + dependencies: + tslib: ~2.3.0 + peerDependencies: + graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 + checksum: a0ed295b265fa235027c84a665eb5cf8cd289c5896c11f8630287837bea4aaed72bc0f1cf026b01a1f5b6c9390620fa7a51a3ff74fedd909ebc68415082576d5 + languageName: node + linkType: hard + "graphql-sse@npm:^1.0.1": version: 1.0.6 resolution: "graphql-sse@npm:1.0.6" From 473365c223f9f143fd76bc846662dcbac3c716b8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 18:44:38 +0000 Subject: [PATCH 08/14] fix(deps): update typescript-eslint monorepo to v5.22.0 (#5410) Co-authored-by: Renovate Bot --- packages/eslint-config/package.json | 4 +- yarn.lock | 98 ++++++++++++++--------------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 749fc35e0394..f4800cb59c8f 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -16,8 +16,8 @@ "@babel/eslint-parser": "7.16.5", "@babel/eslint-plugin": "7.16.5", "@redwoodjs/internal": "1.2.1", - "@typescript-eslint/eslint-plugin": "5.21.0", - "@typescript-eslint/parser": "5.21.0", + "@typescript-eslint/eslint-plugin": "5.22.0", + "@typescript-eslint/parser": "5.22.0", "eslint": "8.14.0", "eslint-config-prettier": "8.5.0", "eslint-import-resolver-babel-module": "5.3.1", diff --git a/yarn.lock b/yarn.lock index 38d25f892881..31bf70ae3b5b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6139,8 +6139,8 @@ __metadata: "@babel/eslint-parser": 7.16.5 "@babel/eslint-plugin": 7.16.5 "@redwoodjs/internal": 1.2.1 - "@typescript-eslint/eslint-plugin": 5.21.0 - "@typescript-eslint/parser": 5.21.0 + "@typescript-eslint/eslint-plugin": 5.22.0 + "@typescript-eslint/parser": 5.22.0 eslint: 8.14.0 eslint-config-prettier: 8.5.0 eslint-import-resolver-babel-module: 5.3.1 @@ -9112,13 +9112,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.21.0" +"@typescript-eslint/eslint-plugin@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.22.0" dependencies: - "@typescript-eslint/scope-manager": 5.21.0 - "@typescript-eslint/type-utils": 5.21.0 - "@typescript-eslint/utils": 5.21.0 + "@typescript-eslint/scope-manager": 5.22.0 + "@typescript-eslint/type-utils": 5.22.0 + "@typescript-eslint/utils": 5.22.0 debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 @@ -9131,42 +9131,42 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: ef97696f1acacf1f9c6a12a27343c16cdbde26dfdd41a272fd9bb3599150567450387f5c0e7638c0f564d4a8af6b2ca77d60fc83dea0d4f0ee04a9da19ea3524 + checksum: 65ac7404e482292e837c4fbac74c9b7ed9d5c770936bd503e8f806c05ca9f0e62528fb4bc1ddcca13ad414bee4309711df360ff4078dd2a73997cd5d3f8dfa81 languageName: node linkType: hard -"@typescript-eslint/parser@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/parser@npm:5.21.0" +"@typescript-eslint/parser@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/parser@npm:5.22.0" dependencies: - "@typescript-eslint/scope-manager": 5.21.0 - "@typescript-eslint/types": 5.21.0 - "@typescript-eslint/typescript-estree": 5.21.0 + "@typescript-eslint/scope-manager": 5.22.0 + "@typescript-eslint/types": 5.22.0 + "@typescript-eslint/typescript-estree": 5.22.0 debug: ^4.3.2 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 9ffd37b950ced007159813a87c7d679f43a860ac285db9214692320ad67917dfa604500ed35a0d7630e95e7949bf1eb2b363daf7db8b508126f3e07b1672ceb6 + checksum: 32c0e144dd96c2919f9867d77229479fbc1fa5a9a114d23a01dd97537abac035962fcebe2b125a6d18bbb643e26d874ff0837f9da324f86c097fb5f29c0dc5dd languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/scope-manager@npm:5.21.0" +"@typescript-eslint/scope-manager@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/scope-manager@npm:5.22.0" dependencies: - "@typescript-eslint/types": 5.21.0 - "@typescript-eslint/visitor-keys": 5.21.0 - checksum: 59551d5f3625d8465f403a5e6b587766136000ebbb6ebed80f48801047dbbab49a9cda2884a2ed1b6eaa90ef980833e120a65db477240076fd9eda5076137370 + "@typescript-eslint/types": 5.22.0 + "@typescript-eslint/visitor-keys": 5.22.0 + checksum: 1b30217f3bda9136c2cdaba6b45cd7de4e2d9ab82d524176d76c1edb7491f641292bf5e16a45d8ce0cd5d13b2f69b19f5be3d9e8058cac0d8f38770051446010 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/type-utils@npm:5.21.0" +"@typescript-eslint/type-utils@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/type-utils@npm:5.22.0" dependencies: - "@typescript-eslint/utils": 5.21.0 + "@typescript-eslint/utils": 5.22.0 debug: ^4.3.2 tsutils: ^3.21.0 peerDependencies: @@ -9174,23 +9174,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 4f4349cdd9b305b68529ea2d4cdd7e6c7f923644c02296b1d471ed69abe2554db83383c270196aa3e4e27d57ad9f020f71452a880cd4b06f01de61e52fa85969 + checksum: 614151b0cb7e870e49ba021b432eab02dc1aca8ddf4840c17572c6ce62a945a92137e075f3643583bd11dd812ec415f85a84ada5749b22ca40ec545bec5228eb languageName: node linkType: hard -"@typescript-eslint/types@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/types@npm:5.21.0" - checksum: 24732d2783ff5ca4309b2a1839611fd4d929957f62fa75dff875993fb4c95b4f390ee4ae9dde276333f840112cc918ff6bdbcdf6a190c41c96481d6584016d74 +"@typescript-eslint/types@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/types@npm:5.22.0" + checksum: b6bccb75307e71e0372b7b12c3043e54f072dfac975f056dd3ac84bebcc3ddc540bafe7abea7fefc5b67d886e471c07ecee31efd2082b2e02dfa301e2a0b5221 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.21.0" +"@typescript-eslint/typescript-estree@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.22.0" dependencies: - "@typescript-eslint/types": 5.21.0 - "@typescript-eslint/visitor-keys": 5.21.0 + "@typescript-eslint/types": 5.22.0 + "@typescript-eslint/visitor-keys": 5.22.0 debug: ^4.3.2 globby: ^11.0.4 is-glob: ^4.0.3 @@ -9199,33 +9199,33 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 7f8fe85601665492f2c31699fd26af70c4cb8df3430f4644603ebf014bd2a323c420cc1ec3887e2e9046308dad32ef19ccdf44c7171a0a8d1b883da3b66e945c + checksum: 85226e1a1bf920fe043b249946def11857b098b43c70f780b557a37610aa0d826af89da1c326e942089e2517004045a9c6b9fcc2d4e4e9b3352c4b93275543fd languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/utils@npm:5.21.0" +"@typescript-eslint/utils@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/utils@npm:5.22.0" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.21.0 - "@typescript-eslint/types": 5.21.0 - "@typescript-eslint/typescript-estree": 5.21.0 + "@typescript-eslint/scope-manager": 5.22.0 + "@typescript-eslint/types": 5.22.0 + "@typescript-eslint/typescript-estree": 5.22.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 68d06fca060a568c7b21e580f6fb441cb88349060a46dd68be277e0872816a7cda9b7b36064c6633466419eca2207c9281d90a31158785bf7e0694e172fc4ac7 + checksum: 28fca7acb0489b023b72a14b4ea65c3f091d360dd545d5b3678426b9b54efed7bcc86f623b67b8f046f6d84e686fbae4a20cdc12073bc00a0e55e14fff8b505b languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.21.0": - version: 5.21.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.21.0" +"@typescript-eslint/visitor-keys@npm:5.22.0": + version: 5.22.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.22.0" dependencies: - "@typescript-eslint/types": 5.21.0 + "@typescript-eslint/types": 5.22.0 eslint-visitor-keys: ^3.0.0 - checksum: f0fce55915ce62d68e65272afc634eac6e72425a7a26b9d1d3c58a2ab65f94b7cc2092354fca56936b8bff864745094b5306763e12b76be1c848caedbba3100e + checksum: 0f0a222be96550b555c2899cf93aa24898ddf1a56f1370ce9a5b103cc7c73ac471be28a02102d3169f9a01737d0aae14041fa1dd6caf7bda20aa1416a270248e languageName: node linkType: hard From 8b66b3ad9e8fb239c853fb155e4f5bbf6ca8afd1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 19:08:51 +0000 Subject: [PATCH 09/14] fix(deps): update dependency core-js to v3.22.4 (#5409) Co-authored-by: Renovate Bot --- package.json | 2 +- packages/cli/package.json | 2 +- packages/codemods/package.json | 2 +- packages/core/package.json | 2 +- packages/graphql-server/package.json | 2 +- packages/internal/package.json | 2 +- packages/record/package.json | 2 +- packages/router/package.json | 2 +- yarn.lock | 24 ++++++++++++------------ 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index c29aff36191a..00d5194a75da 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "babel-plugin-auto-import": "1.1.0", "babel-plugin-remove-code": "0.0.6", "boxen": "5.1.2", - "core-js": "3.22.3", + "core-js": "3.22.4", "cypress": "9.6.0", "cypress-wait-until": "1.7.2", "eslint": "8.14.0", diff --git a/packages/cli/package.json b/packages/cli/package.json index 5ccfa92581d8..bf3a1ccc9493 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -39,7 +39,7 @@ "chalk": "4.1.2", "concurrently": "7.1.0", "configstore": "3.1.5", - "core-js": "3.22.3", + "core-js": "3.22.4", "cross-env": "7.0.3", "decamelize": "5.0.0", "dotenv-defaults": "5.0.0", diff --git a/packages/codemods/package.json b/packages/codemods/package.json index c8ea90f3102e..a4d9700cf4e3 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -27,7 +27,7 @@ "@babel/plugin-transform-typescript": "7.16.7", "@babel/runtime-corejs3": "7.16.7", "@vscode/ripgrep": "1.14.2", - "core-js": "3.22.3", + "core-js": "3.22.4", "cross-undici-fetch": "0.3.6", "deepmerge": "4.2.2", "fast-glob": "3.2.11", diff --git a/packages/core/package.json b/packages/core/package.json index 6286f7e0fe90..e80b1e0ae862 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -57,7 +57,7 @@ "babel-plugin-module-resolver": "4.1.0", "babel-timing": "0.9.1", "copy-webpack-plugin": "10.2.4", - "core-js": "3.22.3", + "core-js": "3.22.4", "css-loader": "6.7.1", "css-minimizer-webpack-plugin": "3.4.1", "dotenv-webpack": "7.1.0", diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 53d4cedfdec0..b56996d2d671 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -33,7 +33,7 @@ "@graphql-yoga/common": "2.4.0", "@prisma/client": "3.13.0", "@redwoodjs/api": "1.2.1", - "core-js": "3.22.3", + "core-js": "3.22.4", "cross-undici-fetch": "0.3.6", "graphql": "16.4.0", "graphql-scalars": "1.17.0", diff --git a/packages/internal/package.json b/packages/internal/package.json index a52ff14b89e1..d304885b0567 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -44,7 +44,7 @@ "babel-plugin-graphql-tag": "3.3.0", "babel-plugin-polyfill-corejs3": "0.5.0", "chalk": "4.1.2", - "core-js": "3.22.3", + "core-js": "3.22.4", "deepmerge": "4.2.2", "esbuild": "0.14.38", "fast-glob": "3.2.11", diff --git a/packages/record/package.json b/packages/record/package.json index 9960aa7a8d2c..a1505993bc5a 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -28,7 +28,7 @@ }, "dependencies": { "@prisma/client": "3.13.0", - "core-js": "3.22.3" + "core-js": "3.22.4" }, "devDependencies": { "@babel/cli": "7.16.7", diff --git a/packages/router/package.json b/packages/router/package.json index 2f7d911c7a44..b698e9160d9e 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -24,7 +24,7 @@ "dependencies": { "@reach/skip-nav": "0.16.0", "@redwoodjs/auth": "1.2.1", - "core-js": "3.22.3", + "core-js": "3.22.4", "lodash.isequal": "4.5.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 31bf70ae3b5b..120ccf84fd36 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5993,7 +5993,7 @@ __metadata: chalk: 4.1.2 concurrently: 7.1.0 configstore: 3.1.5 - core-js: 3.22.3 + core-js: 3.22.4 cross-env: 7.0.3 decamelize: 5.0.0 dotenv-defaults: 5.0.0 @@ -6038,7 +6038,7 @@ __metadata: "@types/jscodeshift": 0.11.5 "@types/prettier": 2.6.0 "@vscode/ripgrep": 1.14.2 - core-js: 3.22.3 + core-js: 3.22.4 cross-undici-fetch: 0.3.6 deepmerge: 4.2.2 fast-glob: 3.2.11 @@ -6086,7 +6086,7 @@ __metadata: babel-plugin-module-resolver: 4.1.0 babel-timing: 0.9.1 copy-webpack-plugin: 10.2.4 - core-js: 3.22.3 + core-js: 3.22.4 css-loader: 6.7.1 css-minimizer-webpack-plugin: 3.4.1 dotenv-webpack: 7.1.0 @@ -6209,7 +6209,7 @@ __metadata: "@types/lodash.omitby": 4.6.7 "@types/uuid": 8.3.4 aws-lambda: 1.0.7 - core-js: 3.22.3 + core-js: 3.22.4 cross-undici-fetch: 0.3.6 graphql: 16.4.0 graphql-scalars: 1.17.0 @@ -6250,7 +6250,7 @@ __metadata: babel-plugin-polyfill-corejs3: 0.5.0 babel-plugin-tester: 10.1.0 chalk: 4.1.2 - core-js: 3.22.3 + core-js: 3.22.4 deepmerge: 4.2.2 esbuild: 0.14.38 fast-glob: 3.2.11 @@ -6306,7 +6306,7 @@ __metadata: "@babel/core": 7.16.7 "@prisma/client": 3.13.0 "@prisma/sdk": 3.13.0 - core-js: 3.22.3 + core-js: 3.22.4 esbuild: 0.14.38 jest: 27.5.1 languageName: unknown @@ -6321,7 +6321,7 @@ __metadata: "@reach/skip-nav": 0.16.0 "@redwoodjs/auth": 1.2.1 "@types/lodash.isequal": 4.5.6 - core-js: 3.22.3 + core-js: 3.22.4 jest: 27.5.1 lodash.isequal: 4.5.0 prop-types: 15.8.1 @@ -13083,10 +13083,10 @@ __metadata: languageName: node linkType: hard -"core-js@npm:3.22.3, core-js@npm:^3.0.4, core-js@npm:^3.18.3, core-js@npm:^3.19.0, core-js@npm:^3.20.3, core-js@npm:^3.6.5, core-js@npm:^3.8.2": - version: 3.22.3 - resolution: "core-js@npm:3.22.3" - checksum: 9a0745f525bd69dc495c46179f9d8751d6260c284988bfea292a169d72503300901f367c0d8743cdd1c46045b0cbd6e4f6a30771779ee77b230637425994f6ab +"core-js@npm:3.22.4, core-js@npm:^3.0.4, core-js@npm:^3.18.3, core-js@npm:^3.19.0, core-js@npm:^3.20.3, core-js@npm:^3.6.5, core-js@npm:^3.8.2": + version: 3.22.4 + resolution: "core-js@npm:3.22.4" + checksum: 2f4bcce914fb0798e68fe8f6a2122398fd2f7a6d7085924b6b05795d8eead1c1a759c2cde92c4868c9800d682c22d3fc6348bc06017b46100ac6567922d8125d languageName: node linkType: hard @@ -27043,7 +27043,7 @@ __metadata: babel-plugin-auto-import: 1.1.0 babel-plugin-remove-code: 0.0.6 boxen: 5.1.2 - core-js: 3.22.3 + core-js: 3.22.4 cypress: 9.6.0 cypress-wait-until: 1.7.2 eslint: 8.14.0 From 34d310a70bdc1137da80f803efa08421cdf3bf91 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Mon, 2 May 2022 22:39:11 +0200 Subject: [PATCH 10/14] codegen graphql schema (#5213) * codegen: Cleanup * graphqlSchema codegen * Readd commented code * Test custom error message * Remove unneeded test files * More cleanup * Remove unnecessary TS code * Remove empty file * Improve test readability * Add link to docs * Fix tests * Some more empty lines * Remove duplicated "Schema loading failed" * Even more blank lines * \n * Add suggestions * Tweak help text * Fix test Co-authored-by: Dominic Saadi Co-authored-by: Dominic Saadi <32992335+jtoar@users.noreply.github.com> --- .../__snapshots__/graphqlSchema.test.ts.snap | 44 +++++ .../bookshelf/api/db/schema.prisma | 21 +++ .../src/directives/requireAuth/requireAuth.js | 18 ++ .../api/src/directives/skipAuth/skipAuth.js | 13 ++ .../bookshelf/api/src/graphql/books.sdl.ts | 29 ++++ .../bookshelf/api/src/lib/db.js | 6 + .../graphqlCodeGen/bookshelf/redwood.toml | 10 ++ .../src/__tests__/graphqlCodeGen.test.ts | 17 -- .../src/__tests__/graphqlSchema.test.ts | 93 +++++++++++ packages/internal/src/generate/generate.ts | 4 +- .../internal/src/generate/graphqlSchema.ts | 156 +++++++++++++----- 11 files changed, 346 insertions(+), 65 deletions(-) create mode 100644 packages/internal/src/__tests__/__snapshots__/graphqlSchema.test.ts.snap create mode 100644 packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/db/schema.prisma create mode 100644 packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/directives/requireAuth/requireAuth.js create mode 100644 packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/directives/skipAuth/skipAuth.js create mode 100644 packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/graphql/books.sdl.ts create mode 100644 packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/lib/db.js create mode 100644 packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/redwood.toml create mode 100644 packages/internal/src/__tests__/graphqlSchema.test.ts diff --git a/packages/internal/src/__tests__/__snapshots__/graphqlSchema.test.ts.snap b/packages/internal/src/__tests__/__snapshots__/graphqlSchema.test.ts.snap new file mode 100644 index 000000000000..2a6840256df5 --- /dev/null +++ b/packages/internal/src/__tests__/__snapshots__/graphqlSchema.test.ts.snap @@ -0,0 +1,44 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Generates GraphQL schema 1`] = ` +"directive @requireAuth(roles: [String]) on FIELD_DEFINITION + +directive @skipAuth on FIELD_DEFINITION + +scalar BigInt + +scalar Date + +scalar DateTime + +scalar JSON + +scalar JSONObject + +type Mutation { + createTodo(body: String!): Todo + renameTodo(body: String!, id: Int!): Todo + updateTodoStatus(id: Int!, status: String!): Todo +} + +type Query { + currentUser: JSON + redwood: Redwood + todos: [Todo] + todosCount: Int! +} + +type Redwood { + currentUser: JSON + prismaVersion: String + version: String +} + +scalar Time + +type Todo { + body: String! + id: Int! + status: String! +}" +`; diff --git a/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/db/schema.prisma b/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/db/schema.prisma new file mode 100644 index 000000000000..86078a61db0f --- /dev/null +++ b/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/db/schema.prisma @@ -0,0 +1,21 @@ +datasource sqlite { + url = "file:./dev.sqlite" + provider = "sqlite" +} + +generator photonjs { + provider = "prisma-client-js" +} + +model Book { + id Int @id @default(autoincrement()) + title String @unique + Shelf Shelf? @relation(fields: [shelfId], references: [id]) + shelfId Int? +} + +model Shelf { + id Int @id @default(autoincrement()) + name String @unique + books Book[] +} diff --git a/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/directives/requireAuth/requireAuth.js b/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/directives/requireAuth/requireAuth.js new file mode 100644 index 000000000000..dfe68035c1ca --- /dev/null +++ b/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/directives/requireAuth/requireAuth.js @@ -0,0 +1,18 @@ +import gql from 'graphql-tag' + +import { createValidatorDirective } from '@redwoodjs/graphql-server' + +import { requireAuth as applicationRequireAuth } from 'src/lib/auth' + +export const schema = gql` + directive @requireAuth(roles: [String]) on FIELD_DEFINITION +` + +const validate = ({ directiveArgs }) => { + const { roles } = directiveArgs + applicationRequireAuth({ roles }) +} + +const requireAuth = createValidatorDirective(schema, validate) + +export default requireAuth diff --git a/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/directives/skipAuth/skipAuth.js b/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/directives/skipAuth/skipAuth.js new file mode 100644 index 000000000000..9a6d099f951a --- /dev/null +++ b/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/directives/skipAuth/skipAuth.js @@ -0,0 +1,13 @@ +import gql from 'graphql-tag' + +import { createValidatorDirective } from '@redwoodjs/graphql-server' + +export const schema = gql` + directive @skipAuth on FIELD_DEFINITION +` + +const skipAuth = createValidatorDirective(schema, () => { + return +}) + +export default skipAuth diff --git a/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/graphql/books.sdl.ts b/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/graphql/books.sdl.ts new file mode 100644 index 000000000000..9911ad5f382c --- /dev/null +++ b/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/graphql/books.sdl.ts @@ -0,0 +1,29 @@ +export const schema = gql` + type Book { + id: Int! + title: String! + Shelf: Shelf + shelfId: Int + } + + type Query { + books: [Book!]! @requireAuth + book(id: Int!): Book @requireAuth + } + + input CreateBookInput { + title: String! + shelfId: Int + } + + input UpdateBookInput { + title: String + shelfId: Int + } + + type Mutation { + createBook(input: CreateBookInput!): Book! @requireAuth + updateBook(id: Int!, input: UpdateBookInput!): Book! @requireAuth + deleteBook(id: Int!): Book! @requireAuth + } +` diff --git a/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/lib/db.js b/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/lib/db.js new file mode 100644 index 000000000000..465626a85be0 --- /dev/null +++ b/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/api/src/lib/db.js @@ -0,0 +1,6 @@ +// See https://www.prisma.io/docs/reference/tools-and-interfaces/prisma-client/constructor +// for options. + +import { PrismaClient } from '@prisma/client' + +export const db = new PrismaClient() diff --git a/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/redwood.toml b/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/redwood.toml new file mode 100644 index 000000000000..f68d0d5de4db --- /dev/null +++ b/packages/internal/src/__tests__/fixtures/graphqlCodeGen/bookshelf/redwood.toml @@ -0,0 +1,10 @@ +[web] + port = 8910 + apiProxyPath = "/api/functions" + +[api] + port = 8911 + [api.paths] + functions = './api/src/functions' + graphql = './api/src/graphql' + generated = './api/generated' diff --git a/packages/internal/src/__tests__/graphqlCodeGen.test.ts b/packages/internal/src/__tests__/graphqlCodeGen.test.ts index b967d279e270..503487817cd1 100644 --- a/packages/internal/src/__tests__/graphqlCodeGen.test.ts +++ b/packages/internal/src/__tests__/graphqlCodeGen.test.ts @@ -1,20 +1,3 @@ -// jest.mock('fs', () => { -// const actual = jest.requireActual('fs') - -// return { -// ...actual, -// mkdirSync: () => {}, -// writeFileSync: (target, contents) => { -// // if (!global.mockFs) { -// // return actual.writeFileSync.call(null, target, contents) -// // } -// }, -// writeFileSyncActual: (target, contents) => { -// return actual.writeFileSync.call(null, target, contents) -// }, -// } -// }) - import fs from 'fs' import path from 'path' diff --git a/packages/internal/src/__tests__/graphqlSchema.test.ts b/packages/internal/src/__tests__/graphqlSchema.test.ts new file mode 100644 index 000000000000..c215864e129c --- /dev/null +++ b/packages/internal/src/__tests__/graphqlSchema.test.ts @@ -0,0 +1,93 @@ +import fs from 'fs' +import path from 'path' + +import chalk from 'chalk' +import terminalLink from 'terminal-link' + +import { generateGraphQLSchema } from '../generate/graphqlSchema' + +const FIXTURE_PATH = path.resolve( + __dirname, + '../../../../__fixtures__/example-todo-main' +) + +beforeAll(() => { + process.env.RWJS_CWD = FIXTURE_PATH +}) + +afterAll(() => { + delete process.env.RWJS_CWD +}) + +afterEach(() => { + jest.restoreAllMocks() +}) + +test('Generates GraphQL schema', async () => { + const expectedPath = path.join(FIXTURE_PATH, '.redwood', 'schema.graphql') + + jest + .spyOn(fs, 'writeFileSync') + .mockImplementation( + (file: fs.PathOrFileDescriptor, data: string | ArrayBufferView) => { + expect(file).toMatch(expectedPath) + expect(data).toMatchSnapshot() + } + ) + + const schemaPath = await generateGraphQLSchema() + + expect(schemaPath).toMatch(expectedPath) +}) + +test('Prints error message when schema loading fails', async () => { + const fixturePath = path.resolve( + __dirname, + './fixtures/graphqlCodeGen/bookshelf' + ) + process.env.RWJS_CWD = fixturePath + const oldConsoleError = console.error + console.error = jest.fn() + + try { + await generateGraphQLSchema() + + const invocation1to4 = (console.error as jest.Mock).mock.calls.slice(0, 4) + const invocation5 = (console.error as jest.Mock).mock.calls[4] + const invocation6 = (console.error as jest.Mock).mock.calls[5] + + expect(invocation1to4).toEqual([ + [''], + ['Schema loading failed.', 'Unknown type: "Shelf".'], + [''], + [ + [ + ` ${chalk.bgYellow(` ${chalk.black.bold('Heads up')} `)}`, + '', + chalk.yellow( + ` It looks like you have a Shelf model in your Prisma schema.` + ), + chalk.yellow( + ` If it's part of a relation, you may have to generate SDL or scaffolding for Shelf too.` + ), + chalk.yellow( + ` So, if you haven't done that yet, ignore this error message and run the SDL or scaffold generator for Shelf now.` + ), + '', + chalk.yellow( + ` See the ${terminalLink( + 'Troubleshooting Generators', + 'https://redwoodjs.com/docs/schema-relations#troubleshooting-generators' + )} section in our docs for more help.` + ), + '', + ].join('\n'), + ], + ]) + expect(invocation5[0].toString()).toMatch('Error: Unknown type: "Shelf".') + expect(invocation6[0].trim()).toEqual('') + } finally { + console.error = oldConsoleError + delete process.env.RWJS_CWD + } +}) diff --git a/packages/internal/src/generate/generate.ts b/packages/internal/src/generate/generate.ts index 077900192f93..4503e5d34d4b 100644 --- a/packages/internal/src/generate/generate.ts +++ b/packages/internal/src/generate/generate.ts @@ -8,9 +8,7 @@ import { generateTypeDefs } from './typeDefinitions' export const generate = async () => { const schemaPath = await generateGraphQLSchema() const typeDefsPaths = await generateTypeDefs() - return [schemaPath, ...typeDefsPaths].filter( - (x) => typeof x === 'string' - ) as string[] + return [schemaPath, ...typeDefsPaths].filter((x) => typeof x === 'string') } export const run = async () => { diff --git a/packages/internal/src/generate/graphqlSchema.ts b/packages/internal/src/generate/graphqlSchema.ts index 3048ce767a21..db6f64e1526e 100644 --- a/packages/internal/src/generate/graphqlSchema.ts +++ b/packages/internal/src/generate/graphqlSchema.ts @@ -1,59 +1,125 @@ -import { generate } from '@graphql-codegen/cli' +import fs from 'fs' + +import { codegen } from '@graphql-codegen/core' +import type { Types as CodegenTypes } from '@graphql-codegen/plugin-helpers' +import * as schemaAstPlugin from '@graphql-codegen/schema-ast' +import { CodeFileLoader } from '@graphql-tools/code-file-loader' +import { loadSchema, LoadSchemaOptions } from '@graphql-tools/load' import chalk from 'chalk' -import { print } from 'graphql' +import { DocumentNode, print } from 'graphql' +import terminalLink from 'terminal-link' import { rootSchema } from '@redwoodjs/graphql-server' import { getPaths } from '../paths' export const generateGraphQLSchema = async () => { - const rwjsPaths = getPaths() - type GenerateResponse = { filename: string; contents: string }[] - try { - const f: GenerateResponse = await generate( - { - cwd: rwjsPaths.api.src, - schema: [ - print(rootSchema.schema), // generator cli needs a string or a filePath - 'graphql/**/*.sdl.{js,ts}', - 'directives/**/*.{js,ts}', - ], - config: { - scalars: { - BigInt: 'number', - DateTime: 'string', - Date: 'string', - JSON: 'Record', - JSONObject: 'Record', - Time: 'string', - }, - }, - generates: { - // Note the plugin passed, we're not generating types here. - // its subtley different to generateTypeDefGraphQL - [rwjsPaths.generated.schema]: { - plugins: ['schema-ast'], - }, - }, - silent: false, - errorsOnly: true, + const schemaPointerMap = { + [print(rootSchema.schema)]: {}, + 'graphql/**/*.sdl.{js,ts}': {}, + 'directives/**/*.{js,ts}': {}, + } + + const config = { + scalars: { + BigInt: 'number', + DateTime: 'string', + Date: 'string', + JSON: 'Record', + JSONObject: 'Record', + Time: 'string', + }, + } + + const loadSchemaConfig: LoadSchemaOptions = { + assumeValidSDL: true, + sort: true, + convertExtensions: true, + includeSources: true, + cwd: getPaths().api.src, + schema: Object.keys(schemaPointerMap), + config, + generates: { + [getPaths().generated.schema]: { + plugins: ['schema-ast'], }, - true - ) - return f[0].filename - } catch (e: any) { - // `generate` outputs errors which are helpful. - // This tries to clean up the output of those errors. - console.error(chalk.red('Error parsing SDLs or Schema')) - if (e.errors?.length) { - for (const error of e.errors ?? []) { - console.error(error.details) + }, + silent: false, + errorsOnly: false, + pluginContext: {}, + loaders: [new CodeFileLoader()], + } + + let loadedSchema + + try { + loadedSchema = await loadSchema(schemaPointerMap, loadSchemaConfig) + } catch (e) { + if (e instanceof Error) { + const match = e.message.match(/Unknown type: "(\w+)"/) + const name = match?.[1] + const schemaPrisma = fs.readFileSync(getPaths().api.dbSchema) + + console.error('') + console.error('Schema loading failed.', e.message) + console.error('') + + if (name && schemaPrisma.includes(`model ${name}`)) { + // Not all SDLs need to be backed by a DB model, but if they are we can + // provide a more helpful error message + + console.error( + [ + ` ${chalk.bgYellow(` ${chalk.black.bold('Heads up')} `)}`, + '', + chalk.yellow( + ` It looks like you have a ${name} model in your Prisma schema.` + ), + chalk.yellow( + ` If it's part of a relation, you may have to generate SDL or scaffolding for ${name} too.` + ), + chalk.yellow( + ` So, if you haven't done that yet, ignore this error message and run the SDL or scaffold generator for ${name} now.` + ), + '', + chalk.yellow( + ` See the ${terminalLink( + 'Troubleshooting Generators', + 'https://redwoodjs.com/docs/schema-relations#troubleshooting-generators' + )} section in our docs for more help.` + ), + '', + ].join('\n') + ) } - } else { + } + + console.error(e) + // Had to do this, or the full stacktrace wouldn't come through, and I + // couldn't add a blank line after the stacktrace :( :shrug: + console.error('\n\n\n\n\n\n') + } + + const options: CodegenTypes.GenerateOptions = { + config, + plugins: [{ 'schema-ast': {} }], + pluginMap: { 'schema-ast': schemaAstPlugin }, + schema: {} as unknown as DocumentNode, + schemaAst: loadedSchema, + filename: getPaths().generated.schema, + documents: [], + } + + if (loadedSchema) { + try { + const schema = await codegen(options) + fs.writeFileSync(getPaths().generated.schema, schema) + return getPaths().generated.schema + } catch (e) { + console.error('GraphQL Schema codegen failed.') console.error(e) } - console.warn() } - return undefined + return '' } From 1631c16089f7d83f730c966e347eb09b15ff7252 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Mon, 2 May 2022 23:16:15 +0200 Subject: [PATCH 11/14] cli upgrade: Always search from the start for semvers (#5368) --- packages/cli/src/commands/upgrade.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/commands/upgrade.js b/packages/cli/src/commands/upgrade.js index 18513e1429b6..c4ed34af58b5 100644 --- a/packages/cli/src/commands/upgrade.js +++ b/packages/cli/src/commands/upgrade.js @@ -64,7 +64,7 @@ export const builder = (yargs) => { // Used in yargs builder to coerce tag AND to parse yarn version const SEMVER_REGEX = - /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*)(?:\.(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*))*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?(?=$|\s)/gi + /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*)(?:\.(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*))*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?(?=$|\s)/i const validateTag = (tag) => { const isTagValid = tag === 'rc' || From b1b1ea49ac6190d33140f8d25eb9cf3c9a9b7bd7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 May 2022 00:38:26 +0000 Subject: [PATCH 12/14] fix(deps): update react monorepo (#5406) Co-authored-by: Renovate Bot --- packages/core/package.json | 2 +- packages/eslint-config/package.json | 2 +- yarn.lock | 21 ++++++++++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index e80b1e0ae862..b6261f64317b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -72,7 +72,7 @@ "mini-css-extract-plugin": "2.6.0", "nodemon": "2.0.16", "null-loader": "4.0.1", - "react-refresh": "0.11.0", + "react-refresh": "0.13.0", "rimraf": "3.0.2", "style-loader": "3.3.1", "svg-react-loader": "0.4.6", diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index f4800cb59c8f..5c8d0efaf8f4 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -27,7 +27,7 @@ "eslint-plugin-jsx-a11y": "6.5.1", "eslint-plugin-prettier": "4.0.0", "eslint-plugin-react": "7.29.4", - "eslint-plugin-react-hooks": "4.3.0", + "eslint-plugin-react-hooks": "4.5.0", "prettier": "2.6.2" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 120ccf84fd36..40fbc2c0755a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6101,7 +6101,7 @@ __metadata: mini-css-extract-plugin: 2.6.0 nodemon: 2.0.16 null-loader: 4.0.1 - react-refresh: 0.11.0 + react-refresh: 0.13.0 rimraf: 3.0.2 style-loader: 3.3.1 svg-react-loader: 0.4.6 @@ -6150,7 +6150,7 @@ __metadata: eslint-plugin-jsx-a11y: 6.5.1 eslint-plugin-prettier: 4.0.0 eslint-plugin-react: 7.29.4 - eslint-plugin-react-hooks: 4.3.0 + eslint-plugin-react-hooks: 4.5.0 jest: 27.5.1 prettier: 2.6.2 typescript: 4.6.4 @@ -15371,12 +15371,12 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-react-hooks@npm:4.3.0": - version: 4.3.0 - resolution: "eslint-plugin-react-hooks@npm:4.3.0" +"eslint-plugin-react-hooks@npm:4.5.0": + version: 4.5.0 + resolution: "eslint-plugin-react-hooks@npm:4.5.0" peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 - checksum: fdf491b182fd0815c95af6b5a9ef9de0640cbf0e446b2886899769470276c9a69be35a2aac42b2ada3e26b73cefee23b1eb4a93f27ee984b5763ee4718509629 + checksum: 081921e84647cddf29114bba8bb9253f2d0ab3626fa7df7d8f35edb073e6b2a094858699e47868f08160f3633ff8055bcedc87700642b87f07d89dd0e7601dfa languageName: node linkType: hard @@ -25941,7 +25941,14 @@ __metadata: languageName: node linkType: hard -"react-refresh@npm:0.11.0, react-refresh@npm:^0.11.0": +"react-refresh@npm:0.13.0": + version: 0.13.0 + resolution: "react-refresh@npm:0.13.0" + checksum: cb9f324d471485e569628854dc08d1550c0798cde57f1bfb8d954e006659de1da0bdccaf7d5d2ac0d3d53df1aae7b740b2a36128789afb8aff0f7ec01b128587 + languageName: node + linkType: hard + +"react-refresh@npm:^0.11.0": version: 0.11.0 resolution: "react-refresh@npm:0.11.0" checksum: cbb5616c7ba670bbd2f37ddadcdfefa66e727ea188e89733ccb8184d3b874631104b0bc016d5676a7ade4d9c79100b99b46b6ed10cd117ab5d1ddcbf8653a9f2 From 185154ecf5b8c7accb2a41d74baea865a5198a38 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 May 2022 01:06:51 +0000 Subject: [PATCH 13/14] chore(deps): update dependency @azure/msal-browser to v2.24.0 (#5412) 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 f6f3ad9d0505..6aa5c327e102 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -23,7 +23,7 @@ }, "devDependencies": { "@auth0/auth0-spa-js": "1.21.0", - "@azure/msal-browser": "2.23.0", + "@azure/msal-browser": "2.24.0", "@babel/cli": "7.16.7", "@babel/core": "7.16.7", "@clerk/clerk-js": "3.9.0", diff --git a/yarn.lock b/yarn.lock index 40fbc2c0755a..2699d2cea0dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -95,19 +95,19 @@ __metadata: languageName: node linkType: hard -"@azure/msal-browser@npm:2.23.0": - version: 2.23.0 - resolution: "@azure/msal-browser@npm:2.23.0" +"@azure/msal-browser@npm:2.24.0": + version: 2.24.0 + resolution: "@azure/msal-browser@npm:2.24.0" dependencies: - "@azure/msal-common": ^6.2.0 - checksum: 24e58bd853c505ca7a44a384b52dd332afdaf45dcf08c17e417eb0fb89c6d237a561c5e7824e1e5fec7e2afc2ae25dfb1a5e513f2eb6dd2efbfb3532d824eef7 + "@azure/msal-common": ^6.3.0 + checksum: 631a210545c4cb374fcdeb9738cda4ec7c689a623c2f29f466828ec78748edd606db5f14934f1767e0cf06d4f85c2f78a78d144849877a17566d2a62467a0dda languageName: node linkType: hard -"@azure/msal-common@npm:^6.2.0": - version: 6.2.0 - resolution: "@azure/msal-common@npm:6.2.0" - checksum: 83a9ecbb6ad06292d186e8e831f08b068794f603c8006d98d17b8038cfb52679f7625259f2dff6ca95b3e7a651eb7f35ddfb7453f1ac867e04ba182c218702f7 +"@azure/msal-common@npm:^6.3.0": + version: 6.3.0 + resolution: "@azure/msal-common@npm:6.3.0" + checksum: 7b070ac9cb0a0ee3fbcc6992b5772030a4d67a6fe2d87d7fc9bbd3df4e895aa0cdbeb5cde84b898741b003d7801757dd882b6435e69ef118f4d7b1e6d9d692f6 languageName: node linkType: hard @@ -5953,7 +5953,7 @@ __metadata: resolution: "@redwoodjs/auth@workspace:packages/auth" dependencies: "@auth0/auth0-spa-js": 1.21.0 - "@azure/msal-browser": 2.23.0 + "@azure/msal-browser": 2.24.0 "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@clerk/clerk-js": 3.9.0 From af131c2e97075593bdc0631f9d72a1e97e77b294 Mon Sep 17 00:00:00 2001 From: Dominic Saadi <32992335+jtoar@users.noreply.github.com> Date: Tue, 3 May 2022 10:40:59 +0900 Subject: [PATCH 14/14] Remove extra checkout in RC workflow (#5414) --- .github/workflows/publish-release-candidate.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/publish-release-candidate.yml b/.github/workflows/publish-release-candidate.yml index 491e363a46e6..24d5f5944173 100644 --- a/.github/workflows/publish-release-candidate.yml +++ b/.github/workflows/publish-release-candidate.yml @@ -56,7 +56,6 @@ jobs: # This is required because lerna uses tags to determine the version. fetch-depth: 0 - - uses: actions/checkout@v3 - name: 🧶 Setup job uses: ./.github/actions/setup_job @@ -74,7 +73,6 @@ jobs: - name: 🚢 Publish run: | - git fetch --depth=1 origin +refs/tags/*:refs/tags/* echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}" > .npmrc SEMVER=$(basename $(dirname ${{ github.ref_name }})) yarn lerna publish pre$SEMVER --include-merged-tags \