From 4a1d5ca2cb609d81bd96575d802382f73f2dd783 Mon Sep 17 00:00:00 2001 From: Aldo Bucchi Date: Fri, 31 Jul 2020 12:37:52 -0700 Subject: [PATCH 01/37] Improve README for the structure package --- packages/structure/README.md | 12 ++++++++++-- packages/structure/src/language_server/README.md | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 packages/structure/src/language_server/README.md diff --git a/packages/structure/README.md b/packages/structure/README.md index 60069ef25ef8..f178aeaca648 100644 --- a/packages/structure/README.md +++ b/packages/structure/README.md @@ -1,11 +1,19 @@ +**IMPORTANT:** This is an **internal** and **development-time only** package :exclamation: + # Overview -- The @redwoodjs/struture package lets you build, validate and inspect an AST-like representation of a complete Redwood project +- The @redwoodjs/structure package lets you build, validate and inspect an AST-like representation of a complete Redwood project +- It is used by the CLI and by VSCode extensions to provide IDE features such as diagnostics, code-fixes, etc. +- **IMPORTANT:** This is an **internal** and **development-time only** package + - You **cannot** "import it" into a normal redwood app + - A good analogy is this: + - If Redwood is TypeScript, then this is the TypeScript compiler. + **You can't import** the compiler into your TypeScript projects, but it is used by IDEs and other tools to improve your editing experience. ## Code - `/model/*`: The main API and classes (such as RWProject, RWPage, RWService, etc) -- `/language_server/*`: A [Language Server Protocol](https://microsoft.github.io/language-server-protocol/) implementation that wraps the `model` classes. Currently used by the Decoupled Studio VSCode extension. +- `/language_server/*`: A [Language Server Protocol](https://microsoft.github.io/language-server-protocol/) implementation that wraps the `model` classes. More info [here](./src/language_server/README.md) - We use [vscode-languageserver-types](https://www.npmjs.com/package/vscode-languageserver-types) where possible (to represent Document URIs, Positions, Ranges, Diagnostics, etc) # Usage diff --git a/packages/structure/src/language_server/README.md b/packages/structure/src/language_server/README.md new file mode 100644 index 000000000000..1a4c5665e8a1 --- /dev/null +++ b/packages/structure/src/language_server/README.md @@ -0,0 +1,14 @@ +# Overview + +This folder contains a [Language Server Protocol](https://microsoft.github.io/language-server-protocol/) implementation that wraps the `../model` classes. + +# Usage + +The `start.ts` file is the entry point for the language server. + +Note: When Redwood is installed in node_modules, this file will be present somewhere (as `start.js`). + +# Protocol Extensions/Compatibility + +* This server exposes some additional methods that are not part of the protocol (for example, a set of methods called `redwoodjs/x-outline-*`). Since they are extra methods, they shouldn't break compatibility. +* However, **there is a breaking change**: The language server expects the host to implement some extra capabilities for user interaction (like prompting for input). These are only used by the "interactive CLI" functionality. If you are trying to use this language server in your own extension, you'll most likely run into some issues here. For now, only Decoupled Studio implements these extra capabilities. \ No newline at end of file From 90e7e5c769a8341453968e1ef6a8456d5ac1e18a Mon Sep 17 00:00:00 2001 From: Aldo Bucchi Date: Fri, 31 Jul 2020 12:49:45 -0700 Subject: [PATCH 02/37] remove the term "AST". It is confusing people --- packages/structure/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/structure/README.md b/packages/structure/README.md index f178aeaca648..879fc612651b 100644 --- a/packages/structure/README.md +++ b/packages/structure/README.md @@ -2,7 +2,7 @@ # Overview -- The @redwoodjs/structure package lets you build, validate and inspect an AST-like representation of a complete Redwood project +- The @redwoodjs/structure package lets you build, validate and inspect an object graph that represents a complete Redwood project - It is used by the CLI and by VSCode extensions to provide IDE features such as diagnostics, code-fixes, etc. - **IMPORTANT:** This is an **internal** and **development-time only** package - You **cannot** "import it" into a normal redwood app From 64c168baf535173b2ca27ea2c84aa456214dac22 Mon Sep 17 00:00:00 2001 From: Aldo Bucchi Date: Fri, 31 Jul 2020 13:28:15 -0700 Subject: [PATCH 03/37] small clarification on README --- packages/structure/README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/structure/README.md b/packages/structure/README.md index 879fc612651b..25ffb22159f3 100644 --- a/packages/structure/README.md +++ b/packages/structure/README.md @@ -6,10 +6,6 @@ - It is used by the CLI and by VSCode extensions to provide IDE features such as diagnostics, code-fixes, etc. - **IMPORTANT:** This is an **internal** and **development-time only** package - You **cannot** "import it" into a normal redwood app - - A good analogy is this: - - If Redwood is TypeScript, then this is the TypeScript compiler. - **You can't import** the compiler into your TypeScript projects, but it is used by IDEs and other tools to improve your editing experience. - ## Code - `/model/*`: The main API and classes (such as RWProject, RWPage, RWService, etc) From e5fe4b040c66d8c7f3e6c0e62a7de102f0ee8f43 Mon Sep 17 00:00:00 2001 From: Tom Preston-Werner Date: Fri, 31 Jul 2020 22:10:53 -0700 Subject: [PATCH 04/37] Document behavior of NRF route params not defined on route. --- packages/router/README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/router/README.md b/packages/router/README.md index a1eb0be8f700..418f77f2d81f 100644 --- a/packages/router/README.md +++ b/packages/router/README.md @@ -134,11 +134,19 @@ If a route has route parameters, then its named route function will take an obje ```js // SomePage.js - +... ``` All parameters will be converted to strings before being inserted into the generated URL. If you don't like the default JavaScript behavior of how this conversion happens, make sure to convert to a string before passing it into the named route function. +If you specify parameters to the named route function that do not correspond to parameters defined on the route, they will be appended to the end of the generated URL as search params in `key=val` format: + +```js +// SomePage.js +... +// => "/users?sort=desc&filter=all" +``` + ## Route parameter types Route parameters are extracted as strings by default, but they will often represent typed data. RR offers a convenient way to auto-convert certain types right in the `path` specification: From 0054c4093a0bed4fdab865c69e321cfeae2a1aae Mon Sep 17 00:00:00 2001 From: Tom Preston-Werner Date: Sat, 1 Aug 2020 19:20:19 -0700 Subject: [PATCH 05/37] Remove extra closing slash Co-authored-by: Tobbe Lundberg --- packages/router/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/router/README.md b/packages/router/README.md index 418f77f2d81f..063fd195bf40 100644 --- a/packages/router/README.md +++ b/packages/router/README.md @@ -134,7 +134,7 @@ If a route has route parameters, then its named route function will take an obje ```js // SomePage.js -... +... ``` All parameters will be converted to strings before being inserted into the generated URL. If you don't like the default JavaScript behavior of how this conversion happens, make sure to convert to a string before passing it into the named route function. From 4ebeb0b3e2f031c38ee722b53673ceac9b1e13b8 Mon Sep 17 00:00:00 2001 From: Forrest Hayes Date: Sun, 2 Aug 2020 14:54:45 -0500 Subject: [PATCH 06/37] Update studio.js Corrects link to CLI docs for studio command. --- packages/cli/src/commands/dbCommands/studio.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/commands/dbCommands/studio.js b/packages/cli/src/commands/dbCommands/studio.js index 707b3858ba2d..12681e64bdf0 100644 --- a/packages/cli/src/commands/dbCommands/studio.js +++ b/packages/cli/src/commands/dbCommands/studio.js @@ -13,7 +13,7 @@ export const builder = (yargs) => { yargs.epilogue( `Also see the ${terminalLink( 'Redwood CLI Reference', - 'https://redwoodjs.com/reference/command-line-interface#db-studio' + 'https://redwoodjs.com/reference/command-line-interface#studio' )}` ) } From 06da73b8ba84d531c6a67344c5c7fc9492a4f281 Mon Sep 17 00:00:00 2001 From: Forrest Hayes Date: Sun, 2 Aug 2020 15:00:35 -0500 Subject: [PATCH 07/37] Update README.md Remove Prisma Studio from Coming Later section --- packages/cli/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/cli/README.md b/packages/cli/README.md index b3e3fcca153b..2a57c51d80ea 100644 --- a/packages/cli/README.md +++ b/packages/cli/README.md @@ -56,7 +56,6 @@ Since the CLI is the entry point to Redwood, as Redwood continues to grow— ### Coming Later - [Multiple database support](https://github.com/redwoodjs/redwood/issues/507) -- [Prisma studio](https://www.prisma.io/docs/reference/tools-and-interfaces/prisma-studio#overview) - [Storybook generators](https://github.com/redwoodjs/redwood/issues/231) - [Support for dynamic sides and targets](https://github.com/redwoodjs/redwood/pull/355) From 01a4478f51472a2e8c9677b5910dd5fadc0aac2f Mon Sep 17 00:00:00 2001 From: hemildesai Date: Fri, 31 Jul 2020 20:57:14 +0530 Subject: [PATCH 08/37] Switch Date and Time scalar types to graphql-scalars since graphql-iso-date is deprecated --- packages/api/package.json | 3 +-- packages/api/src/makeMergedSchema/rootSchema.ts | 15 +++++++-------- yarn.lock | 15 ++++----------- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index dad91495e0b2..bf58a971753d 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -16,7 +16,7 @@ "core-js": "3.6.4", "glob": "^7.1.6", "graphql": "^14.6.0", - "graphql-iso-date": "^3.6.1", + "graphql-scalars": "^1.2.6", "graphql-tools": "4.0.7", "graphql-type-json": "^0.3.1", "jsonwebtoken": "^8.5.1", @@ -27,7 +27,6 @@ }, "devDependencies": { "@redwoodjs/auth": "^0.15.3", - "@types/graphql-iso-date": "^3.4.0", "@types/graphql-type-json": "^0.3.2", "@types/jsonwebtoken": "^8.3.9", "@types/lodash.merge": "^4.6.6", diff --git a/packages/api/src/makeMergedSchema/rootSchema.ts b/packages/api/src/makeMergedSchema/rootSchema.ts index 9f6ce3b79c76..b472f93ea211 100644 --- a/packages/api/src/makeMergedSchema/rootSchema.ts +++ b/packages/api/src/makeMergedSchema/rootSchema.ts @@ -1,9 +1,8 @@ import type { GlobalContext } from 'src/globalContext' import gql from 'graphql-tag' -import { GraphQLDate, GraphQLTime, GraphQLDateTime } from 'graphql-iso-date' +import { DateResolver, TimeResolver, DateTimeResolver } from 'graphql-scalars' import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json' - // @ts-ignore - not inside the import apiPackageJson from 'src/../package.json' @@ -29,18 +28,18 @@ export const schema = gql` ` export interface Resolvers { - Date: typeof GraphQLDate - Time: typeof GraphQLTime - DateTime: typeof GraphQLDateTime + Date: typeof DateResolver + Time: typeof TimeResolver + DateTime: typeof DateTimeResolver JSON: typeof GraphQLJSON JSONObject: typeof GraphQLJSONObject Query: {} } export const resolvers: Resolvers = { - Date: GraphQLDate, - Time: GraphQLTime, - DateTime: GraphQLDateTime, + Date: DateResolver, + Time: TimeResolver, + DateTime: DateTimeResolver, JSON: GraphQLJSON, JSONObject: GraphQLJSONObject, Query: { diff --git a/yarn.lock b/yarn.lock index 021228701ae4..b2b9f93fff1d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3950,13 +3950,6 @@ dependencies: "@types/node" "*" -"@types/graphql-iso-date@^3.4.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/@types/graphql-iso-date/-/graphql-iso-date-3.4.0.tgz#b6710b21e3b0bfdb1a0529b285148d98eac18b1f" - integrity sha512-V3jITHTsoI2E8TGt9+/HPDz6LWt3z9/HYnPJYWI6WwiLRexsngg7KzaQlCgQkA4jkEbGPROUD0hJFc9F02W9WA== - dependencies: - graphql "^15.1.0" - "@types/graphql-type-json@^0.3.2": version "0.3.2" resolved "https://registry.yarnpkg.com/@types/graphql-type-json/-/graphql-type-json-0.3.2.tgz#1a7105e6546fc1630a5db4834bfbc0eb554986e4" @@ -10536,10 +10529,10 @@ graphql-extensions@^0.12.4: apollo-server-env "^2.4.5" apollo-server-types "^0.5.1" -graphql-iso-date@^3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.6.1.tgz#bd2d0dc886e0f954cbbbc496bbf1d480b57ffa96" - integrity sha512-AwFGIuYMJQXOEAgRlJlFL4H1ncFM8n8XmoVDTNypNOZyQ8LFDG2ppMFlsS862BSTCDcSUfHp8PD3/uJhv7t59Q== +graphql-scalars@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/graphql-scalars/-/graphql-scalars-1.2.6.tgz#a934ed63c91054db00cde41b9beeddb09b606729" + integrity sha512-k/88kZVXIuUKQuVLokokkKU2lnFEZ9aTn7O0fDweJpISd0pP5fQU1wzPN0jarH4Lnadr4092PfyIUtCcKzkeAw== graphql-tag@^2.10.3, graphql-tag@^2.4.2, graphql-tag@^2.9.2: version "2.10.4" From 39aa0e5f8f3c90d192547b5f04fee54e11dbe8b6 Mon Sep 17 00:00:00 2001 From: hemildesai Date: Fri, 31 Jul 2020 21:42:55 +0530 Subject: [PATCH 09/37] Change JSON scalar types from graphql-type-json to graphql-scalars --- packages/api/package.json | 2 -- packages/api/src/makeMergedSchema/rootSchema.ts | 17 +++++++++++------ yarn.lock | 12 ------------ 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index bf58a971753d..bcdd4c15a298 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -18,7 +18,6 @@ "graphql": "^14.6.0", "graphql-scalars": "^1.2.6", "graphql-tools": "4.0.7", - "graphql-type-json": "^0.3.1", "jsonwebtoken": "^8.5.1", "jwks-rsa": "^1.8.0", "lodash.merge": "^4.6.2", @@ -27,7 +26,6 @@ }, "devDependencies": { "@redwoodjs/auth": "^0.15.3", - "@types/graphql-type-json": "^0.3.2", "@types/jsonwebtoken": "^8.3.9", "@types/lodash.merge": "^4.6.6", "@types/lodash.omitby": "^4.6.6", diff --git a/packages/api/src/makeMergedSchema/rootSchema.ts b/packages/api/src/makeMergedSchema/rootSchema.ts index b472f93ea211..80f9d728275c 100644 --- a/packages/api/src/makeMergedSchema/rootSchema.ts +++ b/packages/api/src/makeMergedSchema/rootSchema.ts @@ -1,7 +1,12 @@ import type { GlobalContext } from 'src/globalContext' import gql from 'graphql-tag' -import { DateResolver, TimeResolver, DateTimeResolver } from 'graphql-scalars' -import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json' +import { + DateResolver, + TimeResolver, + DateTimeResolver, + JSONResolver, + JSONObjectResolver, +} from 'graphql-scalars' // @ts-ignore - not inside the import apiPackageJson from 'src/../package.json' @@ -31,8 +36,8 @@ export interface Resolvers { Date: typeof DateResolver Time: typeof TimeResolver DateTime: typeof DateTimeResolver - JSON: typeof GraphQLJSON - JSONObject: typeof GraphQLJSONObject + JSON: typeof JSONResolver + JSONObject: typeof JSONObjectResolver Query: {} } @@ -40,8 +45,8 @@ export const resolvers: Resolvers = { Date: DateResolver, Time: TimeResolver, DateTime: DateTimeResolver, - JSON: GraphQLJSON, - JSONObject: GraphQLJSONObject, + JSON: JSONResolver, + JSONObject: JSONObjectResolver, Query: { redwood: () => ({ version: apiPackageJson.version, diff --git a/yarn.lock b/yarn.lock index b2b9f93fff1d..99dcb8c65122 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3950,13 +3950,6 @@ dependencies: "@types/node" "*" -"@types/graphql-type-json@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@types/graphql-type-json/-/graphql-type-json-0.3.2.tgz#1a7105e6546fc1630a5db4834bfbc0eb554986e4" - integrity sha512-c1cq4o8EhY0Z39ua8UXwG8uBs23xBYA/Uw0tXFl6SuTUpkVv/IJqf6pHQbfdC7nwFRhX2ifTOV/UIg0Q/IJsbg== - dependencies: - graphql "^14.5.3" - "@types/graphql-upload@^8.0.0": version "8.0.3" resolved "https://registry.yarnpkg.com/@types/graphql-upload/-/graphql-upload-8.0.3.tgz#b371edb5f305a2a1f7b7843a890a2a7adc55c3ec" @@ -10575,11 +10568,6 @@ graphql-tools@^4.0.0: iterall "^1.1.3" uuid "^3.1.0" -graphql-type-json@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/graphql-type-json/-/graphql-type-json-0.3.2.tgz#f53a851dbfe07bd1c8157d24150064baab41e115" - integrity sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg== - graphql-upload@^8.0.2: version "8.1.0" resolved "https://registry.yarnpkg.com/graphql-upload/-/graphql-upload-8.1.0.tgz#6d0ab662db5677a68bfb1f2c870ab2544c14939a" From abf1592f43a7742f9011590238f17ef9ba024408 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Mon, 27 Jul 2020 10:13:27 +0200 Subject: [PATCH 10/37] Remove importAll.macro. --- packages/api/package.json | 16 ++--- packages/api/src/importAll.macro.js | 90 ----------------------------- 2 files changed, 4 insertions(+), 102 deletions(-) delete mode 100644 packages/api/src/importAll.macro.js diff --git a/packages/api/package.json b/packages/api/package.json index bcdd4c15a298..182cb4fb531c 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -2,8 +2,7 @@ "name": "@redwoodjs/api", "version": "0.15.3", "files": [ - "dist", - "importAll.macro.js" + "dist" ], "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -12,9 +11,7 @@ "@prisma/client": "~2.3.0", "@redwoodjs/internal": "^0.15.3", "apollo-server-lambda": "2.16.0", - "babel-plugin-macros": "^2.8.0", "core-js": "3.6.4", - "glob": "^7.1.6", "graphql": "^14.6.0", "graphql-scalars": "^1.2.6", "graphql-tools": "4.0.7", @@ -28,23 +25,18 @@ "@redwoodjs/auth": "^0.15.3", "@types/jsonwebtoken": "^8.3.9", "@types/lodash.merge": "^4.6.6", - "@types/lodash.omitby": "^4.6.6", - "babel-plugin-tester": "^9.0.0", - "del-cli": "^3.0.0", - "gotrue-js": "^0.9.25", - "move-cli": "^1.2.1" + "@types/lodash.omitby": "^4.6.6" }, "jest": { "testPathIgnorePatterns": [ - "/fixtures/", "/dist/" ] }, "scripts": { "build": "yarn build:clean && yarn build:js", - "build:js": "yarn cross-env NODE_ENV=production babel src -d dist --extensions \".js,.ts\" --source-maps inline && yarn move-cli ./dist/importAll.macro.js ./importAll.macro.js", + "build:js": "yarn cross-env NODE_ENV=production babel src -d dist --extensions \".js,.ts\"", "build:types": "tsc --build --clean && tsc --build", - "build:clean": "yarn del-cli dist importAll.macro.js", + "build:clean": "", "prepublishOnly": "yarn build", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --ignore importAll.macro.js --exec \"yarn build:js\"", "test": "yarn jest", diff --git a/packages/api/src/importAll.macro.js b/packages/api/src/importAll.macro.js deleted file mode 100644 index d0734d78b4d1..000000000000 --- a/packages/api/src/importAll.macro.js +++ /dev/null @@ -1,90 +0,0 @@ -import path from 'path' - -import { createMacro } from 'babel-plugin-macros' -import glob from 'glob' -import { getPaths } from '@redwoodjs/internal' - -// The majority of this code is copied from `importAll.macro`: https://github.com/kentcdodds/import-all.macro -// And was modified to work with our `getPaths`. - -/** - * This macro runs during build time. - * @example - * ```js - * import importAll from '@redwoodjs/api/importAll.macro - * const typeDefs = importAll('api', 'graphql') - * ``` - */ -function prevalMacros({ references, state, babel }) { - references.default.forEach((referencePath) => { - if (referencePath.parentPath.type === 'CallExpression') { - importAll({ referencePath, state, babel }) - } else { - throw new Error( - `This is not supported: \`${referencePath - .findParent(babel.types.isExpression) - .getSource()}\`. Please use "importAll('target', 'directory')"` - ) - } - }) -} - -const getGlobPattern = (callExpressionPath, cwd) => { - const args = callExpressionPath.parentPath.get('arguments') - const target = args[0].evaluate().value - const dir = args[1].evaluate().value - - const redwoodPaths = getPaths() - const relativePaths = path.relative(cwd, redwoodPaths[target][dir]) - return `./${relativePaths}/**/*.{ts,js}` -} - -/** - * @deprecated Please use: `import services from 'src/lib/services/*.{js,ts}'` instead. - */ -function importAll({ referencePath, state, babel }) { - const t = babel.types - const { filename } = state.file.opts - const cwd = path.dirname(filename) - const globPattern = getGlobPattern(referencePath, cwd) - - // Grab a list of the `js` and `ts` files in the specified directory. - // Remove `.test.{js|ts}` files from matched patterns, `ignore` in glob - // doesn't appear to be working correctly:https://github.com/isaacs/node-glob/issues/309 - const importSources = glob - .sync(globPattern, { cwd }) - .filter((path) => !path.match(/\.(test\.js|stories\.js)$/)) - - const { importNodes, objectProperties } = importSources.reduce( - (all, source) => { - const id = referencePath.scope.generateUidIdentifier(source) - all.importNodes.push( - t.importDeclaration( - [t.importNamespaceSpecifier(id)], - t.stringLiteral(source) - ) - ) - - // Convert the relative path of the module to a key: - // ./services/a.js -> a - // ./services/a/a.js -> a - // ./graphql/x/x.sdl.js -> x - const objectKey = path - .basename(source, path.extname(source)) - .replace('.sdl', '') - all.objectProperties.push( - t.objectProperty(t.stringLiteral(objectKey), id) - ) - return all - }, - { importNodes: [], objectProperties: [] } - ) - - const program = state.file.path - program.node.body.unshift(...importNodes) - - const objectExpression = t.objectExpression(objectProperties) - referencePath.parentPath.replaceWith(objectExpression) -} - -export default createMacro(prevalMacros) From 047012b6d0da251809a736cc55463fc03c476eba Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Mon, 27 Jul 2020 10:13:37 +0200 Subject: [PATCH 11/37] Remove importAll.macro tests. --- .../importAll.macro.test.js.snap | 37 ------------------- .../fixtures/api/src/graphql/posts.sdl.ts | 0 .../fixtures/api/src/graphql/users.sdl.js | 0 .../fixtures/api/src/services/posts.ts | 0 .../fixtures/api/src/services/todos/todos.js | 0 .../api/src/services/todos/todos.test.js | 0 .../fixtures/api/src/services/users.js | 0 .../api/src/__tests__/importAll.macro.test.js | 24 ------------ 8 files changed, 61 deletions(-) delete mode 100644 packages/api/src/__tests__/__snapshots__/importAll.macro.test.js.snap delete mode 100644 packages/api/src/__tests__/fixtures/api/src/graphql/posts.sdl.ts delete mode 100644 packages/api/src/__tests__/fixtures/api/src/graphql/users.sdl.js delete mode 100644 packages/api/src/__tests__/fixtures/api/src/services/posts.ts delete mode 100644 packages/api/src/__tests__/fixtures/api/src/services/todos/todos.js delete mode 100644 packages/api/src/__tests__/fixtures/api/src/services/todos/todos.test.js delete mode 100644 packages/api/src/__tests__/fixtures/api/src/services/users.js delete mode 100644 packages/api/src/__tests__/importAll.macro.test.js diff --git a/packages/api/src/__tests__/__snapshots__/importAll.macro.test.js.snap b/packages/api/src/__tests__/__snapshots__/importAll.macro.test.js.snap deleted file mode 100644 index 3e791054d12d..000000000000 --- a/packages/api/src/__tests__/__snapshots__/importAll.macro.test.js.snap +++ /dev/null @@ -1,37 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`macros api.graphql: api.graphql 1`] = ` - -import importAll from '../importAll.macro.js' -const graphQLImports = importAll('api', 'graphql') - - ↓ ↓ ↓ ↓ ↓ ↓ - -import * as _fixturesApiSrcGraphqlPostsSdlTs from './fixtures/api/src/graphql/posts.sdl.ts' -import * as _fixturesApiSrcGraphqlUsersSdlJs from './fixtures/api/src/graphql/users.sdl.js' -const graphQLImports = { - posts: _fixturesApiSrcGraphqlPostsSdlTs, - users: _fixturesApiSrcGraphqlUsersSdlJs, -} - - -`; - -exports[`macros api.services: api.services 1`] = ` - -import importAll from '../importAll.macro.js' -const serviceImports = importAll('api', 'services') - - ↓ ↓ ↓ ↓ ↓ ↓ - -import * as _fixturesApiSrcServicesPostsTs from './fixtures/api/src/services/posts.ts' -import * as _fixturesApiSrcServicesTodosTodosJs from './fixtures/api/src/services/todos/todos.js' -import * as _fixturesApiSrcServicesUsersJs from './fixtures/api/src/services/users.js' -const serviceImports = { - posts: _fixturesApiSrcServicesPostsTs, - todos: _fixturesApiSrcServicesTodosTodosJs, - users: _fixturesApiSrcServicesUsersJs, -} - - -`; diff --git a/packages/api/src/__tests__/fixtures/api/src/graphql/posts.sdl.ts b/packages/api/src/__tests__/fixtures/api/src/graphql/posts.sdl.ts deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/api/src/__tests__/fixtures/api/src/graphql/users.sdl.js b/packages/api/src/__tests__/fixtures/api/src/graphql/users.sdl.js deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/api/src/__tests__/fixtures/api/src/services/posts.ts b/packages/api/src/__tests__/fixtures/api/src/services/posts.ts deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/api/src/__tests__/fixtures/api/src/services/todos/todos.js b/packages/api/src/__tests__/fixtures/api/src/services/todos/todos.js deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/api/src/__tests__/fixtures/api/src/services/todos/todos.test.js b/packages/api/src/__tests__/fixtures/api/src/services/todos/todos.test.js deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/api/src/__tests__/fixtures/api/src/services/users.js b/packages/api/src/__tests__/fixtures/api/src/services/users.js deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/api/src/__tests__/importAll.macro.test.js b/packages/api/src/__tests__/importAll.macro.test.js deleted file mode 100644 index 2a0f23524600..000000000000 --- a/packages/api/src/__tests__/importAll.macro.test.js +++ /dev/null @@ -1,24 +0,0 @@ -import pluginTester from 'babel-plugin-tester' -import plugin from 'babel-plugin-macros' - -const MACRO_IMPORT_PATH = '../importAll.macro.js' - -jest.mock('@redwoodjs/internal') - -pluginTester({ - plugin, - snapshot: true, - babelOptions: { - filename: __filename, - }, - tests: { - 'api.services': ` - import importAll from '${MACRO_IMPORT_PATH}' - const serviceImports = importAll('api', 'services') - `, - 'api.graphql': ` - import importAll from '${MACRO_IMPORT_PATH}' - const graphQLImports = importAll('api', 'graphql') - `, - }, -}) From be53f15df1f9d329c6d620a53d22355a53026496 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Mon, 27 Jul 2020 10:13:47 +0200 Subject: [PATCH 12/37] Move graphql unit tests. --- packages/api/src/{__tests__ => functions}/authDecoder.test.ts | 0 .../fixtures/apiGatewayProxyEvent.fixture.ts | 0 packages/api/src/{__tests__ => functions}/graphql.test.ts | 3 ++- 3 files changed, 2 insertions(+), 1 deletion(-) rename packages/api/src/{__tests__ => functions}/authDecoder.test.ts (100%) rename packages/api/src/{__tests__ => functions}/fixtures/apiGatewayProxyEvent.fixture.ts (100%) rename packages/api/src/{__tests__ => functions}/graphql.test.ts (96%) diff --git a/packages/api/src/__tests__/authDecoder.test.ts b/packages/api/src/functions/authDecoder.test.ts similarity index 100% rename from packages/api/src/__tests__/authDecoder.test.ts rename to packages/api/src/functions/authDecoder.test.ts diff --git a/packages/api/src/__tests__/fixtures/apiGatewayProxyEvent.fixture.ts b/packages/api/src/functions/fixtures/apiGatewayProxyEvent.fixture.ts similarity index 100% rename from packages/api/src/__tests__/fixtures/apiGatewayProxyEvent.fixture.ts rename to packages/api/src/functions/fixtures/apiGatewayProxyEvent.fixture.ts diff --git a/packages/api/src/__tests__/graphql.test.ts b/packages/api/src/functions/graphql.test.ts similarity index 96% rename from packages/api/src/__tests__/graphql.test.ts rename to packages/api/src/functions/graphql.test.ts index 5fac9e2bcd12..fbeb8a6e3bb2 100644 --- a/packages/api/src/__tests__/graphql.test.ts +++ b/packages/api/src/functions/graphql.test.ts @@ -1,6 +1,7 @@ -import { createContextHandler } from '../functions/graphql' import { context } from '../globalContext' +import { createContextHandler } from './graphql' + describe('graphql createContextHandler', () => { it('merges the context correctly', async () => { const handler = createContextHandler({ a: 1 }) From 7a4af4a2363deac508ad0f3fbc0be09deda147b7 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Mon, 27 Jul 2020 10:18:29 +0200 Subject: [PATCH 13/37] Fix build scripts. --- packages/api/package.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 182cb4fb531c..a4caf36dc789 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -33,12 +33,10 @@ ] }, "scripts": { - "build": "yarn build:clean && yarn build:js", - "build:js": "yarn cross-env NODE_ENV=production babel src -d dist --extensions \".js,.ts\"", + "build": "yarn cross-env NODE_ENV=production babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", "build:types": "tsc --build --clean && tsc --build", - "build:clean": "", "prepublishOnly": "yarn build", - "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --ignore importAll.macro.js --exec \"yarn build:js\"", + "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "yarn jest", "test:watch": "yarn test --watch" }, From 631ac9dc2ee70a87d315e178d24e7d746396e186 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Mon, 3 Aug 2020 12:24:11 +0200 Subject: [PATCH 14/37] Generate types for import dir plugin. --- .../babel-plugin-redwood-import-dir.test.ts | 31 ++++++++++++++++--- .../src/babel-plugin-redwood-import-dir.ts | 29 +++++++++++++++-- 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/packages/core/src/__tests__/babel-plugin-redwood-import-dir.test.ts b/packages/core/src/__tests__/babel-plugin-redwood-import-dir.test.ts index 63ff248769b2..9a120e6a0c92 100644 --- a/packages/core/src/__tests__/babel-plugin-redwood-import-dir.test.ts +++ b/packages/core/src/__tests__/babel-plugin-redwood-import-dir.test.ts @@ -4,8 +4,31 @@ import pluginTester from 'babel-plugin-tester' import plugin from '../babel-plugin-redwood-import-dir' -pluginTester({ - plugin, - pluginName: 'babel-plugin-redwood-import-dir', - fixtures: path.join(__dirname, '__fixtures__/import-dir'), +describe('babel plugin redwood import dir', () => { + pluginTester({ + plugin, + pluginOptions: { + generateTypesPath: '__fixtures__/import-dir', + host: { + writeFileSync: (path, contents) => { + expect(path).toEqual( + '__fixtures__/import-dir/import-dir-services.d.ts' + ) + expect(contents.replace(/\s/g, '')).toMatch( + ` + declare module '../__fixtures__/**/*.{js,ts}' { + export default { + a: any + b: any + c_sdl: any + nested_d: any + } + }`.replace(/\s/g, '') + ) + }, + }, + }, + pluginName: 'babel-plugin-redwood-import-dir', + fixtures: path.join(__dirname, '__fixtures__/import-dir'), + }) }) diff --git a/packages/core/src/babel-plugin-redwood-import-dir.ts b/packages/core/src/babel-plugin-redwood-import-dir.ts index 52b8b1ef7d86..b797734eba65 100644 --- a/packages/core/src/babel-plugin-redwood-import-dir.ts +++ b/packages/core/src/babel-plugin-redwood-import-dir.ts @@ -2,6 +2,15 @@ import path from 'path' import glob from 'glob' import type { PluginObj, types } from '@babel/core' +import type { Host } from '@redwoodjs/structure' + +export const generateTypes = (modulePath: string, typeExports: string[]) => { + return `declare module '${modulePath}' { + export default { + ${typeExports.join('\n')} + } + }` +} /** * This babel plugin will search for import statements that include star `*` @@ -18,10 +27,11 @@ import type { PluginObj, types } from '@babel/core' * // services.b = require('src/services/b.ts') * // services.nested_c = require('src/services/nested/c.js') * ``` - * - * @todo Generate ambient declerations for TypeScript of imported files. */ -export default function ({ types: t }: { types: typeof types }): PluginObj { +export default function ( + { types: t }: { types: typeof types }, + options: { generateTypesPath: string; host: Host } +): PluginObj { return { name: 'babel-plugin-redwood-import-dir', visitor: { @@ -46,6 +56,7 @@ export default function ({ types: t }: { types: typeof types }): PluginObj { ) const importGlob = p.node.source.value + const cwd = path.dirname(state.file.opts.filename) const dirFiles = glob .sync(importGlob, { cwd }) @@ -59,6 +70,7 @@ export default function ({ types: t }: { types: typeof types }): PluginObj { .replace(/[^a-zA-Z0-9]/g, '_') } + let typeExports: string[] = [] for (const filePath of dirFiles) { const { dir: fileDir, name: fileName } = path.parse(filePath) const filePathWithoutExtension = fileDir + '/' + fileName @@ -79,6 +91,7 @@ export default function ({ types: t }: { types: typeof types }): PluginObj { // + . = // services.a = a + typeExports = [...typeExports, `${fpVarName}: any`] nodes.push( t.expressionStatement( t.assignmentExpression( @@ -98,6 +111,16 @@ export default function ({ types: t }: { types: typeof types }): PluginObj { } // - import importName from "dirPath" p.remove() + + if (options.host.writeFileSync) { + options.host.writeFileSync( + path.join( + options.generateTypesPath, + `import-dir-${importName}.d.ts` + ), + generateTypes(importGlob, typeExports) + ) + } }, }, } From 9ebb11d701aae507386b5cba3ebf4e915cac65b1 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Mon, 3 Aug 2020 12:24:22 +0200 Subject: [PATCH 15/37] Remove .only. --- .../src/__tests__/babel-plugin-redwood-mock-cell-data.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/__tests__/babel-plugin-redwood-mock-cell-data.test.ts b/packages/core/src/__tests__/babel-plugin-redwood-mock-cell-data.test.ts index 3bfc9baea387..4d6817c61ce7 100644 --- a/packages/core/src/__tests__/babel-plugin-redwood-mock-cell-data.test.ts +++ b/packages/core/src/__tests__/babel-plugin-redwood-mock-cell-data.test.ts @@ -4,7 +4,7 @@ import pluginTester from 'babel-plugin-tester' import plugin from '../babel-plugin-redwood-mock-cell-data' -describe.only('xxx', () => { +describe('babel plugin redwood mock cell data', () => { const __fixtures__ = path.resolve(__dirname, '../../../../__fixtures__') //? pluginTester({ From fe69e18302bffa152c01edc36aded6c2d1dc8149 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Mon, 3 Aug 2020 12:24:37 +0200 Subject: [PATCH 16/37] Add optional type for Host. --- packages/structure/src/ide.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/structure/src/ide.ts b/packages/structure/src/ide.ts index 00af85ae9213..b7b18eed1a04 100644 --- a/packages/structure/src/ide.ts +++ b/packages/structure/src/ide.ts @@ -30,6 +30,8 @@ export interface Host { readFileSync(path: string): string readdirSync(path: string): string[] globSync(pattern: string): string[] + // TODO: Make non-optional once it's implemented. + writeFileSync?(path: string, contents: string): void } export type IDEInfo = From 50f5e03f5afc8164fe98e49f01cc5d496a88233a Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Mon, 3 Aug 2020 12:26:27 +0200 Subject: [PATCH 17/37] Remove babel-plugin-macros. --- packages/core/config/babel-preset.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/core/config/babel-preset.js b/packages/core/config/babel-preset.js index 82990eee206d..9d894d1480c8 100644 --- a/packages/core/config/babel-preset.js +++ b/packages/core/config/babel-preset.js @@ -15,7 +15,6 @@ module.exports = () => { presets: ['@babel/preset-react', '@babel/preset-typescript'], plugins: [ ['@babel/plugin-proposal-class-properties', { loose: true }], - 'babel-plugin-macros', [ '@babel/plugin-transform-runtime', { From 9bee393a80c4ad12520cbc0b11d421cd3b98962d Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Mon, 3 Aug 2020 12:29:57 +0200 Subject: [PATCH 18/37] Bump lock file. --- yarn.lock | 1585 ++++++++++++++++++++++++++--------------------------- 1 file changed, 769 insertions(+), 816 deletions(-) diff --git a/yarn.lock b/yarn.lock index 99dcb8c65122..94ac6190c0db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -124,28 +124,28 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/compat-data@^7.10.4": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.5.tgz#d38425e67ea96b1480a3f50404d1bf85676301a6" - integrity sha512-mPVoWNzIpYJHbWje0if7Ck36bpbtTvIxOi9+6WSK9wjGEXearAqlwBoTQvVjsAY2VIwgcs8V940geY3okzRCEw== +"@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz#e9f73efe09af1355b723a7f39b11bad637d7c99c" + integrity sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ== dependencies: browserslist "^4.12.0" invariant "^2.2.4" semver "^5.5.0" "@babel/core@^7.1.0", "@babel/core@^7.10.4", "@babel/core@^7.2.2", "@babel/core@^7.4.5", "@babel/core@^7.7.5", "@babel/core@^7.9.0": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.5.tgz#1f15e2cca8ad9a1d78a38ddba612f5e7cdbbd330" - integrity sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.0.tgz#73b9c33f1658506887f767c26dae07798b30df76" + integrity sha512-mkLq8nwaXmDtFmRkQ8ED/eA2CnVw4zr7dCztKalZXBvdK5EeNUAesrrwUqjQEzFgomJssayzB0aqlOsP1vGLqg== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.10.5" - "@babel/helper-module-transforms" "^7.10.5" + "@babel/generator" "^7.11.0" + "@babel/helper-module-transforms" "^7.11.0" "@babel/helpers" "^7.10.4" - "@babel/parser" "^7.10.5" + "@babel/parser" "^7.11.0" "@babel/template" "^7.10.4" - "@babel/traverse" "^7.10.5" - "@babel/types" "^7.10.5" + "@babel/traverse" "^7.11.0" + "@babel/types" "^7.11.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" @@ -155,12 +155,12 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.10.5": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.5.tgz#1b903554bc8c583ee8d25f1e8969732e6b829a69" - integrity sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig== +"@babel/generator@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.0.tgz#4b90c78d8c12825024568cbe83ee6c9af193585c" + integrity sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ== dependencies: - "@babel/types" "^7.10.5" + "@babel/types" "^7.11.0" jsesc "^2.5.1" source-map "^0.5.0" @@ -269,11 +269,11 @@ "@babel/types" "^7.10.4" "@babel/helper-member-expression-to-functions@^7.10.4", "@babel/helper-member-expression-to-functions@^7.10.5": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz#172f56e7a63e78112f3a04055f24365af702e7ee" - integrity sha512-HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df" + integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q== dependencies: - "@babel/types" "^7.10.5" + "@babel/types" "^7.11.0" "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4": version "7.10.4" @@ -282,17 +282,17 @@ dependencies: "@babel/types" "^7.10.4" -"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz#120c271c0b3353673fcdfd8c053db3c544a260d6" - integrity sha512-4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA== +"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359" + integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg== dependencies: "@babel/helper-module-imports" "^7.10.4" "@babel/helper-replace-supers" "^7.10.4" "@babel/helper-simple-access" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.11.0" "@babel/template" "^7.10.4" - "@babel/types" "^7.10.5" + "@babel/types" "^7.11.0" lodash "^4.17.19" "@babel/helper-optimise-call-expression@^7.10.4": @@ -302,7 +302,7 @@ dependencies: "@babel/types" "^7.10.4" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== @@ -343,12 +343,19 @@ "@babel/template" "^7.10.4" "@babel/types" "^7.10.4" -"@babel/helper-split-export-declaration@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz#2c70576eaa3b5609b24cb99db2888cc3fc4251d1" - integrity sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg== +"@babel/helper-skip-transparent-expression-wrappers@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz#eec162f112c2f58d3af0af125e3bb57665146729" + integrity sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.11.0" + +"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" + integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== + dependencies: + "@babel/types" "^7.11.0" "@babel/helper-validator-identifier@^7.10.4": version "7.10.4" @@ -397,10 +404,10 @@ resolve "^1.13.1" v8flags "^3.1.1" -"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.10.4", "@babel/parser@^7.10.5", "@babel/parser@^7.3.2", "@babel/parser@^7.7.0": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz#e7c6bf5a7deff957cec9f04b551e2762909d826b" - integrity sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.10.4", "@babel/parser@^7.11.0", "@babel/parser@^7.3.2", "@babel/parser@^7.7.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.0.tgz#a9d7e11aead25d3b422d17b2c6502c8dddef6a5d" + integrity sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw== "@babel/plugin-proposal-async-generator-functions@^7.10.4": version "7.10.5" @@ -436,6 +443,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-dynamic-import" "^7.8.0" +"@babel/plugin-proposal-export-namespace-from@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz#570d883b91031637b3e2958eea3c438e62c05f54" + integrity sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-proposal-json-strings@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db" @@ -444,6 +459,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.0" +"@babel/plugin-proposal-logical-assignment-operators@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz#9f80e482c03083c87125dee10026b58527ea20c8" + integrity sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a" @@ -460,10 +483,10 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.6.2": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0" - integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA== +"@babel/plugin-proposal-object-rest-spread@^7.11.0", "@babel/plugin-proposal-object-rest-spread@^7.6.2": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af" + integrity sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" @@ -477,12 +500,13 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7" - integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ== +"@babel/plugin-proposal-optional-chaining@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz#de5866d0646f6afdaab8a566382fe3a221755076" + integrity sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0" "@babel/plugin-syntax-optional-chaining" "^7.8.0" "@babel/plugin-proposal-private-methods@^7.10.4": @@ -536,6 +560,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-export-namespace-from@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-flow@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz#53351dd7ae01995e567d04ce42af1a6e0ba846a6" @@ -564,7 +595,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": +"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== @@ -884,9 +915,9 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-runtime@^7.10.4", "@babel/plugin-transform-runtime@^7.9.0": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.5.tgz#3b39b7b24830e0c2d8ff7a4489fe5cf99fbace86" - integrity sha512-tV4V/FjElJ9lQtyjr5xD2IFFbgY46r7EeVu5a8CpEKT5laheHKSlFeHjpkPppW3PqzGLAuv5k2qZX5LgVZIX5w== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz#e27f78eb36f19448636e05c33c90fd9ad9b8bccf" + integrity sha512-LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw== dependencies: "@babel/helper-module-imports" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" @@ -900,12 +931,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-spread@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz#4e2c85ea0d6abaee1b24dcfbbae426fe8d674cff" - integrity sha512-1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ== +"@babel/plugin-transform-spread@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz#fa84d300f5e4f57752fe41a6d1b3c554f13f17cc" + integrity sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw== dependencies: "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0" "@babel/plugin-transform-sticky-regex@^7.10.4": version "7.10.4" @@ -931,9 +963,9 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-typescript@^7.10.4": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.5.tgz#edf353944e979f40d8ff9fe4e9975d0a465037c5" - integrity sha512-YCyYsFrrRMZ3qR7wRwtSSJovPG5vGyG4ZdcSAivGwTfoasMp3VOB/AKhohu3dFtmB4cCDcsndCSxGtrdliCsZQ== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz#2b4879676af37342ebb278216dd090ac67f13abb" + integrity sha512-edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w== dependencies: "@babel/helper-create-class-features-plugin" "^7.10.5" "@babel/helper-plugin-utils" "^7.10.4" @@ -955,29 +987,33 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/preset-env@^7.10.4", "@babel/preset-env@^7.4.5", "@babel/preset-env@^7.9.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.4.tgz#fbf57f9a803afd97f4f32e4f798bb62e4b2bef5f" - integrity sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.0.tgz#860ee38f2ce17ad60480c2021ba9689393efb796" + integrity sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg== dependencies: - "@babel/compat-data" "^7.10.4" + "@babel/compat-data" "^7.11.0" "@babel/helper-compilation-targets" "^7.10.4" "@babel/helper-module-imports" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-proposal-async-generator-functions" "^7.10.4" "@babel/plugin-proposal-class-properties" "^7.10.4" "@babel/plugin-proposal-dynamic-import" "^7.10.4" + "@babel/plugin-proposal-export-namespace-from" "^7.10.4" "@babel/plugin-proposal-json-strings" "^7.10.4" + "@babel/plugin-proposal-logical-assignment-operators" "^7.11.0" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4" "@babel/plugin-proposal-numeric-separator" "^7.10.4" - "@babel/plugin-proposal-object-rest-spread" "^7.10.4" + "@babel/plugin-proposal-object-rest-spread" "^7.11.0" "@babel/plugin-proposal-optional-catch-binding" "^7.10.4" - "@babel/plugin-proposal-optional-chaining" "^7.10.4" + "@babel/plugin-proposal-optional-chaining" "^7.11.0" "@babel/plugin-proposal-private-methods" "^7.10.4" "@babel/plugin-proposal-unicode-property-regex" "^7.10.4" "@babel/plugin-syntax-async-generators" "^7.8.0" "@babel/plugin-syntax-class-properties" "^7.10.4" "@babel/plugin-syntax-dynamic-import" "^7.8.0" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-syntax-json-strings" "^7.8.0" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" "@babel/plugin-syntax-numeric-separator" "^7.10.4" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" @@ -1010,14 +1046,14 @@ "@babel/plugin-transform-regenerator" "^7.10.4" "@babel/plugin-transform-reserved-words" "^7.10.4" "@babel/plugin-transform-shorthand-properties" "^7.10.4" - "@babel/plugin-transform-spread" "^7.10.4" + "@babel/plugin-transform-spread" "^7.11.0" "@babel/plugin-transform-sticky-regex" "^7.10.4" "@babel/plugin-transform-template-literals" "^7.10.4" "@babel/plugin-transform-typeof-symbol" "^7.10.4" "@babel/plugin-transform-unicode-escapes" "^7.10.4" "@babel/plugin-transform-unicode-regex" "^7.10.4" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.10.4" + "@babel/types" "^7.11.0" browserslist "^4.12.0" core-js-compat "^3.6.2" invariant "^2.2.2" @@ -1076,17 +1112,17 @@ source-map-support "^0.5.16" "@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.10.4", "@babel/runtime-corejs3@^7.9.2": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.5.tgz#a57fe6c13045ca33768a2aa527ead795146febe1" - integrity sha512-RMafpmrNB5E/bwdSphLr8a8++9TosnyJp98RZzI6VOx2R2CCMpsXXXRvmI700O9oEKpXdZat6oEK68/F0zjd4A== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.0.tgz#db54a2251206f0f8579b41918acb14488b8dd2c0" + integrity sha512-K0ioacsw8JgzDSPpUiGWokMvLzGvnZPXLrTsJfyHPrFsnp4yoKn+Ap/8NNZgWKZG9o5+qotH8tAa8AXn8gTN5A== dependencies: core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.5.tgz#303d8bd440ecd5a491eae6117fd3367698674c5c" - integrity sha512-otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.0.tgz#f10245877042a815e07f7e693faff0ae9d3a2aac" + integrity sha512-qArkXsjJq7H+T86WrIFV0Fnu/tNOkZ4cgXmjkzAu3b/58D5mFIO8JH/y77t7C9q0OdDRdh9s7Ue5GasYssxtXw== dependencies: regenerator-runtime "^0.13.4" @@ -1099,25 +1135,25 @@ "@babel/parser" "^7.10.4" "@babel/types" "^7.10.4" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6", "@babel/traverse@^7.10.4", "@babel/traverse@^7.10.5", "@babel/traverse@^7.7.0": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.5.tgz#77ce464f5b258be265af618d8fddf0536f20b564" - integrity sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.0", "@babel/traverse@^7.7.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.0.tgz#9b996ce1b98f53f7c3e4175115605d56ed07dd24" + integrity sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.10.5" + "@babel/generator" "^7.11.0" "@babel/helper-function-name" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.10.4" - "@babel/parser" "^7.10.5" - "@babel/types" "^7.10.5" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/parser" "^7.11.0" + "@babel/types" "^7.11.0" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz#d88ae7e2fde86bfbfe851d4d81afa70a997b5d15" - integrity sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q== +"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.0.tgz#2ae6bf1ba9ae8c3c43824e5861269871b206e90d" + integrity sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA== dependencies: "@babel/helper-validator-identifier" "^7.10.4" lodash "^4.17.19" @@ -1325,16 +1361,16 @@ resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.3.1.tgz#3c5f5d71129c88295e17e914e34b391ffda1723c" integrity sha512-63vVJ5NIBh/JF8l9LuPrQYSzFimk7zYHySQB4Dk9rVdJ8kV/vGQoVTvRu1UW05sEc2Ug5PqtEChtTHU+9hvPcA== -"@firebase/analytics@0.3.9": - version "0.3.9" - resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.3.9.tgz#5755ac0f15ccf1fc6c811c99c4ca778985cdc237" - integrity sha512-l4dNskm8uQ+UqO6Lw+fuyO1enZBXUV6xNMxeVABEnVrp3wOP90KKb/ZwYgleAxF1It52lorcTtkA1YFpv3iEIQ== +"@firebase/analytics@0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.4.1.tgz#0f1e6f4e56af11c3956b1652520095a1fbd2c418" + integrity sha512-y5ZuhqX/PwLi0t7AKxNAi3NnlEwXe0rpknulUWUg3/1dALqtd2RrAOATQoV5FNnKK6YUH5UmK0Jb9KcSjsFeNw== dependencies: "@firebase/analytics-types" "0.3.1" - "@firebase/component" "0.1.16" - "@firebase/installations" "0.4.14" + "@firebase/component" "0.1.17" + "@firebase/installations" "0.4.15" "@firebase/logger" "0.2.6" - "@firebase/util" "0.2.50" + "@firebase/util" "0.3.0" tslib "^1.11.1" "@firebase/app-types@0.6.1": @@ -1342,15 +1378,15 @@ resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.6.1.tgz#dcbd23030a71c0c74fc95d4a3f75ba81653850e9" integrity sha512-L/ZnJRAq7F++utfuoTKX4CLBG5YR7tFO3PLzG1/oXXKEezJ0kRL3CMRoueBEmTCzVb/6SIs2Qlaw++uDgi5Xyg== -"@firebase/app@0.6.8": - version "0.6.8" - resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.6.8.tgz#e7ccf31cc1d01f16744d6d27c5f9ba8b64338f12" - integrity sha512-Tm7Pi6Dtpx4FFKcpm0jcrZ/qI9oREBxmP3pWlw1jgDW4syRJHmN9/5DYvfFk6FAhj3FrY8E/6F+ngWJfqONotQ== +"@firebase/app@0.6.9": + version "0.6.9" + resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.6.9.tgz#e60412d9b6012afb73caef2a1353e1b4c4182954" + integrity sha512-X2riRgK49IK8LCQ3j7BKLu3zqHDTJSaT6YgcLewtHuOVwtpHfGODiS1cL5VMvKm3ogxP84GA70tN3sdoL/vTog== dependencies: "@firebase/app-types" "0.6.1" - "@firebase/component" "0.1.16" + "@firebase/component" "0.1.17" "@firebase/logger" "0.2.6" - "@firebase/util" "0.2.50" + "@firebase/util" "0.3.0" dom-storage "2.1.0" tslib "^1.11.1" xmlhttprequest "1.8.0" @@ -1372,12 +1408,12 @@ dependencies: "@firebase/auth-types" "0.10.1" -"@firebase/component@0.1.16": - version "0.1.16" - resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.1.16.tgz#7a0dbdfff1485d45b8485db87a982f053e68761a" - integrity sha512-FvffvFN0LWgv1H/FIyruTECOL69Dhy+JfwoTq+mV39V8Mz9lNpo41etonL5AOr7KmXxYJVbNwkx0L9Ei88i7JA== +"@firebase/component@0.1.17": + version "0.1.17" + resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.1.17.tgz#2ce3e1aa060eccf0f06d20368ef9a32cf07c07be" + integrity sha512-/tN5iLcFp9rdpTfCJPfQ/o2ziGHlDxOzNx6XD2FoHlu4pG/PPGu+59iRfQXIowBGhxcTGD/l7oJhZEY/PVg0KQ== dependencies: - "@firebase/util" "0.2.50" + "@firebase/util" "0.3.0" tslib "^1.11.1" "@firebase/database-types@0.5.1": @@ -1387,16 +1423,16 @@ dependencies: "@firebase/app-types" "0.6.1" -"@firebase/database@0.6.8", "@firebase/database@^0.6.0": - version "0.6.8" - resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.6.8.tgz#28c9fb4e6a3322cdf9b5f58e768f21d9ac948840" - integrity sha512-Psibz/LD9WBvZRS7A/kkYd5i5l6tBw49adSFmCM2ZJlKE9fxZhxay02AerwfXHiq3gPKVeqXUjBIRuHOWdEXmw== +"@firebase/database@0.6.9", "@firebase/database@^0.6.0": + version "0.6.9" + resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.6.9.tgz#18a4bdc93b0b10c19a8ad4ff616bba196e5a16e0" + integrity sha512-+X2dNFDpcLEcDRdXp2Hgkf0RnNz3AOIC+Y7UFMQYadm9buB+snXomlnlkMzOj6o+Cp3V7GnpBrKKeeFqzF6wGQ== dependencies: "@firebase/auth-interop-types" "0.1.5" - "@firebase/component" "0.1.16" + "@firebase/component" "0.1.17" "@firebase/database-types" "0.5.1" "@firebase/logger" "0.2.6" - "@firebase/util" "0.2.50" + "@firebase/util" "0.3.0" faye-websocket "0.11.3" tslib "^1.11.1" @@ -1405,15 +1441,15 @@ resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-1.12.0.tgz#511e572e946b07f5a603c90e078f0cd714923fac" integrity sha512-OqNxVb63wPZdUc7YnpacAW1WNIMSKERSewCRi+unCQ0YI0KNfrDSypyGCyel+S3GdOtKMk9KnvDknaGbnaFX4g== -"@firebase/firestore@1.16.1": - version "1.16.1" - resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-1.16.1.tgz#ddf4e357b4d847abe6a57a89d3e2d5b950339176" - integrity sha512-TGtvNIGHMEFFEuOSsRswou576GPZY39vXIsenn0B1Dqz9ACpyDtvAT9YdbG38srlPq7ZKwsP5x04LB43zZ6eAg== +"@firebase/firestore@1.16.2": + version "1.16.2" + resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-1.16.2.tgz#66eedeefab569331efc1ad9ab49a8f1c867a9163" + integrity sha512-iIkAL860oD/QA1uYI9JBbWqBYFWd+DnuSj//BIbOGn3DNAruDFy07g8re1vn+0MMas9bMk6CZATJNCFPeH8AsQ== dependencies: - "@firebase/component" "0.1.16" + "@firebase/component" "0.1.17" "@firebase/firestore-types" "1.12.0" "@firebase/logger" "0.2.6" - "@firebase/util" "0.2.50" + "@firebase/util" "0.3.0" "@firebase/webchannel-wrapper" "0.2.41" "@grpc/grpc-js" "^1.0.0" "@grpc/proto-loader" "^0.5.0" @@ -1424,12 +1460,12 @@ resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.3.17.tgz#348bf5528b238eeeeeae1d52e8ca547b21d33a94" integrity sha512-DGR4i3VI55KnYk4IxrIw7+VG7Q3gA65azHnZxo98Il8IvYLr2UTBlSh72dTLlDf25NW51HqvJgYJDKvSaAeyHQ== -"@firebase/functions@0.4.48": - version "0.4.48" - resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.4.48.tgz#aee8efeacbfdd74834db0c1b44297f59c5bdddaf" - integrity sha512-BwI/JzO/f/nquKG1IS3VqmwMaKEhvM58/08vTnp46krHBsOYqsdD9T2amz+HXGT9fe2HhDsUhgFE8D00S0vqbg== +"@firebase/functions@0.4.49": + version "0.4.49" + resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.4.49.tgz#cca60a2f8e188e020c7e5a5ecf075474885ffb03" + integrity sha512-ma3+z1wMKervmEJCLWxwIjbSV+n3/BTfFPSZdTjt18Wgiso5q4BzEObFkorxaXZiyT3KpZ0qOO97lgcoth2hIA== dependencies: - "@firebase/component" "0.1.16" + "@firebase/component" "0.1.17" "@firebase/functions-types" "0.3.17" "@firebase/messaging-types" "0.4.5" isomorphic-fetch "2.2.1" @@ -1440,14 +1476,14 @@ resolved "https://registry.yarnpkg.com/@firebase/installations-types/-/installations-types-0.3.4.tgz#589a941d713f4f64bf9f4feb7f463505bab1afa2" integrity sha512-RfePJFovmdIXb6rYwtngyxuEcWnOrzdZd9m7xAW0gRxDIjBT20n3BOhjpmgRWXo/DAxRmS7bRjWAyTHY9cqN7Q== -"@firebase/installations@0.4.14": - version "0.4.14" - resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.4.14.tgz#e0c240869bed834d1b5cc696bec0020e8fcb5f7b" - integrity sha512-hQPsaU7wdTq3CFMtFQwZy6LgdXZAkXoUToV4O+ekPbjM65QzaGVogJVU8O2H6ADXoq37SarcUXKe86pcUWdFLA== +"@firebase/installations@0.4.15": + version "0.4.15" + resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.4.15.tgz#ec5a098aea6b5e3e29e73270eeaaf9791587d20a" + integrity sha512-6uGgDocDGu5gI7FeDBDcLaH4npz0cm2f0kctOFK+5N1CyK8Tv2YGv5/uGqlrTtSwDW+8tgKNo/5XXJJOPr9Jsw== dependencies: - "@firebase/component" "0.1.16" + "@firebase/component" "0.1.17" "@firebase/installations-types" "0.3.4" - "@firebase/util" "0.2.50" + "@firebase/util" "0.3.0" idb "3.0.2" tslib "^1.11.1" @@ -1461,15 +1497,15 @@ resolved "https://registry.yarnpkg.com/@firebase/messaging-types/-/messaging-types-0.4.5.tgz#452572d3c5b7fa83659fdb1884450477229f5dc4" integrity sha512-sux4fgqr/0KyIxqzHlatI04Ajs5rc3WM+WmtCpxrKP1E5Bke8xu/0M+2oy4lK/sQ7nov9z15n3iltAHCgTRU3Q== -"@firebase/messaging@0.6.20": - version "0.6.20" - resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.6.20.tgz#c6139dad753185706196972629e9235cdda8c2d6" - integrity sha512-1MqyljXnbFBeHYhL6QInVM9aO5MW820yhNmOIVxk58wNXq4tOQLzqnKuvlgZ+ttgqlDzrIYiVf3EOHh5DptttQ== +"@firebase/messaging@0.6.21": + version "0.6.21" + resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.6.21.tgz#d301de72ad055c3f302b917b8a11373cd78c7431" + integrity sha512-cunbFNCtUy25Zp4/jn5lenYUPqgHpjKNUwRjKc7vIzYb4IT2Vu/7kaEptO3K0KQBC6O0QV3ZtqQxKrI9aLiSHg== dependencies: - "@firebase/component" "0.1.16" - "@firebase/installations" "0.4.14" + "@firebase/component" "0.1.17" + "@firebase/installations" "0.4.15" "@firebase/messaging-types" "0.4.5" - "@firebase/util" "0.2.50" + "@firebase/util" "0.3.0" idb "3.0.2" tslib "^1.11.1" @@ -1478,16 +1514,16 @@ resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.0.13.tgz#58ce5453f57e34b18186f74ef11550dfc558ede6" integrity sha512-6fZfIGjQpwo9S5OzMpPyqgYAUZcFzZxHFqOyNtorDIgNXq33nlldTL/vtaUZA8iT9TT5cJlCrF/jthKU7X21EA== -"@firebase/performance@0.3.9": - version "0.3.9" - resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.3.9.tgz#01e27616aca8486c7602e4f51c325c2e7caae6e8" - integrity sha512-Fj22DZXRhhKv1OSUzDxX7AqpJUcDld6tzXK1yxOC8e3v1DFPQMQdM9FoG1m1b/Vrqa6pCCqnqG6gh6VPnEcAzQ== +"@firebase/performance@0.3.10": + version "0.3.10" + resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.3.10.tgz#b68336e23f4b5422bd67f6ce35e28293a6b8945e" + integrity sha512-j/hsx2xfOO1hZulmz7KxemoTIVXxrv94rt79x8qO1HzysT7ziViNvQ9cQGjDZWwVSO29TpLH31GOWLVnwmnxWQ== dependencies: - "@firebase/component" "0.1.16" - "@firebase/installations" "0.4.14" + "@firebase/component" "0.1.17" + "@firebase/installations" "0.4.15" "@firebase/logger" "0.2.6" "@firebase/performance-types" "0.0.13" - "@firebase/util" "0.2.50" + "@firebase/util" "0.3.0" tslib "^1.11.1" "@firebase/polyfill@0.3.36": @@ -1504,16 +1540,16 @@ resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.1.9.tgz#fe6bbe4d08f3b6e92fce30e4b7a9f4d6a96d6965" integrity sha512-G96qnF3RYGbZsTRut7NBX0sxyczxt1uyCgXQuH/eAfUCngxjEGcZQnBdy6mvSdqdJh5mC31rWPO4v9/s7HwtzA== -"@firebase/remote-config@0.1.25": - version "0.1.25" - resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.1.25.tgz#93c5bda311d6c1302697d6148bdb33bb8dcb9e15" - integrity sha512-8YWefBhy77HMbWXWdbenalx+IDY/XkS+iURQ9qRYvSIFYx6RL04DzlakZNOY9CQAcxTA+cTSt4NNlhjopBjf2Q== +"@firebase/remote-config@0.1.26": + version "0.1.26" + resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.1.26.tgz#62f448237bc46b986c27ac623b5cc5852007ea05" + integrity sha512-B6+nARVNcswysd6C16nK5tdGECgEpr1wdH6LyqylEQ8hUxYWN18qe49b9uPu+ktaHq0gFLg03gayZvQs7fxJOg== dependencies: - "@firebase/component" "0.1.16" - "@firebase/installations" "0.4.14" + "@firebase/component" "0.1.17" + "@firebase/installations" "0.4.15" "@firebase/logger" "0.2.6" "@firebase/remote-config-types" "0.1.9" - "@firebase/util" "0.2.50" + "@firebase/util" "0.3.0" tslib "^1.11.1" "@firebase/storage-types@0.3.13": @@ -1521,20 +1557,20 @@ resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.3.13.tgz#cd43e939a2ab5742e109eb639a313673a48b5458" integrity sha512-pL7b8d5kMNCCL0w9hF7pr16POyKkb3imOW7w0qYrhBnbyJTdVxMWZhb0HxCFyQWC0w3EiIFFmxoz8NTFZDEFog== -"@firebase/storage@0.3.39": - version "0.3.39" - resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.3.39.tgz#7e387d5948c53ae07bd48e28560c549bfcf2fb9d" - integrity sha512-uTE8kROU/NMas+0i2oK0U9LuAlDzt+Cis0ErmYPlbCvmFqpFdyu3TtlO5MYNoxGLaBjEyxb18NJZai9lNMXFlQ== +"@firebase/storage@0.3.41": + version "0.3.41" + resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.3.41.tgz#cba8946f980d70e68d52cfb110ad109592a645d0" + integrity sha512-2imzI78HcB7FjUqXMRHsGLlZnTYkaCHBjJflSbypwLrEty0hreR6vx3ThOO5y0MFH93WwifqUFJAa+Twkx6CIA== dependencies: - "@firebase/component" "0.1.16" + "@firebase/component" "0.1.17" "@firebase/storage-types" "0.3.13" - "@firebase/util" "0.2.50" + "@firebase/util" "0.3.0" tslib "^1.11.1" -"@firebase/util@0.2.50": - version "0.2.50" - resolved "https://registry.yarnpkg.com/@firebase/util/-/util-0.2.50.tgz#77666b845dcb49bc217650aa296a7a8986c06b44" - integrity sha512-vFE6+Jfc25u0ViSpFxxq0q5s+XmuJ/y7CL3ud79RQe+WLFFg+j0eH1t23k0yNSG9vZNM7h3uHRIXbV97sYLAyw== +"@firebase/util@0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@firebase/util/-/util-0.3.0.tgz#c3e938192cde4e1c6260aecaaf22103add2352f5" + integrity sha512-GTwC+FSLeCPc44/TXCDReNQ5FPRIS5cb8Gr1XcD1TgiNBOvmyx61Om2YLwHp2GnN++6m6xmwmXARm06HOukATA== dependencies: tslib "^1.11.1" @@ -1644,9 +1680,9 @@ tslib "1.11.1" "@grpc/grpc-js@^1.0.0": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.1.2.tgz#3125484c19fd1c9e3f4dc7a880f9fa1b872b46c8" - integrity sha512-k2u86Bkm/3xrjUaSWeIyzXScBt/cC8uE7BznR0cpueQi11R33W6qfJdMrkrsmSHirp5likR55JSXUrcWG6ybHA== + version "1.1.3" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.1.3.tgz#0b91b166d744b6a43b00430dceff0f0ff88c98d5" + integrity sha512-HtOsk2YUofBcm1GkPqGzb6pwHhv+74eC2CUO229USIDKRtg30ycbZmqC+HdNtY3nHqoc9IgcRlntFgopyQoYCA== dependencies: semver "^6.2.0" @@ -1681,89 +1717,93 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.1.0.tgz#f67c89e4f4d04dbcf7b052aed5ab9c74f915b954" - integrity sha512-+0lpTHMd/8pJp+Nd4lyip+/Iyf2dZJvcCqrlkeZQoQid+JlThA4M9vxHtheyrQ99jJTMQam+es4BcvZ5W5cC3A== +"@jest/console@^26.2.0": + version "26.2.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.2.0.tgz#d18f2659b90930e7ec3925fb7209f1ba2cf463f0" + integrity sha512-mXQfx3nSLwiHm1i7jbu+uvi+vvpVjNGzIQYLCfsat9rapC+MJkS4zBseNrgJE0vU921b3P67bQzhduphjY3Tig== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" + "@types/node" "*" chalk "^4.0.0" - jest-message-util "^26.1.0" - jest-util "^26.1.0" + jest-message-util "^26.2.0" + jest-util "^26.2.0" slash "^3.0.0" -"@jest/core@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.1.0.tgz#4580555b522de412a7998b3938c851e4f9da1c18" - integrity sha512-zyizYmDJOOVke4OO/De//aiv8b07OwZzL2cfsvWF3q9YssfpcKfcnZAwDY8f+A76xXSMMYe8i/f/LPocLlByfw== - dependencies: - "@jest/console" "^26.1.0" - "@jest/reporters" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/transform" "^26.1.0" - "@jest/types" "^26.1.0" +"@jest/core@^26.2.2": + version "26.2.2" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.2.2.tgz#63de01ffce967618003dd7a0164b05c8041b81a9" + integrity sha512-UwA8gNI8aeV4FHGfGAUfO/DHjrFVvlBravF1Tm9Kt6qFE+6YHR47kFhgdepOFpADEKstyO+MVdPvkV6/dyt9sA== + dependencies: + "@jest/console" "^26.2.0" + "@jest/reporters" "^26.2.2" + "@jest/test-result" "^26.2.0" + "@jest/transform" "^26.2.2" + "@jest/types" "^26.2.0" + "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" - jest-changed-files "^26.1.0" - jest-config "^26.1.0" - jest-haste-map "^26.1.0" - jest-message-util "^26.1.0" + jest-changed-files "^26.2.0" + jest-config "^26.2.2" + jest-haste-map "^26.2.2" + jest-message-util "^26.2.0" jest-regex-util "^26.0.0" - jest-resolve "^26.1.0" - jest-resolve-dependencies "^26.1.0" - jest-runner "^26.1.0" - jest-runtime "^26.1.0" - jest-snapshot "^26.1.0" - jest-util "^26.1.0" - jest-validate "^26.1.0" - jest-watcher "^26.1.0" + jest-resolve "^26.2.2" + jest-resolve-dependencies "^26.2.2" + jest-runner "^26.2.2" + jest-runtime "^26.2.2" + jest-snapshot "^26.2.2" + jest-util "^26.2.0" + jest-validate "^26.2.0" + jest-watcher "^26.2.0" micromatch "^4.0.2" p-each-series "^2.1.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.1.0.tgz#378853bcdd1c2443b4555ab908cfbabb851e96da" - integrity sha512-86+DNcGongbX7ai/KE/S3/NcUVZfrwvFzOOWX/W+OOTvTds7j07LtC+MgGydH5c8Ri3uIrvdmVgd1xFD5zt/xA== +"@jest/environment@^26.2.0": + version "26.2.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.2.0.tgz#f6faee1630fcc2fad208953164bccb31dbe0e45f" + integrity sha512-oCgp9NmEiJ5rbq9VI/v/yYLDpladAAVvFxZgNsnJxOETuzPZ0ZcKKHYjKYwCtPOP1WCrM5nmyuOhMStXFGHn+g== dependencies: - "@jest/fake-timers" "^26.1.0" - "@jest/types" "^26.1.0" - jest-mock "^26.1.0" + "@jest/fake-timers" "^26.2.0" + "@jest/types" "^26.2.0" + "@types/node" "*" + jest-mock "^26.2.0" -"@jest/fake-timers@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.1.0.tgz#9a76b7a94c351cdbc0ad53e5a748789f819a65fe" - integrity sha512-Y5F3kBVWxhau3TJ825iuWy++BAuQzK/xEa+wD9vDH3RytW9f2DbMVodfUQC54rZDX3POqdxCgcKdgcOL0rYUpA== +"@jest/fake-timers@^26.2.0": + version "26.2.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.2.0.tgz#b485c57dc4c74d61406a339807a9af4bac74b75a" + integrity sha512-45Gfe7YzYTKqTayBrEdAF0qYyAsNRBzfkV0IyVUm3cx7AsCWlnjilBM4T40w7IXT5VspOgMPikQlV0M6gHwy/g== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" "@sinonjs/fake-timers" "^6.0.1" - jest-message-util "^26.1.0" - jest-mock "^26.1.0" - jest-util "^26.1.0" + "@types/node" "*" + jest-message-util "^26.2.0" + jest-mock "^26.2.0" + jest-util "^26.2.0" -"@jest/globals@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.1.0.tgz#6cc5d7cbb79b76b120f2403d7d755693cf063ab1" - integrity sha512-MKiHPNaT+ZoG85oMaYUmGHEqu98y3WO2yeIDJrs2sJqHhYOy3Z6F7F/luzFomRQ8SQ1wEkmahFAz2291Iv8EAw== +"@jest/globals@^26.2.0": + version "26.2.0" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.2.0.tgz#ad78f1104f250c1a4bf5184a2ba51facc59b23f6" + integrity sha512-Hoc6ScEIPaym7RNytIL2ILSUWIGKlwEv+JNFof9dGYOdvPjb2evEURSslvCMkNuNg1ECEClTE8PH7ULlMJntYA== dependencies: - "@jest/environment" "^26.1.0" - "@jest/types" "^26.1.0" - expect "^26.1.0" + "@jest/environment" "^26.2.0" + "@jest/types" "^26.2.0" + expect "^26.2.0" -"@jest/reporters@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.1.0.tgz#08952e90c90282e14ff49e927bdf1873617dae78" - integrity sha512-SVAysur9FOIojJbF4wLP0TybmqwDkdnFxHSPzHMMIYyBtldCW9gG+Q5xWjpMFyErDiwlRuPyMSJSU64A67Pazg== +"@jest/reporters@^26.2.2": + version "26.2.2" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.2.2.tgz#5a8632ab410f4fc57782bc05dcf115e91818e869" + integrity sha512-7854GPbdFTAorWVh+RNHyPO9waRIN6TcvCezKVxI1khvFq9YjINTW7J3WU+tbR038Ynn6WjYred6vtT0YmIWVQ== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/transform" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/console" "^26.2.0" + "@jest/test-result" "^26.2.0" + "@jest/transform" "^26.2.2" + "@jest/types" "^26.2.0" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -1774,10 +1814,10 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^26.1.0" - jest-resolve "^26.1.0" - jest-util "^26.1.0" - jest-worker "^26.1.0" + jest-haste-map "^26.2.2" + jest-resolve "^26.2.2" + jest-util "^26.2.0" + jest-worker "^26.2.1" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" @@ -1795,26 +1835,26 @@ graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.1.0.tgz#a93fa15b21ad3c7ceb21c2b4c35be2e407d8e971" - integrity sha512-Xz44mhXph93EYMA8aYDz+75mFbarTV/d/x0yMdI3tfSRs/vh4CqSxgzVmCps1fPkHDCtn0tU8IH9iCKgGeGpfw== +"@jest/test-result@^26.2.0": + version "26.2.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.2.0.tgz#51c9b165c8851cfcf7a3466019114785e154f76b" + integrity sha512-kgPlmcVafpmfyQEu36HClK+CWI6wIaAWDHNxfQtGuKsgoa2uQAYdlxjMDBEa3CvI40+2U3v36gQF6oZBkoKatw== dependencies: - "@jest/console" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/console" "^26.2.0" + "@jest/types" "^26.2.0" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.1.0.tgz#41a6fc8b850c3f33f48288ea9ea517c047e7f14e" - integrity sha512-Z/hcK+rTq56E6sBwMoQhSRDVjqrGtj1y14e2bIgcowARaIE1SgOanwx6gvY4Q9gTKMoZQXbXvptji+q5GYxa6Q== +"@jest/test-sequencer@^26.2.2": + version "26.2.2" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.2.2.tgz#5e8091f2e6c61fdf242af566cb820a4eadc6c4af" + integrity sha512-SliZWon5LNqV/lVXkeowSU6L8++FGOu3f43T01L1Gv6wnFDP00ER0utV9jyK9dVNdXqfMNCN66sfcyar/o7BNw== dependencies: - "@jest/test-result" "^26.1.0" + "@jest/test-result" "^26.2.0" graceful-fs "^4.2.4" - jest-haste-map "^26.1.0" - jest-runner "^26.1.0" - jest-runtime "^26.1.0" + jest-haste-map "^26.2.2" + jest-runner "^26.2.2" + jest-runtime "^26.2.2" "@jest/transform@^25.5.1": version "25.5.1" @@ -1838,21 +1878,21 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/transform@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.1.0.tgz#697f48898c2a2787c9b4cb71d09d7e617464e509" - integrity sha512-ICPm6sUXmZJieq45ix28k0s+d/z2E8CHDsq+WwtWI6kW8m7I8kPqarSEcUN86entHQ570ZBRci5OWaKL0wlAWw== +"@jest/transform@^26.2.2": + version "26.2.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.2.2.tgz#86c005c8d5d749ac54d8df53ea58675fffe7a97e" + integrity sha512-c1snhvi5wRVre1XyoO3Eef5SEWpuBCH/cEbntBUd9tI5sNYiBDmO0My/lc5IuuGYKp/HFIHV1eZpSx5yjdkhKw== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" babel-plugin-istanbul "^6.0.0" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^26.1.0" + jest-haste-map "^26.2.2" jest-regex-util "^26.0.0" - jest-util "^26.1.0" + jest-util "^26.2.0" micromatch "^4.0.2" pirates "^4.0.1" slash "^3.0.0" @@ -1869,13 +1909,14 @@ "@types/yargs" "^15.0.0" chalk "^3.0.0" -"@jest/types@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.1.0.tgz#f8afaaaeeb23b5cad49dd1f7779689941dcb6057" - integrity sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ== +"@jest/types@^26.2.0": + version "26.2.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.2.0.tgz#b28ca1fb517a4eb48c0addea7fcd9edc4ab45721" + integrity sha512-lvm3rJvctxd7+wxKSxxbzpDbr4FXDLaC57WEKdUIZ2cjTYuxYSc0zlyD7Z4Uqr5VdKxRUrtwIkiqBuvgf8uKJA== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^1.1.1" + "@types/node" "*" "@types/yargs" "^15.0.0" chalk "^4.0.0" @@ -2706,9 +2747,9 @@ "@types/node" ">= 8" "@octokit/types@^5.0.0", "@octokit/types@^5.0.1": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.1.0.tgz#4377a3f39edad3e60753fb5c3c310756f1ded57f" - integrity sha512-OFxUBgrEllAbdEmWp/wNmKIu5EuumKHG4sgy56vjZ8lXPgMhF05c76hmulfOdFHHYRpPj49ygOZJ8wgVsPecuA== + version "5.2.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.2.0.tgz#d075dc23bf293f540739250b6879e2c1be2fc20c" + integrity sha512-XjOk9y4m8xTLIKPe1NFxNWBdzA2/z3PFFA/bwf4EoH6oS8hM0Y46mEa4Cb+KCyj/tFDznJFahzQ0Aj3o1FYq4A== dependencies: "@types/node" ">= 8" @@ -2918,9 +2959,9 @@ integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== "@sindresorhus/is@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.0.0.tgz#78fabc5e295adb6e1ef57eaafe4cc5d7aa35b183" - integrity sha512-kqA5I6Yun7PBHk8WN9BBP1c7FfN2SrD05GuVSEYPqDb4nerv7HqYfgBfMIKmT/EuejURkJKLZuLyGKGs6WEG9w== + version "3.1.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" + integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== "@sinonjs/commons@^1.7.0": version "1.8.1" @@ -3097,10 +3138,10 @@ strip-ansi "^5.0.0" through "^2.3.6" -"@snyk/java-call-graph-builder@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.11.1.tgz#1e1ca9cad0d5bee82d831f51f258ea7d46b06778" - integrity sha512-1SiAE78D8HQCE5fDKj6CeToFE/S52318oSP/X4flRwgFj9N78gD8i5O4oTkP9WwNMeFtW4Viqctc0sOK6Iea/w== +"@snyk/java-call-graph-builder@1.12.3": + version "1.12.3" + resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.12.3.tgz#f0be2c2acb1df900bbd52c0a4d2e6efbbdb0dbac" + integrity sha512-eN32RcCq5J0Veo5NIbDUSb2KRNiVsZMt1w94bFYKxFt6F1tIoiv1CraXdTHSlgQosZ7tw93e8qdOKmQXOtK88Q== dependencies: "@snyk/graphlib" "2.1.9-patch" ci-info "^2.0.0" @@ -3600,9 +3641,9 @@ defer-to-connect "^2.0.0" "@testing-library/dom@^7.17.1", "@testing-library/dom@^7.9.0": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.21.4.tgz#24b045f3161b7c91fdb35da7c001908cdc99b55b" - integrity sha512-IXjKRTAH31nQ+mx6q3IPw85RTLul8VlWBm1rxURoxDt7JI0HPlAAfbtrKTdeq83XYCYO7HSHogyV+OsD+6FX0Q== + version "7.21.7" + resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.21.7.tgz#23c57c361db5e961afa3e6f3f15bd57fbda01187" + integrity sha512-GVNrLAt0yq7Squz1HrW8IiDVKP5jeWSv9cpgQJsfmXYXLFPpaFoRxn+H/NcUitVXyb0J62PkpVWjMe5b0fvYrQ== dependencies: "@babel/runtime" "^7.10.3" "@types/aria-query" "^4.2.0" @@ -3626,9 +3667,9 @@ redent "^3.0.0" "@testing-library/jest-dom@^5.8.0": - version "5.11.1" - resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.1.tgz#b9541d7625cec9e5feb647f49a96c43f7c055cdd" - integrity sha512-NHOHjDwyBoqM7mXjNLieSp/6vJ17DILzhNTw7+RarluaBkyWRzWgFj+d6xnd1adMBlwfQSeR2FWGTxHXCxeMSA== + version "5.11.2" + resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.2.tgz#c49de331555c70127b5d7fc97344ad5265f4c54c" + integrity sha512-s+rWJx+lanEGKqvOl4qJR0rGjCrxsEjj9qjxFlg4NV4/FRD7fnUUAWPHqwpyafNHfLYArs58FADgdn4UKmjFmw== dependencies: "@babel/runtime" "^7.9.2" "@types/testing-library__jest-dom" "^5.9.1" @@ -3665,9 +3706,9 @@ "@babel/runtime" "^7.10.2" "@testing-library/user-event@^12.0.11": - version "12.0.11" - resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-12.0.11.tgz#157594e6c6d73a1503003933177843648b8c7da4" - integrity sha512-r7QNfktLE2n8IODEl32orup/HNOMueJpoXRDeTMlvWR4nZIHJwx59+8SkLf6nqV4Ot5Xo6qNeaWrvC1KO4eOng== + version "12.1.0" + resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-12.1.0.tgz#a2597419466a93e338c91baa7bb22d4da0309d1d" + integrity sha512-aH/XuNFpPD6dA+fh754EGqKeAzpH66HpLJYkv9vOAih2yGmTM8JiZ8uisQDGWRPkc6sxE2zCqDwLR4ZskhRCxw== dependencies: "@babel/runtime" "^7.10.2" @@ -3961,9 +4002,9 @@ graphql "^14.5.3" "@types/history@*": - version "4.7.6" - resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.6.tgz#ed8fc802c45b8e8f54419c2d054e55c9ea344356" - integrity sha512-GRTZLeLJ8ia00ZH8mxMO8t0aC9M1N9bN461Z2eaRurJo6Fpa+utgCwLzI4jQHcrdzuzp5WPN9jRwpsCQ1VhJ5w== + version "4.7.7" + resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.7.tgz#613957d900fab9ff84c8dfb24fa3eef0c2a40896" + integrity sha512-2xtoL22/3Mv6a70i4+4RB7VgbDDORoWwjcqeNysojZA0R7NK17RbY5Gof/2QiFfJgX+KkWghbwJ+d/2SB8Ndzg== "@types/hosted-git-info@^2.7.0": version "2.7.0" @@ -4011,9 +4052,9 @@ "@types/istanbul-lib-report" "*" "@types/jest@*", "@types/jest@^26.0.3": - version "26.0.5" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.5.tgz#23a8eecf4764a770ea8d3a0d1ea16b96c822035d" - integrity sha512-heU+7w8snfwfjtcj2H458aTx3m5unIToOJhx75ebHilBiiQ39OIdA18WkG4LP08YKeAoWAGvWg8s+22w/PeJ6w== + version "26.0.8" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.8.tgz#f5c5559cf25911ce227f7ce30f1f160f24966369" + integrity sha512-eo3VX9jGASSuv680D4VQ89UmuLZneNxv2MCZjfwlInav05zXVJTzfc//lavdV0GPwSxsXJTy2jALscB7Acqg0g== dependencies: jest-diff "^25.2.1" pretty-format "^25.2.1" @@ -4117,9 +4158,9 @@ "@types/braces" "*" "@types/mime@*": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.2.tgz#857a118d8634c84bba7ae14088e4508490cd5da5" - integrity sha512-4kPlzbljFcsttWEq6aBW0OZe6BDajAmyvr2xknBG92tejQnvdGtT9+kXSZ580DqpxY9qG2xeQVF9Dq0ymUTo5Q== + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.3.tgz#c893b73721db73699943bfc3653b1deb7faa4a3a" + integrity sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q== "@types/minimatch@*", "@types/minimatch@^3.0.3": version "3.0.3" @@ -4152,24 +4193,24 @@ form-data "^3.0.0" "@types/node@*", "@types/node@>= 8", "@types/node@>=6": - version "14.0.24" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.24.tgz#b0f86f58564fa02a28b68f8b55d4cdec42e3b9d6" - integrity sha512-btt/oNOiDWcSuI721MdL8VQGnjsKjlTMdrKyTcLCKeQp/n4AAMFJ961wMbp+09y8WuGPClDEv07RIItdXKIXAA== + version "14.0.27" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1" + integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g== "@types/node@^10.1.0": - version "10.17.27" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.27.tgz#391cb391c75646c8ad2a7b6ed3bbcee52d1bdf19" - integrity sha512-J0oqm9ZfAXaPdwNXMMgAhylw5fhmXkToJd06vuDUSAgEDZ/n/69/69UmyBZbc+zT34UnShuDSBqvim3SPnozJg== + version "10.17.28" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.28.tgz#0e36d718a29355ee51cec83b42d921299200f6d9" + integrity sha512-dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ== "@types/node@^12.12.0": - version "12.12.51" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.51.tgz#446a67af8c5ff98947d7cef296484c6ad47ddb16" - integrity sha512-6ILqt8iNThALrxDv2Q4LyYFQxULQz96HKNIFd4s9QRQaiHINYeUpLqeU/2IU7YMtvipG1fQVAy//vY8/fX1Y9w== + version "12.12.53" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.53.tgz#be0d375933c3d15ef2380dafb3b0350ea7021129" + integrity sha512-51MYTDTyCziHb70wtGNFRwB4l+5JNvdqzFSkbDvpbftEgVUBEE+T5f7pROhWMp/fxp07oNIEQZd5bbfAH22ohQ== "@types/node@^13.7.0", "@types/node@^13.9.5": - version "13.13.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.14.tgz#20cd7d2a98f0c3b08d379f4ea9e6b315d2019529" - integrity sha512-Az3QsOt1U/K1pbCQ0TXGELTuTkPLOiFIQf3ILzbOyo0FqgV9SxRnxbxM5QlAveERZMHpZY+7u3Jz2tKyl+yg6g== + version "13.13.15" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.15.tgz#fe1cc3aa465a3ea6858b793fd380b66c39919766" + integrity sha512-kwbcs0jySLxzLsa2nWUAGOd/s21WU1jebrEdtzhsj1D4Yps1EOuyI1Qcu+FD56dL7NRNIJtDDjcqIG22NwkgLw== "@types/node@^6.14.4", "@types/node@^6.14.7": version "6.14.10" @@ -4177,9 +4218,9 @@ integrity sha512-pF4HjZGSog75kGq7B1InK/wt/N08BuPATo+7HRfv7gZUzccebwv/fmWVGs/j6LvSiLWpCuGGhql51M/wcQsNzA== "@types/node@^8.10.59": - version "8.10.61" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.61.tgz#d299136ce54bcaf1abaa4a487f9e4bedf6b0d393" - integrity sha512-l+zSbvT8TPRaCxL1l9cwHCb0tSqGAGcjPJFItGGYat5oCTiq1uQQKYg5m7AF1mgnEBzFXGLJ2LRmNjtreRX76Q== + version "8.10.62" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.62.tgz#8d0d0db44a46ae7679d92e2e36d41bf1c3625d6a" + integrity sha512-76fupxOYVxk36kb7O/6KtrAPZ9jnSK3+qisAX4tQMEuGNdlvl7ycwatlHqjoE6jHfVtXFM3pCrCixZOidc5cuw== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -4212,9 +4253,9 @@ integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== "@types/qs@*", "@types/qs@^6.9.1": - version "6.9.3" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.3.tgz#b755a0934564a200d3efdf88546ec93c369abd03" - integrity sha512-7s9EQWupR1fTc2pSMtXRQ9w9gLOcrJn+h7HOXw4evxyvVqMi4f+q7d2tnFe3ng3SNHjtK+0EzGMGFUQX4/AQRA== + version "6.9.4" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.4.tgz#a59e851c1ba16c0513ea123830dd639a0a15cb6a" + integrity sha512-+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ== "@types/range-parser@*": version "1.2.3" @@ -4281,9 +4322,9 @@ integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== "@types/serve-static@*": - version "1.13.4" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.4.tgz#6662a93583e5a6cabca1b23592eb91e12fa80e7c" - integrity sha512-jTDt0o/YbpNwZbQmE/+2e+lfjJEJJR0I3OFaKQKPWkASkCoW3i6fsUnqudSMcNAfbtmADGu8f4MV4q+GqULmug== + version "1.13.5" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.5.tgz#3d25d941a18415d3ab092def846e135a08bbcf53" + integrity sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ== dependencies: "@types/express-serve-static-core" "*" "@types/mime" "*" @@ -4304,9 +4345,9 @@ integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA== "@types/testing-library__jest-dom@^5.9.1": - version "5.9.1" - resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.1.tgz#aba5ee062b7880f69c212ef769389f30752806e5" - integrity sha512-yYn5EKHO3MPEMSOrcAb1dLWY+68CG29LiXKsWmmpVHqoP5+ZRiAVLyUHvPNrO2dABDdUGZvavMsaGpWNjM6N2g== + version "5.9.2" + resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.2.tgz#59e4771a1cf87d51e89a5cc8195cd3b647cba322" + integrity sha512-K7nUSpH/5i8i0NagTJ+uFUDRueDlnMNhJtMjMwTGPPSqyImbWC/hgKPDCKt6Phu2iMJg2kWqlax+Ucj2DKMwpA== dependencies: "@types/jest" "*" @@ -4328,9 +4369,9 @@ integrity sha512-67ZgZpAlhIICIdfQrB5fnDvaKFcDxpKibxznfYRVAT4mQE41Dido/3Ty+E3xGBmTogc5+0Qb8tWhna+5B8z1iQ== "@types/webpack-sources@*": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-1.4.0.tgz#e58f1f05f87d39a5c64cf85705bdbdbb94d4d57e" - integrity sha512-c88dKrpSle9BtTqR6ifdaxu1Lvjsl3C5OsfvuUbUwdXymshv1TkufUAXBajCCUM/f/TmnkZC/Esb03MinzSiXQ== + version "1.4.2" + resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-1.4.2.tgz#5d3d4dea04008a779a90135ff96fb5c0c9e6292c" + integrity sha512-77T++JyKow4BQB/m9O96n9d/UUHWLQHlcqXb9Vsf4F1+wKNrrlWNFPDLKNT92RJnCSL6CieTc+NDXtCVZswdTw== dependencies: "@types/node" "*" "@types/source-list-map" "*" @@ -4702,9 +4743,9 @@ JSONStream@^1.0.4, JSONStream@^1.3.4: through ">=2.2.7 <3" abab@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a" - integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg== + version "2.0.4" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.4.tgz#6dfa57b417ca06d21b2478f0e638302f99c2405c" + integrity sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ== abbrev@1, abbrev@^1.1.1: version "1.1.1" @@ -4719,9 +4760,9 @@ abort-controller@^3.0.0: event-target-shim "^5.0.0" abortcontroller-polyfill@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.4.0.tgz#0d5eb58e522a461774af8086414f68e1dda7a6c4" - integrity sha512-3ZFfCRfDzx3GFjO6RAkYx81lPGpUS20ISxux9gLxuKnqafNcFQo59+IoZqpO2WvQlyc287B62HDnDdNYRmlvWA== + version "1.5.0" + resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.5.0.tgz#2c562f530869abbcf88d949a2b60d1d402e87a7c" + integrity sha512-O6Xk757Jb4o0LMzMOMdWvxpHWrQzruYBaUruFaIOfAQRnWFxfdXYobw12jrVHGtoXk6WiiyYzc0QWN9aL62HQA== accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: version "1.3.7" @@ -4755,9 +4796,9 @@ acorn@^6.4.1: integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== acorn@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd" - integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== + version "7.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c" + integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w== address@1.1.2, address@^1.0.1: version "1.1.2" @@ -4829,11 +4870,11 @@ ajv-errors@^1.0.0: integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.1.tgz#b83ca89c5d42d69031f424cad49aada0236c6957" - integrity sha512-KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA== + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.11.0, ajv@^6.12.2, ajv@^6.5.5: +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.11.0, ajv@^6.12.2, ajv@^6.12.3: version "6.12.3" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706" integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA== @@ -5104,9 +5145,9 @@ apollo-server-caching@^0.5.2: lru-cache "^5.0.0" apollo-server-core@^2.16.0: - version "2.16.0" - resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.16.0.tgz#56b367db49f97b7da03b29cef89b63d9ed14ee0c" - integrity sha512-mnvg2cPvsQtjFXIqIhEAbPqGyiSXDSbiBgNQ8rY8g7r2eRMhHKZePqGF03gP1/w87yVaSDRAZBDk6o+jiBXjVQ== + version "2.16.1" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.16.1.tgz#5b5b8245ab9c0cb6c2367ec19ab855dea6ccea3a" + integrity sha512-nuwn5ZBbmzPwDetb3FgiFFJlNK7ZBFg8kis/raymrjd3eBGdNcOyMTJDl6J9673X9Xqp+dXQmFYDW/G3G8S1YA== dependencies: "@apollographql/apollo-tools" "^0.4.3" "@apollographql/graphql-playground-html" "1.6.26" @@ -5526,13 +5567,13 @@ atob@^2.1.2: integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== autoprefixer@^9.7.2: - version "9.8.5" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.5.tgz#2c225de229ddafe1d1424c02791d0c3e10ccccaa" - integrity sha512-C2p5KkumJlsTHoNv9w31NrBRgXhf6eCMteJuHZi2xhkgC+5Vm40MEtCKPhc0qdgAOhox0YPy1SQHTAky05UoKg== + version "9.8.6" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" + integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== dependencies: browserslist "^4.12.0" - caniuse-lite "^1.0.30001097" - colorette "^1.2.0" + caniuse-lite "^1.0.30001109" + colorette "^1.2.1" normalize-range "^0.1.2" num2fraction "^1.2.2" postcss "^7.0.32" @@ -5650,16 +5691,16 @@ babel-jest@^25.2.3: graceful-fs "^4.2.4" slash "^3.0.0" -babel-jest@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.1.0.tgz#b20751185fc7569a0f135730584044d1cb934328" - integrity sha512-Nkqgtfe7j6PxLO6TnCQQlkMm8wdTdnIF8xrdpooHCuD5hXRzVEPbPneTJKknH5Dsv3L8ip9unHDAp48YQ54Dkg== +babel-jest@^26.1.0, babel-jest@^26.2.2: + version "26.2.2" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.2.2.tgz#70f618f2d7016ed71b232241199308985462f812" + integrity sha512-JmLuePHgA+DSOdOL8lPxCgD2LhPPm+rdw1vnxR73PpIrnmKCS2/aBhtkAcxQWuUcW2hBrH8MJ3LKXE7aWpNZyA== dependencies: - "@jest/transform" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/transform" "^26.2.2" + "@jest/types" "^26.2.0" "@types/babel__core" "^7.1.7" babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^26.1.0" + babel-preset-jest "^26.2.0" chalk "^4.0.0" graceful-fs "^4.2.4" slash "^3.0.0" @@ -5749,17 +5790,17 @@ babel-plugin-jest-hoist@^25.5.0: "@babel/types" "^7.3.3" "@types/babel__traverse" "^7.0.6" -babel-plugin-jest-hoist@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.1.0.tgz#c6a774da08247a28285620a64dfadbd05dd5233a" - integrity sha512-qhqLVkkSlqmC83bdMhM8WW4Z9tB+JkjqAqlbbohS9sJLT5Ha2vfzuKqg5yenXrAjOPG2YC0WiXdH3a9PvB+YYw== +babel-plugin-jest-hoist@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz#bdd0011df0d3d513e5e95f76bd53b51147aca2dd" + integrity sha512-B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" -babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.7.0, babel-plugin-macros@^2.8.0: +babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.7.0: version "2.8.0" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== @@ -5879,7 +5920,7 @@ babel-plugin-syntax-jsx@^6.18.0: resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= -babel-plugin-tester@^9.0.0, babel-plugin-tester@^9.0.1: +babel-plugin-tester@^9.0.1: version "9.2.0" resolved "https://registry.yarnpkg.com/babel-plugin-tester/-/babel-plugin-tester-9.2.0.tgz#7169f99678419b9c6754bcc5e3a44eb4a11cdff3" integrity sha512-HCbgmxOJXCcJ8hMk4ek6Ehfv0Ye7D7EpglNP8bh2gmRZnLPkKSJF+ufvypur/F38N3bEWWHYX4QfdnfLyql2DQ== @@ -5973,12 +6014,12 @@ babel-preset-jest@^25.5.0: babel-plugin-jest-hoist "^25.5.0" babel-preset-current-node-syntax "^0.1.2" -babel-preset-jest@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.1.0.tgz#612f714e5b457394acfd863793c564cbcdb7d1c1" - integrity sha512-na9qCqFksknlEj5iSdw1ehMVR06LCCTkZLGKeEtxDDdhg8xpUF09m29Kvh1pRbZ07h7AQ5ttLYUwpXL4tO6w7w== +babel-preset-jest@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.2.0.tgz#f198201a4e543a43eb40bc481e19736e095fd3e0" + integrity sha512-R1k8kdP3R9phYQugXeNnK/nvCGlBzG4m3EoIIukC80GXb6wCv2XiwPhK6K9MAkQcMszWBYvl2Wm+yigyXFQqXg== dependencies: - babel-plugin-jest-hoist "^26.1.0" + babel-plugin-jest-hoist "^26.2.0" babel-preset-current-node-syntax "^0.1.2" "babel-preset-minify@^0.5.0 || 0.6.0-alpha.5": @@ -6075,9 +6116,9 @@ before-after-hook@^2.0.0: integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A== bent@^7.1.2: - version "7.3.7" - resolved "https://registry.yarnpkg.com/bent/-/bent-7.3.7.tgz#6dc42fea1b58c6ebe04146c39aba666f9c13cb0c" - integrity sha512-APYx9bkrq3olflUbDeymwmQLQLR39d0Qz/xbvWG3pgKtklrxHvFUHQgEEK4Tp5e0pnvQQCQM7Vdb3SzErmTtZQ== + version "7.3.9" + resolved "https://registry.yarnpkg.com/bent/-/bent-7.3.9.tgz#41af9939b1017d911d944f21d86626fe3ee7b099" + integrity sha512-CyuIXgoO6UWJaoMtPHkq6JlzNRjCGQqZQeYuO4W5MxY+P0sO1jM3CMYLf16eoga2ozyhVPzXVUxkPw9rz5VNgA== dependencies: bytesish "^0.4.1" caseless "~0.12.0" @@ -6254,9 +6295,9 @@ browser-process-hrtime@^1.0.0: integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== browser-tabs-lock@^1.2.8: - version "1.2.10" - resolved "https://registry.yarnpkg.com/browser-tabs-lock/-/browser-tabs-lock-1.2.10.tgz#98674fc70824ee4e25b4df3d6a25a5c937c2058c" - integrity sha512-/gHzPVC/GYVJ98sQsfnp7mAVxGys1+vF0hTpCy7jc0SFtJ47cFG/Nqjg/AyqOY47ONhduchPt2ufzkehLouLLw== + version "1.2.11" + resolved "https://registry.yarnpkg.com/browser-tabs-lock/-/browser-tabs-lock-1.2.11.tgz#59d72c6653b827685b54fca1c0e6eb4aee08ef52" + integrity sha512-R0xXMzQ8CU0v52zSFn3EDGIfsjteMFJ6oIhhZK6+Vhz5NYzSxCP2epLD9PN7e2HprQl2QTReFptwp6c9tdOF0g== dependencies: lodash ">=4.17.19" @@ -6656,10 +6697,10 @@ can-use-dom@^0.1.0: resolved "https://registry.yarnpkg.com/can-use-dom/-/can-use-dom-0.1.0.tgz#22cc4a34a0abc43950f42c6411024a3f6366b45a" integrity sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo= -caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001097: - version "1.0.30001105" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001105.tgz#d2cb0b31e5cf2f3ce845033b61c5c01566549abf" - integrity sha512-JupOe6+dGMr7E20siZHIZQwYqrllxotAhiaej96y6x00b/48rPt42o+SzOSCPbrpsDWvRja40Hwrj0g0q6LZJg== +caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001109: + version "1.0.30001109" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001109.tgz#a9f3f26a0c3753b063d7acbb48dfb9c0e46f2b19" + integrity sha512-4JIXRodHzdS3HdK8nSgIqXYLExOvG+D2/EenSvcub2Kp3QEADjo2v2oUn5g0n0D+UNwG9BtwKOyGcSq2qvQXvQ== capture-exit@^2.0.0: version "2.0.0" @@ -6802,7 +6843,7 @@ chokidar@^2.0.4, chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chokidar@^3.2.2, chokidar@^3.3.1, chokidar@^3.4.0: +chokidar@^3.2.2, chokidar@^3.3.1, chokidar@^3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.1.tgz#e905bdecf10eaa0a0b1db0c664481cc4cbc22ba1" integrity sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g== @@ -6940,9 +6981,9 @@ cli-width@^3.0.0: integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== clipanion@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/clipanion/-/clipanion-2.4.2.tgz#2dfd52f7eb3cd472752c35d868dd4eb47cb98145" - integrity sha512-kBCYtQKI4/R/zjierdwoDAsNUSvoh4pX2tseYxgLYQcKIpdPsHZrFWiQOfbe2Scd/btsqJEc4q6g55q0p5DZAw== + version "2.4.4" + resolved "https://registry.yarnpkg.com/clipanion/-/clipanion-2.4.4.tgz#d70244c6f60feb3f4cbd509d2fcbe829fc619061" + integrity sha512-KjyCBz8xplftHjIK/nOqq/9b3hPlXbAAo/AxoITrO4yySpQ6a9QSJDAfOx9PfcRUHteeqbdNxZKSPfeFqQ7plg== clipboard@^2.0.0: version "2.0.6" @@ -7093,7 +7134,7 @@ color@0.8.x: color-convert "^0.5.0" color-string "^0.3.0" -colorette@^1.2.0: +colorette@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== @@ -7136,7 +7177,7 @@ comma-separated-tokens@^1.0.0: resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw== -commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.20.3: +commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.20.3, commander@^2.8.1: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -7146,13 +7187,6 @@ commander@^4.0.1, commander@^4.1.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== -commander@~2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4" - integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ= - dependencies: - graceful-readlink ">= 1.0.0" - commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -7746,9 +7780,9 @@ cssstyle@^2.2.0: cssom "~0.3.6" csstype@^2.2.0, csstype@^2.5.7: - version "2.6.11" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.11.tgz#452f4d024149ecf260a852b025e36562a253ffc5" - integrity sha512-l8YyEC9NBkSm783PFTvh0FmJy7s5pFKrDp49ZL7zBGX3fWkO+N4EEyan1qqp8cwPLDcD0OSdyY6hAMoxp34JFw== + version "2.6.13" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz#a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f" + integrity sha512-ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A== currently-unhandled@^0.4.1: version "0.4.1" @@ -8087,14 +8121,6 @@ degenerator@^1.0.4: escodegen "1.x.x" esprima "3.x.x" -del-cli@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/del-cli/-/del-cli-3.0.1.tgz#2d27ff260204b5104cadeda86f78f180a4ebe89a" - integrity sha512-BLHItGr82rUbHhjMu41d+vw9Md49i81jmZSV00HdTq4t+RTHywmEht/23mNFpUl2YeLYJZJyGz4rdlMAyOxNeg== - dependencies: - del "^5.1.0" - meow "^6.1.1" - del@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4" @@ -8108,20 +8134,6 @@ del@^4.1.1: pify "^4.0.1" rimraf "^2.6.3" -del@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7" - integrity sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA== - dependencies: - globby "^10.0.1" - graceful-fs "^4.2.2" - is-glob "^4.0.1" - is-path-cwd "^2.2.0" - is-path-inside "^3.0.1" - p-map "^3.0.0" - rimraf "^3.0.0" - slash "^3.0.0" - delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -8190,6 +8202,11 @@ detect-newline@^3.0.0: resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== +detect-node-es@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.0.0.tgz#c0318b9e539a5256ca780dd9575c9345af05b8ed" + integrity sha512-S4AHriUkTX9FoFvL4G8hXDcx6t3gp2HpfCza3Q0v6S78gul2hKWifLQbeW+ZF89+hSm2ZIc/uF3J97ZgytgTRg== + detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -8349,9 +8366,9 @@ doctrine@^3.0.0: esutils "^2.0.2" dom-accessibility-api@^0.4.6: - version "0.4.6" - resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.4.6.tgz#f3f2af68aee01b1c862f37918d41841bb1aaf92a" - integrity sha512-qxFVFR/ymtfamEQT/AsYLe048sitxFCoCHiM+vuOdR3fE94i3so2SCFJxyz/RxV69PZ+9FgToYWOd7eqJqcbYw== + version "0.4.7" + resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.4.7.tgz#31d01c113af49f323409b3ed09e56967aba485a8" + integrity sha512-5+GzhTpCQYHz4NjL8loYTDVBnXIjNLBadWQBKxXk+osFEplLt3EsSYBu2YZcdZ8QqrvCHgW6TSMGMbmgfhrn2g== dom-converter@^0.2: version "0.2.0" @@ -8548,9 +8565,9 @@ ejs@^2.6.1, ejs@^2.7.4: integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.488: - version "1.3.503" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.503.tgz#3b2fc07b7e3ea0262c395984579ddabee1c9e0cd" - integrity sha512-Rh4+JP+5a+HeCg+77/BOLKzA6pLf8WZMd+DqiduEWCPyvSdY6KWzfkZXa2JRxrLO/aaB1YjTXenQdamZYzWfUw== + version "1.3.516" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.516.tgz#03ec071b061e462b786bf7e7ce226fd7ab7cf1f6" + integrity sha512-WDM5AAQdOrvLqSX8g3Zd5AujBXfMxf96oeZkff0U2HF5op3tjShE+on2yay3r1UD4M9I3p0iHpAS4+yV8U8A9A== elegant-spinner@^1.0.1: version "1.0.1" @@ -8592,6 +8609,11 @@ emits@3.0.x: resolved "https://registry.yarnpkg.com/emits/-/emits-3.0.0.tgz#32752bba95e1707b219562384ab9bb8b1fd62f70" integrity sha1-MnUrupXhcHshlWI4Srm7ix/WL3A= +emittery@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451" + integrity sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ== + emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -8659,7 +8681,7 @@ end-of-stream@~1.1.0: dependencies: once "~1.3.0" -enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0, enhanced-resolve@^4.1.1: +enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ== @@ -8701,9 +8723,9 @@ env-variable@0.0.x: integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg== envinfo@^7.3.1, envinfo@^7.5.1: - version "7.7.0" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.0.tgz#fbfa46d739dec0554ef40220cd91fb20f64c9698" - integrity sha512-XX0+kACx7HcIFhar/JjsDtDIVcC8hnzQO1Asehq+abs+v9MtzpUuujFb6eBTT4lF9j2Bh6d2XFngbFRryjUAeQ== + version "7.7.2" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.2.tgz#098f97a0e902f8141f9150553c92dbb282c4cabe" + integrity sha512-k3Eh5bKuQnZjm49/L7H4cHzs2FlL5QjbTB3JrPxoTI8aJG7hVMe4uKyJxSYH4ahseby2waUwk5OaKX/nAsaYgg== err-code@^1.0.0: version "1.1.2" @@ -8936,9 +8958,9 @@ eslint-plugin-react-hooks@^3.0.0: integrity sha512-EjxTHxjLKIBWFgDJdhKKzLh5q+vjTFrqNZX36uIxWS4OfyXe5DawqPj3U5qeJ1ngLwatjzQnmR0Lz0J0YH3kxw== eslint-plugin-react@^7.19.0: - version "7.20.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.3.tgz#0590525e7eb83890ce71f73c2cf836284ad8c2f1" - integrity sha512-txbo090buDeyV0ugF3YMWrzLIUqpYTsWSDZV9xLSmExE1P/Kmgg9++PD931r+KEWS66O1c9R4srLVVHmeHpoAg== + version "7.20.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.5.tgz#29480f3071f64a04b2c3d99d9b460ce0f76fb857" + integrity sha512-ajbJfHuFnpVNJjhyrfq+pH1C0gLc2y94OiCbAXT5O0J0YCKaFEHDV8+3+mDOr+w8WguRX+vSs1bM2BDG0VLvCw== dependencies: array-includes "^3.1.1" array.prototype.flatmap "^1.2.3" @@ -9123,9 +9145,9 @@ eventemitter3@^4.0.0, eventemitter3@^4.0.4: integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ== events@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" - integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== + version "3.2.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" + integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== eventsource@^1.0.7: version "1.0.7" @@ -9205,16 +9227,16 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-26.1.0.tgz#8c62e31d0f8d5a8ebb186ee81473d15dd2fbf7c8" - integrity sha512-QbH4LZXDsno9AACrN9eM0zfnby9G+OsdNgZUohjg/P0mLy1O+/bzTAJGT6VSIjVCe8yKM6SzEl/ckEOFBT7Vnw== +expect@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.2.0.tgz#0140dd9cc7376d7833852e9cda88c05414f1efba" + integrity sha512-8AMBQ9UVcoUXt0B7v+5/U5H6yiUR87L6eKCfjE3spx7Ya5lF+ebUo37MCFBML2OiLfkX1sxmQOZhIDonyVTkcw== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" ansi-styles "^4.0.0" jest-get-type "^26.0.0" - jest-matcher-utils "^26.1.0" - jest-message-util "^26.1.0" + jest-matcher-utils "^26.2.0" + jest-message-util "^26.2.0" jest-regex-util "^26.0.0" express@^4.16.3, express@^4.17.0, express@^4.17.1: @@ -9413,7 +9435,7 @@ fault@^1.0.2: dependencies: format "^0.2.0" -faye-websocket@0.11.3, faye-websocket@~0.11.1: +faye-websocket@0.11.3, faye-websocket@^0.11.3, faye-websocket@~0.11.1: version "0.11.3" resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e" integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA== @@ -9659,24 +9681,24 @@ firebase-admin@^8.11.0: "@google-cloud/storage" "^4.1.2" firebase@^7.14.5: - version "7.16.1" - resolved "https://registry.yarnpkg.com/firebase/-/firebase-7.16.1.tgz#a9f5803acba8ac937eb43f11a874a0901b015afc" - integrity sha512-mcvFh617lWPYnx6SmwgtwmliY8P3XBi8pm0LDY4a8WPD049goCMgmIEpKkX4R3gZ2noz2rVrxSUfodENPpttLg== + version "7.17.1" + resolved "https://registry.yarnpkg.com/firebase/-/firebase-7.17.1.tgz#6b2566d91a820a7993e3d2c75435f8baaabb58bb" + integrity sha512-g2Wkk2fz8VoeSrxv2PIQizm2j74EtbpxQ+wd2AvH2iEF5LRaJOsk3zVBtIlyJIQ3vGTmlutIxtyyoDAQcPO9TA== dependencies: - "@firebase/analytics" "0.3.9" - "@firebase/app" "0.6.8" + "@firebase/analytics" "0.4.1" + "@firebase/app" "0.6.9" "@firebase/app-types" "0.6.1" "@firebase/auth" "0.14.9" - "@firebase/database" "0.6.8" - "@firebase/firestore" "1.16.1" - "@firebase/functions" "0.4.48" - "@firebase/installations" "0.4.14" - "@firebase/messaging" "0.6.20" - "@firebase/performance" "0.3.9" + "@firebase/database" "0.6.9" + "@firebase/firestore" "1.16.2" + "@firebase/functions" "0.4.49" + "@firebase/installations" "0.4.15" + "@firebase/messaging" "0.6.21" + "@firebase/performance" "0.3.10" "@firebase/polyfill" "0.3.36" - "@firebase/remote-config" "0.1.25" - "@firebase/storage" "0.3.39" - "@firebase/util" "0.2.50" + "@firebase/remote-config" "0.1.26" + "@firebase/storage" "0.3.41" + "@firebase/util" "0.3.0" flat-cache@^2.0.1: version "2.0.1" @@ -9988,9 +10010,9 @@ gaxios@^2.0.0, gaxios@^2.1.0: node-fetch "^2.3.0" gaxios@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-3.0.4.tgz#4714fbb003d6f6f08a297f772284463e041e04db" - integrity sha512-97NmFuMETFQh6gqPUxkqjxRMjmY8aRKRMphIkgO/b90AbCt5wAVuXsp8oWjIXlLN2pIK/fsXD8edcM7ULkFMLg== + version "3.1.0" + resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-3.1.0.tgz#95f65f5a335f61aff602fe124cfdba8524f765fa" + integrity sha512-DDTn3KXVJJigtz+g0J3vhcfbDbKtAroSTxauWsdnP57sM5KZ3d2c/3D9RKFJ86s43hfw6WULg6TXYw/AYiBlpA== dependencies: abort-controller "^3.0.0" extend "^3.0.2" @@ -10220,17 +10242,6 @@ glob-to-regexp@^0.3.0: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= -glob@^6.0.1: - version "6.0.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" - integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" @@ -10485,13 +10496,6 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -gotrue-js@^0.9.25: - version "0.9.26" - resolved "https://registry.yarnpkg.com/gotrue-js/-/gotrue-js-0.9.26.tgz#c5e39fec1539d12893042979435972847a2a5f79" - integrity sha512-UC1MIyyjfPxwpyd8X/xeigtUUaHI3+0dXvUEjymBfN3wE2MUfANVyTtO5HMwlBGlEFwbXuH0D1h6EExcvm/nug== - dependencies: - micro-api-client "^3.2.1" - "gotrue-js@git://github.com/netlify/gotrue-js.git#28df09cfcac505feadcb1719714d2a9507cf68eb": version "0.9.24" resolved "git://github.com/netlify/gotrue-js.git#28df09cfcac505feadcb1719714d2a9507cf68eb" @@ -10503,11 +10507,6 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1. resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= - grapheme-splitter@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" @@ -10528,9 +10527,9 @@ graphql-scalars@^1.2.6: integrity sha512-k/88kZVXIuUKQuVLokokkKU2lnFEZ9aTn7O0fDweJpISd0pP5fQU1wzPN0jarH4Lnadr4092PfyIUtCcKzkeAw== graphql-tag@^2.10.3, graphql-tag@^2.4.2, graphql-tag@^2.9.2: - version "2.10.4" - resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.4.tgz#2f301a98219be8b178a6453bb7e33b79b66d8f83" - integrity sha512-O7vG5BT3w6Sotc26ybcvLKNTdfr4GfsIVMD+LdYqXCeJIYPRyp8BIsDOUtxw7S1PYvRw5vH3278J2EDezR6mfA== + version "2.11.0" + resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.11.0.tgz#1deb53a01c46a7eb401d6cb59dec86fa1cccbffd" + integrity sha512-VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA== graphql-tools@4.0.7: version "4.0.7" @@ -10661,11 +10660,11 @@ har-schema@^2.0.0: integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= har-validator@~5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" - integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== dependencies: - ajv "^6.5.5" + ajv "^6.12.3" har-schema "^2.0.0" hard-rejection@^2.1.0: @@ -11329,9 +11328,9 @@ inquirer@^6.2.0: through "^2.3.6" inquirer@^7.0.0: - version "7.3.2" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.2.tgz#25245d2e32dc9f33dbe26eeaada231daa66e9c7c" - integrity sha512-DF4osh1FM6l0RJc5YWYhSDB6TawiBRlbV9Cox8MWlidU218Tb7fm3lQTULyUJDfJ0tjbzl0W4q651mrCCEM55w== + version "7.3.3" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" + integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== dependencies: ansi-escapes "^4.2.1" chalk "^4.1.0" @@ -11339,7 +11338,7 @@ inquirer@^7.0.0: cli-width "^3.0.0" external-editor "^3.0.3" figures "^3.0.0" - lodash "^4.17.16" + lodash "^4.17.19" mute-stream "0.0.8" run-async "^2.4.0" rxjs "^6.6.0" @@ -11550,9 +11549,9 @@ is-directory@^0.3.1: integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= is-docker@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b" - integrity sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.0.tgz#25dc043e4fdc3cf969d622735e05a86ba9952e2b" + integrity sha512-mB2WygGsSeoXtLKpSYzP6sa0Z9DyU9ZyKlnvuZWxCociaI0qsF8u12sR72DFTX236g1u6oWSWYFuUk09nGQEjg== is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" @@ -11706,7 +11705,7 @@ is-observable@^1.1.0: dependencies: symbol-observable "^1.1.0" -is-path-cwd@^2.0.0, is-path-cwd@^2.2.0: +is-path-cwd@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== @@ -11748,9 +11747,9 @@ is-plain-object@^3.0.0: integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g== is-plain-object@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-4.1.0.tgz#00196ad308ebb7de9d1fb57ae92ef1c38d5a740e" - integrity sha512-1N1OpoS8S4Ua+FsH6Mhvgaj0di3uRXgulcv2dnFu2J/WcEsDNbBoiUX6mYmhQ2cAzZ+B/lTJtX1qUSL5RwsGug== + version "4.1.1" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-4.1.1.tgz#1a14d6452cbd50790edc7fdaa0aed5a40a35ebb5" + integrity sha512-5Aw8LLVsDlZsETVMhoMXzqsXwQqr/0vlnBYzIXJbYo2F4yYlhLHs+Ez7Bod7IIQKWkJbJfxrWD7pA1Dw1TKrwA== is-potential-custom-element-name@^1.0.0: version "1.0.0" @@ -12000,57 +11999,57 @@ iterate-value@^1.0.0: es-get-iterator "^1.0.2" iterate-iterator "^1.0.1" -jest-changed-files@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.1.0.tgz#de66b0f30453bca2aff98e9400f75905da495305" - integrity sha512-HS5MIJp3B8t0NRKGMCZkcDUZo36mVRvrDETl81aqljT1S9tqiHRSpyoOvWg9ZilzZG9TDisDNaN1IXm54fLRZw== +jest-changed-files@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.2.0.tgz#b4946201defe0c919a2f3d601e9f98cb21dacc15" + integrity sha512-+RyJb+F1K/XBLIYiL449vo5D+CvlHv29QveJUWNPXuUicyZcq+tf1wNxmmFeRvAU1+TzhwqczSjxnCCFt7+8iA== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" execa "^4.0.0" throat "^5.0.0" -jest-cli@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.1.0.tgz#eb9ec8a18cf3b6aa556d9deaa9e24be12b43ad87" - integrity sha512-Imumvjgi3rU7stq6SJ1JUEMaV5aAgJYXIs0jPqdUnF47N/Tk83EXfmtvNKQ+SnFVI6t6mDOvfM3aA9Sg6kQPSw== +jest-cli@^26.2.2: + version "26.2.2" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.2.2.tgz#4c273e5474baafac1eb15fd25aaafb4703f5ffbc" + integrity sha512-vVcly0n/ijZvdy6gPQiQt0YANwX2hLTPQZHtW7Vi3gcFdKTtif7YpI85F8R8JYy5DFSWz4x1OW0arnxlziu5Lw== dependencies: - "@jest/core" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/core" "^26.2.2" + "@jest/test-result" "^26.2.0" + "@jest/types" "^26.2.0" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" is-ci "^2.0.0" - jest-config "^26.1.0" - jest-util "^26.1.0" - jest-validate "^26.1.0" + jest-config "^26.2.2" + jest-util "^26.2.0" + jest-validate "^26.2.0" prompts "^2.0.1" yargs "^15.3.1" -jest-config@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.1.0.tgz#9074f7539acc185e0113ad6d22ed589c16a37a73" - integrity sha512-ONTGeoMbAwGCdq4WuKkMcdMoyfs5CLzHEkzFOlVvcDXufZSaIWh/OXMLa2fwKXiOaFcqEw8qFr4VOKJQfn4CVw== +jest-config@^26.2.2: + version "26.2.2" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.2.2.tgz#f3ebc7e2bc3f49de8ed3f8007152f345bb111917" + integrity sha512-2lhxH0y4YFOijMJ65usuf78m7+9/8+hAb1PZQtdRdgnQpAb4zP6KcVDDktpHEkspBKnc2lmFu+RQdHukUUbiTg== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^26.1.0" - "@jest/types" "^26.1.0" - babel-jest "^26.1.0" + "@jest/test-sequencer" "^26.2.2" + "@jest/types" "^26.2.0" + babel-jest "^26.2.2" chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" - jest-environment-jsdom "^26.1.0" - jest-environment-node "^26.1.0" + jest-environment-jsdom "^26.2.0" + jest-environment-node "^26.2.0" jest-get-type "^26.0.0" - jest-jasmine2 "^26.1.0" + jest-jasmine2 "^26.2.2" jest-regex-util "^26.0.0" - jest-resolve "^26.1.0" - jest-util "^26.1.0" - jest-validate "^26.1.0" + jest-resolve "^26.2.2" + jest-util "^26.2.0" + jest-validate "^26.2.0" micromatch "^4.0.2" - pretty-format "^26.1.0" + pretty-format "^26.2.0" jest-diff@^25.1.0, jest-diff@^25.2.1, jest-diff@^25.5.0: version "25.5.0" @@ -12062,15 +12061,15 @@ jest-diff@^25.1.0, jest-diff@^25.2.1, jest-diff@^25.5.0: jest-get-type "^25.2.6" pretty-format "^25.5.0" -jest-diff@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.1.0.tgz#00a549bdc936c9691eb4dc25d1fbd78bf456abb2" - integrity sha512-GZpIcom339y0OXznsEKjtkfKxNdg7bVbEofK8Q6MnevTIiR1jNhDWKhRX6X0SDXJlwn3dy59nZ1z55fLkAqPWg== +jest-diff@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.2.0.tgz#dee62c771adbb23ae585f3f1bd289a6e8ef4f298" + integrity sha512-Wu4Aopi2nzCsHWLBlD48TgRy3Z7OsxlwvHNd1YSnHc7q1NJfrmyCPoUXrTIrydQOG5ApaYpsAsdfnMbJqV1/wQ== dependencies: chalk "^4.0.0" diff-sequences "^26.0.0" jest-get-type "^26.0.0" - pretty-format "^26.1.0" + pretty-format "^26.2.0" jest-directory-named-resolver@^0.3.0: version "0.3.0" @@ -12086,39 +12085,41 @@ jest-docblock@^26.0.0: dependencies: detect-newline "^3.0.0" -jest-each@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.1.0.tgz#e35449875009a22d74d1bda183b306db20f286f7" - integrity sha512-lYiSo4Igr81q6QRsVQq9LIkJW0hZcKxkIkHzNeTMPENYYDw/W/Raq28iJ0sLlNFYz2qxxeLnc5K2gQoFYlu2bA== +jest-each@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.2.0.tgz#aec8efa01d072d7982c900e74940863385fa884e" + integrity sha512-gHPCaho1twWHB5bpcfnozlc6mrMi+VAewVPNgmwf81x2Gzr6XO4dl+eOrwPWxbkYlgjgrYjWK2xgKnixbzH3Ew== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" chalk "^4.0.0" jest-get-type "^26.0.0" - jest-util "^26.1.0" - pretty-format "^26.1.0" + jest-util "^26.2.0" + pretty-format "^26.2.0" -jest-environment-jsdom@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.1.0.tgz#9dc7313ffe1b59761dad1fedb76e2503e5d37c5b" - integrity sha512-dWfiJ+spunVAwzXbdVqPH1LbuJW/kDL+FyqgA5YzquisHqTi0g9hquKif9xKm7c1bKBj6wbmJuDkeMCnxZEpUw== - dependencies: - "@jest/environment" "^26.1.0" - "@jest/fake-timers" "^26.1.0" - "@jest/types" "^26.1.0" - jest-mock "^26.1.0" - jest-util "^26.1.0" +jest-environment-jsdom@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.2.0.tgz#6443a6f3569297dcaa4371dddf93acaf167302dc" + integrity sha512-sDG24+5M4NuIGzkI3rJW8XUlrpkvIdE9Zz4jhD8OBnVxAw+Y1jUk9X+lAOD48nlfUTlnt3lbAI3k2Ox+WF3S0g== + dependencies: + "@jest/environment" "^26.2.0" + "@jest/fake-timers" "^26.2.0" + "@jest/types" "^26.2.0" + "@types/node" "*" + jest-mock "^26.2.0" + jest-util "^26.2.0" jsdom "^16.2.2" -jest-environment-node@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.1.0.tgz#8bb387b3eefb132eab7826f9a808e4e05618960b" - integrity sha512-DNm5x1aQH0iRAe9UYAkZenuzuJ69VKzDCAYISFHQ5i9e+2Tbeu2ONGY7YStubCLH8a1wdKBgqScYw85+ySxqxg== +jest-environment-node@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.2.0.tgz#fee89e06bdd4bed3f75ee2978d73ede9bb57a681" + integrity sha512-4M5ExTYkJ19efBzkiXtBi74JqKLDciEk4CEsp5tTjWGYMrlKFQFtwIVG3tW1OGE0AlXhZjuHPwubuRYY4j4uOw== dependencies: - "@jest/environment" "^26.1.0" - "@jest/fake-timers" "^26.1.0" - "@jest/types" "^26.1.0" - jest-mock "^26.1.0" - jest-util "^26.1.0" + "@jest/environment" "^26.2.0" + "@jest/fake-timers" "^26.2.0" + "@jest/types" "^26.2.0" + "@types/node" "*" + jest-mock "^26.2.0" + jest-util "^26.2.0" jest-get-type@^25.2.6: version "25.2.6" @@ -12150,56 +12151,58 @@ jest-haste-map@^25.5.1: optionalDependencies: fsevents "^2.1.2" -jest-haste-map@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.1.0.tgz#ef31209be73f09b0d9445e7d213e1b53d0d1476a" - integrity sha512-WeBS54xCIz9twzkEdm6+vJBXgRBQfdbbXD0dk8lJh7gLihopABlJmIQFdWSDDtuDe4PRiObsjZSUjbJ1uhWEpA== +jest-haste-map@^26.2.2: + version "26.2.2" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.2.2.tgz#6d4267b1903854bfdf6a871419f35a82f03ae71e" + integrity sha512-3sJlMSt+NHnzCB+0KhJ1Ut4zKJBiJOlbrqEYNdRQGlXTv8kqzZWjUKQRY3pkjmlf+7rYjAV++MQ4D6g4DhAyOg== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" "@types/graceful-fs" "^4.1.2" + "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.4" - jest-serializer "^26.1.0" - jest-util "^26.1.0" - jest-worker "^26.1.0" + jest-regex-util "^26.0.0" + jest-serializer "^26.2.0" + jest-util "^26.2.0" + jest-worker "^26.2.1" micromatch "^4.0.2" sane "^4.0.3" walker "^1.0.7" - which "^2.0.2" optionalDependencies: fsevents "^2.1.2" -jest-jasmine2@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.1.0.tgz#4dfe349b2b2d3c6b3a27c024fd4cb57ac0ed4b6f" - integrity sha512-1IPtoDKOAG+MeBrKvvuxxGPJb35MTTRSDglNdWWCndCB3TIVzbLThRBkwH9P081vXLgiJHZY8Bz3yzFS803xqQ== +jest-jasmine2@^26.2.2: + version "26.2.2" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.2.2.tgz#d82b1721fac2b153a4f8b3f0c95e81e702812de2" + integrity sha512-Q8AAHpbiZMVMy4Hz9j1j1bg2yUmPa1W9StBvcHqRaKa9PHaDUMwds8LwaDyzP/2fkybcTQE4+pTMDOG9826tEw== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^26.1.0" + "@jest/environment" "^26.2.0" "@jest/source-map" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/test-result" "^26.2.0" + "@jest/types" "^26.2.0" + "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^26.1.0" + expect "^26.2.0" is-generator-fn "^2.0.0" - jest-each "^26.1.0" - jest-matcher-utils "^26.1.0" - jest-message-util "^26.1.0" - jest-runtime "^26.1.0" - jest-snapshot "^26.1.0" - jest-util "^26.1.0" - pretty-format "^26.1.0" + jest-each "^26.2.0" + jest-matcher-utils "^26.2.0" + jest-message-util "^26.2.0" + jest-runtime "^26.2.2" + jest-snapshot "^26.2.2" + jest-util "^26.2.0" + pretty-format "^26.2.0" throat "^5.0.0" -jest-leak-detector@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.1.0.tgz#039c3a07ebcd8adfa984b6ac015752c35792e0a6" - integrity sha512-dsMnKF+4BVOZwvQDlgn3MG+Ns4JuLv8jNvXH56bgqrrboyCbI1rQg6EI5rs+8IYagVcfVP2yZFKfWNZy0rK0Hw== +jest-leak-detector@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.2.0.tgz#073ee6d8db7a9af043e7ce99d8eea17a4fb0cc50" + integrity sha512-aQdzTX1YiufkXA1teXZu5xXOJgy7wZQw6OJ0iH5CtQlOETe6gTSocaYKUNui1SzQ91xmqEUZ/WRavg9FD82rtQ== dependencies: jest-get-type "^26.0.0" - pretty-format "^26.1.0" + pretty-format "^26.2.0" jest-matcher-utils@^25.1.0: version "25.5.0" @@ -12211,23 +12214,23 @@ jest-matcher-utils@^25.1.0: jest-get-type "^25.2.6" pretty-format "^25.5.0" -jest-matcher-utils@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.1.0.tgz#cf75a41bd413dda784f022de5a65a2a5c73a5c92" - integrity sha512-PW9JtItbYvES/xLn5mYxjMd+Rk+/kIt88EfH3N7w9KeOrHWaHrdYPnVHndGbsFGRJ2d5gKtwggCvkqbFDoouQA== +jest-matcher-utils@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.2.0.tgz#b107af98c2b8c557ffd46c1adf06f794aa52d622" + integrity sha512-2cf/LW2VFb3ayPHrH36ZDjp9+CAeAe/pWBAwsV8t3dKcrINzXPVxq8qMWOxwt5BaeBCx4ZupVGH7VIgB8v66vQ== dependencies: chalk "^4.0.0" - jest-diff "^26.1.0" + jest-diff "^26.2.0" jest-get-type "^26.0.0" - pretty-format "^26.1.0" + pretty-format "^26.2.0" -jest-message-util@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.1.0.tgz#52573fbb8f5cea443c4d1747804d7a238a3e233c" - integrity sha512-dY0+UlldiAJwNDJ08SF0HdF32g9PkbF2NRK/+2iMPU40O6q+iSn1lgog/u0UH8ksWoPv0+gNq8cjhYO2MFtT0g== +jest-message-util@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.2.0.tgz#757fbc1323992297092bb9016a71a2eb12fd22ea" + integrity sha512-g362RhZaJuqeqG108n1sthz5vNpzTNy926eNDszo4ncRbmmcMRIUAZibnd6s5v2XSBCChAxQtCoN25gnzp7JbQ== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" "@types/stack-utils" "^1.0.1" chalk "^4.0.0" graceful-fs "^4.2.4" @@ -12235,14 +12238,15 @@ jest-message-util@^26.1.0: slash "^3.0.0" stack-utils "^2.0.2" -jest-mock@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.1.0.tgz#80d8286da1f05a345fbad1bfd6fa49a899465d3d" - integrity sha512-1Rm8EIJ3ZFA8yCIie92UbxZWj9SuVmUGcyhLHyAhY6WI3NIct38nVcfOPWhJteqSn8V8e3xOMha9Ojfazfpovw== +jest-mock@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.2.0.tgz#a1b3303ab38c34aa1dbbc16ab57cdc1a59ed50d1" + integrity sha512-XeC7yWtWmWByoyVOHSsE7NYsbXJLtJNgmhD7z4MKumKm6ET0si81bsSLbQ64L5saK3TgsHo2B/UqG5KNZ1Sp/Q== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" + "@types/node" "*" -jest-pnp-resolver@^1.2.1: +jest-pnp-resolver@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== @@ -12257,82 +12261,83 @@ jest-regex-util@^26.0.0: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== -jest-resolve-dependencies@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.1.0.tgz#1ce36472f864a5dadf7dc82fa158e1c77955691b" - integrity sha512-fQVEPHHQ1JjHRDxzlLU/buuQ9om+hqW6Vo928aa4b4yvq4ZHBtRSDsLdKQLuCqn5CkTVpYZ7ARh2fbA8WkRE6g== +jest-resolve-dependencies@^26.2.2: + version "26.2.2" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.2.2.tgz#2ad3cd9281730e9a5c487cd846984c5324e47929" + integrity sha512-S5vufDmVbQXnpP7435gr710xeBGUFcKNpNswke7RmFvDQtmqPjPVU/rCeMlEU0p6vfpnjhwMYeaVjKZAy5QYJA== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" jest-regex-util "^26.0.0" - jest-snapshot "^26.1.0" + jest-snapshot "^26.2.2" -jest-resolve@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.1.0.tgz#a530eaa302b1f6fa0479079d1561dd69abc00e68" - integrity sha512-KsY1JV9FeVgEmwIISbZZN83RNGJ1CC+XUCikf/ZWJBX/tO4a4NvA21YixokhdR9UnmPKKAC4LafVixJBrwlmfg== +jest-resolve@^26.2.2: + version "26.2.2" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.2.2.tgz#324a20a516148d61bffa0058ed0c77c510ecfd3e" + integrity sha512-ye9Tj/ILn/0OgFPE/3dGpQPUqt4dHwIocxt5qSBkyzxQD8PbL0bVxBogX2FHxsd3zJA7V2H/cHXnBnNyyT9YoQ== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" chalk "^4.0.0" graceful-fs "^4.2.4" - jest-pnp-resolver "^1.2.1" - jest-util "^26.1.0" + jest-pnp-resolver "^1.2.2" + jest-util "^26.2.0" read-pkg-up "^7.0.1" resolve "^1.17.0" slash "^3.0.0" -jest-runner@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.1.0.tgz#457f7fc522afe46ca6db1dccf19f87f500b3288d" - integrity sha512-elvP7y0fVDREnfqit0zAxiXkDRSw6dgCkzPCf1XvIMnSDZ8yogmSKJf192dpOgnUVykmQXwYYJnCx641uLTgcw== +jest-runner@^26.2.2: + version "26.2.2" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.2.2.tgz#6d03d057886e9c782e10b2cf37443f902fe0e39e" + integrity sha512-/qb6ptgX+KQ+aNMohJf1We695kaAfuu3u3ouh66TWfhTpLd9WbqcF6163d/tMoEY8GqPztXPLuyG0rHRVDLxCA== dependencies: - "@jest/console" "^26.1.0" - "@jest/environment" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/console" "^26.2.0" + "@jest/environment" "^26.2.0" + "@jest/test-result" "^26.2.0" + "@jest/types" "^26.2.0" + "@types/node" "*" chalk "^4.0.0" + emittery "^0.7.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-config "^26.1.0" + jest-config "^26.2.2" jest-docblock "^26.0.0" - jest-haste-map "^26.1.0" - jest-jasmine2 "^26.1.0" - jest-leak-detector "^26.1.0" - jest-message-util "^26.1.0" - jest-resolve "^26.1.0" - jest-runtime "^26.1.0" - jest-util "^26.1.0" - jest-worker "^26.1.0" + jest-haste-map "^26.2.2" + jest-leak-detector "^26.2.0" + jest-message-util "^26.2.0" + jest-resolve "^26.2.2" + jest-runtime "^26.2.2" + jest-util "^26.2.0" + jest-worker "^26.2.1" source-map-support "^0.5.6" throat "^5.0.0" -jest-runtime@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.1.0.tgz#45a37af42115f123ed5c51f126c05502da2469cb" - integrity sha512-1qiYN+EZLmG1QV2wdEBRf+Ci8i3VSfIYLF02U18PiUDrMbhfpN/EAMMkJtT02jgJUoaEOpHAIXG6zS3QRMzRmA== +jest-runtime@^26.2.2: + version "26.2.2" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.2.2.tgz#2480ff79320680a643031dd21998d7c63d83ab68" + integrity sha512-a8VXM3DxCDnCIdl9+QucWFfQ28KdqmyVFqeKLigHdErtsx56O2ZIdQkhFSuP1XtVrG9nTNHbKxjh5XL1UaFDVQ== dependencies: - "@jest/console" "^26.1.0" - "@jest/environment" "^26.1.0" - "@jest/fake-timers" "^26.1.0" - "@jest/globals" "^26.1.0" + "@jest/console" "^26.2.0" + "@jest/environment" "^26.2.0" + "@jest/fake-timers" "^26.2.0" + "@jest/globals" "^26.2.0" "@jest/source-map" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/transform" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/test-result" "^26.2.0" + "@jest/transform" "^26.2.2" + "@jest/types" "^26.2.0" "@types/yargs" "^15.0.0" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-config "^26.1.0" - jest-haste-map "^26.1.0" - jest-message-util "^26.1.0" - jest-mock "^26.1.0" + jest-config "^26.2.2" + jest-haste-map "^26.2.2" + jest-message-util "^26.2.0" + jest-mock "^26.2.0" jest-regex-util "^26.0.0" - jest-resolve "^26.1.0" - jest-snapshot "^26.1.0" - jest-util "^26.1.0" - jest-validate "^26.1.0" + jest-resolve "^26.2.2" + jest-snapshot "^26.2.2" + jest-util "^26.2.0" + jest-validate "^26.2.0" slash "^3.0.0" strip-bom "^4.0.0" yargs "^15.3.1" @@ -12344,32 +12349,33 @@ jest-serializer@^25.5.0: dependencies: graceful-fs "^4.2.4" -jest-serializer@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.1.0.tgz#72a394531fc9b08e173dc7d297440ac610d95022" - integrity sha512-eqZOQG/0+MHmr25b2Z86g7+Kzd5dG9dhCiUoyUNJPgiqi38DqbDEOlHcNijyfZoj74soGBohKBZuJFS18YTJ5w== +jest-serializer@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.2.0.tgz#92dcae5666322410f4bf50211dd749274959ddac" + integrity sha512-V7snZI9IVmyJEu0Qy0inmuXgnMWDtrsbV2p9CRAcmlmPVwpC2ZM8wXyYpiugDQnwLHx0V4+Pnog9Exb3UO8M6Q== dependencies: + "@types/node" "*" graceful-fs "^4.2.4" -jest-snapshot@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.1.0.tgz#c36ed1e0334bd7bd2fe5ad07e93a364ead7e1349" - integrity sha512-YhSbU7eMTVQO/iRbNs8j0mKRxGp4plo7sJ3GzOQ0IYjvsBiwg0T1o0zGQAYepza7lYHuPTrG5J2yDd0CE2YxSw== +jest-snapshot@^26.2.2: + version "26.2.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.2.2.tgz#9d2eda083a4a1017b157e351868749bd63211799" + integrity sha512-NdjD8aJS7ePu268Wy/n/aR1TUisG0BOY+QOW4f6h46UHEKOgYmmkvJhh2BqdVZQ0BHSxTMt04WpCf9njzx8KtA== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" "@types/prettier" "^2.0.0" chalk "^4.0.0" - expect "^26.1.0" + expect "^26.2.0" graceful-fs "^4.2.4" - jest-diff "^26.1.0" + jest-diff "^26.2.0" jest-get-type "^26.0.0" - jest-haste-map "^26.1.0" - jest-matcher-utils "^26.1.0" - jest-message-util "^26.1.0" - jest-resolve "^26.1.0" + jest-haste-map "^26.2.2" + jest-matcher-utils "^26.2.0" + jest-message-util "^26.2.0" + jest-resolve "^26.2.2" natural-compare "^1.4.0" - pretty-format "^26.1.0" + pretty-format "^26.2.0" semver "^7.3.2" jest-util@^25.5.0: @@ -12383,39 +12389,41 @@ jest-util@^25.5.0: is-ci "^2.0.0" make-dir "^3.0.0" -jest-util@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.1.0.tgz#80e85d4ba820decacf41a691c2042d5276e5d8d8" - integrity sha512-rNMOwFQevljfNGvbzNQAxdmXQ+NawW/J72dmddsK0E8vgxXCMtwQ/EH0BiWEIxh0hhMcTsxwAxINt7Lh46Uzbg== +jest-util@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.2.0.tgz#0597d2a27c559340957609f106c408c17c1d88ac" + integrity sha512-YmDwJxLZ1kFxpxPfhSJ0rIkiZOM0PQbRcfH0TzJOhqCisCAsI1WcmoQqO83My9xeVA2k4n+rzg2UuexVKzPpig== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" + "@types/node" "*" chalk "^4.0.0" graceful-fs "^4.2.4" is-ci "^2.0.0" micromatch "^4.0.2" -jest-validate@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.1.0.tgz#942c85ad3d60f78250c488a7f85d8f11a29788e7" - integrity sha512-WPApOOnXsiwhZtmkDsxnpye+XLb/tUISP+H6cHjfUIXvlG+eKwP+isnivsxlHCPaO9Q5wvbhloIBkdF3qUn+Nw== +jest-validate@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.2.0.tgz#97fedf3e7984b7608854cbf925b9ca6ebcbdb78a" + integrity sha512-8XKn3hM6VIVmLNuyzYLCPsRCT83o8jMZYhbieh4dAyKLc4Ypr36rVKC+c8WMpWkfHHpGnEkvWUjjIAyobEIY/Q== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" camelcase "^6.0.0" chalk "^4.0.0" jest-get-type "^26.0.0" leven "^3.1.0" - pretty-format "^26.1.0" + pretty-format "^26.2.0" -jest-watcher@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.1.0.tgz#99812a0cd931f0cb3d153180426135ab83e4d8f2" - integrity sha512-ffEOhJl2EvAIki613oPsSG11usqnGUzIiK7MMX6hE4422aXOcVEG3ySCTDFLn1+LZNXGPE8tuJxhp8OBJ1pgzQ== +jest-watcher@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.2.0.tgz#45bdf2fecadd19c0a501f3b071a474dca636825b" + integrity sha512-674Boco4Joe0CzgKPL6K4Z9LgyLx+ZvW2GilbpYb8rFEUkmDGgsZdv1Hv5rxsRpb1HLgKUOL/JfbttRCuFdZXQ== dependencies: - "@jest/test-result" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/test-result" "^26.2.0" + "@jest/types" "^26.2.0" + "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^26.1.0" + jest-util "^26.2.0" string-length "^4.0.1" jest-worker@^25.4.0, jest-worker@^25.5.0: @@ -12426,22 +12434,23 @@ jest-worker@^25.4.0, jest-worker@^25.5.0: merge-stream "^2.0.0" supports-color "^7.0.0" -jest-worker@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.1.0.tgz#65d5641af74e08ccd561c240e7db61284f82f33d" - integrity sha512-Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ== +jest-worker@^26.2.1: + version "26.2.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.2.1.tgz#5d630ab93f666b53f911615bc13e662b382bd513" + integrity sha512-+XcGMMJDTeEGncRb5M5Zq9P7K4sQ1sirhjdOxsN1462h6lFo9w59bl2LVQmdGEEeU3m+maZCkS2Tcc9SfCHO4A== dependencies: + "@types/node" "*" merge-stream "^2.0.0" supports-color "^7.0.0" jest@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-26.1.0.tgz#2f3aa7bcffb9bfd025473f83bbbf46a3af026263" - integrity sha512-LIti8jppw5BcQvmNJe4w2g1N/3V68HUfAv9zDVm7v+VAtQulGhH0LnmmiVkbNE4M4I43Bj2fXPiBGKt26k9tHw== + version "26.2.2" + resolved "https://registry.yarnpkg.com/jest/-/jest-26.2.2.tgz#a022303887b145147204c5f66e6a5c832333c7e7" + integrity sha512-EkJNyHiAG1+A8pqSz7cXttoVa34hOEzN/MrnJhYnfp5VHxflVcf2pu3oJSrhiy6LfIutLdWo+n6q63tjcoIeig== dependencies: - "@jest/core" "^26.1.0" + "@jest/core" "^26.2.2" import-local "^3.0.2" - jest-cli "^26.1.0" + jest-cli "^26.2.2" "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" @@ -12561,7 +12570,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json3@^3.3.2: +json3@^3.3.2, json3@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== @@ -13344,7 +13353,7 @@ lodash@4.17.15: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== -lodash@>=4.17.19, lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.2.1: +lodash@>=4.17.19, lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.2.1: version "4.17.19" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== @@ -13466,9 +13475,9 @@ lru-memoizer@^2.1.2: lru-cache "~4.0.0" macos-release@^2.2.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.4.0.tgz#837b39fc01785c3584f103c5599e0f0c8068b49e" - integrity sha512-ko6deozZYiAkqa/0gmcsz+p4jSy3gY7/ZsCEokPaYd8k+6/aXGkiTgr61+Owup7Sf+xjqW8u2ElhoM9SEcEfuA== + version "2.4.1" + resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.4.1.tgz#64033d0ec6a5e6375155a74b1a1eba8e509820ac" + integrity sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg== magic-sdk@^1.3.5: version "1.4.0" @@ -13662,38 +13671,6 @@ meow@^4.0.0: redent "^2.0.0" trim-newlines "^2.0.0" -meow@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4" - integrity sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig== - dependencies: - camelcase-keys "^4.0.0" - decamelize-keys "^1.0.0" - loud-rejection "^1.0.0" - minimist-options "^3.0.1" - normalize-package-data "^2.3.4" - read-pkg-up "^3.0.0" - redent "^2.0.0" - trim-newlines "^2.0.0" - yargs-parser "^10.0.0" - -meow@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/meow/-/meow-6.1.1.tgz#1ad64c4b76b2a24dfb2f635fddcadf320d251467" - integrity sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg== - dependencies: - "@types/minimist" "^1.2.0" - camelcase-keys "^6.2.2" - decamelize-keys "^1.1.0" - hard-rejection "^2.1.0" - minimist-options "^4.0.2" - normalize-package-data "^2.5.0" - read-pkg-up "^7.0.1" - redent "^3.0.0" - trim-newlines "^3.0.0" - type-fest "^0.13.1" - yargs-parser "^18.1.3" - meow@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/meow/-/meow-7.0.1.tgz#1ed4a0a50b3844b451369c48362eb0515f04c1dc" @@ -13890,7 +13867,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4: +minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -13934,9 +13911,9 @@ minipass-flush@^1.0.5: minipass "^3.0.0" minipass-pipeline@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz#55f7839307d74859d6e8ada9c3ebe72cec216a34" - integrity sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ== + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== dependencies: minipass "^3.0.0" @@ -14019,7 +13996,7 @@ mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@~0.5.1: +mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -14047,14 +14024,6 @@ morgan@^1.10.0: on-finished "~2.3.0" on-headers "~1.0.2" -move-cli@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/move-cli/-/move-cli-1.2.1.tgz#c41d98933e741a375b3433dce981bed8bae9c78c" - integrity sha512-tsXvWsP/ZNCP007xO2TjNwH5LtTuRaSNtdznGNHGXqBs8OLzii8yeN06G8PUd9qEumhCOJtb468Rus7KNvNcBg== - dependencies: - meow "^5.0.0" - mv "^2.1.1" - move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -14164,15 +14133,6 @@ mute-stream@0.0.8, mute-stream@~0.0.4: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -mv@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2" - integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI= - dependencies: - mkdirp "~0.5.1" - ncp "~2.0.0" - rimraf "~2.4.0" - mz@^2.5.0: version "2.7.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" @@ -14224,11 +14184,6 @@ nconf@^0.10.0: secure-keys "^1.0.0" yargs "^3.19.0" -ncp@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" - integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= - needle@^2.3.3, needle@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz#e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0" @@ -14409,9 +14364,9 @@ node-notifier@^7.0.0: which "^2.0.2" node-releases@^1.1.29, node-releases@^1.1.58: - version "1.1.59" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.59.tgz#4d648330641cec704bff10f8e4fe28e453ab8e8e" - integrity sha512-H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw== + version "1.1.60" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084" + integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA== node-request-interceptor@^0.3.3: version "0.3.3" @@ -14781,9 +14736,9 @@ onetime@^2.0.0: mimic-fn "^1.0.0" onetime@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" - integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== + version "5.1.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.1.tgz#5c8016847b0d67fcedb7eef254751cfcdc7e9418" + integrity sha512-ZpZpjcJeugQfWsfyQlshVoowIIQ1qBGSVll4rfDq6JJVO//fesjoX808hXWfBjY+ROZgpKDI5TRSRBSoJiZ8eg== dependencies: mimic-fn "^2.1.0" @@ -15144,9 +15099,9 @@ parse-json@^4.0.0: json-parse-better-errors "^1.0.1" parse-json@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" - integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== + version "5.0.1" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.1.tgz#7cfe35c1ccd641bce3981467e6c2ece61b3b3878" + integrity sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ== dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" @@ -15430,13 +15385,13 @@ popper.js@^1.14.4, popper.js@^1.14.7: integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== portfinder@^1.0.26: - version "1.0.27" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.27.tgz#a41333c116b5e5f3d380f9745ac2f35084c4c758" - integrity sha512-bJ3U3MThKnyJ9Dx1Idtm5pQmxXqw08+XOHhi/Lie8OF1OlhVaBFhsntAIhkZYjfDcCzszSr0w1yCbccThhzgxQ== + version "1.0.28" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" + integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== dependencies: async "^2.6.2" debug "^3.1.1" - mkdirp "^0.5.1" + mkdirp "^0.5.5" posix-character-classes@^0.1.0: version "0.1.1" @@ -15476,14 +15431,14 @@ postcss-modules-extract-imports@^2.0.0: postcss "^7.0.5" postcss-modules-local-by-default@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915" - integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ== + version "3.0.3" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" + integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== dependencies: icss-utils "^4.1.1" - postcss "^7.0.16" + postcss "^7.0.32" postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.0.0" + postcss-value-parser "^4.1.0" postcss-modules-scope@^2.2.0: version "2.2.0" @@ -15510,12 +15465,12 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0: +postcss-value-parser@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== -postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: +postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: version "7.0.32" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw== @@ -15602,12 +15557,12 @@ pretty-format@^25.2.1, pretty-format@^25.5.0: ansi-styles "^4.0.0" react-is "^16.12.0" -pretty-format@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.1.0.tgz#272b9cd1f1a924ab5d443dc224899d7a65cb96ec" - integrity sha512-GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg== +pretty-format@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.2.0.tgz#83ecc8d7de676ff224225055e72bd64821cec4f1" + integrity sha512-qi/8IuBu2clY9G7qCXgCdD1Bf9w+sXakdHTRToknzMtVy0g7c4MBWaZy7MfB7ndKZovRO6XRwJiAYqq+MC7SDA== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.2.0" ansi-regex "^5.0.0" ansi-styles "^4.0.0" react-is "^16.12.0" @@ -16487,9 +16442,9 @@ regenerate@^1.4.0: integrity sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A== regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4: - version "0.13.6" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.6.tgz#d236043c46ffab2968c1ef651803d8acdea8ed65" - integrity sha512-GmwlGiazQEbOwQWDdbbaP10i15pGtScYWLbMZuu+RKRz0cZ+g8IUONazBnaZqe7j1670IV1HgE4/8iy7CQPf4Q== + version "0.13.7" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" + integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== regenerator-transform@^0.14.2: version "0.14.5" @@ -16774,9 +16729,9 @@ ret@~0.1.10: integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== retry-request@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-4.1.1.tgz#f676d0db0de7a6f122c048626ce7ce12101d2bd8" - integrity sha512-BINDzVtLI2BDukjWmjAIRZ0oglnCAkpP2vQjM3jdLhmT62h0xnQgciPwBRDAvHqpkPT2Wo1XuUyLyn6nbGrZQQ== + version "4.1.2" + resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-4.1.2.tgz#88eb28ba5b0b81c3692f03dd9f2f91868be2a30b" + integrity sha512-fa4OwUcplhOYIhTm7zt6xsUfoApWo+auhvxbpPR4XLxHj0k67MhPItpCzYWzOEjtJlCH4MJ5V0qUrXiu/pOpag== dependencies: debug "^4.1.1" through2 "^3.0.1" @@ -16817,13 +16772,6 @@ rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" -rimraf@~2.4.0: - version "2.4.5" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da" - integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto= - dependencies: - glob "^6.0.1" - ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" @@ -16874,9 +16822,9 @@ rx@4.1.0: integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.2, rxjs@^6.6.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz#af2901eedf02e3a83ffa7f886240ff9018bbec84" - integrity sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg== + version "6.6.2" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2" + integrity sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg== dependencies: tslib "^1.9.0" @@ -16966,11 +16914,11 @@ secure-keys@^1.0.0: integrity sha1-8MgtmKOxOah3aogIBQuCRDEIf8o= seek-bzip@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc" - integrity sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w= + version "1.0.6" + resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4" + integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ== dependencies: - commander "~2.8.1" + commander "^2.8.1" select-hose@^2.0.0: version "2.0.0" @@ -17446,13 +17394,13 @@ snyk-module@^2.0.2: debug "^3.1.0" hosted-git-info "^2.7.1" -snyk-mvn-plugin@2.17.3: - version "2.17.3" - resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.17.3.tgz#b9e4e23cde6f5748a99d7185142dfcd01b36df2d" - integrity sha512-yDlqPuNacYUdf4JlyW8dHcxJJC3BMOU01m5cuGhX6s8j88T79A0qrwUu8AJwCIjbDXpD1YSoS1Wb7gRdvDlbKA== +snyk-mvn-plugin@2.18.2: + version "2.18.2" + resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.18.2.tgz#d35e825ccfc2807c26bf6776116d46de03d3f115" + integrity sha512-A36YmfpeEXGsKoChm644DysKG40d5y5MZnldkpsbrLz37R3JMxkt4igMACZ9QJZAkiWjVs28hOKyyT1vuMPlHg== dependencies: "@snyk/cli-interface" "2.8.1" - "@snyk/java-call-graph-builder" "1.11.1" + "@snyk/java-call-graph-builder" "1.12.3" debug "^4.1.1" needle "^2.5.0" tmp "^0.1.0" @@ -17614,9 +17562,9 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1: then-fs "^2.0.0" snyk@^1.319.1: - version "1.364.1" - resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.364.1.tgz#927be09d1d1302158c8b01f25a32235d029e464d" - integrity sha512-B1nEFYgBdCN3/F1maPyQi90Avhe7FEC4a29JaME6sbRAMTWcEJysblqYPqgNQkVgqiQzxojXNhrnnzYCxl3Q7Q== + version "1.369.2" + resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.369.2.tgz#23065ff8bdf92e020c631685906b4cf0c3ca1c63" + integrity sha512-LgY0lHycWag6wVNH/B1FlM4CWyE+O55j7bMa5CtVp/W/id4DKglpYxKjN56Vb9f7krOFtxbQiksE1W70rJOUoQ== dependencies: "@snyk/cli-interface" "2.8.1" "@snyk/dep-graph" "1.18.3" @@ -17645,7 +17593,7 @@ snyk@^1.319.1: snyk-go-plugin "1.16.0" snyk-gradle-plugin "3.5.1" snyk-module "3.1.0" - snyk-mvn-plugin "2.17.3" + snyk-mvn-plugin "2.18.2" snyk-nodejs-lockfile-parser "1.26.3" snyk-nuget-plugin "1.18.1" snyk-php-plugin "1.9.0" @@ -17663,7 +17611,7 @@ snyk@^1.319.1: uuid "^3.3.2" wrap-ansi "^5.1.0" -sockjs-client@1.4.0, sockjs-client@^1.4.0: +sockjs-client@1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5" integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g== @@ -17675,6 +17623,18 @@ sockjs-client@1.4.0, sockjs-client@^1.4.0: json3 "^3.3.2" url-parse "^1.4.3" +sockjs-client@^1.4.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.0.tgz#2f8ff5d4b659e0d092f7aba0b7c386bd2aa20add" + integrity sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q== + dependencies: + debug "^3.2.6" + eventsource "^1.0.7" + faye-websocket "^0.11.3" + inherits "^2.0.4" + json3 "^3.3.3" + url-parse "^1.4.7" + sockjs@0.3.20: version "0.3.20" resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855" @@ -18973,9 +18933,9 @@ typescript@^3.8.3, typescript@^3.9.6, typescript@~3.9.7: integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== uglify-js@^3.1.4: - version "3.10.0" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.10.0.tgz#397a7e6e31ce820bfd1cb55b804ee140c587a9e7" - integrity sha512-Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA== + version "3.10.1" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.10.1.tgz#dd14767eb7150de97f2573a5ff210db14fffe4ad" + integrity sha512-RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q== uid-number@0.0.6: version "0.0.6" @@ -19211,11 +19171,11 @@ use-callback-ref@^1.2.1: integrity sha512-rXpsyvOnqdScyied4Uglsp14qzag1JIemLeTWGKbwpotWht57hbP78aNT+Q4wdFKQfQibbUX4fb6Qb4y11aVOQ== use-sidecar@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.2.tgz#e72f582a75842f7de4ef8becd6235a4720ad8af6" - integrity sha512-287RZny6m5KNMTb/Kq9gmjafi7lQL0YHO1lYolU6+tY1h9+Z3uCtkJJ3OSOq3INwYf2hBryCcDh4520AhJibMA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.3.tgz#17a4e567d4830c0c0ee100040e85a7fe68611e0f" + integrity sha512-ygJwGUBeQfWgDls7uTrlEDzJUUR67L8Rm14v/KfFtYCdHhtjHZx1Krb3DIQl3/Q5dJGfXLEQ02RY8BdNBv87SQ== dependencies: - detect-node "^2.0.4" + detect-node-es "^1.0.0" tslib "^1.9.3" use@^3.1.0: @@ -19293,9 +19253,9 @@ uuid@^7.0.0, uuid@^7.0.3: integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== uuid@^8.0.0, uuid@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.2.0.tgz#cb10dd6b118e2dada7d0cd9730ba7417c93d920e" - integrity sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q== + version "8.3.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea" + integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ== v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1: version "2.1.1" @@ -19427,15 +19387,15 @@ watchpack-chokidar2@^2.0.0: dependencies: chokidar "^2.1.8" -watchpack@^1.6.1: - version "1.7.2" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz#c02e4d4d49913c3e7e122c3325365af9d331e9aa" - integrity sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g== +watchpack@^1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b" + integrity sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg== dependencies: graceful-fs "^4.1.2" neo-async "^2.5.0" optionalDependencies: - chokidar "^3.4.0" + chokidar "^3.4.1" watchpack-chokidar2 "^2.0.0" wbuf@^1.1.0, wbuf@^1.7.3: @@ -19594,9 +19554,9 @@ webpack-virtual-modules@^0.2.0: debug "^3.0.0" webpack@^4.33.0, webpack@^4.38.0, webpack@^4.42.1: - version "4.43.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6" - integrity sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g== + version "4.44.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.1.tgz#17e69fff9f321b8f117d1fda714edfc0b939cc21" + integrity sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ== dependencies: "@webassemblyjs/ast" "1.9.0" "@webassemblyjs/helper-module-context" "1.9.0" @@ -19606,7 +19566,7 @@ webpack@^4.33.0, webpack@^4.38.0, webpack@^4.42.1: ajv "^6.10.2" ajv-keywords "^3.4.1" chrome-trace-event "^1.0.2" - enhanced-resolve "^4.1.0" + enhanced-resolve "^4.3.0" eslint-scope "^4.0.3" json-parse-better-errors "^1.0.2" loader-runner "^2.4.0" @@ -19619,7 +19579,7 @@ webpack@^4.33.0, webpack@^4.38.0, webpack@^4.42.1: schema-utils "^1.0.0" tapable "^1.1.3" terser-webpack-plugin "^1.4.3" - watchpack "^1.6.1" + watchpack "^1.7.4" webpack-sources "^1.4.1" websocket-driver@0.6.5: @@ -19970,9 +19930,9 @@ xregexp@4.0.0: integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg== xss@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.7.tgz#a554cbd5e909324bd6893fb47fff441ad54e2a95" - integrity sha512-A9v7tblGvxu8TWXQC9rlpW96a+LN1lyw6wyhpTmmGW+FwRMactchBR3ROKSi33UPCUcUHSu8s9YP6F+K3Mw//w== + version "1.0.8" + resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz#32feb87feb74b3dcd3d404b7a68ababf10700535" + integrity sha512-3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw== dependencies: commander "^2.20.3" cssfilter "0.0.10" @@ -20012,13 +19972,6 @@ yaml@^1.7.2, yaml@^1.9.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e" integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== -yargs-parser@^10.0.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" - integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ== - dependencies: - camelcase "^4.1.0" - yargs-parser@^13.1.2: version "13.1.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" From df27d3fa4e3397da4470e0f2c7ed049736b3ec36 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Mon, 3 Aug 2020 14:18:53 +0200 Subject: [PATCH 19/37] Simplify types and add way generate them. --- packages/core/config/babel-preset.js | 22 +++++++++++++------ .../babel-plugin-redwood-import-dir.test.ts | 12 +++------- .../src/babel-plugin-redwood-import-dir.ts | 21 ++++++++++-------- packages/internal/src/paths.ts | 12 +++++----- 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/packages/core/config/babel-preset.js b/packages/core/config/babel-preset.js index 9d894d1480c8..4443b45ccd2b 100644 --- a/packages/core/config/babel-preset.js +++ b/packages/core/config/babel-preset.js @@ -1,3 +1,5 @@ +const fs = require('fs') + /** * This is the babel preset used `create-redwood-app` */ @@ -11,6 +13,8 @@ const TARGETS_NODE = '12.16.1' const CORE_JS_VERSION = '3.6' module.exports = () => { + const paths = getPaths() + return { presets: ['@babel/preset-react', '@babel/preset-typescript'], plugins: [ @@ -58,9 +62,7 @@ module.exports = () => { src: // Jest monorepo and multi project runner is not correctly determining // the `cwd`: https://github.com/facebook/jest/issues/7359 - process.env.NODE_ENV !== 'test' - ? './src' - : getPaths().api.src, + process.env.NODE_ENV !== 'test' ? './src' : paths.api.src, }, }, ], @@ -80,7 +82,15 @@ module.exports = () => { ], }, ], - [require('../dist/babel-plugin-redwood-import-dir')], + [ + require('../dist/babel-plugin-redwood-import-dir'), + { + generateTypesPath: paths.types, + host: { + writeFileSync: fs.writeFileSync, + }, + }, + ], ], }, // ** WEB ** @@ -107,9 +117,7 @@ module.exports = () => { src: // Jest monorepo and multi project runner is not correctly determining // the `cwd`: https://github.com/facebook/jest/issues/7359 - process.env.NODE_ENV !== 'test' - ? './src' - : getPaths().web.src, + process.env.NODE_ENV !== 'test' ? './src' : paths.web.src, }, }, ], diff --git a/packages/core/src/__tests__/babel-plugin-redwood-import-dir.test.ts b/packages/core/src/__tests__/babel-plugin-redwood-import-dir.test.ts index 9a120e6a0c92..94d53941c472 100644 --- a/packages/core/src/__tests__/babel-plugin-redwood-import-dir.test.ts +++ b/packages/core/src/__tests__/babel-plugin-redwood-import-dir.test.ts @@ -15,15 +15,9 @@ describe('babel plugin redwood import dir', () => { '__fixtures__/import-dir/import-dir-services.d.ts' ) expect(contents.replace(/\s/g, '')).toMatch( - ` - declare module '../__fixtures__/**/*.{js,ts}' { - export default { - a: any - b: any - c_sdl: any - nested_d: any - } - }`.replace(/\s/g, '') + `// @ts-expect-error + declare module 'src/__fixtures__/**/*.{js,ts}'; + `.replace(/\s/g, '') ) }, }, diff --git a/packages/core/src/babel-plugin-redwood-import-dir.ts b/packages/core/src/babel-plugin-redwood-import-dir.ts index b797734eba65..fcf1a2a9466f 100644 --- a/packages/core/src/babel-plugin-redwood-import-dir.ts +++ b/packages/core/src/babel-plugin-redwood-import-dir.ts @@ -4,12 +4,17 @@ import glob from 'glob' import type { PluginObj, types } from '@babel/core' import type { Host } from '@redwoodjs/structure' -export const generateTypes = (modulePath: string, typeExports: string[]) => { - return `declare module '${modulePath}' { - export default { - ${typeExports.join('\n')} - } - }` +export const generateTypes = (modulePath: string) => { + // TODO: + // This implementation is a bit lacking: + // 1. We receive the resolved path instead of the aliases path, + // so we monkey patch it by replacing `../` with `src/`. + // 2. We don't provide any types beyond the module, which is fine since + // people aren't going to be using those. + return `// @ts-expect-error\ndeclare module '${modulePath.replace( + '../', + 'src/' + )}';` } /** @@ -70,7 +75,6 @@ export default function ( .replace(/[^a-zA-Z0-9]/g, '_') } - let typeExports: string[] = [] for (const filePath of dirFiles) { const { dir: fileDir, name: fileName } = path.parse(filePath) const filePathWithoutExtension = fileDir + '/' + fileName @@ -91,7 +95,6 @@ export default function ( // + . = // services.a = a - typeExports = [...typeExports, `${fpVarName}: any`] nodes.push( t.expressionStatement( t.assignmentExpression( @@ -118,7 +121,7 @@ export default function ( options.generateTypesPath, `import-dir-${importName}.d.ts` ), - generateTypes(importGlob, typeExports) + generateTypes(importGlob) ) } }, diff --git a/packages/internal/src/paths.ts b/packages/internal/src/paths.ts index 387e98a076d5..85c83dd3b6c6 100644 --- a/packages/internal/src/paths.ts +++ b/packages/internal/src/paths.ts @@ -30,6 +30,7 @@ export interface BrowserTargetPaths { export interface Paths { cache: string + types: string base: string web: BrowserTargetPaths api: NodeTargetPaths @@ -110,17 +111,16 @@ export const resolveFile = ( export const getPaths = (BASE_DIR: string = getBaseDir()): Paths => { const routes = resolveFile(path.join(BASE_DIR, PATH_WEB_ROUTES)) as string - // We store ambient type declerations and our test database over here. + // We store ambient types and our test database over here: const cache = path.join(BASE_DIR, 'node_modules', '.redwood') - try { - fs.mkdirSync(cache) - } catch (e) { - // noop - } + const types = path.join(BASE_DIR, 'node_modules', '.redwood', 'types') + fs.mkdirSync(cache, { recursive: true }) + fs.mkdirSync(types, { recursive: true }) return { base: BASE_DIR, cache, + types, api: { base: path.join(BASE_DIR, 'api'), dataMigrations: path.join(BASE_DIR, PATH_API_DIR_DATA_MIGRATIONS), From b63fff1e3085fdbef5870f71d80b743810ddbf31 Mon Sep 17 00:00:00 2001 From: Daniel Choudhury Date: Tue, 28 Jul 2020 17:09:30 +0100 Subject: [PATCH 20/37] Add webpack retry chunks plugin --- packages/core/config/webpack.common.js | 10 ++++++++++ packages/core/package.json | 3 ++- yarn.lock | 12 ++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/packages/core/config/webpack.common.js b/packages/core/config/webpack.common.js index 0162470581c8..046909eecd96 100644 --- a/packages/core/config/webpack.common.js +++ b/packages/core/config/webpack.common.js @@ -7,6 +7,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin') const DirectoryNamedWebpackPlugin = require('directory-named-webpack-plugin') const MiniCssExtractPlugin = require('mini-css-extract-plugin') const CopyPlugin = require('copy-webpack-plugin') +const { RetryChunkLoadPlugin } = require('webpack-retry-chunk-load-plugin') const Dotenv = require('dotenv-webpack') const { getConfig, getPaths } = require('@redwoodjs/internal') const merge = require('webpack-merge') @@ -182,6 +183,15 @@ module.exports = (webpackEnv) => { chunks: 'all', }), new CopyPlugin([{ from: 'public/', to: '', ignore: ['README.md'] }]), + isEnvProduction && + new RetryChunkLoadPlugin({ + cacheBust: `function() { + return Date.now(); + }`, + maxRetries: 5, + // @TODO: Add redirect to fatalErrorPage + // lastResortScript: "window.location.href='/500.html';" + }), ...getSharedPlugins(isEnvProduction), ].filter(Boolean), module: { diff --git a/packages/core/package.json b/packages/core/package.json index 58842a8be7e1..0cbc093e78af 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -59,7 +59,8 @@ "webpack-bundle-analyzer": "^3.6.1", "webpack-cli": "^3.3.11", "webpack-dev-server": "^3.10.3", - "webpack-merge": "^4.2.2" + "webpack-merge": "^4.2.2", + "webpack-retry-chunk-load-plugin": "^1.4.0" }, "gitHead": "1cb7c8d1085147787209af423c33a9c91c3e6517", "scripts": { diff --git a/yarn.lock b/yarn.lock index 99dcb8c65122..08ed15db6cda 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15574,6 +15574,11 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" +prettier@^1.19.1: + version "1.19.1" + resolved "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" + integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== + prettier@^2.0.1, prettier@^2.0.2, prettier@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4" @@ -19578,6 +19583,13 @@ webpack-merge@^4.2.2: dependencies: lodash "^4.17.15" +webpack-retry-chunk-load-plugin@^1.4.0: + version "1.4.0" + resolved "https://registry.npmjs.org/webpack-retry-chunk-load-plugin/-/webpack-retry-chunk-load-plugin-1.4.0.tgz#8ec191d9e431efec6ea24cd3251a753e75a56d18" + integrity sha512-R9Esfu/uQ8GX85mxcmfebmCuVjwaVaACQsaJNj3JE0xiYoHqXbubg+kRPnKgfNhYLYn6oHSK1MtH79o24rdYpw== + dependencies: + prettier "^1.19.1" + webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" From b6e92df85684bc57d0565d9d6bf3f810dc1f53ce Mon Sep 17 00:00:00 2001 From: hemildesai Date: Mon, 3 Aug 2020 23:41:07 +0530 Subject: [PATCH 21/37] Fix graphQLClientConfig bug in GraphQLWithAuth provider --- packages/web/src/components/RedwoodProvider.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/src/components/RedwoodProvider.js b/packages/web/src/components/RedwoodProvider.js index 47b6904af452..5422f21c2666 100644 --- a/packages/web/src/components/RedwoodProvider.js +++ b/packages/web/src/components/RedwoodProvider.js @@ -85,7 +85,7 @@ const RedwoodProvider = ({ return ( {children} From db802980e749c4d47d327d5f2a2edbc13b1d7c7f Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Tue, 4 Aug 2020 06:33:23 +0200 Subject: [PATCH 22/37] Fix windows tests. --- .../src/__tests__/babel-plugin-redwood-import-dir.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/src/__tests__/babel-plugin-redwood-import-dir.test.ts b/packages/core/src/__tests__/babel-plugin-redwood-import-dir.test.ts index 94d53941c472..0c31b64ae31d 100644 --- a/packages/core/src/__tests__/babel-plugin-redwood-import-dir.test.ts +++ b/packages/core/src/__tests__/babel-plugin-redwood-import-dir.test.ts @@ -10,9 +10,9 @@ describe('babel plugin redwood import dir', () => { pluginOptions: { generateTypesPath: '__fixtures__/import-dir', host: { - writeFileSync: (path, contents) => { - expect(path).toEqual( - '__fixtures__/import-dir/import-dir-services.d.ts' + writeFileSync: (p, contents) => { + expect(p).toEqual( + path.join('__fixtures__/import-dir/import-dir-services.d.ts') ) expect(contents.replace(/\s/g, '')).toMatch( `// @ts-expect-error From ef120a453dc2d4b31f418639383564d1817cf3cf Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Wed, 5 Aug 2020 09:49:36 +0200 Subject: [PATCH 23/37] Upgrade Prisma client. --- packages/api/package.json | 2 +- packages/cli/package.json | 2 +- packages/core/package.json | 2 +- packages/structure/package.json | 4 +- yarn.lock | 113 ++++++++++++++++---------------- 5 files changed, 60 insertions(+), 63 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index a4caf36dc789..f04a3ad415a9 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -8,7 +8,7 @@ "types": "./dist/index.d.ts", "license": "MIT", "dependencies": { - "@prisma/client": "~2.3.0", + "@prisma/client": "2.4.0", "@redwoodjs/internal": "^0.15.3", "apollo-server-lambda": "2.16.0", "core-js": "3.6.4", diff --git a/packages/cli/package.json b/packages/cli/package.json index 4099d5cd1e8e..26613fd7856d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -13,7 +13,7 @@ "dist" ], "dependencies": { - "@prisma/sdk": "~2.3.0", + "@prisma/sdk": "2.4.0", "@redwoodjs/internal": "^0.15.3", "@redwoodjs/structure": "^0.15.3", "camelcase": "^5.3.1", diff --git a/packages/core/package.json b/packages/core/package.json index 58842a8be7e1..1710c4bc0da5 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -18,7 +18,7 @@ "@babel/preset-react": "^7.9.4", "@babel/preset-typescript": "^7.9.0", "@babel/runtime-corejs3": "^7.9.2", - "@prisma/cli": "~2.3.0", + "@prisma/cli": "2.4.0", "@redwoodjs/cli": "^0.15.3", "@redwoodjs/dev-server": "^0.15.3", "@redwoodjs/eslint-config": "^0.15.3", diff --git a/packages/structure/package.json b/packages/structure/package.json index 79e35f195597..817d38c59d53 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -9,8 +9,8 @@ ], "types": "./dist/index.d.ts", "dependencies": { - "@prisma/sdk": "~2.3.0", - "@redwoodjs/internal": "^0.8.2", + "@prisma/sdk": "2.4.0", + "@redwoodjs/internal": "^0.15.3", "camelcase": "^6.0.0", "deepmerge": "^4.2.2", "enquirer": "2.3.6", diff --git a/yarn.lock b/yarn.lock index 94ac6190c0db..9bf042916efb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2758,33 +2758,38 @@ resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca" integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q== -"@prisma/cli@~2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@prisma/cli/-/cli-2.3.0.tgz#ddc89de63c2fcb88199fdd1b490a7616a2d32de1" - integrity sha512-S84VeeUR3I2Z1fkBh3x42KmVyFgiX4USzIN5N5EDyoWC8BSlMVs2eHeLlhHOtx68sDz5oNo/YEIM2bkU8cUZKA== +"@prisma/ci-info@2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@prisma/ci-info/-/ci-info-2.1.2.tgz#3da64f54584bde0aaf4b42f298a6c63f025aeb3f" + integrity sha512-RhAHY+wp6Nqu89Tp3zfUVkpGfqk4TfngeOWaMGgmhP7mB2ASDtOl8dkwxHmI8eN4edo+luyjPmbJBC4kST321A== -"@prisma/client@~2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.3.0.tgz#3979d973e0eececad5387c791aa1dd63316fc690" - integrity sha512-mlXV/VdOKjEEoZPOmFOy7KJPecYGV5XSVXGsti0F1kkShpGcMvhPkpKhNOwIb/8muUTeN5NoNqEGqKDD5XKw3w== +"@prisma/cli@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@prisma/cli/-/cli-2.4.0.tgz#865a21cd8b072340d4d7b5fda888815b5692956e" + integrity sha512-+ybn21k+nAwoyILP5I0+VzRmMLfLmCfnJsJmBktg1FgKIWr9ppcM28Fu8LAohb7kQlKNRhv2eJmC5pdZC6unMw== + +"@prisma/client@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.4.0.tgz#221ef0074c63bb9079c92a169bb177ba6fb7cea2" + integrity sha512-kFWCVJ8Ux8IsUjaIOlEQ7n3H2rf9MqxkLwM2bOt7LL7P50WraK0dJ7if8KU/Ui9/QYwUIe/5wATi1bfJSrVIAg== dependencies: pkg-up "^3.1.0" -"@prisma/debug@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-2.3.0.tgz#612bf5e8917ec0095bfc0ba7bde366a15eb1a0a2" - integrity sha512-b/pkhAL3flv5Vof8V7J8E1oqHuoYySQdAgzEsSdGzOOMRqFQhpXVbmt2/pYf+zgvaeGvqMiP7CMXasa1JotuhQ== +"@prisma/debug@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-2.4.0.tgz#a947cb609cd3db73042fe87bcda6b09eabd222a9" + integrity sha512-GbVlZvcd5EJoY8fdpL6BZLeGpOaZM+nhxSntd2J5cmHTbCf////GrhLNzwPd249A0CqNvDxhKIpfgKeXfjwKVQ== dependencies: debug "^4.1.1" -"@prisma/engine-core@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-2.3.0.tgz#37ce2428ce8ab1f0b937d07f78a6e2c7683c8741" - integrity sha512-8fCA7UF29MLaaihWrvfrUYgwkjD6ePWpNzO3pxMW52mcyxc6BE/AXQTKhgl6uSmP6xMUw2tPBp3VEs4+8hDQ9A== +"@prisma/engine-core@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-2.4.0.tgz#90365469cbb807793a09c5f348499c4f25952362" + integrity sha512-AzTk2ofy3nTQVzJwyvb7ylaRBHjlZ45lc3barmcmxyOJvy3l1IYZsjMQqh+f6Cjswm/ahlNUS6x/cX44yXmsRA== dependencies: - "@prisma/debug" "2.3.0" - "@prisma/generator-helper" "2.3.0" - "@prisma/get-platform" "2.3.0" + "@prisma/debug" "2.4.0" + "@prisma/generator-helper" "2.4.0" + "@prisma/get-platform" "2.4.0" bent "^7.1.2" chalk "^4.0.0" cross-fetch "^3.0.4" @@ -2797,13 +2802,13 @@ terminal-link "^2.1.1" undici "1.1.0" -"@prisma/fetch-engine@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.3.0.tgz#aaeebe53a02353013eabec280899b575d7c90d3c" - integrity sha512-wmEfkwGa0u2MksUR51Eako/3zSUN1a95XLDbPowvvre1yyDFjajsKJKA7TcgaYWH8bHF1UCSB3ED4FhcOCA48w== +"@prisma/fetch-engine@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.4.0.tgz#6dc0045528943990949e046656be5842cea6a236" + integrity sha512-QM0S4I60SuB/T9cRYJI51wATEfTwUWtZaQl34Xq1Bb9Z0J1qP5s/beL68lyU2oqNMsnSf8Ee5JH4XebAcDFkyA== dependencies: - "@prisma/debug" "2.3.0" - "@prisma/get-platform" "2.3.0" + "@prisma/debug" "2.4.0" + "@prisma/get-platform" "2.4.0" chalk "^4.0.0" execa "^4.0.0" find-cache-dir "^3.3.1" @@ -2821,38 +2826,38 @@ temp-dir "^2.0.0" tempy "^0.5.0" -"@prisma/generator-helper@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-2.3.0.tgz#62e7eb666aa92a57eb6f308792e2addabac017eb" - integrity sha512-DL+9fpBSkLxic4VxA2U0N5leGV6o+E0LOgzlDIDpQsTVzwYiGWX0xSM2PJLKJv/sqY2B9ayeJBSYGfa6/79D3w== +"@prisma/generator-helper@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-2.4.0.tgz#c56652b3a53e97c81a29b98a32caf61a8559bc8f" + integrity sha512-ckUmB9YjY6Pr1Ea8XQD5mM3yH3t4EvVTJf7WVjpUAopQUpu6zRKP+Nf65f9SqhxnGd4crizrJ8S7XrcMtl4y5Q== dependencies: - "@prisma/debug" "2.3.0" + "@prisma/debug" "2.4.0" "@types/cross-spawn" "^6.0.1" chalk "^4.0.0" cross-spawn "^7.0.2" -"@prisma/get-platform@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.3.0.tgz#bc7ee2e427808356ca89b531a2aa9a1b2a32c7fe" - integrity sha512-2ZMuFuPevBTqiX0SHQwIpLczPPV0Cgh5+XsgIyQ4b/sD0J7o5b+JPQOTkoQGXZ2bV4HjdlwJqYg7+F+08tl6gw== +"@prisma/get-platform@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.4.0.tgz#4e19f7c7234870d2adf0cd6bee13be2cb6868526" + integrity sha512-PNyaCsCOmJzN5Wz0K9ksjqevr/naScI2cVapYR0xBA72PjxM5xyyT+GjcZ1t5QEJ4FugtcR2s6501cFo+IvotA== dependencies: - "@prisma/debug" "2.3.0" + "@prisma/debug" "2.4.0" -"@prisma/sdk@~2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-2.3.0.tgz#a9ec72fd6fbcda13d968a6cb908c3977491cc70d" - integrity sha512-bFFDrLhG/reJXONa47QQcQ+9PECxO2ArOSMF4W1+xNOpvui1XM3EwZqdQVA+HeMm95H0l0dpNndihnTyNhGIzw== +"@prisma/sdk@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-2.4.0.tgz#9db3c67c5a24b75328e9371c845058225efe16f2" + integrity sha512-2bjCV/+TuijQ6qElzE/47XB80Rj2/WPlbgv/r8GissSI4YLGAQSO906DdUKJ29bm58UfV3rxGWkLV/wRb1323Q== dependencies: "@apexearth/copy" "^1.4.5" - "@prisma/debug" "2.3.0" - "@prisma/engine-core" "2.3.0" - "@prisma/fetch-engine" "2.3.0" - "@prisma/generator-helper" "2.3.0" - "@prisma/get-platform" "2.3.0" + "@prisma/debug" "2.4.0" + "@prisma/engine-core" "2.4.0" + "@prisma/fetch-engine" "2.4.0" + "@prisma/generator-helper" "2.4.0" + "@prisma/get-platform" "2.4.0" archiver "^4.0.0" arg "^4.1.3" chalk "4.1.0" - checkpoint-client "1.1.2" + checkpoint-client "1.1.6" cli-truncate "^2.1.0" execa "^4.0.0" globby "^11.0.0" @@ -2937,15 +2942,6 @@ prop-types "^15.6.1" react-lifecycles-compat "^3.0.4" -"@redwoodjs/internal@^0.8.2": - version "0.8.2" - resolved "https://registry.yarnpkg.com/@redwoodjs/internal/-/internal-0.8.2.tgz#7b61c5f9bc142b6d40205901f0cc641509de7661" - integrity sha512-K5j7npyg8mr/r8AHYwaztyhmeKKEzztPheI2ftObuLSVV+EBWh6slFn80dZhWAIlsDuy7irZcb0eiRW8U+Wuew== - dependencies: - deepmerge "^4.2.2" - findup-sync "^4.0.0" - toml "^3.0.0" - "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -6806,11 +6802,12 @@ check-types@^8.0.3: resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552" integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ== -checkpoint-client@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/checkpoint-client/-/checkpoint-client-1.1.2.tgz#2f78f11d5e2f69366d296134deaca877052843d0" - integrity sha512-Nvwpf7qi5bJD8+HAZ8HWzdHZBQJxi+Sw33OI8ahx1H0yby8nPcpP+h4bYYhl+8z0XrjBaUz5p6xQeTinzUi/Qw== +checkpoint-client@1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/checkpoint-client/-/checkpoint-client-1.1.6.tgz#5552256007cb46ad6e4b7ed472f788717ccbefdb" + integrity sha512-/sl6b1CJq/eKarfO/bi5f1akpZzJemn9bQqzDGjSo0ZdN9KI2hpqJyd19YA4w/oalEsJ915jhOkCtYnoYwE0Jg== dependencies: + "@prisma/ci-info" "2.1.2" cross-spawn "7.0.3" env-paths "2.2.0" fast-write-atomic "0.2.1" From 972700c1990089c85bd3245ce0b33302b06ef733 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Wed, 5 Aug 2020 11:26:28 +0200 Subject: [PATCH 24/37] Clean build commands. --- babel.config.js | 8 ++++---- package.json | 12 +++++------ packages/api/package.json | 9 +++++---- packages/auth/package.json | 9 +++++---- packages/cli/package.json | 9 ++++----- packages/core/package.json | 18 ++++++++--------- packages/create-redwood-app/package.json | 5 ++--- packages/dev-server/package.json | 7 ++++--- packages/eslint-plugin-redwood/package.json | 5 +++-- packages/forms/package.json | 8 +++++--- packages/forms/src/types.d.ts | 1 + packages/forms/tsconfig.json | 3 +++ packages/internal/package.json | 8 ++++++-- .../src/__tests__/fixtures/api/test/test.ts | 2 +- packages/router/package.json | 20 ++++++++++--------- packages/structure/package.json | 4 +++- packages/testing/package.json | 6 +++--- packages/web/package.json | 5 +++-- yarn.lock | 2 +- 19 files changed, 79 insertions(+), 62 deletions(-) create mode 100644 packages/forms/src/types.d.ts diff --git a/babel.config.js b/babel.config.js index 49d864a29712..195f46daf6ca 100644 --- a/babel.config.js +++ b/babel.config.js @@ -96,9 +96,9 @@ module.exports = { ], }, ], - // Do not build tests or mocks in production. + // Ignore test directories when we're not testing ignore: - process.env.NODE_ENV === 'production' - ? [/\.test\.(js|ts)/, '**/__tests__', '**/__mocks__'] - : [], + process.env.NODE_ENV === 'test' + ? [] + : [/\.test\.(js|ts)/, '**/__tests__', '**/__mocks__'], } diff --git a/package.json b/package.json index 96972b85e9c3..2c8afc5227a5 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,8 @@ "msw": "0.20.0", "nodemon": "^2.0.2", "typescript": "^3.9.6", - "whatwg-fetch": "3.0.0" + "whatwg-fetch": "3.0.0", + "rimraf": "^3.0.2" }, "resolutions": { "@types/react": "16.9.38" @@ -39,13 +40,12 @@ "extends": "@redwoodjs/eslint-config" }, "scripts": { - "build": "yarn build:clean && yarn build:js", - "build:clean": "lerna run build:clean", - "build:js": "cross-env NODE_ENV=production lerna run build", + "build": "yarn build:js && yarn build:types", + "build:js": "lerna run build:js", "build:types": "tsc --build --clean && tsc --build", "build:watch": "lerna run build:watch --parallel", "test": "lerna run test --stream -- --colors --maxWorkers=4", - "lint": "yarn eslint packages", - "lint:fix": "yarn eslint --fix packages" + "lint": "eslint packages", + "lint:fix": "eslint --fix packages" } } diff --git a/packages/api/package.json b/packages/api/package.json index a4caf36dc789..a08f0cb75358 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -16,7 +16,7 @@ "graphql-scalars": "^1.2.6", "graphql-tools": "4.0.7", "jsonwebtoken": "^8.5.1", - "jwks-rsa": "^1.8.0", + "jwks-rsa": "^1.8.1", "lodash.merge": "^4.6.2", "lodash.omitby": "^4.6.0", "merge-graphql-schemas": "^1.7.6" @@ -33,9 +33,10 @@ ] }, "scripts": { - "build": "yarn cross-env NODE_ENV=production babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "tsc --build --clean && tsc --build", - "prepublishOnly": "yarn build", + "build": "yarn build:js && yarn build:types", + "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", + "build:js": "yarn babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", + "build:types": "yarn tsc --build --clean && yarn tsc --build", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "yarn jest", "test:watch": "yarn test --watch" diff --git a/packages/auth/package.json b/packages/auth/package.json index f38e0070e521..604247346a1d 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -31,10 +31,11 @@ } ], "scripts": { - "build": "yarn cross-env NODE_ENV=production babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "tsc --build --clean && tsc --build", - "prepublishOnly": "yarn build && yarn bundlesize", - "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build:js\"", + "build": "yarn build:js && yarn build:types", + "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", + "build:js": "yarn babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", + "build:types": "yarn tsc --build --clean && yarn tsc --build", + "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "yarn jest", "test:watch": "yarn test --watch" }, diff --git a/packages/cli/package.json b/packages/cli/package.json index 4099d5cd1e8e..53c8dd78dc85 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -38,15 +38,14 @@ "yargs": "^15.3.1" }, "devDependencies": { - "@types/node-fetch": "^2.5.5", - "rimraf": "^3.0.2" + "@types/node-fetch": "^2.5.5" }, "scripts": { "build": "yarn build:js && yarn build:clean-dist", - "build:js": "yarn cross-env NODE_ENV=production yarn babel src -d dist --extensions \".js,.ts\" --delete-dir-on-start --copy-files --no-copy-ignored", - "build:clean-dist": "yarn rimraf 'dist/**/__tests__'", "prepublishOnly": "yarn build", - "build:watch": "nodemon --watch src --ext \"js,ts,tsx,template\" --ignore dist --exec \"yarn build:js\"", + "build:clean-dist": "yarn rimraf 'dist/**/__tests__'", + "build:js": "yarn babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start --copy-files --no-copy-ignored", + "build:watch": "nodemon --watch src --ext \"js,ts,tsx,template\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" }, diff --git a/packages/core/package.json b/packages/core/package.json index 58842a8be7e1..bbb95e8f8db9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -61,20 +61,20 @@ "webpack-dev-server": "^3.10.3", "webpack-merge": "^4.2.2" }, + "devDependencies": { + "@types/babel-core": "^6.25.6", + "@types/babel-plugin-tester": "^9.0.0", + "babel-plugin-tester": "^9.0.1", + "whatwg-fetch": "^3.0.0" + }, "gitHead": "1cb7c8d1085147787209af423c33a9c91c3e6517", "scripts": { "build": "yarn build:js && yarn build:types", - "build:js": "yarn cross-env NODE_ENV=production babel src --out-dir dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "tsc --build --clean && tsc --build", "prepublishOnly": "yarn build", - "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build:js\"", + "build:js": "yarn babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", + "build:types": "tsc --build --clean && tsc --build", + "build:watch": "nodemon --watch src --ext \"js,ts,tsx,template\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" - }, - "devDependencies": { - "@types/babel-core": "^6.25.6", - "@types/babel-plugin-tester": "^9.0.0", - "babel-plugin-tester": "^9.0.1", - "whatwg-fetch": "^3.0.0" } } diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index 1a6a8fc181db..d79e2c7553c1 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -19,9 +19,8 @@ "yargs": "^15.3.1" }, "scripts": { - "build": "yarn cross-env NODE_ENV=production babel src -d dist --delete-dir-on-start", - "prepublishOnly": "yarn build", - "build:watch": "nodemon --ignore dist --exec \"yarn build\"" + "build": "babel src -d dist --delete-dir-on-start", + "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build" }, "gitHead": "1cb7c8d1085147787209af423c33a9c91c3e6517" } diff --git a/packages/dev-server/package.json b/packages/dev-server/package.json index e6b7559cfadb..108b6e16d272 100644 --- a/packages/dev-server/package.json +++ b/packages/dev-server/package.json @@ -31,9 +31,10 @@ "@types/require-dir": "^1.0.1" }, "scripts": { - "build": "yarn cross-env NODE_ENV=production babel src -d dist --delete-dir-on-start --extensions \".ts\" --source-maps inline", - "prepublishOnly": "yarn build", + "build": "yarn build:js", + "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", + "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"" }, "gitHead": "1cb7c8d1085147787209af423c33a9c91c3e6517" -} +} \ No newline at end of file diff --git a/packages/eslint-plugin-redwood/package.json b/packages/eslint-plugin-redwood/package.json index 18e6dad4f2ca..c742d55f075b 100644 --- a/packages/eslint-plugin-redwood/package.json +++ b/packages/eslint-plugin-redwood/package.json @@ -11,8 +11,9 @@ "license": "MIT", "gitHead": "1cb7c8d1085147787209af423c33a9c91c3e6517", "scripts": { - "build": "yarn cross-env NODE_ENV=production babel src -d dist --delete-dir-on-start", - "prepublishOnly": "yarn build", + "build": "yarn build:js", + "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", + "build:js": "babel src -d dist --delete-dir-on-start", "build:watch": "nodemon --ignore dist --exec \"yarn build\"" } } diff --git a/packages/forms/package.json b/packages/forms/package.json index 4345e71b64fc..294d47271ff4 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -20,11 +20,13 @@ "react": "*" }, "scripts": { - "build": "yarn cross-env NODE_ENV=production babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", + "build": "yarn build:js && yarn build:types", + "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", + "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", "build:types": "tsc --build --clean && tsc --build", - "prepublishOnly": "yarn build", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" - } + }, + "gitHead": "1cb7c8d1085147787209af423c33a9c91c3e6517" } diff --git a/packages/forms/src/types.d.ts b/packages/forms/src/types.d.ts new file mode 100644 index 000000000000..d2c0a4e44920 --- /dev/null +++ b/packages/forms/src/types.d.ts @@ -0,0 +1 @@ +// placeholder for types. diff --git a/packages/forms/tsconfig.json b/packages/forms/tsconfig.json index 5d56d31535ad..f469a9e0cde2 100644 --- a/packages/forms/tsconfig.json +++ b/packages/forms/tsconfig.json @@ -6,4 +6,7 @@ "rootDir": "src", "outDir": "dist", }, + "files": [ + "src/types.d.ts" + ] } diff --git a/packages/internal/package.json b/packages/internal/package.json index dc033a642de1..13d142dc51ac 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -22,11 +22,15 @@ ] }, "scripts": { - "build": "yarn cross-env NODE_ENV=production babel src -d dist --delete-dir-on-start --extensions \".js,.ts\" --source-maps inline", - "prepublishOnly": "yarn build", + "build": "yarn build:js && yarn build:types", + "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", + "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", + "build:types": "tsc --build --clean && tsc --build", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" }, "gitHead": "1cb7c8d1085147787209af423c33a9c91c3e6517" } + + diff --git a/packages/internal/src/__tests__/fixtures/api/test/test.ts b/packages/internal/src/__tests__/fixtures/api/test/test.ts index 0084f3b48283..0608960e0403 100644 --- a/packages/internal/src/__tests__/fixtures/api/test/test.ts +++ b/packages/internal/src/__tests__/fixtures/api/test/test.ts @@ -1 +1 @@ -hello. \ No newline at end of file +export const hello = "" \ No newline at end of file diff --git a/packages/router/package.json b/packages/router/package.json index b6ad08f2efb1..9a6e7964e9c5 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -15,17 +15,19 @@ "prop-types": "*", "react": "*" }, - "scripts": { - "build": "yarn cross-env NODE_ENV=production babel src -d dist --delete-dir-on-start", - "prepublishOnly": "yarn build", - "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", - "test": "yarn jest src", - "test:watch": "yarn test --watch" - }, - "gitHead": "1cb7c8d1085147787209af423c33a9c91c3e6517", "devDependencies": { "prop-types": "15.7.2", "react": "^16.13.1", "react-dom": "^16.13.1" - } + }, + "scripts": { + "build": "yarn build:js && yarn build:types", + "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", + "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", + "build:types": "tsc --build --clean && tsc --build", + "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", + "test": "jest", + "test:watch": "yarn test --watch" + }, + "gitHead": "1cb7c8d1085147787209af423c33a9c91c3e6517" } diff --git a/packages/structure/package.json b/packages/structure/package.json index 79e35f195597..9fb2a5a28baf 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -53,7 +53,9 @@ ] }, "scripts": { - "build": "yarn cross-env NODE_ENV=production babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", + "build": "yarn build:js && yarn build:types", + "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", + "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", "build:types": "tsc --build --clean && tsc --build", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", diff --git a/packages/testing/package.json b/packages/testing/package.json index 9ac63553140f..7c5ac2044e02 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -17,10 +17,10 @@ }, "scripts": { "build": "yarn build:js && yarn build:types", - "build:js": "yarn cross-env NODE_ENV=production babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", + "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", + "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", "build:types": "tsc --build --clean && tsc --build", - "prepublishOnly": "yarn build", - "build:watch": "nodemon --watch src --ext 'js,ts,tsx' --ignore dist --exec 'yarn build:js'", + "build:watch": "nodemon --watch src --ext 'js,ts,tsx' --ignore dist --exec 'yarn build'", "test": "jest", "test:watch": "yarn test --watch" } diff --git a/packages/web/package.json b/packages/web/package.json index a2b8f1c87264..b46193ae476e 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -26,9 +26,10 @@ "react": "*" }, "scripts": { - "build": "yarn cross-env NODE_ENV=production babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", + "build": "yarn build:js && yarn build:types", + "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", + "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", "build:types": "tsc --build --clean && tsc --build", - "prepublishOnly": "yarn build", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" diff --git a/yarn.lock b/yarn.lock index 94ac6190c0db..3bdf551d7920 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12694,7 +12694,7 @@ jwa@^2.0.0: ecdsa-sig-formatter "1.0.11" safe-buffer "^5.0.1" -jwks-rsa@^1.8.0: +jwks-rsa@^1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-1.8.1.tgz#375c62a50c4ca805ad5bd682c12c8a695de13ddf" integrity sha512-CcE8ypsATHwGmzELwzeFjLzPBXTXTrMmDYbn92LTQwYsZdOedp+ZIuYTofUdrWreu8CKRuXmhk17+6/li2sR6g== From e0e2344af97e9fef32098a41b41ec6840526b6e1 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Wed, 5 Aug 2020 13:47:20 +0200 Subject: [PATCH 25/37] Make tsconfig build into a cache directory. --- .gitignore | 2 +- .prettierignore | 1 - packages/api/tsconfig.json | 4 ++-- packages/auth/tsconfig.json | 4 ++-- packages/core/tsconfig.json | 4 ++-- packages/dev-server/tsconfig.json | 4 ++-- packages/forms/tsconfig.json | 6 +++--- packages/internal/tsconfig.json | 4 ++-- packages/structure/tsconfig.json | 4 ++-- packages/testing/tsconfig.json | 4 ++-- packages/web/tsconfig.json | 4 ++-- tsconfig.compilerOption.json | 1 + 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index bf7b2a6a22bd..824f83bcc077 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ .DS_Store node_modules dist -packages/api/importAll.macro.js +.buildcache lerna-debug.log yarn-error.log **/*.tsbuildinfo diff --git a/.prettierignore b/.prettierignore index 6f5108cc85c1..b33452924a44 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,4 @@ **/dist -packages/api/importAll.macro.js # Do not format Markdown files to allow easier documentation contribution *.md diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json index a09654e0172d..b9dbe4a87245 100644 --- a/packages/api/tsconfig.json +++ b/packages/api/tsconfig.json @@ -1,10 +1,10 @@ { "extends": "../../tsconfig.compilerOption.json", "compilerOptions": { - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", "baseUrl": ".", "rootDir": "src", - "outDir": "dist", + "tsBuildInfoFile": ".buildcache/tsconfig.tsbuildinfo", + "outDir": ".buildcache", }, "include": ["src", "src/../package.json"], "references": [ diff --git a/packages/auth/tsconfig.json b/packages/auth/tsconfig.json index 587de9eeaef5..d188d9e75915 100644 --- a/packages/auth/tsconfig.json +++ b/packages/auth/tsconfig.json @@ -1,10 +1,10 @@ { "extends": "../../tsconfig.compilerOption.json", "compilerOptions": { - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", "baseUrl": ".", - "outDir": "dist", "rootDir": "src", + "tsBuildInfoFile": ".buildcache/tsconfig.tsbuildinfo", + "outDir": ".buildcache", }, "include": ["src"], } diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 97f2330dd32c..ab9e2ed7ce3a 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -1,10 +1,10 @@ { "extends": "../../tsconfig.compilerOption.json", "compilerOptions": { - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", "baseUrl": ".", "rootDir": "src", - "outDir": "dist" + "tsBuildInfoFile": ".buildcache/tsconfig.tsbuildinfo", + "outDir": ".buildcache", }, "include": ["src"], "references": [ diff --git a/packages/dev-server/tsconfig.json b/packages/dev-server/tsconfig.json index f8928c1729a6..66ffc39f0677 100644 --- a/packages/dev-server/tsconfig.json +++ b/packages/dev-server/tsconfig.json @@ -1,10 +1,10 @@ { "extends": "../../tsconfig.compilerOption.json", "compilerOptions": { - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", "baseUrl": ".", "rootDir": "src", - "outDir": "dist" + "tsBuildInfoFile": ".buildcache/tsconfig.tsbuildinfo", + "outDir": ".buildcache", }, "include": ["src", "ambient.d.ts"], "references": [{ "path": "../internal" }] diff --git a/packages/forms/tsconfig.json b/packages/forms/tsconfig.json index f469a9e0cde2..8f21166db1f7 100644 --- a/packages/forms/tsconfig.json +++ b/packages/forms/tsconfig.json @@ -1,12 +1,12 @@ { "extends": "../../tsconfig.compilerOption.json", "compilerOptions": { - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", "baseUrl": ".", "rootDir": "src", - "outDir": "dist", + "tsBuildInfoFile": ".buildcache/tsconfig.tsbuildinfo", + "outDir": ".buildcache", }, "files": [ - "src/types.d.ts" + "./src/types.d.ts" ] } diff --git a/packages/internal/tsconfig.json b/packages/internal/tsconfig.json index 9c7da02c451b..c4195092b9e8 100644 --- a/packages/internal/tsconfig.json +++ b/packages/internal/tsconfig.json @@ -1,10 +1,10 @@ { "extends": "../../tsconfig.compilerOption.json", "compilerOptions": { - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", "baseUrl": ".", "rootDir": "src", - "outDir": "dist" + "tsBuildInfoFile": ".buildcache/tsconfig.tsbuildinfo", + "outDir": ".buildcache", }, "include": ["src", "./ambient.d.ts"], } diff --git a/packages/structure/tsconfig.json b/packages/structure/tsconfig.json index 682f596e3617..3343e2db75c1 100644 --- a/packages/structure/tsconfig.json +++ b/packages/structure/tsconfig.json @@ -1,10 +1,10 @@ { "extends": "../../tsconfig.compilerOption.json", "compilerOptions": { - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", "baseUrl": ".", "rootDir": "src", - "outDir": "dist", + "tsBuildInfoFile": ".buildcache/tsconfig.tsbuildinfo", + "outDir": ".buildcache", "experimentalDecorators": true, "noImplicitReturns": false, "noImplicitAny": false, diff --git a/packages/testing/tsconfig.json b/packages/testing/tsconfig.json index 0eb33d4ca1c4..72ab4928fedb 100644 --- a/packages/testing/tsconfig.json +++ b/packages/testing/tsconfig.json @@ -1,10 +1,10 @@ { "extends": "../../tsconfig.compilerOption.json", "compilerOptions": { - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", "baseUrl": ".", "rootDir": "src", - "outDir": "dist", + "tsBuildInfoFile": ".buildcache/tsconfig.tsbuildinfo", + "outDir": ".buildcache", }, "include": [ "src" diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json index 4cee149049ac..497d9caa617b 100644 --- a/packages/web/tsconfig.json +++ b/packages/web/tsconfig.json @@ -1,10 +1,10 @@ { "extends": "../../tsconfig.compilerOption.json", "compilerOptions": { - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", "baseUrl": ".", "rootDir": "src", - "outDir": "dist", + "tsBuildInfoFile": ".buildcache/tsconfig.tsbuildinfo", + "outDir": ".buildcache", }, "references": [ { diff --git a/tsconfig.compilerOption.json b/tsconfig.compilerOption.json index 8257494a08c8..b9100b238b96 100644 --- a/tsconfig.compilerOption.json +++ b/tsconfig.compilerOption.json @@ -7,6 +7,7 @@ "emitDeclarationOnly": true, "sourceMap": true, "composite": true, + "incremental": true, "strict": true, "esModuleInterop": true, "noUnusedLocals": true, From 50650a6f39de61d8b5605dff0257d4a37ba3750b Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Wed, 5 Aug 2020 13:47:39 +0200 Subject: [PATCH 26/37] Copy from cache directory into dist directory. --- packages/api/package.json | 9 +++++---- packages/auth/package.json | 7 ++++--- packages/cli/package.json | 2 +- packages/core/package.json | 5 +++-- packages/create-redwood-app/package.json | 3 ++- packages/forms/package.json | 3 ++- packages/internal/package.json | 3 ++- packages/router/package.json | 3 +-- packages/structure/package.json | 3 ++- packages/testing/package.json | 3 ++- packages/web/package.json | 3 ++- 11 files changed, 26 insertions(+), 18 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index a08f0cb75358..8047e285d1fd 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -5,7 +5,7 @@ "dist" ], "main": "./dist/index.js", - "types": "./dist/index.d.ts", + "types": "./distTypes/index.d.ts", "license": "MIT", "dependencies": { "@prisma/client": "~2.3.0", @@ -35,10 +35,11 @@ "scripts": { "build": "yarn build:js && yarn build:types", "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", - "build:js": "yarn babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "yarn tsc --build --clean && yarn tsc --build", + "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", + "build:types": "tsc --build --verbose && yarn postbuild:types", + "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", - "test": "yarn jest", + "test": "jest", "test:watch": "yarn test --watch" }, "gitHead": "1cb7c8d1085147787209af423c33a9c91c3e6517" diff --git a/packages/auth/package.json b/packages/auth/package.json index 604247346a1d..34a2cc42714a 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -33,10 +33,11 @@ "scripts": { "build": "yarn build:js && yarn build:types", "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", - "build:js": "yarn babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "yarn tsc --build --clean && yarn tsc --build", + "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", + "build:types": "tsc --build --verbose && yarn postbuild:types", + "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", - "test": "yarn jest", + "test": "jest", "test:watch": "yarn test --watch" }, "gitHead": "1cb7c8d1085147787209af423c33a9c91c3e6517" diff --git a/packages/cli/package.json b/packages/cli/package.json index 53c8dd78dc85..978c4534e8d1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -44,7 +44,7 @@ "build": "yarn build:js && yarn build:clean-dist", "prepublishOnly": "yarn build", "build:clean-dist": "yarn rimraf 'dist/**/__tests__'", - "build:js": "yarn babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start --copy-files --no-copy-ignored", + "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start --copy-files --no-copy-ignored", "build:watch": "nodemon --watch src --ext \"js,ts,tsx,template\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" diff --git a/packages/core/package.json b/packages/core/package.json index bbb95e8f8db9..3b772def3325 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -71,8 +71,9 @@ "scripts": { "build": "yarn build:js && yarn build:types", "prepublishOnly": "yarn build", - "build:js": "yarn babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "tsc --build --clean && tsc --build", + "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", + "build:types": "tsc --build --verbose && yarn postbuild:types", + "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx,template\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index d79e2c7553c1..c6ea5c65bf3a 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -20,7 +20,8 @@ }, "scripts": { "build": "babel src -d dist --delete-dir-on-start", - "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build" + "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", + "build:watch": "nodemon --ignore dist --exec \"yarn build\"" }, "gitHead": "1cb7c8d1085147787209af423c33a9c91c3e6517" } diff --git a/packages/forms/package.json b/packages/forms/package.json index 294d47271ff4..9cd9f162b08a 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -23,7 +23,8 @@ "build": "yarn build:js && yarn build:types", "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "tsc --build --clean && tsc --build", + "build:types": "tsc --build --verbose && yarn postbuild:types", + "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" diff --git a/packages/internal/package.json b/packages/internal/package.json index 13d142dc51ac..8772e4faf8ff 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -25,7 +25,8 @@ "build": "yarn build:js && yarn build:types", "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "tsc --build --clean && tsc --build", + "build:types": "tsc --build --verbose && yarn postbuild:types", + "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" diff --git a/packages/router/package.json b/packages/router/package.json index 9a6e7964e9c5..3910d9781969 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -21,10 +21,9 @@ "react-dom": "^16.13.1" }, "scripts": { - "build": "yarn build:js && yarn build:types", + "build": "yarn build:js", "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "tsc --build --clean && tsc --build", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" diff --git a/packages/structure/package.json b/packages/structure/package.json index 9fb2a5a28baf..af64a7d0ff3e 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -56,7 +56,8 @@ "build": "yarn build:js && yarn build:types", "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "tsc --build --clean && tsc --build", + "build:types": "tsc --build --verbose && yarn postbuild:types", + "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch", diff --git a/packages/testing/package.json b/packages/testing/package.json index 7c5ac2044e02..e1a7e488ffd3 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -19,7 +19,8 @@ "build": "yarn build:js && yarn build:types", "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "tsc --build --clean && tsc --build", + "build:types": "tsc --build --verbose && yarn postbuild:types", + "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", "build:watch": "nodemon --watch src --ext 'js,ts,tsx' --ignore dist --exec 'yarn build'", "test": "jest", "test:watch": "yarn test --watch" diff --git a/packages/web/package.json b/packages/web/package.json index b46193ae476e..6cec6b05f238 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -29,7 +29,8 @@ "build": "yarn build:js && yarn build:types", "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "tsc --build --clean && tsc --build", + "build:types": "tsc --build --verbose && yarn postbuild:types", + "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" From 5d94d9aed07531ff4ca2a1f6a348d474902e2965 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Wed, 5 Aug 2020 13:47:48 +0200 Subject: [PATCH 27/37] Fix build commands. --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 2c8afc5227a5..c11d3ec59dcf 100644 --- a/package.json +++ b/package.json @@ -40,9 +40,7 @@ "extends": "@redwoodjs/eslint-config" }, "scripts": { - "build": "yarn build:js && yarn build:types", - "build:js": "lerna run build:js", - "build:types": "tsc --build --clean && tsc --build", + "build": "lerna run build", "build:watch": "lerna run build:watch --parallel", "test": "lerna run test --stream -- --colors --maxWorkers=4", "lint": "eslint packages", From 8c1974fb1589c37b2edc6d9fdf3717361b512508 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Wed, 5 Aug 2020 13:48:04 +0200 Subject: [PATCH 28/37] Ignore these errors. Shrug. --- packages/web/src/global.web-auto-imports.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/web/src/global.web-auto-imports.ts b/packages/web/src/global.web-auto-imports.ts index d8982a93e909..f24a59694d9f 100644 --- a/packages/web/src/global.web-auto-imports.ts +++ b/packages/web/src/global.web-auto-imports.ts @@ -1,8 +1,9 @@ -/* eslint-disable no-redeclare, no-undef */ +/* eslint-disable no-redeclare */ +/* eslint-disable no-undef */ import type _React from 'react' import type _gql from 'graphql-tag' import type _PropTypes from 'prop-types' -import { +import type { mockGraphQLMutation as _mockGraphQLMutation, mockGraphQLQuery as _mockGraphQLQuery, } from '@redwoodjs/testing' @@ -10,9 +11,14 @@ import { declare global { // We reduce the number of imports that a user has to do by making them // globals via `Webpack.ProvidePlugin` + // @ts-ignore const React: typeof _React + // @ts-ignore const gql: typeof _gql + // @ts-ignore const PropTypes: typeof _PropTypes + // @ts-ignore const mockGraphQLQuery: typeof _mockGraphQLQuery + // @ts-ignore const mockGraphQLMutation: typeof _mockGraphQLMutation } From 0b36bd7bc576601dae95bc03331ab446068cf3c0 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Wed, 5 Aug 2020 14:31:17 +0200 Subject: [PATCH 29/37] Web is not an actual TS project. --- packages/web/package.json | 9 ++++----- packages/web/src/global.web-auto-imports.ts | 6 +----- packages/web/tsconfig.json | 14 -------------- tsconfig.json | 1 - 4 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 packages/web/tsconfig.json diff --git a/packages/web/package.json b/packages/web/package.json index 6cec6b05f238..d281894a2835 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -2,10 +2,11 @@ "name": "@redwoodjs/web", "version": "0.15.3", "files": [ - "dist" + "dist", + "src/global.web-auto-imports.d.ts" ], "main": "dist/index.js", - "types": "dist/global.web-auto-imports.d.ts", + "types": "src/global.web-auto-imports.d.ts", "license": "MIT", "dependencies": { "@apollo/react-components": "^3.1.3", @@ -26,11 +27,9 @@ "react": "*" }, "scripts": { - "build": "yarn build:js && yarn build:types", + "build": "yarn build:js", "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "tsc --build --verbose && yarn postbuild:types", - "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" diff --git a/packages/web/src/global.web-auto-imports.ts b/packages/web/src/global.web-auto-imports.ts index f24a59694d9f..ce43f200c31b 100644 --- a/packages/web/src/global.web-auto-imports.ts +++ b/packages/web/src/global.web-auto-imports.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-ts-ignore */ /* eslint-disable no-redeclare */ /* eslint-disable no-undef */ import type _React from 'react' @@ -11,14 +12,9 @@ import type { declare global { // We reduce the number of imports that a user has to do by making them // globals via `Webpack.ProvidePlugin` - // @ts-ignore const React: typeof _React - // @ts-ignore const gql: typeof _gql - // @ts-ignore const PropTypes: typeof _PropTypes - // @ts-ignore const mockGraphQLQuery: typeof _mockGraphQLQuery - // @ts-ignore const mockGraphQLMutation: typeof _mockGraphQLMutation } diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json deleted file mode 100644 index 497d9caa617b..000000000000 --- a/packages/web/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.compilerOption.json", - "compilerOptions": { - "baseUrl": ".", - "rootDir": "src", - "tsBuildInfoFile": ".buildcache/tsconfig.tsbuildinfo", - "outDir": ".buildcache", - }, - "references": [ - { - "path": "../testing" - } - ] -} diff --git a/tsconfig.json b/tsconfig.json index b1daba64bc84..b57916021abb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,6 @@ { "path": "packages/api" }, { "path": "packages/dev-server" }, { "path": "packages/auth" }, - { "path": "packages/web" }, { "path": "packages/forms" }, ], "files": [] From 040a820a5efbc8d4f76ced810945b92040549e10 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Wed, 5 Aug 2020 14:31:33 +0200 Subject: [PATCH 30/37] Add ts-ignore. --- packages/api/src/functions/graphql.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/api/src/functions/graphql.ts b/packages/api/src/functions/graphql.ts index 199504b0fe3c..3d6bd81297ca 100644 --- a/packages/api/src/functions/graphql.ts +++ b/packages/api/src/functions/graphql.ts @@ -105,6 +105,7 @@ export const createGraphQLHandler = ( if (isDevEnv) { // I want the dev-server to pick this up!? // TODO: Move the error handling into a separate package + // @ts-ignore import('@redwoodjs/dev-server/dist/error') .then(({ handleError }) => { return handleError(error.originalError as Error) From fde756e258e92180dde016959d8af537cb553501 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Wed, 5 Aug 2020 14:39:26 +0200 Subject: [PATCH 31/37] Fail fast. --- .github/workflows/build-eslint-jest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-eslint-jest.yaml b/.github/workflows/build-eslint-jest.yaml index a295a8d5054c..4fb5b3459110 100644 --- a/.github/workflows/build-eslint-jest.yaml +++ b/.github/workflows/build-eslint-jest.yaml @@ -13,7 +13,7 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] node-version: ['12', '14'] - fail-fast: false + fail-fast: true name: ${{ matrix.os }} | Node ${{ matrix.node-version }} latest steps: - uses: actions/checkout@v2 From e0b85972a51325543c1d3d635f8073acb63546d0 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Wed, 5 Aug 2020 14:55:02 +0200 Subject: [PATCH 32/37] Cache node_modules. --- .github/workflows/build-eslint-jest.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-eslint-jest.yaml b/.github/workflows/build-eslint-jest.yaml index 4fb5b3459110..5c108d368a64 100644 --- a/.github/workflows/build-eslint-jest.yaml +++ b/.github/workflows/build-eslint-jest.yaml @@ -17,22 +17,29 @@ jobs: name: ${{ matrix.os }} | Node ${{ matrix.node-version }} latest steps: - uses: actions/checkout@v2 + - name: Setup node uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} - - name: Print node and yarn versions - run: | - node --version - yarn --version + + - name: Cache node_modules + - uses: actions/cache@v2 + with: + path: '**/node_modules' + key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }} + - name: Install dependencies run: yarn install --frozen-lockfile --check-files + - name: Run ESLint run: yarn lint env: CI: true + - name: Build run: yarn build + - name: Run tests run: yarn test env: From 0a35d23076974cc13ae545d942820847915d8bec Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Wed, 5 Aug 2020 15:00:51 +0200 Subject: [PATCH 33/37] Fix action. --- .github/workflows/build-eslint-jest.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-eslint-jest.yaml b/.github/workflows/build-eslint-jest.yaml index 5c108d368a64..bc2575f49550 100644 --- a/.github/workflows/build-eslint-jest.yaml +++ b/.github/workflows/build-eslint-jest.yaml @@ -22,24 +22,19 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} - - - name: Cache node_modules - - uses: actions/cache@v2 + - name: Cache "node_modules" + uses: actions/cache@v2 with: path: '**/node_modules' key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }} - - name: Install dependencies run: yarn install --frozen-lockfile --check-files - - name: Run ESLint run: yarn lint env: CI: true - - name: Build run: yarn build - - name: Run tests run: yarn test env: From 9b003ca464e744383202c549ae02e9cad89c5b59 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Wed, 5 Aug 2020 15:55:33 +0200 Subject: [PATCH 34/37] Cross platform copy. --- package.json | 5 +- packages/api/package.json | 3 +- packages/auth/package.json | 2 +- packages/core/package.json | 2 +- packages/forms/package.json | 2 +- packages/internal/package.json | 2 +- packages/structure/package.json | 2 +- packages/testing/package.json | 2 +- yarn.lock | 124 ++++++++++++++++++++++++++++---- 9 files changed, 123 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index c11d3ec59dcf..02afe6e6f702 100644 --- a/package.json +++ b/package.json @@ -24,14 +24,15 @@ "babel-plugin-module-resolver": "^4.0.0", "babel-plugin-remove-code": "^0.0.6", "bundlesize": "^0.18.0", + "cp-cli": "^2.0.0", "cross-env": "^7.0.2", "jest": "^26.1.0", "lerna": "^3.20.2", "msw": "0.20.0", "nodemon": "^2.0.2", + "rimraf": "^3.0.2", "typescript": "^3.9.6", - "whatwg-fetch": "3.0.0", - "rimraf": "^3.0.2" + "whatwg-fetch": "3.0.0" }, "resolutions": { "@types/react": "16.9.38" diff --git a/packages/api/package.json b/packages/api/package.json index edbcc18f9804..e90c1b795a3d 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -23,6 +23,7 @@ }, "devDependencies": { "@redwoodjs/auth": "^0.15.3", + "@redwoodjs/dev-server": "^0.15.3", "@types/jsonwebtoken": "^8.3.9", "@types/lodash.merge": "^4.6.6", "@types/lodash.omitby": "^4.6.6" @@ -37,7 +38,7 @@ "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", "build:types": "tsc --build --verbose && yarn postbuild:types", - "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", + "postbuild:types": "yarn cp-cli .buildcache/ dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" diff --git a/packages/auth/package.json b/packages/auth/package.json index 34a2cc42714a..bac8b4df66c8 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -35,7 +35,7 @@ "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", "build:types": "tsc --build --verbose && yarn postbuild:types", - "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", + "postbuild:types": "yarn cp-cli .buildcache/ dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" diff --git a/packages/core/package.json b/packages/core/package.json index 16fa5916847b..6a90ebd74839 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -74,7 +74,7 @@ "prepublishOnly": "yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", "build:types": "tsc --build --verbose && yarn postbuild:types", - "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", + "postbuild:types": "yarn cp-cli .buildcache/ dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx,template\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" diff --git a/packages/forms/package.json b/packages/forms/package.json index 9cd9f162b08a..78249c505400 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -24,7 +24,7 @@ "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", "build:types": "tsc --build --verbose && yarn postbuild:types", - "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", + "postbuild:types": "yarn cp-cli .buildcache/ dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" diff --git a/packages/internal/package.json b/packages/internal/package.json index 8772e4faf8ff..83c73cecf879 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -26,7 +26,7 @@ "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", "build:types": "tsc --build --verbose && yarn postbuild:types", - "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", + "postbuild:types": "yarn cp-cli .buildcache/ dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" diff --git a/packages/structure/package.json b/packages/structure/package.json index ed30adbc7119..e63bbbf2267b 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -57,7 +57,7 @@ "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", "build:types": "tsc --build --verbose && yarn postbuild:types", - "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", + "postbuild:types": "yarn cp-cli .buildcache/ dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch", diff --git a/packages/testing/package.json b/packages/testing/package.json index e1a7e488ffd3..16a426fd881f 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -20,7 +20,7 @@ "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", "build:types": "tsc --build --verbose && yarn postbuild:types", - "postbuild:types": "rsync -avhW --inplace .buildcache/* dist/", + "postbuild:types": "yarn cp-cli .buildcache/ dist/", "build:watch": "nodemon --watch src --ext 'js,ts,tsx' --ignore dist --exec 'yarn build'", "test": "jest", "test:watch": "yarn test --watch" diff --git a/yarn.lock b/yarn.lock index 43f7c5bc0698..c260650a3076 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7000,6 +7000,15 @@ cliui@^3.0.3: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" +cliui@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" + integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ== + dependencies: + string-width "^2.1.1" + strip-ansi "^4.0.0" + wrap-ansi "^2.0.0" + cliui@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" @@ -7538,6 +7547,14 @@ cosmiconfig@^6.0.0: path-type "^4.0.0" yaml "^1.7.2" +cp-cli@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/cp-cli/-/cp-cli-2.0.0.tgz#0707ca60bcbf20884b16c2c110484263fa7f922d" + integrity sha512-UfGOwpKeEVfdT+RFBGqlXTPZfHSJn31vaIOvr/YXLk494k6/xWUbN8+YZ2EvM6G8C8dGaU2Hy0nBmYCR5ux15g== + dependencies: + fs-extra "7.0.1" + yargs "12.0.5" + crc32-stream@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-3.0.1.tgz#cae6eeed003b0e44d739d279de5ae63b171b4e85" @@ -9835,6 +9852,15 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== +fs-extra@7.0.1, fs-extra@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-extra@^0.30.0: version "0.30.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0" @@ -9846,15 +9872,6 @@ fs-extra@^0.30.0: path-is-absolute "^1.0.0" rimraf "^2.2.8" -fs-extra@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" - integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-extra@^8.0.1, fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -10047,6 +10064,11 @@ gensync@^1.0.0-beta.1: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg== +get-caller-file@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" + integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== + get-caller-file@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -11382,6 +11404,11 @@ invert-kv@^1.0.0: resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= +invert-kv@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" + integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== + ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" @@ -12856,6 +12883,13 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" +lcid@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" + integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA== + dependencies: + invert-kv "^2.0.0" + lerna@^3.20.2: version "3.22.1" resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.22.1.tgz#82027ac3da9c627fd8bf02ccfeff806a98e65b62" @@ -13545,6 +13579,13 @@ mana@0.1.x: millisecond "0.1.x" request "2.x.x" +map-age-cleaner@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" + integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== + dependencies: + p-defer "^1.0.0" + map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -13614,6 +13655,15 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= +mem@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" + integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== + dependencies: + map-age-cleaner "^0.1.1" + mimic-fn "^2.0.0" + p-is-promise "^2.0.0" + memoizerific@^1.11.3: version "1.11.3" resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a" @@ -13802,7 +13852,7 @@ mimic-fn@^1.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== -mimic-fn@^2.1.0: +mimic-fn@^2.0.0, mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== @@ -14809,6 +14859,15 @@ os-locale@^1.4.0: dependencies: lcid "^1.0.0" +os-locale@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" + integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== + dependencies: + execa "^1.0.0" + lcid "^2.0.0" + mem "^4.0.0" + os-name@^3.0.0, os-name@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801" @@ -14840,6 +14899,11 @@ p-cancelable@^2.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.0.0.tgz#4a3740f5bdaf5ed5d7c3e34882c6fb5d6b266a6e" integrity sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg== +p-defer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" + integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= + p-each-series@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" @@ -14857,6 +14921,11 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= +p-is-promise@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" + integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== + p-limit@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" @@ -16609,6 +16678,11 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +require-main-filename@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" + integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= + require-main-filename@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" @@ -18001,7 +18075,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2", string-width@^2.1.0, string-width@^2.1.1: +"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -19956,7 +20030,7 @@ y18n@^3.2.0: resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= -y18n@^4.0.0: +"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== @@ -19981,6 +20055,14 @@ yaml@^1.7.2, yaml@^1.9.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e" integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== +yargs-parser@^11.1.1: + version "11.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" + integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^13.1.2: version "13.1.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" @@ -20005,6 +20087,24 @@ yargs-parser@^18.1.2, yargs-parser@^18.1.3: camelcase "^5.0.0" decamelize "^1.2.0" +yargs@12.0.5: + version "12.0.5" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" + integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== + dependencies: + cliui "^4.0.0" + decamelize "^1.2.0" + find-up "^3.0.0" + get-caller-file "^1.0.1" + os-locale "^3.0.0" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^2.0.0" + which-module "^2.0.0" + y18n "^3.2.1 || ^4.0.0" + yargs-parser "^11.1.1" + yargs@^13.3.0, yargs@^13.3.2: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" From d46699cb43ef4773a8536887561e5411bbf2714e Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Wed, 5 Aug 2020 17:02:16 +0200 Subject: [PATCH 35/37] Add job to cache first. --- .github/workflows/build-eslint-jest.yaml | 84 +++++++++++++++++++++++- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-eslint-jest.yaml b/.github/workflows/build-eslint-jest.yaml index bc2575f49550..c1bc04295b4e 100644 --- a/.github/workflows/build-eslint-jest.yaml +++ b/.github/workflows/build-eslint-jest.yaml @@ -7,17 +7,40 @@ on: types: [opened, edited, synchronize, reopened] jobs: - build: + + ## LINUX + dependency_cache_linux: + strategy: + matrix: + os: ['ubuntu-latest'] + node-version: ['14'] + fail-fast: true runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - name: Setup node + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - name: Cache "node_modules" + uses: actions/cache@v2 + with: + path: '**/node_modules' + key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }} + - name: Install dependencies + run: yarn install --frozen-lockfile --check-files + + lint_build_test_linux: + needs: dependency_cache_linux strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: ['ubuntu-latest'] node-version: ['12', '14'] fail-fast: true + runs-on: ${{ matrix.os }} name: ${{ matrix.os }} | Node ${{ matrix.node-version }} latest steps: - uses: actions/checkout@v2 - - name: Setup node uses: actions/setup-node@v1 with: @@ -39,3 +62,58 @@ jobs: run: yarn test env: CI: true + + + ## WINDOWS + dependency_cache_windows: + strategy: + matrix: + os: ['windows-latest'] + node-version: ['14'] + fail-fast: true + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - name: Setup node + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - name: Cache "node_modules" + uses: actions/cache@v2 + with: + path: '**/node_modules' + key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }} + - name: Install dependencies + run: yarn install --frozen-lockfile --check-files + lint_build_test_windows: + needs: dependency_cache_windows + strategy: + matrix: + os: ['windows-latest'] + node-version: ['12', '14'] + fail-fast: true + runs-on: ${{ matrix.os }} + name: ${{ matrix.os }} | Node ${{ matrix.node-version }} latest + steps: + - uses: actions/checkout@v2 + - name: Setup node + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - name: Cache "node_modules" + uses: actions/cache@v2 + with: + path: '**/node_modules' + key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }} + - name: Install dependencies + run: yarn install --frozen-lockfile --check-files + - name: Run ESLint + run: yarn lint + env: + CI: true + - name: Build + run: yarn build + - name: Run tests + run: yarn test + env: + CI: true \ No newline at end of file From 2531e4c60b011c3c1015e4fdfd40ab4fb88fff01 Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Thu, 6 Aug 2020 08:05:29 +0200 Subject: [PATCH 36/37] Update packages/api/package.json --- packages/api/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/package.json b/packages/api/package.json index e90c1b795a3d..ab532ad41682 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -5,7 +5,7 @@ "dist" ], "main": "./dist/index.js", - "types": "./distTypes/index.d.ts", + "types": "./dist/index.d.ts", "license": "MIT", "dependencies": { "@prisma/client": "2.4.0", From 78239d5a065d2ed917ff510840ba6f44020a3fad Mon Sep 17 00:00:00 2001 From: Peter Pistorius Date: Fri, 7 Aug 2020 10:21:31 +0200 Subject: [PATCH 37/37] Clean up. --- packages/forms/package.json | 7 +++---- packages/forms/src/index.d.ts | 2 ++ packages/forms/src/types.d.ts | 1 - packages/forms/tsconfig.json | 12 ------------ packages/web/package.json | 4 ++-- packages/web/src/global.web-auto-imports.ts | 20 -------------------- packages/web/src/index.d.ts | 9 ++++----- 7 files changed, 11 insertions(+), 44 deletions(-) delete mode 100644 packages/forms/src/types.d.ts delete mode 100644 packages/forms/tsconfig.json delete mode 100644 packages/web/src/global.web-auto-imports.ts diff --git a/packages/forms/package.json b/packages/forms/package.json index d4839b38694d..80ff5bf32f37 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -2,7 +2,8 @@ "name": "@redwoodjs/forms", "version": "0.15.3", "files": [ - "dist" + "dist", + "src/index.d.ts" ], "main": "dist/index.js", "types": "src/index.d.ts", @@ -21,11 +22,9 @@ "react": "*" }, "scripts": { - "build": "yarn build:js && yarn build:types", + "build": "yarn build:js", "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build", "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --delete-dir-on-start", - "build:types": "tsc --build --verbose && yarn postbuild:types", - "postbuild:types": "yarn cp-cli .buildcache/ dist/", "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"", "test": "jest", "test:watch": "yarn test --watch" diff --git a/packages/forms/src/index.d.ts b/packages/forms/src/index.d.ts index cc54429dbe55..5719e0ec0993 100644 --- a/packages/forms/src/index.d.ts +++ b/packages/forms/src/index.d.ts @@ -1,3 +1,5 @@ +// TODO: These need proper types. + declare module '@redwoodjs/forms' { const Form: any const FieldErrorContext: any diff --git a/packages/forms/src/types.d.ts b/packages/forms/src/types.d.ts deleted file mode 100644 index d2c0a4e44920..000000000000 --- a/packages/forms/src/types.d.ts +++ /dev/null @@ -1 +0,0 @@ -// placeholder for types. diff --git a/packages/forms/tsconfig.json b/packages/forms/tsconfig.json deleted file mode 100644 index 8f21166db1f7..000000000000 --- a/packages/forms/tsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../tsconfig.compilerOption.json", - "compilerOptions": { - "baseUrl": ".", - "rootDir": "src", - "tsBuildInfoFile": ".buildcache/tsconfig.tsbuildinfo", - "outDir": ".buildcache", - }, - "files": [ - "./src/types.d.ts" - ] -} diff --git a/packages/web/package.json b/packages/web/package.json index d281894a2835..024d828201a0 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -3,10 +3,10 @@ "version": "0.15.3", "files": [ "dist", - "src/global.web-auto-imports.d.ts" + "src/index.d.ts" ], "main": "dist/index.js", - "types": "src/global.web-auto-imports.d.ts", + "types": "src/index.d.ts", "license": "MIT", "dependencies": { "@apollo/react-components": "^3.1.3", diff --git a/packages/web/src/global.web-auto-imports.ts b/packages/web/src/global.web-auto-imports.ts deleted file mode 100644 index ce43f200c31b..000000000000 --- a/packages/web/src/global.web-auto-imports.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* eslint-disable @typescript-eslint/ban-ts-ignore */ -/* eslint-disable no-redeclare */ -/* eslint-disable no-undef */ -import type _React from 'react' -import type _gql from 'graphql-tag' -import type _PropTypes from 'prop-types' -import type { - mockGraphQLMutation as _mockGraphQLMutation, - mockGraphQLQuery as _mockGraphQLQuery, -} from '@redwoodjs/testing' - -declare global { - // We reduce the number of imports that a user has to do by making them - // globals via `Webpack.ProvidePlugin` - const React: typeof _React - const gql: typeof _gql - const PropTypes: typeof _PropTypes - const mockGraphQLQuery: typeof _mockGraphQLQuery - const mockGraphQLMutation: typeof _mockGraphQLMutation -} diff --git a/packages/web/src/index.d.ts b/packages/web/src/index.d.ts index cb62e3aa9590..aceb299e9866 100644 --- a/packages/web/src/index.d.ts +++ b/packages/web/src/index.d.ts @@ -1,10 +1,8 @@ -/* eslint-disable no-undef */ -/*eslint no-redeclare: [2, { "builtinGlobals": false }]*/ - +/* eslint-disable no-redeclare, no-undef */ import type _React from 'react' import type _gql from 'graphql-tag' import type _PropTypes from 'prop-types' -import { +import type { mockGraphQLMutation as _mockGraphQLMutation, mockGraphQLQuery as _mockGraphQLQuery, } from '@redwoodjs/testing' @@ -68,5 +66,6 @@ declare module '@redwoodjs/web' { const FlashProvider: any const GraphQLProvider: any const createGraphQLClient: any - const withCell: any + + // TODO: RedwoodProvider }