From b989aed3509cfa0c663ec4b6887dfe6ead5920f7 Mon Sep 17 00:00:00 2001 From: Bucky Maler Date: Thu, 8 Oct 2020 00:15:04 -0500 Subject: [PATCH] update to Nx v10.3.0 --- .eslintrc => .eslintrc.json | 3 +- .vscode/extensions.json | 3 +- apps/docusaurus-e2e/jest.config.js | 4 +- apps/nuxt-e2e/jest.config.js | 4 +- apps/nuxt-e2e/tests/nuxt.test.ts | 19 + apps/vue-e2e/jest.config.js | 4 +- apps/vue-e2e/tests/vue.test.ts | 19 + jest.config.js | 12 +- jest.preset.js | 3 + libs/docusaurus/{.eslintrc => .eslintrc.json} | 2 +- libs/docusaurus/jest.config.js | 4 +- libs/docusaurus/package.json | 8 +- libs/nuxt/{.eslintrc => .eslintrc.json} | 2 +- libs/nuxt/jest.config.js | 4 +- libs/nuxt/package.json | 6 +- .../schematics/application/schematic.spec.ts | 6 +- .../src/schematics/application/schematic.ts | 24 +- libs/vue/{.eslintrc => .eslintrc.json} | 2 +- libs/vue/jest.config.js | 4 +- libs/vue/package.json | 8 +- libs/vue/src/builders/browser/schema.d.ts | 2 + libs/vue/src/builders/dev-server/schema.d.ts | 3 + libs/vue/src/builders/library/schema.d.ts | 2 + .../schematics/application/schematic.spec.ts | 6 +- .../src/schematics/application/schematic.ts | 16 +- .../src/schematics/library/schematic.spec.ts | 6 +- libs/vue/src/schematics/library/schematic.ts | 16 +- nx.json | 3 +- package.json | 27 +- workspace.json | 57 +- yarn.lock | 965 ++++++++---------- 31 files changed, 590 insertions(+), 654 deletions(-) rename .eslintrc => .eslintrc.json (93%) create mode 100644 jest.preset.js rename libs/docusaurus/{.eslintrc => .eslintrc.json} (56%) rename libs/nuxt/{.eslintrc => .eslintrc.json} (56%) rename libs/vue/{.eslintrc => .eslintrc.json} (56%) diff --git a/.eslintrc b/.eslintrc.json similarity index 93% rename from .eslintrc rename to .eslintrc.json index 8d11e33f..1559a214 100644 --- a/.eslintrc +++ b/.eslintrc.json @@ -31,7 +31,8 @@ } ] } - ] + ], + "@typescript-eslint/explicit-module-boundary-types": "off" }, "overrides": [ { diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 37d5544a..c2675bfa 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,6 +1,7 @@ { "recommendations": [ "ms-vscode.vscode-typescript-tslint-plugin", - "esbenp.prettier-vscode" + "esbenp.prettier-vscode", + "firsttris.vscode-jest-runner" ] } diff --git a/apps/docusaurus-e2e/jest.config.js b/apps/docusaurus-e2e/jest.config.js index 8dd18fda..4325b320 100644 --- a/apps/docusaurus-e2e/jest.config.js +++ b/apps/docusaurus-e2e/jest.config.js @@ -1,5 +1,5 @@ module.exports = { - name: 'docusaurus-e2e', - preset: '../../jest.config.js', + displayName: 'docusaurus-e2e', + preset: '../../jest.preset.js', coverageDirectory: '../../coverage/apps/docusaurus-e2e', }; diff --git a/apps/nuxt-e2e/jest.config.js b/apps/nuxt-e2e/jest.config.js index 744d8825..ea84b7f3 100644 --- a/apps/nuxt-e2e/jest.config.js +++ b/apps/nuxt-e2e/jest.config.js @@ -1,5 +1,5 @@ module.exports = { - name: 'nuxt-e2e', - preset: '../../jest.config.js', + displayName: 'nuxt-e2e', + preset: '../../jest.preset.js', coverageDirectory: '../../coverage/apps/nuxt-e2e', }; diff --git a/apps/nuxt-e2e/tests/nuxt.test.ts b/apps/nuxt-e2e/tests/nuxt.test.ts index d283ffa1..4c027f0f 100644 --- a/apps/nuxt-e2e/tests/nuxt.test.ts +++ b/apps/nuxt-e2e/tests/nuxt.test.ts @@ -4,6 +4,7 @@ import { ensureNxProject, runNxCommandAsync, uniq, + updateFile, } from '@nrwl/nx-plugin/testing'; describe('nuxt e2e', () => { it('should generate app', async (done) => { @@ -50,6 +51,24 @@ describe('nuxt e2e', () => { done(); }, 300000); + it('should report lint error in index.vue', async (done) => { + const appName = uniq('app'); + ensureNxProject('@nx-plus/nuxt', 'dist/libs/nuxt'); + await runNxCommandAsync(`generate @nx-plus/nuxt:app ${appName}`); + + updateFile( + `apps/${appName}/pages/index.vue`, + '' + ); + + const result = await runNxCommandAsync(`lint ${appName}`, { + silenceError: true, + }); + expect(result.stderr).toContain('Lint errors found in the listed files.'); + + done(); + }, 300000); + describe('--directory subdir', () => { it('should generate app', async (done) => { const appName = uniq('app'); diff --git a/apps/vue-e2e/jest.config.js b/apps/vue-e2e/jest.config.js index 536c8c22..b90de625 100644 --- a/apps/vue-e2e/jest.config.js +++ b/apps/vue-e2e/jest.config.js @@ -1,5 +1,5 @@ module.exports = { - name: 'vue-e2e', - preset: '../../jest.config.js', + displayName: 'vue-e2e', + preset: '../../jest.preset.js', coverageDirectory: '../../coverage/apps/vue-e2e', }; diff --git a/apps/vue-e2e/tests/vue.test.ts b/apps/vue-e2e/tests/vue.test.ts index e76acdfe..7ba632cf 100644 --- a/apps/vue-e2e/tests/vue.test.ts +++ b/apps/vue-e2e/tests/vue.test.ts @@ -5,6 +5,7 @@ import { runNxCommandAsync, tmpProjPath, uniq, + updateFile, } from '@nrwl/nx-plugin/testing'; import * as cp from 'child_process'; @@ -152,6 +153,24 @@ describe('vue e2e', () => { done(); }, 300000); + it('should report lint error in App.vue', async (done) => { + const appName = uniq('app'); + ensureNxProject('@nx-plus/vue', 'dist/libs/vue'); + await runNxCommandAsync(`generate @nx-plus/vue:app ${appName}`); + + updateFile( + `apps/${appName}/src/App.vue`, + '' + ); + + const result = await runNxCommandAsync(`lint ${appName}`, { + silenceError: true, + }); + expect(result.stderr).toContain('Lint errors found in the listed files.'); + + done(); + }, 300000); + describe('--directory subdir', () => { it('should generate app', async (done) => { const appName = uniq('app'); diff --git a/jest.config.js b/jest.config.js index 9090b491..a216aa53 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,9 +1,7 @@ module.exports = { - testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'], - transform: { - '^.+\\.(ts|js|html)$': 'ts-jest', - }, - resolver: '@nrwl/jest/plugins/resolver', - moduleFileExtensions: ['ts', 'js', 'html'], - coverageReporters: ['html'], + projects: [ + '/libs/docusaurus', + '/libs/vue', + '/libs/nuxt', + ], }; diff --git a/jest.preset.js b/jest.preset.js new file mode 100644 index 00000000..c93ed9dc --- /dev/null +++ b/jest.preset.js @@ -0,0 +1,3 @@ +const nxPreset = require('@nrwl/jest/preset'); + +module.exports = { ...nxPreset }; diff --git a/libs/docusaurus/.eslintrc b/libs/docusaurus/.eslintrc.json similarity index 56% rename from libs/docusaurus/.eslintrc rename to libs/docusaurus/.eslintrc.json index 9afd5d63..76c97f7a 100644 --- a/libs/docusaurus/.eslintrc +++ b/libs/docusaurus/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": "../../.eslintrc", + "extends": "../../.eslintrc.json", "rules": {}, "ignorePatterns": ["!**/*"] } diff --git a/libs/docusaurus/jest.config.js b/libs/docusaurus/jest.config.js index b240cad5..b353504b 100644 --- a/libs/docusaurus/jest.config.js +++ b/libs/docusaurus/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'docusaurus', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], coverageDirectory: '../../coverage/libs/docusaurus', globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'docusaurus', }; diff --git a/libs/docusaurus/package.json b/libs/docusaurus/package.json index 5ba90d65..3d33b5a9 100644 --- a/libs/docusaurus/package.json +++ b/libs/docusaurus/package.json @@ -28,11 +28,11 @@ "@nrwl/workspace": "^10.0.0" }, "dependencies": { - "@angular-devkit/architect": "0.1000.7", - "@angular-devkit/core": "10.0.7", - "@angular-devkit/schematics": "10.0.7", + "@angular-devkit/architect": "0.1001.4", + "@angular-devkit/core": "10.1.4", + "@angular-devkit/schematics": "10.1.4", "rxjs": "6.5.5", - "typescript": "3.9.7" + "typescript": "4.0.3" }, "ng-update": { "migrations": "./migrations.json" diff --git a/libs/nuxt/.eslintrc b/libs/nuxt/.eslintrc.json similarity index 56% rename from libs/nuxt/.eslintrc rename to libs/nuxt/.eslintrc.json index 9afd5d63..76c97f7a 100644 --- a/libs/nuxt/.eslintrc +++ b/libs/nuxt/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": "../../.eslintrc", + "extends": "../../.eslintrc.json", "rules": {}, "ignorePatterns": ["!**/*"] } diff --git a/libs/nuxt/jest.config.js b/libs/nuxt/jest.config.js index e401130c..f8398093 100644 --- a/libs/nuxt/jest.config.js +++ b/libs/nuxt/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'nuxt', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], coverageDirectory: '../../coverage/libs/nuxt', globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'nuxt', }; diff --git a/libs/nuxt/package.json b/libs/nuxt/package.json index efc41423..0d18f6f1 100644 --- a/libs/nuxt/package.json +++ b/libs/nuxt/package.json @@ -30,9 +30,9 @@ "@nrwl/workspace": "^10.0.0" }, "dependencies": { - "@angular-devkit/architect": "0.1000.7", - "@angular-devkit/core": "10.0.7", - "@angular-devkit/schematics": "10.0.7", + "@angular-devkit/architect": "0.1001.4", + "@angular-devkit/core": "10.1.4", + "@angular-devkit/schematics": "10.1.4", "@nrwl/cypress": "^10.0.0", "@nrwl/jest": "^10.0.0", "@nrwl/linter": "^10.0.0", diff --git a/libs/nuxt/src/schematics/application/schematic.spec.ts b/libs/nuxt/src/schematics/application/schematic.spec.ts index 840cf43c..5dbf90b3 100644 --- a/libs/nuxt/src/schematics/application/schematic.spec.ts +++ b/libs/nuxt/src/schematics/application/schematic.spec.ts @@ -45,7 +45,7 @@ describe('nuxt schematic', () => { browserTarget: 'my-app:build:production', dev: false, }); - expect(lint.builder).toBe('@nrwl/linter:lint'); + expect(lint.builder).toBe('@nrwl/linter:eslint'); expect(test.builder).toBe('@nrwl/jest:jest'); expect(workspaceJson.projects['my-app-e2e']).toBeDefined(); @@ -71,7 +71,7 @@ describe('nuxt schematic', () => { const eslintConfig = tree.readContent('apps/my-app/.eslintrc.js'); expect(eslintConfig).toContain(`extends: [ - '../../.eslintrc', + '../../.eslintrc.json', '@nuxtjs/eslint-config-typescript', 'plugin:nuxt/recommended', 'prettier', @@ -167,7 +167,7 @@ describe('nuxt schematic', () => { const eslintConfig = tree.readContent('apps/subdir/my-app/.eslintrc.js'); expect(eslintConfig).toContain(`extends: [ - '../../../.eslintrc', + '../../../.eslintrc.json', '@nuxtjs/eslint-config-typescript', 'plugin:nuxt/recommended', 'prettier', diff --git a/libs/nuxt/src/schematics/application/schematic.ts b/libs/nuxt/src/schematics/application/schematic.ts index c7213681..4d7596e8 100644 --- a/libs/nuxt/src/schematics/application/schematic.ts +++ b/libs/nuxt/src/schematics/application/schematic.ts @@ -92,6 +92,9 @@ function addEsLint(options: NormalizedSchema): Rule { 'prettier', 'prettier/@typescript-eslint', ], + parserOptions: { + extraFileExtensions: ['.vue'], + }, rules: {}, }; @@ -103,24 +106,27 @@ function addEsLint(options: NormalizedSchema): Rule { ...generateProjectLint( options.projectRoot, `${options.projectRoot}/tsconfig.json`, - Linter.EsLint + Linter.EsLint, + [`${options.projectRoot}/**/*.{ts,js,vue}`] ), }); }), addLintFiles(options.projectRoot, Linter.EsLint, { localConfig: eslintConfig, }), - // Extending the root ESLint config should be the first value in the - // app's local ESLint config extends array. - updateJsonInTree(`${options.projectRoot}/.eslintrc`, (json) => { + updateJsonInTree(`${options.projectRoot}/.eslintrc.json`, (json) => { + // Extending the root ESLint config should be the first value in the + // app's local ESLint config extends array. json.extends.unshift(json.extends.pop()); + json.ignorePatterns = [...(json.ignorePatterns || []), '.eslintrc.js']; return json; }), (tree: Tree) => { - const configPath = `${options.projectRoot}/.eslintrc`; + const configPath = `${options.projectRoot}/.eslintrc.json`; const content = tree.read(configPath).toString('utf-8').trim(); - tree.rename(configPath, `${configPath}.js`); - tree.overwrite(`${configPath}.js`, `module.exports = ${content};`); + const newConfigPath = configPath.slice(0, -2); + tree.rename(configPath, newConfigPath); + tree.overwrite(newConfigPath, `module.exports = ${content};`); }, ]); } @@ -149,8 +155,8 @@ function addJest(options: NormalizedSchema): Rule { (tree: Tree) => { const content = tags.stripIndent` module.exports = { - name: '${options.projectName}', - preset: '${offsetFromRoot(options.projectRoot)}jest.config.js', + displayName: '${options.projectName}', + preset: '${offsetFromRoot(options.projectRoot)}jest.preset.js', transform: { '.*\\.(vue)$': 'vue-jest', '^.+\\.ts$': 'ts-jest', diff --git a/libs/vue/.eslintrc b/libs/vue/.eslintrc.json similarity index 56% rename from libs/vue/.eslintrc rename to libs/vue/.eslintrc.json index 9afd5d63..76c97f7a 100644 --- a/libs/vue/.eslintrc +++ b/libs/vue/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": "../../.eslintrc", + "extends": "../../.eslintrc.json", "rules": {}, "ignorePatterns": ["!**/*"] } diff --git a/libs/vue/jest.config.js b/libs/vue/jest.config.js index 9536876f..f449bd47 100644 --- a/libs/vue/jest.config.js +++ b/libs/vue/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - name: 'vue', - preset: '../../jest.config.js', + preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'ts-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], coverageDirectory: '../../coverage/libs/vue', globals: { 'ts-jest': { tsConfig: '/tsconfig.spec.json' } }, + displayName: 'vue', }; diff --git a/libs/vue/package.json b/libs/vue/package.json index 60aafbde..444b2884 100644 --- a/libs/vue/package.json +++ b/libs/vue/package.json @@ -30,9 +30,9 @@ "@nrwl/workspace": "^10.0.0" }, "dependencies": { - "@angular-devkit/architect": "0.1000.7", - "@angular-devkit/core": "10.0.7", - "@angular-devkit/schematics": "10.0.7", + "@angular-devkit/architect": "0.1001.4", + "@angular-devkit/core": "10.1.4", + "@angular-devkit/schematics": "10.1.4", "@nrwl/cypress": "^10.0.0", "@nrwl/jest": "^10.0.0", "@nrwl/linter": "^10.0.0", @@ -46,7 +46,7 @@ "stylus": "^0.54.7", "stylus-loader": "^3.0.2", "tsconfig-paths-webpack-plugin": "3.3.0", - "typescript": "3.9.7" + "typescript": "4.0.3" }, "ng-update": { "migrations": "./migrations.json" diff --git a/libs/vue/src/builders/browser/schema.d.ts b/libs/vue/src/builders/browser/schema.d.ts index 5babf397..ff5168ee 100644 --- a/libs/vue/src/builders/browser/schema.d.ts +++ b/libs/vue/src/builders/browser/schema.d.ts @@ -16,8 +16,10 @@ export interface BrowserBuilderSchema extends JsonObject { productionSourceMap: boolean; css: { requireModuleExtension: boolean; + // eslint-disable-next-line @typescript-eslint/ban-types extract: boolean | object; sourceMap: boolean; + // eslint-disable-next-line @typescript-eslint/ban-types loaderOptions: object; }; stdin: boolean; diff --git a/libs/vue/src/builders/dev-server/schema.d.ts b/libs/vue/src/builders/dev-server/schema.d.ts index bbc4050d..c2cb2376 100644 --- a/libs/vue/src/builders/dev-server/schema.d.ts +++ b/libs/vue/src/builders/dev-server/schema.d.ts @@ -15,9 +15,12 @@ export interface DevServerBuilderSchema extends JsonObject { publicPath?: string; css: { requireModuleExtension?: boolean; + // eslint-disable-next-line @typescript-eslint/ban-types extract?: boolean | object; sourceMap?: boolean; + // eslint-disable-next-line @typescript-eslint/ban-types loaderOptions: object; }; + // eslint-disable-next-line @typescript-eslint/ban-types devServer: object; } diff --git a/libs/vue/src/builders/library/schema.d.ts b/libs/vue/src/builders/library/schema.d.ts index f6c8f1de..10d2bfa5 100644 --- a/libs/vue/src/builders/library/schema.d.ts +++ b/libs/vue/src/builders/library/schema.d.ts @@ -12,8 +12,10 @@ export interface LibraryBuilderSchema extends JsonObject { inlineVue: boolean; css: { requireModuleExtension: boolean; + // eslint-disable-next-line @typescript-eslint/ban-types extract: boolean | object; sourceMap: boolean; + // eslint-disable-next-line @typescript-eslint/ban-types loaderOptions: object; }; formats: string; diff --git a/libs/vue/src/schematics/application/schematic.spec.ts b/libs/vue/src/schematics/application/schematic.spec.ts index b1746465..3b93896b 100644 --- a/libs/vue/src/schematics/application/schematic.spec.ts +++ b/libs/vue/src/schematics/application/schematic.spec.ts @@ -60,7 +60,7 @@ describe('application schematic', () => { expect(serve.configurations.production).toEqual({ browserTarget: 'my-app:build:production', }); - expect(lint.builder).toBe('@nrwl/linter:lint'); + expect(lint.builder).toBe('@nrwl/linter:eslint'); expect(test.builder).toBe('@nrwl/jest:jest'); expect(workspaceJson.projects['my-app-e2e']).toBeDefined(); @@ -94,7 +94,7 @@ describe('application schematic', () => { const eslintConfig = tree.readContent('apps/my-app/.eslintrc.js'); expect(eslintConfig).toContain(`extends: [ - '../../.eslintrc', + '../../.eslintrc.json', 'plugin:vue/essential', '@vue/typescript/recommended', 'prettier', @@ -402,7 +402,7 @@ describe('application schematic', () => { const eslintConfig = tree.readContent('apps/subdir/my-app/.eslintrc.js'); expect(eslintConfig).toContain(`extends: [ - '../../../.eslintrc', + '../../../.eslintrc.json', 'plugin:vue/essential', '@vue/typescript/recommended', 'prettier', diff --git a/libs/vue/src/schematics/application/schematic.ts b/libs/vue/src/schematics/application/schematic.ts index 14b6bc18..6ec3c465 100644 --- a/libs/vue/src/schematics/application/schematic.ts +++ b/libs/vue/src/schematics/application/schematic.ts @@ -131,7 +131,8 @@ function addEsLint(options: NormalizedSchema): Rule { ...generateProjectLint( options.projectRoot, `${options.projectRoot}/tsconfig.app.json`, - Linter.EsLint + Linter.EsLint, + [`${options.projectRoot}/**/*.{ts,tsx,vue}`] ), }); }), @@ -140,15 +141,16 @@ function addEsLint(options: NormalizedSchema): Rule { }), // Extending the root ESLint config should be the first value in the // app's local ESLint config extends array. - updateJsonInTree(`${options.projectRoot}/.eslintrc`, (json) => { + updateJsonInTree(`${options.projectRoot}/.eslintrc.json`, (json) => { json.extends.unshift(json.extends.pop()); return json; }), (tree: Tree) => { - const configPath = `${options.projectRoot}/.eslintrc`; + const configPath = `${options.projectRoot}/.eslintrc.json`; const content = tree.read(configPath).toString('utf-8').trim(); - tree.rename(configPath, `${configPath}.js`); - tree.overwrite(`${configPath}.js`, `module.exports = ${content};`); + const newConfigPath = configPath.slice(0, -2); + tree.rename(configPath, newConfigPath); + tree.overwrite(newConfigPath, `module.exports = ${content};`); }, ]); } @@ -177,8 +179,8 @@ function addJest(options: NormalizedSchema): Rule { (tree: Tree) => { const content = tags.stripIndent` module.exports = { - name: '${options.projectName}', - preset: '${offsetFromRoot(options.projectRoot)}jest.config.js', + displayName: '${options.projectName}', + preset: '${offsetFromRoot(options.projectRoot)}jest.preset.js', transform: { '^.+\\.vue$': 'vue-jest', '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': diff --git a/libs/vue/src/schematics/library/schematic.spec.ts b/libs/vue/src/schematics/library/schematic.spec.ts index 400aa4da..7d91f0ad 100644 --- a/libs/vue/src/schematics/library/schematic.spec.ts +++ b/libs/vue/src/schematics/library/schematic.spec.ts @@ -33,7 +33,7 @@ describe('library schematic', () => { expect(workspaceJson.projects['my-lib'].root).toBe('libs/my-lib'); expect(workspaceJson.projects['my-lib'].sourceRoot).toBe('libs/my-lib/src'); - expect(lint.builder).toBe('@nrwl/linter:lint'); + expect(lint.builder).toBe('@nrwl/linter:eslint'); expect(test.builder).toBe('@nrwl/jest:jest'); const tsConfigBaseJson = readJsonInTree(tree, 'tsconfig.base.json'); @@ -68,7 +68,7 @@ describe('library schematic', () => { const eslintConfig = tree.readContent('libs/my-lib/.eslintrc.js'); expect(eslintConfig).toContain(`extends: [ - '../../.eslintrc', + '../../.eslintrc.json', 'plugin:vue/essential', '@vue/typescript/recommended', 'prettier', @@ -208,7 +208,7 @@ describe('library schematic', () => { const eslintConfig = tree.readContent('libs/subdir/my-lib/.eslintrc.js'); expect(eslintConfig).toContain(`extends: [ - '../../../.eslintrc', + '../../../.eslintrc.json', 'plugin:vue/essential', '@vue/typescript/recommended', 'prettier', diff --git a/libs/vue/src/schematics/library/schematic.ts b/libs/vue/src/schematics/library/schematic.ts index 3f15b3bf..cfec4e0a 100644 --- a/libs/vue/src/schematics/library/schematic.ts +++ b/libs/vue/src/schematics/library/schematic.ts @@ -109,8 +109,8 @@ function addJest(options: NormalizedSchema): Rule { (tree: Tree) => { const content = tags.stripIndent` module.exports = { - name: '${options.projectName}', - preset: '${offsetFromRoot(options.projectRoot)}jest.config.js', + displayName: '${options.projectName}', + preset: '${offsetFromRoot(options.projectRoot)}jest.preset.js', transform: { '^.+\\.vue$': 'vue-jest', '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': @@ -182,7 +182,8 @@ function addEsLint(options: NormalizedSchema): Rule { ...generateProjectLint( options.projectRoot, `${options.projectRoot}/tsconfig.lib.json`, - Linter.EsLint + Linter.EsLint, + [`${options.projectRoot}/**/*.{ts,tsx,vue}`] ), }); }), @@ -191,15 +192,16 @@ function addEsLint(options: NormalizedSchema): Rule { }), // Extending the root ESLint config should be the first value in the // app's local ESLint config extends array. - updateJsonInTree(`${options.projectRoot}/.eslintrc`, (json) => { + updateJsonInTree(`${options.projectRoot}/.eslintrc.json`, (json) => { json.extends.unshift(json.extends.pop()); return json; }), (tree: Tree) => { - const configPath = `${options.projectRoot}/.eslintrc`; + const configPath = `${options.projectRoot}/.eslintrc.json`; const content = tree.read(configPath).toString('utf-8').trim(); - tree.rename(configPath, `${configPath}.js`); - tree.overwrite(`${configPath}.js`, `module.exports = ${content};`); + const newConfigPath = configPath.slice(0, -2); + tree.rename(configPath, newConfigPath); + tree.overwrite(newConfigPath, `module.exports = ${content};`); }, ]); } diff --git a/nx.json b/nx.json index c7f80eea..88e51fd5 100644 --- a/nx.json +++ b/nx.json @@ -9,7 +9,8 @@ "tslint.json": "*", "nx.json": "*", "tsconfig.base.json": "*", - ".circleci/config.yml": "*" + ".circleci/config.yml": "*", + ".eslintrc.json": "*" }, "tasksRunnerOptions": { "default": { diff --git a/package.json b/package.json index ce879578..4c7a9ab5 100644 --- a/package.json +++ b/package.json @@ -38,24 +38,25 @@ "private": true, "dependencies": {}, "devDependencies": { - "@angular-devkit/architect": "0.1000.7", - "@angular-devkit/core": "10.0.7", - "@angular-devkit/schematics": "10.0.7", + "@angular-devkit/architect": "0.1001.4", + "@angular-devkit/core": "10.1.4", + "@angular-devkit/schematics": "10.1.4", "@docusaurus/core": "^2.0.0-alpha.61", - "@nrwl/cypress": "10.1.0", - "@nrwl/eslint-plugin-nx": "10.1.0", - "@nrwl/jest": "10.1.0", - "@nrwl/nx-plugin": "10.1.0", - "@nrwl/workspace": "10.1.0", + "@nrwl/cli": "10.3.0", + "@nrwl/cypress": "10.3.0", + "@nrwl/eslint-plugin-nx": "10.3.0", + "@nrwl/jest": "10.3.0", + "@nrwl/nx-plugin": "10.3.0", + "@nrwl/workspace": "10.3.0", "@types/fs-extra": "^9.0.1", "@types/jest": "26.0.8", "@types/node": "~8.9.4", - "@typescript-eslint/eslint-plugin": "2.19.2", - "@typescript-eslint/parser": "2.19.2", + "@typescript-eslint/eslint-plugin": "4.3.0", + "@typescript-eslint/parser": "4.3.0", "@vue/cli-service": "~4.5.0", "@vue/cli-shared-utils": "~4.5.0", "dotenv": "6.2.0", - "eslint": "6.8.0", + "eslint": "7.10.0", "eslint-config-prettier": "6.0.0", "fs-extra": "^9.0.1", "husky": "^4.2.5", @@ -64,9 +65,9 @@ "nuxt": "^2.14.0", "prettier": "2.0.4", "rxjs": "6.5.5", - "ts-jest": "26.1.4", + "ts-jest": "26.4.0", "ts-node": "~7.0.0", "tslint": "~6.0.0", - "typescript": "3.9.7" + "typescript": "4.0.3" } } diff --git a/workspace.json b/workspace.json index 0aafb4b5..4fcc8db7 100644 --- a/workspace.json +++ b/workspace.json @@ -8,14 +8,16 @@ "schematics": {}, "architect": { "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "tsConfig": [ - "libs/docusaurus/tsconfig.lib.json", - "libs/docusaurus/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**", "!libs/docusaurus/**/*"] + "lintFilePatterns": [ + "libs/docusaurus/**/*.ts", + "libs/docusaurus/**/*.spec.ts", + "libs/docusaurus/**/*.spec.tsx", + "libs/docusaurus/**/*.spec.js", + "libs/docusaurus/**/*.spec.jsx", + "libs/docusaurus/**/*.d.ts" + ] } }, "test": { @@ -71,8 +73,7 @@ "target": "docusaurus:build", "npmPackageName": "@nx-plus/docusaurus", "pluginOutputPath": "dist/libs/docusaurus", - "jestConfig": "apps/docusaurus-e2e/jest.config.js", - "tsSpecConfig": "apps/docusaurus-e2e/tsconfig.spec.json" + "jestConfig": "apps/docusaurus-e2e/jest.config.js" } } } @@ -84,14 +85,16 @@ "schematics": {}, "architect": { "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "tsConfig": [ - "libs/vue/tsconfig.lib.json", - "libs/vue/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**", "!libs/vue/**/*"] + "lintFilePatterns": [ + "libs/vue/**/*.ts", + "libs/vue/**/*.spec.ts", + "libs/vue/**/*.spec.tsx", + "libs/vue/**/*.spec.js", + "libs/vue/**/*.spec.jsx", + "libs/vue/**/*.d.ts" + ] } }, "test": { @@ -152,8 +155,7 @@ "target": "vue:build", "npmPackageName": "@nx-plus/vue", "pluginOutputPath": "dist/libs/vue", - "jestConfig": "apps/vue-e2e/jest.config.js", - "tsSpecConfig": "apps/vue-e2e/tsconfig.spec.json" + "jestConfig": "apps/vue-e2e/jest.config.js" } } } @@ -165,14 +167,16 @@ "schematics": {}, "architect": { "lint": { - "builder": "@nrwl/linter:lint", + "builder": "@nrwl/linter:eslint", "options": { - "linter": "eslint", - "tsConfig": [ - "libs/nuxt/tsconfig.lib.json", - "libs/nuxt/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**", "!libs/nuxt/**/*"] + "lintFilePatterns": [ + "libs/nuxt/**/*.ts", + "libs/nuxt/**/*.spec.ts", + "libs/nuxt/**/*.spec.tsx", + "libs/nuxt/**/*.spec.js", + "libs/nuxt/**/*.spec.jsx", + "libs/nuxt/**/*.d.ts" + ] } }, "test": { @@ -223,8 +227,7 @@ "target": "nuxt:build", "npmPackageName": "@nx-plus/nuxt", "pluginOutputPath": "dist/libs/nuxt", - "jestConfig": "apps/nuxt-e2e/jest.config.js", - "tsSpecConfig": "apps/nuxt-e2e/tsconfig.spec.json" + "jestConfig": "apps/nuxt-e2e/jest.config.js" } } } diff --git a/yarn.lock b/yarn.lock index 561ec1e0..16053a71 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,42 +2,42 @@ # yarn lockfile v1 -"@angular-devkit/architect@0.1000.7", "@angular-devkit/architect@~0.1000.0": - version "0.1000.7" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1000.7.tgz#4cc7771239b1111d64dd3a6b6874d58909436f17" - integrity sha512-6pa98C5i+OrBumWobEjjGAeVNbv8m3h3LQQnXtihv9tjxCWceg25jtDhaNzeS6L8D/NsBnVb61MhTaOKUj7kUA== +"@angular-devkit/architect@0.1001.4", "@angular-devkit/architect@~0.1001.3": + version "0.1001.4" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1001.4.tgz#a10f11ab34cd76ecb469cbc5b06a95e82c9171da" + integrity sha512-0U/w+61vWxnEe9Ln/hNOH6O27FVcU+s/sbJAuPREbP875R4bQzK2PX0eYRlISzkDtQyw16GzlsikLWOoJ3vjTA== dependencies: - "@angular-devkit/core" "10.0.7" - rxjs "6.5.5" + "@angular-devkit/core" "10.1.4" + rxjs "6.6.2" -"@angular-devkit/build-webpack@~0.1000.0": - version "0.1000.7" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1000.7.tgz#83752eab33b35541157de6307345dd4bf4fce2c1" - integrity sha512-+QYsEBcpZGVFFwrIlfH/NbChVdfIlnxtoTPjjR7xI5DOgl57sb79hOo4Ev0mPkbbgfn5tjSHvE3rmVQmlYqzcg== +"@angular-devkit/build-webpack@~0.1001.3": + version "0.1001.4" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1001.4.tgz#cbdf5a97a2bbe099abeb294d20546b2c475a3d9c" + integrity sha512-4n9pcBD7JE2Cpg3zFBPEOr2r//c3EwnAqFOcDLA3rXt0AUsbnm9H8xPTwb6MHOEMyWS/fscNqYLFGHnVZiunEg== dependencies: - "@angular-devkit/architect" "0.1000.7" - "@angular-devkit/core" "10.0.7" - rxjs "6.5.5" + "@angular-devkit/architect" "0.1001.4" + "@angular-devkit/core" "10.1.4" + rxjs "6.6.2" -"@angular-devkit/core@10.0.7", "@angular-devkit/core@~10.0.0": - version "10.0.7" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.0.7.tgz#f88c1fe316e83049703c658ec82b2d1f811b1e36" - integrity sha512-pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw== +"@angular-devkit/core@10.1.4", "@angular-devkit/core@~10.1.3": + version "10.1.4" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.1.4.tgz#5db3fa603f2cff3303e687b9e7cc5346db538644" + integrity sha512-B1cwVcfChBvmEacydE2uqZ1UC2ez1G+KY0GyVnCQKpAb/DdfDgtaYjTx9JLvGQjE/BlVklEj8YCKDjVV0WPE5g== dependencies: - ajv "6.12.3" + ajv "6.12.4" fast-json-stable-stringify "2.1.0" magic-string "0.25.7" - rxjs "6.5.5" + rxjs "6.6.2" source-map "0.7.3" -"@angular-devkit/schematics@10.0.7", "@angular-devkit/schematics@~10.0.0": - version "10.0.7" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.0.7.tgz#460272c3fa4a4838d2da65a0e3f512c557d486f1" - integrity sha512-eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg== +"@angular-devkit/schematics@10.1.4", "@angular-devkit/schematics@~10.1.3": + version "10.1.4" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.1.4.tgz#0966e0cbbdaccc294718db9b84b46ab54c03631b" + integrity sha512-NIueJQYZ8OY3Yr3TGfxcGgP9ZGGsbtM7sa7sf9hSqxEAXdiGQdDJk5nChhtGtoGxUImterwqR8OiGmLcK5lg5g== dependencies: - "@angular-devkit/core" "10.0.7" - ora "4.0.4" - rxjs "6.5.5" + "@angular-devkit/core" "10.1.4" + ora "5.0.0" + rxjs "6.6.2" "@babel/code-frame@7.8.3", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3": version "7.8.3" @@ -2066,6 +2066,22 @@ url "^0.11.0" webpack-sources "^1.4.3" +"@eslint/eslintrc@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085" + integrity sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + lodash "^4.17.19" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + "@hapi/address@2.x.x": version "2.1.4" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" @@ -2384,128 +2400,147 @@ dependencies: mkdirp "^1.0.4" -"@nrwl/cli@10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-10.1.0.tgz#b0b85fe875c62d6518e7be59e6bbc5d039130cb1" - integrity sha512-kzTFHZmaoC1sdDbgdLQjns6BFyHkpLaj8JIXJkamg2Rp2ZPQtUDTjbrS/pg1FYGBvV87mpX0kG+bhGZPTg1kew== +"@nrwl/cli@10.3.0": + version "10.3.0" + resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-10.3.0.tgz#74c1067aa7c26ba31060f67acec42a9182115733" + integrity sha512-VCufjjMaFSjkTapoUXCbtQksbR1sHb7IKjvxp6n2V0DbsSF2jnasqu631ggpCPAE8zolsm3zHjLr2NqzEi6l+A== dependencies: - "@nrwl/tao" "10.1.0" + "@nrwl/tao" "10.3.0" chalk "2.4.2" tmp "0.0.33" - yargs "^11.0.0" - yargs-parser "10.0.0" + yargs "15.4.1" + yargs-parser "20.0.0" -"@nrwl/cypress@10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@nrwl/cypress/-/cypress-10.1.0.tgz#c448a0080ced0972d70ca097fbf9d9967c3ad49f" - integrity sha512-MaMvSN2vue3E9hRxVMr5pw1bjyr2tyWDVIQXrQ69r7TlYQLOUNxLWZ/8vlYZGkBExCUJABFjMUKZw4QB/Ave3Q== +"@nrwl/cypress@10.3.0": + version "10.3.0" + resolved "https://registry.yarnpkg.com/@nrwl/cypress/-/cypress-10.3.0.tgz#dee49ad95455b00a8e66782f1179373be73e3f5f" + integrity sha512-5JkCkiXcbCQsy3atf0iqqTVkXekAfSP0H025eAwTSQX+TCdLEJAQfBy+EUlUQPunnJLj/bJEV/pq8OKIOqP6uw== dependencies: - "@angular-devkit/architect" "~0.1000.0" - "@angular-devkit/core" "~10.0.0" + "@angular-devkit/architect" "~0.1001.3" + "@angular-devkit/core" "~10.1.3" + "@angular-devkit/schematics" "~10.1.3" "@cypress/webpack-preprocessor" "~4.1.2" fork-ts-checker-webpack-plugin "^3.1.1" + fs-extra "7.0.1" + rxjs "^6.5.4" tree-kill "1.2.2" - ts-loader "^5.3.1" + ts-loader "5.4.5" tsconfig-paths-webpack-plugin "3.2.0" + tslib "^1.9.3" webpack-node-externals "1.7.2" + yargs-parser "20.0.0" -"@nrwl/eslint-plugin-nx@10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-10.1.0.tgz#43bb8339b33bd2a1469df6405f7776f6147b27af" - integrity sha512-Ys2H6C5yS0aAWWlgSmke+BD3leyiQ+hjP1HZmwF61JDID8Qk2L64GGMASn84Mi+8zpBV96TktGWzWgTGlVFTcw== - dependencies: - "@typescript-eslint/experimental-utils" "^2.19.2" - -"@nrwl/jest@10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-10.1.0.tgz#b19c63076280da44335bdd34438e2123188a08c4" - integrity sha512-FGazorVVp0acDnGCKWej+jnWoj84whLsEwr/rbONJD9l7OgPUh2SH7KmcYKo0BHzAc/sZuYZVSKu3dSw6Re5fw== +"@nrwl/eslint-plugin-nx@10.3.0": + version "10.3.0" + resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-10.3.0.tgz#e5964a47f9d9d151aab69c679af9404415bfc1df" + integrity sha512-CxpPsB+ydz1bdhYuihUHMZ10/mAC9QGhgUjMVZrkCvdgeyxNgqRmTPlxw+XGUjC6mWgep7omwLCrXnoy4WXHkQ== dependencies: - "@angular-devkit/architect" "~0.1000.0" - "@angular-devkit/core" "~10.0.0" - "@angular-devkit/schematics" "~10.0.0" + "@angular-devkit/core" "~10.1.3" + "@typescript-eslint/experimental-utils" "^4.3.0" -"@nrwl/linter@10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-10.1.0.tgz#59cc68bba14d09dd2707c1a68a944f62ce8b9d6b" - integrity sha512-JePWJQhRi+lIoAu4tqQMUl+/Fq+dMVNHXUds0PuMXJZntuobP57DFLmX4fjit5zLm1Lv4qZfXtX4W2CoHK6eFQ== +"@nrwl/jest@10.3.0": + version "10.3.0" + resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-10.3.0.tgz#b30f11770ab144552ff025733f17b87772b21a51" + integrity sha512-p7b/iUOdoC4n/1rCEthamkqlNAlk0anocwJfK9YiuWwZnNcV0xs15uEXltlv0Y3H+61wf4vTMG/FYmirVMOSwg== dependencies: - "@angular-devkit/architect" "~0.1000.0" + "@angular-devkit/architect" "~0.1001.3" + "@angular-devkit/core" "~10.1.3" + "@angular-devkit/schematics" "~10.1.3" + rxjs "^6.5.4" -"@nrwl/node@10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@nrwl/node/-/node-10.1.0.tgz#a81f18c21e9d923dc31dfb3780d30449e15cc813" - integrity sha512-IX9jR1CU9xyWCOy9sl4Q3P6cWljhHj2UOdHdUbZhtnSVUSBAo4slBWFDFArQFdJCBC5TBsJS8NkRw67ekP4zSQ== +"@nrwl/linter@10.3.0": + version "10.3.0" + resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-10.3.0.tgz#50d49bbcf9443411879d34bdb022a4e34437cdbf" + integrity sha512-gLIaKyEaUK1MzXUmdK/fablclw0dtSgzlerHCkM2VfhWFBdxs0gY/3cSHEldlMz0xe8vYvHj+o7R+A69C8nIgg== dependencies: - "@angular-devkit/architect" "~0.1000.0" - "@angular-devkit/build-webpack" "~0.1000.0" - "@angular-devkit/core" "~10.0.0" - "@angular-devkit/schematics" "~10.0.0" - "@nrwl/jest" "10.1.0" - "@nrwl/linter" "10.1.0" + "@angular-devkit/architect" "~0.1001.3" + glob "7.1.4" + minimatch "3.0.4" + tslib "^1.9.3" + +"@nrwl/node@10.3.0": + version "10.3.0" + resolved "https://registry.yarnpkg.com/@nrwl/node/-/node-10.3.0.tgz#566b52a128333d6e642ac2fa2145c7777381b828" + integrity sha512-HpiNZNyYDEp9RSdjm+T4dpk4rRbM9oPXQCerRmHHYtGmASrRIUreeTIKZ5ujkP3gl21Qp6r+v4rQOx40AFOuDw== + dependencies: + "@angular-devkit/architect" "~0.1001.3" + "@angular-devkit/build-webpack" "~0.1001.3" + "@angular-devkit/core" "~10.1.3" + "@angular-devkit/schematics" "~10.1.3" + "@nrwl/jest" "10.3.0" + "@nrwl/linter" "10.3.0" circular-dependency-plugin "5.2.0" copy-webpack-plugin "6.0.3" fork-ts-checker-webpack-plugin "^3.1.1" license-webpack-plugin "2.1.2" - source-map-support "0.5.12" + source-map-support "0.5.16" tree-kill "1.2.2" ts-loader "5.4.5" tsconfig-paths-webpack-plugin "3.2.0" webpack "4.42.0" - webpack-dev-server "3.9.0" + webpack-dev-server "3.11.0" webpack-merge "4.2.1" webpack-node-externals "1.7.2" -"@nrwl/nx-plugin@10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@nrwl/nx-plugin/-/nx-plugin-10.1.0.tgz#202d34962eb8c9b7116bb77768f71469ba454492" - integrity sha512-vDcBnzOGCzEyfDoQtD1/HdNtwNrjECvlDsTnevZhZf56035XNhfktzSPo16/DJ0O5ckZ/64MrwImx9MwEYEWgg== +"@nrwl/nx-plugin@10.3.0": + version "10.3.0" + resolved "https://registry.yarnpkg.com/@nrwl/nx-plugin/-/nx-plugin-10.3.0.tgz#315d9ba195cc1894415dec32c9b8c1e7ebe6d755" + integrity sha512-wBPAhH3A9vws7yKf6ca2GmOkf/zEYfb/pH/3raE/V70B3Kx6Q6mu0SJYl6s0PWO17UYsbDHjC9DSjHFLtuPmIA== dependencies: - "@angular-devkit/architect" "~0.1000.0" - "@angular-devkit/core" "~10.0.0" - "@angular-devkit/schematics" "~10.0.0" - "@nrwl/linter" "10.1.0" - "@nrwl/node" "10.1.0" + "@angular-devkit/architect" "~0.1001.3" + "@angular-devkit/core" "~10.1.3" + "@angular-devkit/schematics" "~10.1.3" + "@nrwl/linter" "10.3.0" + "@nrwl/node" "10.3.0" fs-extra "7.0.1" inquirer "^6.3.1" tmp "0.0.33" - yargs "^11.0.0" - yargs-parser "10.0.0" + yargs "15.4.1" -"@nrwl/tao@10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-10.1.0.tgz#28420ae22e4cea928c002cad3a12a29587e949bd" - integrity sha512-h8q+XdEuSo2m6HK1lRXn7wrxFbM/4vJ6wFSaAETWjxSIsEP7leMrkGkoIs7lu2Ic12Ju/DfxMcCYlcFTlcbK7w== +"@nrwl/tao@10.3.0": + version "10.3.0" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-10.3.0.tgz#1b3478d716317b5a47d95fb4866136a384c1fbdf" + integrity sha512-ud1K2x9s26nqBE2M0o2REgUflSZt+6JHWb+eUgvAlubfab8yESjsN4mtltCdkxHDbg6j+55f+BD6F1C0vkeNrA== dependencies: - "@angular-devkit/architect" "~0.1000.0" - "@angular-devkit/core" "~10.0.0" - "@angular-devkit/schematics" "~10.0.0" + "@angular-devkit/architect" "~0.1001.3" + "@angular-devkit/core" "~10.1.3" + "@angular-devkit/schematics" "~10.1.3" inquirer "^6.3.1" minimist "^1.2.0" + semver "6.3.0" strip-json-comments "2.0.1" - -"@nrwl/workspace@10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-10.1.0.tgz#56b955eca3a3bd230cb563116876b5e47779a675" - integrity sha512-mdpiWo8kDtK2ois1KVbrcxQm7+WT6smv+L1FUqDLuwrBSefp+mGP0KyInLmyo/Pb5EbaCkCmVmtC8HN6icH9Yg== - dependencies: - "@angular-devkit/core" "~10.0.0" - "@angular-devkit/schematics" "~10.0.0" - "@nrwl/cli" "10.1.0" + tmp "0.0.33" + tslib "^1.9.3" + yargs-parser "20.0.0" + +"@nrwl/workspace@10.3.0": + version "10.3.0" + resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-10.3.0.tgz#a1fd6dda5676387e8d8ea86a0f4dc4fed056ea14" + integrity sha512-Q/GsxEMzNppSTAe9rzUNIxJm+5qn50KVVrbUkcUVMDLAW9JzCdELOAAXQf7wJuhAoUFu5ll1nHzjQ2iMGqREng== + dependencies: + "@angular-devkit/architect" "~0.1001.3" + "@angular-devkit/core" "~10.1.3" + "@angular-devkit/schematics" "~10.1.3" + "@nrwl/cli" "10.3.0" axios "0.19.2" chalk "2.4.2" - cosmiconfig "4.0.0" - dotenv "8.2.0" - fs-extra "6.0.0" - ignore "5.0.4" - npm-run-all "4.1.5" + cosmiconfig "^4.0.0" + dotenv "6.2.0" + flat "^5.0.2" + fs-extra "7.0.1" + ignore "^5.0.4" + inquirer "^6.3.1" + minimatch "3.0.4" + npm-run-all "^4.1.5" opn "^5.3.0" + resolve "1.17.0" rxjs "^6.5.4" - semver "5.4.1" + semver "6.3.0" strip-json-comments "2.0.1" tmp "0.0.33" - yargs "^11.0.0" - yargs-parser "10.0.0" + tslib "^1.9.3" + yargs "15.4.1" + yargs-parser "20.0.0" "@nuxt/babel-preset-app@2.14.4": version "2.14.4" @@ -3035,11 +3070,6 @@ dependencies: "@types/node" "*" -"@types/eslint-visitor-keys@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d" - integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag== - "@types/events@*": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" @@ -3143,6 +3173,14 @@ jest-diff "^25.2.1" pretty-format "^25.2.1" +"@types/jest@26.x": + version "26.0.14" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.14.tgz#078695f8f65cb55c5a98450d65083b2b73e5a3f3" + integrity sha512-Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg== + dependencies: + jest-diff "^25.2.1" + pretty-format "^25.2.1" + "@types/json-schema@^7.0.3": version "7.0.4" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339" @@ -3306,72 +3344,76 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@2.19.2": - version "2.19.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.19.2.tgz#e279aaae5d5c1f2547b4cff99204e1250bc7a058" - integrity sha512-HX2qOq2GOV04HNrmKnTpSIpHjfl7iwdXe3u/Nvt+/cpmdvzYvY0NHSiTkYN257jHnq4OM/yo+OsFgati+7LqJA== +"@typescript-eslint/eslint-plugin@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz#1a23d904bf8ea248d09dc3761af530d90f39c8fa" + integrity sha512-RqEcaHuEKnn3oPFislZ6TNzsBLqpZjN93G69SS+laav/I8w/iGMuMq97P0D2/2/kW4SCebHggqhbcCfbDaaX+g== dependencies: - "@typescript-eslint/experimental-utils" "2.19.2" - eslint-utils "^1.4.3" + "@typescript-eslint/experimental-utils" "4.3.0" + "@typescript-eslint/scope-manager" "4.3.0" + debug "^4.1.1" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" + semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.19.2": - version "2.19.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.19.2.tgz#4611d44cf0f0cb460c26aa7676fc0a787281e233" - integrity sha512-B88QuwT1wMJR750YvTJBNjMZwmiPpbmKYLm1yI7PCc3x0NariqPwqaPsoJRwU9DmUi0cd9dkhz1IqEnwfD+P1A== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.19.2" - eslint-scope "^5.0.0" - -"@typescript-eslint/experimental-utils@^2.19.2": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f" - integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA== +"@typescript-eslint/experimental-utils@4.3.0", "@typescript-eslint/experimental-utils@^4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz#3f3c6c508e01b8050d51b016e7f7da0e3aefcb87" + integrity sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.34.0" + "@typescript-eslint/scope-manager" "4.3.0" + "@typescript-eslint/types" "4.3.0" + "@typescript-eslint/typescript-estree" "4.3.0" eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@2.19.2": - version "2.19.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.19.2.tgz#21f42c0694846367e7d6a907feb08ab2f89c0879" - integrity sha512-8uwnYGKqX9wWHGPGdLB9sk9+12sjcdqEEYKGgbS8A0IvYX59h01o8os5qXUHMq2na8vpDRaV0suTLM7S8wraTA== +"@typescript-eslint/parser@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.3.0.tgz#684fc0be6551a2bfcb253991eec3c786a8c063a3" + integrity sha512-JyfRnd72qRuUwItDZ00JNowsSlpQGeKfl9jxwO0FHK1qQ7FbYdoy5S7P+5wh1ISkT2QyAvr2pc9dAemDxzt75g== dependencies: - "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.19.2" - "@typescript-eslint/typescript-estree" "2.19.2" - eslint-visitor-keys "^1.1.0" + "@typescript-eslint/scope-manager" "4.3.0" + "@typescript-eslint/types" "4.3.0" + "@typescript-eslint/typescript-estree" "4.3.0" + debug "^4.1.1" -"@typescript-eslint/typescript-estree@2.19.2": - version "2.19.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.19.2.tgz#67485b00172f400474d243c6c0be27581a579350" - integrity sha512-Xu/qa0MDk6upQWqE4Qy2X16Xg8Vi32tQS2PR0AvnT/ZYS4YGDvtn2MStOh5y8Zy2mg4NuL06KUHlvCh95j9C6Q== +"@typescript-eslint/scope-manager@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz#c743227e087545968080d2362cfb1273842cb6a7" + integrity sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig== dependencies: - debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^6.3.0" - tsutils "^3.17.1" + "@typescript-eslint/types" "4.3.0" + "@typescript-eslint/visitor-keys" "4.3.0" + +"@typescript-eslint/types@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf" + integrity sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw== -"@typescript-eslint/typescript-estree@2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5" - integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg== +"@typescript-eslint/typescript-estree@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz#0edc1068e6b2e4c7fdc54d61e329fce76241cee8" + integrity sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw== dependencies: + "@typescript-eslint/types" "4.3.0" + "@typescript-eslint/visitor-keys" "4.3.0" debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" + globby "^11.0.1" is-glob "^4.0.1" lodash "^4.17.15" semver "^7.3.2" tsutils "^3.17.1" +"@typescript-eslint/visitor-keys@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz#0e5ab0a09552903edeae205982e8521e17635ae0" + integrity sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw== + dependencies: + "@typescript-eslint/types" "4.3.0" + eslint-visitor-keys "^2.0.0" + "@vue/babel-helper-vue-jsx-merge-props@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz#048fe579958da408fb7a8b2a3ec050b50a661040" @@ -3951,10 +3993,10 @@ ajv-keywords@^3.5.2: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -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== +ajv@6.12.4, ajv@^6.12.2, ajv@^6.12.4: + version "6.12.4" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" + integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" @@ -3971,16 +4013,6 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^6.12.2, ajv@^6.12.4: - version "6.12.4" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" - integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -4871,11 +4903,6 @@ camel-case@^4.1.1: pascal-case "^3.1.1" tslib "^1.10.0" -camelcase@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= - camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" @@ -4933,7 +4960,7 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -5148,11 +5175,16 @@ cli-highlight@^2.1.4: parse5-htmlparser2-tree-adapter "^5.1.1" yargs "^15.0.0" -cli-spinners@^2.0.0, cli-spinners@^2.2.0: +cli-spinners@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.2.0.tgz#e8b988d9206c692302d8ee834e7a85c0144d8f77" integrity sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ== +cli-spinners@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.4.0.tgz#c6256db216b878cfba4720e719cec7cf72685d7f" + integrity sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA== + cli-truncate@2.1.0, cli-truncate@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" @@ -5180,15 +5212,6 @@ clipboardy@^2.3.0: execa "^1.0.0" is-wsl "^2.1.1" -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" @@ -5244,11 +5267,6 @@ coa@^2.0.2: chalk "^2.4.1" q "^1.1.2" -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -5557,7 +5575,7 @@ core-util-is@1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cosmiconfig@4.0.0: +cosmiconfig@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc" integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ== @@ -5660,6 +5678,15 @@ cross-spawn@^7.0.0: shebang-command "^2.0.0" which "^2.0.1" +cross-spawn@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -5972,7 +5999,7 @@ debug@^3.1.1, debug@^3.2.5: dependencies: ms "^2.1.1" -decamelize@^1.1.1, decamelize@^1.2.0: +decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -6016,7 +6043,7 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== -deep-is@~0.1.3: +deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= @@ -6348,7 +6375,7 @@ dotenv@6.2.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064" integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w== -dotenv@8.2.0, dotenv@^8.2.0: +dotenv@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== @@ -6615,14 +6642,15 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" - integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== dependencies: - eslint-visitor-keys "^1.1.0" + esrecurse "^4.3.0" + estraverse "^4.1.1" -eslint-utils@^2.0.0: +eslint-utils@^2.0.0, eslint-utils@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== @@ -6634,22 +6662,34 @@ eslint-visitor-keys@^1.1.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== -eslint@6.8.0: - version "6.8.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" - integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig== +eslint-visitor-keys@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + +eslint-visitor-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" + integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + +eslint@7.10.0: + version "7.10.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.10.0.tgz#494edb3e4750fb791133ca379e786a8f648c72b9" + integrity sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA== dependencies: "@babel/code-frame" "^7.0.0" + "@eslint/eslintrc" "^0.1.3" ajv "^6.10.0" - chalk "^2.1.0" - cross-spawn "^6.0.5" + chalk "^4.0.0" + cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" - eslint-scope "^5.0.0" - eslint-utils "^1.4.3" - eslint-visitor-keys "^1.1.0" - espree "^6.1.2" - esquery "^1.0.1" + enquirer "^2.3.5" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^1.3.0" + espree "^7.3.0" + esquery "^1.2.0" esutils "^2.0.2" file-entry-cache "^5.0.1" functional-red-black-tree "^1.0.1" @@ -6658,21 +6698,19 @@ eslint@6.8.0: ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" - inquirer "^7.0.0" is-glob "^4.0.0" js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.3.0" - lodash "^4.17.14" + levn "^0.4.1" + lodash "^4.17.19" minimatch "^3.0.4" - mkdirp "^0.5.1" natural-compare "^1.4.0" - optionator "^0.8.3" + optionator "^0.9.1" progress "^2.0.0" - regexpp "^2.0.1" - semver "^6.1.2" - strip-ansi "^5.2.0" - strip-json-comments "^3.0.1" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" table "^5.2.3" text-table "^0.2.0" v8-compile-cache "^2.0.3" @@ -6682,26 +6720,26 @@ esm@^3.2.25: resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== -espree@^6.1.2: - version "6.2.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" - integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== +espree@^7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348" + integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw== dependencies: - acorn "^7.1.1" + acorn "^7.4.0" acorn-jsx "^5.2.0" - eslint-visitor-keys "^1.1.0" + eslint-visitor-keys "^1.3.0" esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.2.0.tgz#a010a519c0288f2530b3404124bfb5f02e9797fe" - integrity sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q== +esquery@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" + integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== dependencies: - estraverse "^5.0.0" + estraverse "^5.1.0" esrecurse@^4.1.0: version "4.2.1" @@ -6710,15 +6748,22 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== -estraverse@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.0.0.tgz#ac81750b482c11cca26e4b07e83ed8f75fbcdc22" - integrity sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A== +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== esutils@^2.0.2: version "2.0.3" @@ -6997,7 +7042,7 @@ fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@2.x, fast-json-stab resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@~2.0.6: +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= @@ -7180,7 +7225,7 @@ flat-cache@^2.0.1: rimraf "2.6.3" write "1.0.3" -flat@^5.0.0: +flat@^5.0.0, flat@^5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== @@ -7285,15 +7330,6 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-extra@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.0.tgz#0f0afb290bb3deb87978da816fcd3c7797f3a817" - integrity sha512-lk2cUCo8QzbiEWEbt7Cw3m27WMiRG321xsssbcIpfMhpRjrlC08WBOVQqj1/nQYYNnPtyIhP1oqLO3QwT2tPCw== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - 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" @@ -7377,11 +7413,6 @@ 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" @@ -7470,6 +7501,18 @@ 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@7.1.4: + version "7.1.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" + integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + 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" @@ -7876,11 +7919,6 @@ html-entities@^1.2.0, html-entities@^1.3.1: resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44" integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA== -html-entities@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" - integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8= - html-escaper@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" @@ -8104,11 +8142,6 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore@5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.0.4.tgz#33168af4a21e99b00c5d41cbadb6a6cb49903a45" - integrity sha512-WLsTMEhsQuXpCiG173+f3aymI43SXa+fB1rSfbzyP4GkPP+ZFVuO0/3sFUGNBtifisPeDcl/uD/Y2NxZ7xFq4g== - ignore@^3.3.5: version "3.3.10" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" @@ -8119,16 +8152,16 @@ ignore@^4.0.3, ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== +ignore@^5.0.4, ignore@^5.1.4, ignore@^5.1.8: + version "5.1.8" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" + integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== + ignore@^5.1.1: version "5.1.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== -ignore@^5.1.4, ignore@^5.1.8: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== - immer@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d" @@ -8271,25 +8304,6 @@ inquirer@^6.3.1: strip-ansi "^5.1.0" through "^2.3.6" -inquirer@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29" - integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg== - dependencies: - ansi-escapes "^4.2.1" - chalk "^3.0.0" - cli-cursor "^3.1.0" - cli-width "^2.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.15" - mute-stream "0.0.8" - run-async "^2.4.0" - rxjs "^6.5.3" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" - inquirer@^7.2.0, inquirer@^7.3.0: version "7.3.3" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" @@ -8329,11 +8343,6 @@ invariant@^2.2.2, invariant@^2.2.4: dependencies: loose-envify "^1.0.0" -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" @@ -8500,13 +8509,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" @@ -9157,7 +9159,7 @@ jest-snapshot@^26.4.2: pretty-format "^26.4.2" semver "^7.3.2" -jest-util@26.x, jest-util@^26.3.0: +jest-util@^26.1.0, jest-util@^26.3.0: version "26.3.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e" integrity sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw== @@ -9470,13 +9472,6 @@ lazy-cache@^1.0.3: resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4= -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" - leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -9489,7 +9484,15 @@ levenary@^1.1.1: dependencies: leven "^3.1.0" -levn@^0.3.0, levn@~0.3.0: +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + +levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= @@ -9782,13 +9785,6 @@ log-symbols@^2.2.0: dependencies: chalk "^2.0.1" -log-symbols@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4" - integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ== - dependencies: - chalk "^2.4.2" - log-symbols@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" @@ -9806,11 +9802,6 @@ log-update@^4.0.0: slice-ansi "^4.0.0" wrap-ansi "^6.2.0" -loglevel@^1.6.4: - version "1.6.7" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz#b3e034233188c68b889f5b862415306f565e2c56" - integrity sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A== - loglevel@^1.6.8: version "1.6.8" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171" @@ -9920,7 +9911,7 @@ mamacro@^0.0.3: resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA== -map-age-cleaner@^0.1.1, map-age-cleaner@^0.1.3: +map-age-cleaner@^0.1.3: 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== @@ -9963,15 +9954,6 @@ 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" - mem@^6.0.1: version "6.1.1" resolved "https://registry.yarnpkg.com/mem/-/mem-6.1.1.tgz#ea110c2ebc079eca3022e6b08c85a795e77f6318" @@ -10133,7 +10115,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.0.0, mimic-fn@^2.1.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== @@ -10555,7 +10537,7 @@ normalize-url@^4.1.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== -npm-run-all@4.1.5: +npm-run-all@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba" integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ== @@ -10609,11 +10591,6 @@ num2fraction@^1.2.2: resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - nuxt@^2.14.0: version "2.14.4" resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.14.4.tgz#c12ee6060aa7660cdeed4ef9efdcefc4472077d9" @@ -10789,7 +10766,7 @@ optimize-css-assets-webpack-plugin@^5.0.3: cssnano "^4.1.10" last-call-webpack-plugin "^3.0.0" -optionator@^0.8.1, optionator@^0.8.3: +optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== @@ -10801,16 +10778,28 @@ optionator@^0.8.1, optionator@^0.8.3: type-check "~0.3.2" word-wrap "~1.2.3" -ora@4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.4.tgz#e8da697cc5b6a47266655bf68e0fb588d29a545d" - integrity sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww== +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== dependencies: - chalk "^3.0.0" + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + +ora@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.0.0.tgz#4f0b34f2994877b49b452a707245ab1e9f6afccb" + integrity sha512-s26qdWqke2kjN/wC4dy+IQPBIMWBJlSU/0JZhk30ZDBLelW25rv66yutUWARMigpGPzcXHb+Nac5pNhN/WsARw== + dependencies: + chalk "^4.1.0" cli-cursor "^3.1.0" - cli-spinners "^2.2.0" + cli-spinners "^2.4.0" is-interactive "^1.0.0" - log-symbols "^3.0.0" + log-symbols "^4.0.0" mute-stream "0.0.8" strip-ansi "^6.0.0" wcwidth "^1.0.1" @@ -10839,15 +10828,6 @@ os-browserify@^0.3.0: resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= -os-locale@^3.0.0, os-locale@^3.1.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-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -10878,11 +10858,6 @@ p-finally@^2.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== -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" @@ -11269,15 +11244,6 @@ pnp-webpack-plugin@^1.6.4: dependencies: ts-pnp "^1.1.6" -portfinder@^1.0.25: - version "1.0.25" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca" - integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg== - dependencies: - async "^2.6.2" - debug "^3.1.1" - mkdirp "^0.5.1" - portfinder@^1.0.26: version "1.0.27" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.27.tgz#a41333c116b5e5f3d380f9745ac2f35084c4c758" @@ -11954,6 +11920,11 @@ postcss@^7.0.32: source-map "^0.6.1" supports-color "^6.1.0" +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -12490,12 +12461,7 @@ regexp.prototype.flags@^1.2.0: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" -regexpp@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" - integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== - -regexpp@^3.0.0: +regexpp@^3.0.0, regexpp@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== @@ -12626,11 +12592,6 @@ require-from-string@^2.0.1: resolved "https://registry.yarnpkg.com/require-like/-/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" integrity sha1-rW8wwTvs15cBDEaK+ndcDAprR/o= -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" @@ -12680,6 +12641,13 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= +resolve@1.17.0, resolve@^1.1.7, resolve@^1.17.0, resolve@^1.2.0: + version "1.17.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" + integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== + dependencies: + path-parse "^1.0.6" + resolve@^1.1.6, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.8.1: version "1.15.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" @@ -12687,13 +12655,6 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.8.1: dependencies: path-parse "^1.0.6" -resolve@^1.1.7, resolve@^1.17.0, resolve@^1.2.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" - integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== - dependencies: - path-parse "^1.0.6" - responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -12812,6 +12773,13 @@ rxjs@6.5.5: dependencies: tslib "^1.9.0" +rxjs@6.6.2: + 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" + rxjs@^6.4.0, rxjs@^6.5.3, rxjs@^6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" @@ -12942,17 +12910,22 @@ semver-regex@^2.0.0: resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338" integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw== -"semver@2 || 3 || 4 || 5", semver@5.4.1, semver@^5.0.1, semver@^5.4.1: +"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg== +semver@6.3.0, semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + semver@7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@7.x, semver@^7.3.2: +semver@7.x, semver@^7.2.1, semver@^7.3.2: version "7.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== @@ -12962,11 +12935,6 @@ semver@^5.3.0, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -13251,14 +13219,6 @@ sockjs-client@1.4.0: json3 "^3.3.2" url-parse "^1.4.3" -sockjs@0.3.19: - version "0.3.19" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d" - integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw== - dependencies: - faye-websocket "^0.10.0" - uuid "^3.0.1" - sockjs@0.3.20: version "0.3.20" resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855" @@ -13298,15 +13258,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@0.5.12: - version "0.5.12" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" - integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-support@^0.5.6, source-map-support@~0.5.12: +source-map-support@0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12: version "0.5.16" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== @@ -13382,7 +13334,7 @@ spdy-transport@^3.0.0: readable-stream "^3.0.6" wbuf "^1.7.3" -spdy@^4.0.1, spdy@^4.0.2: +spdy@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== @@ -13539,16 +13491,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: +string-width@^2.0.0, string-width@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -13706,10 +13649,10 @@ strip-json-comments@2.0.1, strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= -strip-json-comments@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" - integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== style-resources-loader@^1.3.3: version "1.3.3" @@ -14091,23 +14034,24 @@ tryer@^1.0.1: resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== -ts-jest@26.1.4: - version "26.1.4" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.1.4.tgz#87d41a96016a8efe4b8cc14501d3785459af6fa6" - integrity sha512-Nd7diUX6NZWfWq6FYyvcIPR/c7GbEF75fH1R6coOp3fbNzbRJBZZAn0ueVS0r8r9ral1VcrpneAFAwB3TsVS1Q== +ts-jest@26.4.0: + version "26.4.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.0.tgz#903c7827f3d3bc33efc2f91be294b164400c32e3" + integrity sha512-ofBzoCqf6Nv/PoWb/ByV3VNKy2KJSikamOBxvR3E6eVdIw10GwAXoyvMWXXjZJK2s6S27ZE8fI+JBTnGaovl6Q== dependencies: + "@types/jest" "26.x" bs-logger "0.x" buffer-from "1.x" fast-json-stable-stringify "2.x" - jest-util "26.x" + jest-util "^26.1.0" json5 "2.x" lodash.memoize "4.x" make-error "1.x" mkdirp "1.x" semver "7.x" - yargs-parser "18.x" + yargs-parser "20.x" -ts-loader@5.4.5, ts-loader@^5.3.1: +ts-loader@5.4.5: version "5.4.5" resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.4.5.tgz#a0c1f034b017a9344cef0961bfd97cc192492b8b" integrity sha512-XYsjfnRQCBum9AMRZpk2rTYSVpdZBpZK+kDh0TeT3kxmQNBDVIeUjdPjY5RZry4eIAb8XHc4gYSUiUWPYvzSRw== @@ -14161,6 +14105,11 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== +tslib@^1.9.3: + version "1.13.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" + integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== + tslint@~6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.0.0.tgz#1c0148beac4779924216302f192cdaa153618310" @@ -14211,6 +14160,13 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" @@ -14258,10 +14214,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@3.9.7: - version "3.9.7" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" - integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== +typescript@4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5" + integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg== ua-parser-js@^0.7.21: version "0.7.21" @@ -14514,7 +14470,7 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@^3.0.1, uuid@^3.3.2, uuid@^3.4.0: +uuid@^3.3.2, uuid@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== @@ -14808,46 +14764,7 @@ webpack-dev-middleware@^3.7.2: range-parser "^1.2.1" webpack-log "^2.0.0" -webpack-dev-server@3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz#27c3b5d0f6b6677c4304465ac817623c8b27b89c" - integrity sha512-E6uQ4kRrTX9URN9s/lIbqTAztwEPdvzVrcmHE8EQ9YnuT9J8Es5Wrd8n9BKg1a0oZ5EgEke/EQFgUsp18dSTBw== - dependencies: - ansi-html "0.0.7" - bonjour "^3.5.0" - chokidar "^2.1.8" - compression "^1.7.4" - connect-history-api-fallback "^1.6.0" - debug "^4.1.1" - del "^4.1.1" - express "^4.17.1" - html-entities "^1.2.1" - http-proxy-middleware "0.19.1" - import-local "^2.0.0" - internal-ip "^4.3.0" - ip "^1.1.5" - is-absolute-url "^3.0.3" - killable "^1.0.1" - loglevel "^1.6.4" - opn "^5.5.0" - p-retry "^3.0.1" - portfinder "^1.0.25" - schema-utils "^1.0.0" - selfsigned "^1.10.7" - semver "^6.3.0" - serve-index "^1.9.1" - sockjs "0.3.19" - sockjs-client "1.4.0" - spdy "^4.0.1" - strip-ansi "^3.0.1" - supports-color "^6.1.0" - url "^0.11.0" - webpack-dev-middleware "^3.7.2" - webpack-log "^2.0.0" - ws "^6.2.1" - yargs "12.0.5" - -webpack-dev-server@^3.11.0: +webpack-dev-server@3.11.0, webpack-dev-server@^3.11.0: version "3.11.0" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c" integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg== @@ -15106,7 +15023,7 @@ widest-line@^3.1.0: dependencies: string-width "^4.0.0" -word-wrap@~1.2.3: +word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== @@ -15125,14 +15042,6 @@ worker-rpc@^0.1.0: dependencies: microevent.ts "~0.1.1" -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" @@ -15233,11 +15142,6 @@ xxhashjs@^0.2.1: dependencies: cuint "^0.2.2" -y18n@^3.2.1, "y18n@^3.2.1 || ^4.0.0": - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= - y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" @@ -15263,28 +15167,15 @@ yaml@^1.7.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.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.0.0.tgz#c737c93de2567657750cb1f2c00be639fd19c994" - integrity sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g== - dependencies: - camelcase "^4.1.0" - -yargs-parser@18.x, yargs-parser@^18.1.1: - version "18.1.3" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" - integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" +yargs-parser@20.0.0: + version "20.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.0.0.tgz#c65a1daaa977ad63cebdd52159147b789a4e19a9" + integrity sha512-8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA== -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@20.x: + version "20.2.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.1.tgz#28f3773c546cdd8a69ddae68116b48a5da328e77" + integrity sha512-yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA== yargs-parser@^13.1.2: version "13.1.2" @@ -15294,48 +15185,30 @@ yargs-parser@^13.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" - integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc= - dependencies: - camelcase "^4.1.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== +yargs-parser@^18.1.1, yargs-parser@^18.1.2: + version "18.1.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" + integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== dependencies: - cliui "^4.0.0" + camelcase "^5.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@^11.0.0: - version "11.1.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766" - integrity sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw== +yargs@15.4.1: + version "15.4.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== dependencies: - cliui "^4.0.0" - decamelize "^1.1.1" - find-up "^2.1.0" - get-caller-file "^1.0.1" - os-locale "^3.1.0" + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" require-directory "^2.1.1" - require-main-filename "^1.0.1" + require-main-filename "^2.0.0" set-blocking "^2.0.0" - string-width "^2.0.0" + string-width "^4.2.0" which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^9.0.2" + y18n "^4.0.0" + yargs-parser "^18.1.2" yargs@^13.3.2: version "13.3.2"