From e02fa3a2ab2fc5616c633437dd74691bd8a0cf85 Mon Sep 17 00:00:00 2001 From: mmalerba Date: Sat, 27 Apr 2019 17:35:40 -0700 Subject: [PATCH] chore: update to angular 8.0.0-rc.1 (#15909) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: update to angular 8.0.0-rc.1 * build: use ts-api-guardian from npm * update rules_nodejs * update to rc.1 * updgrade ts-api-guardian * update @angular-devkit * don't rename symbols that start with ɵɵ * add @bazel/bazel to dev deps * fix e2e deps * fix schematic tests --- WORKSPACE | 21 +- package.json | 43 +- src/cdk/schematics/ng-add/index.spec.ts | 4 +- .../ng-generate/drag-drop/index.spec.ts | 52 +- .../misc/method-call-checks.spec.ts | 4 +- src/cdk/schematics/testing/test-app.ts | 7 +- src/cdk/schematics/testing/test-case-setup.ts | 12 +- src/cdk/schematics/utils/ast.ts | 2 +- src/cdk/schematics/utils/get-project.ts | 2 +- src/cdk/schematics/utils/project-main-file.ts | 2 +- .../schematics/utils/project-style-file.ts | 2 +- src/cdk/schematics/utils/project-targets.ts | 2 +- src/cdk/schematics/utils/schematic-options.ts | 2 +- src/e2e-app/BUILD.bazel | 2 + .../ng-add/fonts/project-index-html.ts | 2 +- src/material/schematics/ng-add/index.spec.ts | 14 +- .../schematics/ng-add/theming/theming.ts | 2 +- .../ng-generate/address-form/index.spec.ts | 45 +- .../ng-generate/dashboard/index.spec.ts | 45 +- .../schematics/ng-generate/nav/index.spec.ts | 45 +- .../ng-generate/table/index.spec.ts | 45 +- .../schematics/ng-generate/tree/index.spec.ts | 45 +- .../misc/constructor-checks.spec.ts | 2 +- .../test-cases/misc/import-checks.spec.ts | 2 +- .../test-cases/misc/material-imports.spec.ts | 2 +- tools/package-tools/compile-entry-point.ts | 7 +- .../public_api_guard/generate-guard-tests.bzl | 2 +- yarn.lock | 713 ++++++++++-------- 28 files changed, 585 insertions(+), 543 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 7b409a83e89..dcc8553251f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # Add NodeJS rules (explicitly used for sass bundle rules) http_archive( name = "build_bazel_rules_nodejs", - sha256 = "88e5e579fb9edfbd19791b8a3c6bfbe16ae3444dba4b428e5efd36856db7cf16", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.8/rules_nodejs-0.27.8.tar.gz"], + sha256 = "4c702ffeeab2d24dd4101601b6d27cf582d2e0d4cdc3abefddd4834664669b6b", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.28.0/rules_nodejs-0.28.0.tar.gz"], ) # Add sass rules @@ -68,23 +68,6 @@ rules_sass_dependencies() load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories") sass_repositories() -# Temporarily add the Angular repository so that we can set up "ts_api_guardian". -# TODO(jelbourn): remove this once we can do all the same stuff via @npm//@angular -http_archive( - name = "angular", - sha256 = "a542f00adf5cafbcad24268d69da8e4746c22619699f29c3b3b0259d0ce52974", - url = "https://github.com/angular/angular/archive/8.0.0-beta.6.zip", - strip_prefix = "angular-8.0.0-beta.6", -) - -# Only install the "ts-api-guardian" dependencies as we don't want to install the -# Angular dev dependencies which are not needed. -yarn_install( - name = "ts-api-guardian_deps", - package_json = "@angular//tools/ts-api-guardian:package.json", - yarn_lock = "@angular//tools/ts-api-guardian:yarn.lock", -) - # Bring in bazel_toolchains for RBE setup configuration. http_archive( name = "bazel_toolchains", diff --git a/package.json b/package.json index 892f2c99530..df8930ef473 100644 --- a/package.json +++ b/package.json @@ -29,42 +29,42 @@ "format": "git-clang-format HEAD $(git diff HEAD --name-only | grep -v \"\\.d\\.ts\")" }, "version": "8.0.0-beta.2", - "requiredAngularVersion": ">=7.0.0", + "requiredAngularVersion": ">=8.0.0-rc.1", "requiredMDCVersion": "^1.1.0", "dependencies": { - "@angular/animations": "8.0.0-beta.10", - "@angular/common": "8.0.0-beta.10", - "@angular/compiler": "8.0.0-beta.10", - "@angular/core": "8.0.0-beta.10", - "@angular/elements": "8.0.0-beta.10", - "@angular/forms": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-beta.10", + "@angular/animations": "^8.0.0-rc.1", + "@angular/common": "^8.0.0-rc.1", + "@angular/compiler": "^8.0.0-rc.1", + "@angular/core": "^8.0.0-rc.1", + "@angular/elements": "^8.0.0-rc.1", + "@angular/forms": "^8.0.0-rc.1", + "@angular/platform-browser": "^8.0.0-rc.1", "@webcomponents/custom-elements": "^1.1.0", "core-js": "^2.6.1", "material-components-web": "^1.1.0", "rxjs": "^6.4.0", "systemjs": "0.19.43", - "tsickle": "^0.34.0", + "tsickle": "^0.35.0", "tslib": "^1.9.3", "zone.js": "^0.9.0" }, "devDependencies": { - "@angular-devkit/core": "7.3.7", - "@angular-devkit/schematics": "7.3.7", - "@angular/bazel": "8.0.0-beta.10", - "@angular/compiler-cli": "8.0.0-beta.10", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser-dynamic": "8.0.0-beta.10", - "@angular/platform-server": "8.0.0-beta.10", - "@angular/router": "8.0.0-beta.10", - "@angular/upgrade": "8.0.0-beta.10", + "@angular-devkit/core": "^8.0.0-rc.1", + "@angular-devkit/schematics": "^8.0.0-rc.1", + "@angular/bazel": "^8.0.0-rc.1", + "@angular/compiler-cli": "^8.0.0-rc.1", + "@angular/platform-browser-dynamic": "^8.0.0-rc.1", + "@angular/platform-server": "^8.0.0-rc.1", + "@angular/router": "^8.0.0-rc.1", + "@angular/upgrade": "^8.0.0-rc.1", + "@bazel/bazel": "^0.24.1", "@bazel/ibazel": "^0.9.0", "@bazel/jasmine": "0.27.8", "@bazel/karma": "0.27.8", - "@bazel/typescript": "0.27.8", + "@bazel/typescript": "^0.27.12", "@firebase/app-types": "^0.3.2", "@octokit/rest": "^15.9.4", - "@schematics/angular": "7.3.7", + "@schematics/angular": "^8.0.0-rc.1", "@types/browser-sync": "^0.0.42", "@types/chalk": "^0.4.31", "@types/fs-extra": "^4.0.3", @@ -135,11 +135,12 @@ "selenium-webdriver": "^3.6.0", "sorcery": "^0.10.0", "stylelint": "^9.10.1", + "ts-api-guardian": "^0.4.4", "ts-node": "^3.0.4", "tsconfig-paths": "^2.3.0", "tslint": "^5.13.1", "tsutils": "^3.0.0", - "typescript": "~3.3.3333", + "typescript": "~3.4", "uglify-js": "^2.8.14" } } diff --git a/src/cdk/schematics/ng-add/index.spec.ts b/src/cdk/schematics/ng-add/index.spec.ts index 6a41847839d..8071a8c779c 100644 --- a/src/cdk/schematics/ng-add/index.spec.ts +++ b/src/cdk/schematics/ng-add/index.spec.ts @@ -6,9 +6,9 @@ describe('CDK ng-add', () => { let runner: SchematicTestRunner; let appTree: Tree; - beforeEach(() => { + beforeEach(async () => { runner = new SchematicTestRunner('schematics', require.resolve('../collection.json')); - appTree = createTestApp(runner); + appTree = await createTestApp(runner); }); it('should update the package.json', () => { diff --git a/src/cdk/schematics/ng-generate/drag-drop/index.spec.ts b/src/cdk/schematics/ng-generate/drag-drop/index.spec.ts index 8cfece2121f..0bc2f41844a 100644 --- a/src/cdk/schematics/ng-generate/drag-drop/index.spec.ts +++ b/src/cdk/schematics/ng-generate/drag-drop/index.spec.ts @@ -20,8 +20,8 @@ describe('CDK drag-drop schematic', () => { runner = new SchematicTestRunner('schematics', require.resolve('../../collection.json')); }); - it('should create drag-drop files and add them to module', () => { - const tree = runner.runSchematic('drag-drop', baseOptions, createTestApp(runner)); + it('should create drag-drop files and add them to module', async () => { + const tree = runner.runSchematic('drag-drop', baseOptions, await createTestApp(runner)); const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts'); const files = tree.files; @@ -34,23 +34,23 @@ describe('CDK drag-drop schematic', () => { expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooComponent\r?\n/m); }); - it('should add drag-drop module', () => { - const tree = runner.runSchematic('drag-drop', baseOptions, createTestApp(runner)); + it('should add drag-drop module', async () => { + const tree = runner.runSchematic('drag-drop', baseOptions, await createTestApp(runner)); const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts'); expect(moduleContent).toContain('DragDropModule'); }); describe('style option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'drag-drop', {style: 'scss', ...baseOptions}, createTestApp(runner)); + 'drag-drop', {style: 'scss', ...baseOptions}, await createTestApp(runner)); expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss'); }); - it('should respect the deprecated "styleext" option value', () => { - let tree = createTestApp(runner); + it('should respect the deprecated "styleext" option value', async () => { + let tree = await createTestApp(runner); const workspace = getWorkspace(tree); const project = getProjectFromWorkspace(workspace); @@ -66,9 +66,9 @@ describe('CDK drag-drop schematic', () => { expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss'); }); - it('should not generate invalid stylesheets', () => { + it('should not generate invalid stylesheets', async () => { const tree = runner.runSchematic( - 'drag-drop', {style: 'styl', ...baseOptions}, createTestApp(runner)); + 'drag-drop', {style: 'styl', ...baseOptions}, await createTestApp(runner)); // In this case we expect the schematic to generate a plain "css" file because // the component schematics are using CSS style templates which are not compatible @@ -79,56 +79,56 @@ describe('CDK drag-drop schematic', () => { 'Expected the schematic to not generate a "stylus" file'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'drag-drop', baseOptions, createTestApp(runner, {style: 'less'})); + 'drag-drop', baseOptions, await createTestApp(runner, {style: 'less'})); expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less'); }); }); describe('inlineStyle option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'drag-drop', {inlineStyle: true, ...baseOptions}, createTestApp(runner)); + 'drag-drop', {inlineStyle: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'drag-drop', baseOptions, createTestApp(runner, {inlineStyle: true})); + 'drag-drop', baseOptions, await createTestApp(runner, {inlineStyle: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css'); }); }); describe('inlineTemplate option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'drag-drop', {inlineTemplate: true, ...baseOptions}, createTestApp(runner)); + 'drag-drop', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'drag-drop', baseOptions, createTestApp(runner, {inlineTemplate: true})); + 'drag-drop', baseOptions, await createTestApp(runner, {inlineTemplate: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html'); }); }); describe('skipTests option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'drag-drop', {skipTests: true, ...baseOptions}, createTestApp(runner)); + 'drag-drop', {skipTests: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts'); }); - it('should respect the deprecated global "spec" option value', () => { - let tree = createTestApp(runner); + it('should respect the deprecated global "spec" option value', async () => { + let tree = await createTestApp(runner); const workspace = getWorkspace(tree); const project = getProjectFromWorkspace(workspace); @@ -144,9 +144,9 @@ describe('CDK drag-drop schematic', () => { expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'drag-drop', baseOptions, createTestApp(runner, {skipTests: true})); + 'drag-drop', baseOptions, await createTestApp(runner, {skipTests: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts'); }); diff --git a/src/cdk/schematics/ng-update/test-cases/misc/method-call-checks.spec.ts b/src/cdk/schematics/ng-update/test-cases/misc/method-call-checks.spec.ts index b9ff9b01312..86785df31cd 100644 --- a/src/cdk/schematics/ng-update/test-cases/misc/method-call-checks.spec.ts +++ b/src/cdk/schematics/ng-update/test-cases/misc/method-call-checks.spec.ts @@ -4,8 +4,8 @@ import {createTestCaseSetup} from '../../../testing'; describe('v6 method call checks', () => { it('should properly report invalid method calls', async () => { - const {runFixers, removeTempDir} = createTestCaseSetup('migration-v6', migrationCollection, - [require.resolve('./method-call-checks_input.ts')]); + const {runFixers, removeTempDir} = await createTestCaseSetup('migration-v6', + migrationCollection, [require.resolve('./method-call-checks_input.ts')]); const {logOutput} = await runFixers(); diff --git a/src/cdk/schematics/testing/test-app.ts b/src/cdk/schematics/testing/test-app.ts index 8bc1399a5da..ebf141944c0 100644 --- a/src/cdk/schematics/testing/test-app.ts +++ b/src/cdk/schematics/testing/test-app.ts @@ -9,13 +9,14 @@ import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing'; /** Create a base app used for testing. */ -export function createTestApp(runner: SchematicTestRunner, appOptions = {}): UnitTestTree { +export async function createTestApp(runner: SchematicTestRunner, appOptions = {}): + Promise { const workspaceTree = runner.runExternalSchematic('@schematics/angular', 'workspace', { name: 'workspace', version: '6.0.0', newProjectRoot: 'projects', }); - return runner.runExternalSchematic('@schematics/angular', 'application', - {name: 'material', ...appOptions}, workspaceTree); + return runner.runExternalSchematicAsync('@schematics/angular', 'application', + {name: 'material', ...appOptions}, workspaceTree).toPromise(); } diff --git a/src/cdk/schematics/testing/test-case-setup.ts b/src/cdk/schematics/testing/test-case-setup.ts index 735e48742e3..5c82da46c7f 100644 --- a/src/cdk/schematics/testing/test-case-setup.ts +++ b/src/cdk/schematics/testing/test-case-setup.ts @@ -30,9 +30,9 @@ export function readFileContent(filePath: string): string { * Creates a test app schematic tree that will be copied over to a real filesystem location. * This is necessary because TSLint is not able to read from the virtual filesystem tree. */ -export function createFileSystemTestApp(runner: SchematicTestRunner) { +export async function createFileSystemTestApp(runner: SchematicTestRunner) { const tempFileSystemHost = new TempScopedNodeJsSyncHost(); - const appTree: UnitTestTree = createTestApp(runner, {name: 'cdk-testing'}); + const appTree: UnitTestTree = await createTestApp(runner, {name: 'cdk-testing'}); const tempPath = getSystemPath(tempFileSystemHost.root); // Since the TSLint fix task expects all files to be present on the real file system, we @@ -44,7 +44,7 @@ export function createFileSystemTestApp(runner: SchematicTestRunner) { return {appTree, tempPath, removeTempDir: () => removeSync(tempPath)}; } -export function createTestCaseSetup(migrationName: string, collectionPath: string, +export async function createTestCaseSetup(migrationName: string, collectionPath: string, inputFiles: string[]) { const runner = new SchematicTestRunner('schematics', collectionPath); @@ -53,7 +53,7 @@ export function createTestCaseSetup(migrationName: string, collectionPath: strin let logOutput = ''; runner.logger.subscribe(entry => logOutput += entry.message); - const {appTree, tempPath, removeTempDir} = createFileSystemTestApp(runner); + const {appTree, tempPath, removeTempDir} = await createFileSystemTestApp(runner); // Write each test-case input to the file-system. This is necessary because otherwise // TSLint won't be able to pick up the test cases. @@ -66,7 +66,7 @@ export function createTestCaseSetup(migrationName: string, collectionPath: strin }); const runFixers = async function() { - runner.runSchematic(migrationName, {}, appTree); + await runner.runSchematicAsync(migrationName, {}, appTree).toPromise(); // Switch to the new temporary directory because otherwise TSLint cannot read the files. process.chdir(tempPath); @@ -149,7 +149,7 @@ export function defineJasmineTestCases(versionName: string, collectionFile: stri beforeAll(async () => { const {tempPath, runFixers, removeTempDir} = - createTestCaseSetup(`migration-${versionName}`, collectionFile, inputFiles); + await createTestCaseSetup(`migration-${versionName}`, collectionFile, inputFiles); await runFixers(); diff --git a/src/cdk/schematics/utils/ast.ts b/src/cdk/schematics/utils/ast.ts index ef067b766b5..da812b0f492 100644 --- a/src/cdk/schematics/utils/ast.ts +++ b/src/cdk/schematics/utils/ast.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; +import {WorkspaceProject} from '@angular-devkit/core/src/experimental/workspace'; import {SchematicsException, Tree} from '@angular-devkit/schematics'; import {Schema as ComponentOptions} from '@schematics/angular/component/schema'; import {addImportToModule} from '@schematics/angular/utility/ast-utils'; diff --git a/src/cdk/schematics/utils/get-project.ts b/src/cdk/schematics/utils/get-project.ts index 8728b6eb7bd..b68d69d3d8a 100644 --- a/src/cdk/schematics/utils/get-project.ts +++ b/src/cdk/schematics/utils/get-project.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {WorkspaceSchema, WorkspaceProject} from '@angular-devkit/core/src/workspace'; +import {WorkspaceSchema, WorkspaceProject} from '@angular-devkit/core/src/experimental/workspace'; import {SchematicsException} from '@angular-devkit/schematics'; /** diff --git a/src/cdk/schematics/utils/project-main-file.ts b/src/cdk/schematics/utils/project-main-file.ts index e822f5fd39c..bc8b125d294 100644 --- a/src/cdk/schematics/utils/project-main-file.ts +++ b/src/cdk/schematics/utils/project-main-file.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; +import {WorkspaceProject} from '@angular-devkit/core/src/experimental/workspace'; import {SchematicsException} from '@angular-devkit/schematics'; import {getProjectTargetOptions} from './project-targets'; diff --git a/src/cdk/schematics/utils/project-style-file.ts b/src/cdk/schematics/utils/project-style-file.ts index 8b9cf07517e..7ca209fcc1d 100644 --- a/src/cdk/schematics/utils/project-style-file.ts +++ b/src/cdk/schematics/utils/project-style-file.ts @@ -7,7 +7,7 @@ */ import {normalize} from '@angular-devkit/core'; -import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; +import {WorkspaceProject} from '@angular-devkit/core/src/experimental/workspace'; import {getProjectTargetOptions} from './project-targets'; /** Regular expression that matches all possible Angular CLI default style files. */ diff --git a/src/cdk/schematics/utils/project-targets.ts b/src/cdk/schematics/utils/project-targets.ts index d7cc18a01ad..099e3b38fa7 100644 --- a/src/cdk/schematics/utils/project-targets.ts +++ b/src/cdk/schematics/utils/project-targets.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; +import {WorkspaceProject} from '@angular-devkit/core/src/experimental/workspace'; import {SchematicsException} from '@angular-devkit/schematics'; /** Resolves the architect options for the build target of the given project. */ diff --git a/src/cdk/schematics/utils/schematic-options.ts b/src/cdk/schematics/utils/schematic-options.ts index 77325569867..d82394febcf 100644 --- a/src/cdk/schematics/utils/schematic-options.ts +++ b/src/cdk/schematics/utils/schematic-options.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; +import {WorkspaceProject} from '@angular-devkit/core/src/experimental/workspace'; /** diff --git a/src/e2e-app/BUILD.bazel b/src/e2e-app/BUILD.bazel index a9432ded302..306a51c54c7 100644 --- a/src/e2e-app/BUILD.bazel +++ b/src/e2e-app/BUILD.bazel @@ -70,6 +70,8 @@ ts_devserver( "@npm//zone.js", "@npm//core-js", "@npm//hammerjs", + "@npm//material-components-web", + "@npm//moment", "@npm//@webcomponents/custom-elements", "//src/material/prebuilt-themes:indigo-pink", ":index.html", diff --git a/src/material/schematics/ng-add/fonts/project-index-html.ts b/src/material/schematics/ng-add/fonts/project-index-html.ts index 52e023fc8b7..102ae89b3ed 100644 --- a/src/material/schematics/ng-add/fonts/project-index-html.ts +++ b/src/material/schematics/ng-add/fonts/project-index-html.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; +import {WorkspaceProject} from '@angular-devkit/core/src/experimental/workspace'; import {SchematicsException} from '@angular-devkit/schematics'; import {getProjectTargetOptions} from '@angular/cdk/schematics'; diff --git a/src/material/schematics/ng-add/index.spec.ts b/src/material/schematics/ng-add/index.spec.ts index 2c932a25638..ce3db6afcda 100644 --- a/src/material/schematics/ng-add/index.spec.ts +++ b/src/material/schematics/ng-add/index.spec.ts @@ -1,5 +1,5 @@ import {normalize} from '@angular-devkit/core'; -import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; +import {WorkspaceProject} from '@angular-devkit/core/src/experimental/workspace'; import {Tree} from '@angular-devkit/schematics'; import {SchematicTestRunner} from '@angular-devkit/schematics/testing'; import { @@ -16,9 +16,9 @@ describe('ng-add schematic', () => { let runner: SchematicTestRunner; let appTree: Tree; - beforeEach(() => { + beforeEach(async () => { runner = new SchematicTestRunner('schematics', require.resolve('../collection.json')); - appTree = createTestApp(runner); + appTree = await createTestApp(runner); }); /** Expects the given file to be in the styles of the specified workspace project. */ @@ -77,9 +77,9 @@ describe('ng-add schematic', () => { './node_modules/@angular/material/prebuilt-themes/indigo-pink.css'); }); - it('should support adding a custom theme', () => { + it('should support adding a custom theme', async () => { // TODO(devversion): do not re-create test app here. - appTree = createTestApp(runner, {style: 'scss'}); + appTree = await createTestApp(runner, {style: 'scss'}); const tree = runner.runSchematic('ng-add-setup-project', {theme: 'custom'}, appTree); @@ -94,9 +94,9 @@ describe('ng-add schematic', () => { expect(themeContent).toContain(`$app-primary: mat-palette(`); }); - it('should create a custom theme file if no SCSS file could be found', () => { + it('should create a custom theme file if no SCSS file could be found', async () => { // TODO(devversion): do not re-create test app here. - appTree = createTestApp(runner, {style: 'css'}); + appTree = await createTestApp(runner, {style: 'css'}); const tree = runner.runSchematic('ng-add-setup-project', {theme: 'custom'}, appTree); const workspace = getWorkspace(tree); diff --git a/src/material/schematics/ng-add/theming/theming.ts b/src/material/schematics/ng-add/theming/theming.ts index 29bd52ed529..33873f4523e 100644 --- a/src/material/schematics/ng-add/theming/theming.ts +++ b/src/material/schematics/ng-add/theming/theming.ts @@ -7,7 +7,7 @@ */ import {normalize} from '@angular-devkit/core'; -import {WorkspaceProject, WorkspaceSchema} from '@angular-devkit/core/src/workspace'; +import {WorkspaceProject, WorkspaceSchema} from '@angular-devkit/core/src/experimental/workspace'; import {SchematicsException, Tree} from '@angular-devkit/schematics'; import { getProjectFromWorkspace, diff --git a/src/material/schematics/ng-generate/address-form/index.spec.ts b/src/material/schematics/ng-generate/address-form/index.spec.ts index bcc49462b6f..4f62c2986d5 100644 --- a/src/material/schematics/ng-generate/address-form/index.spec.ts +++ b/src/material/schematics/ng-generate/address-form/index.spec.ts @@ -14,8 +14,8 @@ describe('Material address-form schematic', () => { runner = new SchematicTestRunner('schematics', require.resolve('../../collection.json')); }); - it('should create address-form files and add them to module', () => { - const tree = runner.runSchematic('address-form', baseOptions, createTestApp(runner)); + it('should create address-form files and add them to module', async () => { + const tree = runner.runSchematic('address-form', baseOptions, await createTestApp(runner)); const files = tree.files; expect(files).toContain('/projects/material/src/app/foo/foo.component.css'); @@ -28,8 +28,8 @@ describe('Material address-form schematic', () => { expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooComponent\r?\n/m); }); - it('should add address-form imports to module', () => { - const tree = runner.runSchematic('address-form', baseOptions, createTestApp(runner)); + it('should add address-form imports to module', async () => { + const tree = runner.runSchematic('address-form', baseOptions, await createTestApp(runner)); const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts'); expect(moduleContent).toContain('MatInputModule'); @@ -39,71 +39,72 @@ describe('Material address-form schematic', () => { expect(moduleContent).toContain('ReactiveFormsModule'); }); - it('should throw if no name has been specified', () => { + it('should throw if no name has been specified', async () => { + const appTree = await createTestApp(runner); expect(() => { - runner.runSchematic('address-form', {project: 'material'}, createTestApp(runner)); + runner.runSchematic('address-form', {project: 'material'}, appTree); }).toThrowError(/required property 'name'/); }); describe('style option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'address-form', {style: 'scss', ...baseOptions}, createTestApp(runner)); + 'address-form', {style: 'scss', ...baseOptions}, await createTestApp(runner)); expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'address-form', baseOptions, createTestApp(runner, {style: 'less'})); + 'address-form', baseOptions, await createTestApp(runner, {style: 'less'})); expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less'); }); }); describe('inlineStyle option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'address-form', {inlineStyle: true, ...baseOptions}, createTestApp(runner)); + 'address-form', {inlineStyle: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'address-form', baseOptions, createTestApp(runner, {inlineStyle: true})); + 'address-form', baseOptions, await createTestApp(runner, {inlineStyle: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css'); }); }); describe('inlineTemplate option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'address-form', {inlineTemplate: true, ...baseOptions}, createTestApp(runner)); + 'address-form', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'address-form', baseOptions, createTestApp(runner, {inlineTemplate: true})); + 'address-form', baseOptions, await createTestApp(runner, {inlineTemplate: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html'); }); }); describe('skipTests option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'address-form', {skipTests: true, ...baseOptions}, createTestApp(runner)); + 'address-form', {skipTests: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'address-form', baseOptions, createTestApp(runner, {skipTests: true})); + 'address-form', baseOptions, await createTestApp(runner, {skipTests: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts'); }); diff --git a/src/material/schematics/ng-generate/dashboard/index.spec.ts b/src/material/schematics/ng-generate/dashboard/index.spec.ts index 97f1ea3d88f..4291a96bd1b 100644 --- a/src/material/schematics/ng-generate/dashboard/index.spec.ts +++ b/src/material/schematics/ng-generate/dashboard/index.spec.ts @@ -14,8 +14,8 @@ describe('material-dashboard-schematic', () => { runner = new SchematicTestRunner('schematics', require.resolve('../../collection.json')); }); - it('should create dashboard files and add them to module', () => { - const tree = runner.runSchematic('dashboard', baseOptions, createTestApp(runner)); + it('should create dashboard files and add them to module', async () => { + const tree = runner.runSchematic('dashboard', baseOptions, await createTestApp(runner)); const files = tree.files; expect(files).toContain('/projects/material/src/app/foo/foo.component.css'); @@ -28,8 +28,8 @@ describe('material-dashboard-schematic', () => { expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooComponent\r?\n/m); }); - it('should add dashboard imports to module', () => { - const tree = runner.runSchematic('dashboard', baseOptions, createTestApp(runner)); + it('should add dashboard imports to module', async () => { + const tree = runner.runSchematic('dashboard', baseOptions, await createTestApp(runner)); const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts'); expect(moduleContent).toContain('MatGridListModule'); @@ -43,71 +43,72 @@ describe('material-dashboard-schematic', () => { ` from '@angular/material';`); }); - it('should throw if no name has been specified', () => { + it('should throw if no name has been specified', async () => { + const appTree = await createTestApp(runner); expect(() => { - runner.runSchematic('dashboard', {project: 'material'}, createTestApp(runner)); + runner.runSchematic('dashboard', {project: 'material'}, appTree); }).toThrowError(/required property 'name'/); }); describe('style option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'dashboard', {style: 'scss', ...baseOptions}, createTestApp(runner)); + 'dashboard', {style: 'scss', ...baseOptions}, await createTestApp(runner)); expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'dashboard', baseOptions, createTestApp(runner, {style: 'less'})); + 'dashboard', baseOptions, await createTestApp(runner, {style: 'less'})); expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less'); }); }); describe('inlineStyle option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'dashboard', {inlineStyle: true, ...baseOptions}, createTestApp(runner)); + 'dashboard', {inlineStyle: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'dashboard', baseOptions, createTestApp(runner, {inlineStyle: true})); + 'dashboard', baseOptions, await createTestApp(runner, {inlineStyle: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css'); }); }); describe('inlineTemplate option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'dashboard', {inlineTemplate: true, ...baseOptions}, createTestApp(runner)); + 'dashboard', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'dashboard', baseOptions, createTestApp(runner, {inlineTemplate: true})); + 'dashboard', baseOptions, await createTestApp(runner, {inlineTemplate: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html'); }); }); describe('skipTests option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'dashboard', {skipTests: true, ...baseOptions}, createTestApp(runner)); + 'dashboard', {skipTests: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'dashboard', baseOptions, createTestApp(runner, {skipTests: true})); + 'dashboard', baseOptions, await createTestApp(runner, {skipTests: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts'); }); diff --git a/src/material/schematics/ng-generate/nav/index.spec.ts b/src/material/schematics/ng-generate/nav/index.spec.ts index 273d26af627..afbd2c2f824 100644 --- a/src/material/schematics/ng-generate/nav/index.spec.ts +++ b/src/material/schematics/ng-generate/nav/index.spec.ts @@ -14,8 +14,8 @@ describe('material-nav-schematic', () => { runner = new SchematicTestRunner('schematics', require.resolve('../../collection.json')); }); - it('should create nav files and add them to module', () => { - const tree = runner.runSchematic('nav', baseOptions, createTestApp(runner)); + it('should create nav files and add them to module', async () => { + const tree = runner.runSchematic('nav', baseOptions, await createTestApp(runner)); const files = tree.files; expect(files).toContain('/projects/material/src/app/foo/foo.component.css'); @@ -28,8 +28,8 @@ describe('material-nav-schematic', () => { expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooComponent\r?\n/m); }); - it('should add nav imports to module', () => { - const tree = runner.runSchematic('nav', baseOptions, createTestApp(runner)); + it('should add nav imports to module', async () => { + const tree = runner.runSchematic('nav', baseOptions, await createTestApp(runner)); const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts'); expect(moduleContent).toContain('LayoutModule'); @@ -45,71 +45,72 @@ describe('material-nav-schematic', () => { `MatListModule } from '@angular/material';`); }); - it('should throw if no name has been specified', () => { + it('should throw if no name has been specified', async () => { + const appTree = await createTestApp(runner); expect(() => { - runner.runSchematic('nav', {project: 'material'}, createTestApp(runner)); + runner.runSchematic('nav', {project: 'material'}, appTree); }).toThrowError(/required property 'name'/); }); describe('style option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'nav', {style: 'scss', ...baseOptions}, createTestApp(runner)); + 'nav', {style: 'scss', ...baseOptions}, await createTestApp(runner)); expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'nav', baseOptions, createTestApp(runner, {style: 'less'})); + 'nav', baseOptions, await createTestApp(runner, {style: 'less'})); expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less'); }); }); describe('inlineStyle option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'nav', {inlineStyle: true, ...baseOptions}, createTestApp(runner)); + 'nav', {inlineStyle: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'nav', baseOptions, createTestApp(runner, {inlineStyle: true})); + 'nav', baseOptions, await createTestApp(runner, {inlineStyle: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css'); }); }); describe('inlineTemplate option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'nav', {inlineTemplate: true, ...baseOptions}, createTestApp(runner)); + 'nav', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'nav', baseOptions, createTestApp(runner, {inlineTemplate: true})); + 'nav', baseOptions, await createTestApp(runner, {inlineTemplate: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html'); }); }); describe('skipTests option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'nav', {skipTests: true, ...baseOptions}, createTestApp(runner)); + 'nav', {skipTests: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'nav', baseOptions, createTestApp(runner, {skipTests: true})); + 'nav', baseOptions, await createTestApp(runner, {skipTests: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts'); }); diff --git a/src/material/schematics/ng-generate/table/index.spec.ts b/src/material/schematics/ng-generate/table/index.spec.ts index 6115edf2aa1..770622eedbe 100644 --- a/src/material/schematics/ng-generate/table/index.spec.ts +++ b/src/material/schematics/ng-generate/table/index.spec.ts @@ -14,8 +14,8 @@ describe('material-table-schematic', () => { runner = new SchematicTestRunner('schematics', require.resolve('../../collection.json')); }); - it('should create table files and add them to module', () => { - const tree = runner.runSchematic('table', baseOptions, createTestApp(runner)); + it('should create table files and add them to module', async () => { + const tree = runner.runSchematic('table', baseOptions, await createTestApp(runner)); const files = tree.files; expect(files).toContain('/projects/material/src/app/foo/foo.component.css'); @@ -40,8 +40,8 @@ describe('material-table-schematic', () => { expect(componentContent).toContain('FooDataSource'); }); - it('should add table imports to module', () => { - const tree = runner.runSchematic('table', baseOptions, createTestApp(runner)); + it('should add table imports to module', async () => { + const tree = runner.runSchematic('table', baseOptions, await createTestApp(runner)); const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts'); expect(moduleContent).toContain('MatTableModule'); @@ -52,71 +52,72 @@ describe('material-table-schematic', () => { `import { MatTableModule, MatPaginatorModule, MatSortModule } from '@angular/material';`); }); - it('should throw if no name has been specified', () => { + it('should throw if no name has been specified', async () => { + const appTree = await createTestApp(runner); expect(() => { - runner.runSchematic('table', {project: 'material'}, createTestApp(runner)); + runner.runSchematic('table', {project: 'material'}, appTree); }).toThrowError(/required property 'name'/); }); describe('style option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'table', {style: 'scss', ...baseOptions}, createTestApp(runner)); + 'table', {style: 'scss', ...baseOptions}, await createTestApp(runner)); expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'table', baseOptions, createTestApp(runner, {style: 'less'})); + 'table', baseOptions, await createTestApp(runner, {style: 'less'})); expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less'); }); }); describe('inlineStyle option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'table', {inlineStyle: true, ...baseOptions}, createTestApp(runner)); + 'table', {inlineStyle: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'table', baseOptions, createTestApp(runner, {inlineStyle: true})); + 'table', baseOptions, await createTestApp(runner, {inlineStyle: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css'); }); }); describe('inlineTemplate option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'table', {inlineTemplate: true, ...baseOptions}, createTestApp(runner)); + 'table', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'table', baseOptions, createTestApp(runner, {inlineTemplate: true})); + 'table', baseOptions, await createTestApp(runner, {inlineTemplate: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html'); }); }); describe('skipTests option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'table', {skipTests: true, ...baseOptions}, createTestApp(runner)); + 'table', {skipTests: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'table', baseOptions, createTestApp(runner, {skipTests: true})); + 'table', baseOptions, await createTestApp(runner, {skipTests: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts'); }); diff --git a/src/material/schematics/ng-generate/tree/index.spec.ts b/src/material/schematics/ng-generate/tree/index.spec.ts index 1c6b3d7e8c0..29ef3aac910 100644 --- a/src/material/schematics/ng-generate/tree/index.spec.ts +++ b/src/material/schematics/ng-generate/tree/index.spec.ts @@ -14,8 +14,8 @@ describe('Material tree schematic', () => { runner = new SchematicTestRunner('schematics', require.resolve('../../collection.json')); }); - it('should create tree component files and add them to module', () => { - const tree = runner.runSchematic('tree', baseOptions, createTestApp(runner)); + it('should create tree component files and add them to module', async () => { + const tree = runner.runSchematic('tree', baseOptions, await createTestApp(runner)); const files = tree.files; expect(files).toContain('/projects/material/src/app/foo/foo.component.css'); @@ -28,8 +28,8 @@ describe('Material tree schematic', () => { expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooComponent\r?\n/m); }); - it('should add tree imports to module', () => { - const tree = runner.runSchematic('tree', baseOptions, createTestApp(runner)); + it('should add tree imports to module', async () => { + const tree = runner.runSchematic('tree', baseOptions, await createTestApp(runner)); const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts'); expect(moduleContent).toContain('MatTreeModule'); @@ -37,71 +37,72 @@ describe('Material tree schematic', () => { expect(moduleContent).toContain('MatButtonModule'); }); - it('should throw if no name has been specified', () => { + it('should throw if no name has been specified', async () => { + const appTree = await createTestApp(runner); expect(() => { - runner.runSchematic('tree', {project: 'material'}, createTestApp(runner)); + runner.runSchematic('tree', {project: 'material'}, appTree); }).toThrowError(/required property 'name'/); }); describe('style option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'tree', {style: 'scss', ...baseOptions}, createTestApp(runner)); + 'tree', {style: 'scss', ...baseOptions}, await createTestApp(runner)); expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'tree', baseOptions, createTestApp(runner, {style: 'less'})); + 'tree', baseOptions, await createTestApp(runner, {style: 'less'})); expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less'); }); }); describe('inlineStyle option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'tree', {inlineStyle: true, ...baseOptions}, createTestApp(runner)); + 'tree', {inlineStyle: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'tree', baseOptions, createTestApp(runner, {inlineStyle: true})); + 'tree', baseOptions, await createTestApp(runner, {inlineStyle: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css'); }); }); describe('inlineTemplate option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'tree', {inlineTemplate: true, ...baseOptions}, createTestApp(runner)); + 'tree', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'tree', baseOptions, createTestApp(runner, {inlineTemplate: true})); + 'tree', baseOptions, await createTestApp(runner, {inlineTemplate: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html'); }); }); describe('skipTests option', () => { - it('should respect the option value', () => { + it('should respect the option value', async () => { const tree = runner.runSchematic( - 'tree', {skipTests: true, ...baseOptions}, createTestApp(runner)); + 'tree', {skipTests: true, ...baseOptions}, await createTestApp(runner)); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts'); }); - it('should fall back to the @schematics/angular:component option value', () => { + it('should fall back to the @schematics/angular:component option value', async () => { const tree = runner.runSchematic( - 'tree', baseOptions, createTestApp(runner, {skipTests: true})); + 'tree', baseOptions, await createTestApp(runner, {skipTests: true})); expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts'); }); diff --git a/src/material/schematics/ng-update/test-cases/misc/constructor-checks.spec.ts b/src/material/schematics/ng-update/test-cases/misc/constructor-checks.spec.ts index dc6b534f143..296de87d0e2 100644 --- a/src/material/schematics/ng-update/test-cases/misc/constructor-checks.spec.ts +++ b/src/material/schematics/ng-update/test-cases/misc/constructor-checks.spec.ts @@ -4,7 +4,7 @@ import {createTestCaseSetup} from '@angular/cdk/schematics/testing'; describe('constructor checks', () => { it('should properly report invalid constructor expression signatures', async () => { - const {removeTempDir, runFixers} = createTestCaseSetup('migration-v6', + const {removeTempDir, runFixers} = await createTestCaseSetup('migration-v6', migrationCollection, [require.resolve('./constructor-checks_input.ts')]); const {logOutput} = await runFixers(); diff --git a/src/material/schematics/ng-update/test-cases/misc/import-checks.spec.ts b/src/material/schematics/ng-update/test-cases/misc/import-checks.spec.ts index 7c1672a579d..2ed8663d4b5 100644 --- a/src/material/schematics/ng-update/test-cases/misc/import-checks.spec.ts +++ b/src/material/schematics/ng-update/test-cases/misc/import-checks.spec.ts @@ -4,7 +4,7 @@ import {migrationCollection} from '../index.spec'; describe('v6 import misc checks', () => { it('should report imports for deleted animation constants', async () => { - const {removeTempDir, runFixers} = createTestCaseSetup('migration-v6', + const {removeTempDir, runFixers} = await createTestCaseSetup('migration-v6', migrationCollection, [require.resolve('./import-checks_input.ts')]); const {logOutput} = await runFixers(); diff --git a/src/material/schematics/ng-update/test-cases/misc/material-imports.spec.ts b/src/material/schematics/ng-update/test-cases/misc/material-imports.spec.ts index 92846bb1acb..220427cbca2 100644 --- a/src/material/schematics/ng-update/test-cases/misc/material-imports.spec.ts +++ b/src/material/schematics/ng-update/test-cases/misc/material-imports.spec.ts @@ -12,7 +12,7 @@ describe('v8 material imports', () => { } it('should report imports for deleted animation constants', async () => { - const {runFixers, removeTempDir, tempPath} = createTestCaseSetup( + const {runFixers, removeTempDir, tempPath} = await createTestCaseSetup( 'migration-v8', migrationCollection, [require.resolve('./material-imports_input.ts')]); const materialPath = join(tempPath, 'node_modules/@angular/material'); diff --git a/tools/package-tools/compile-entry-point.ts b/tools/package-tools/compile-entry-point.ts index 6b1a98d7f4f..d20e32de605 100644 --- a/tools/package-tools/compile-entry-point.ts +++ b/tools/package-tools/compile-entry-point.ts @@ -71,7 +71,12 @@ function addImportAs(packageName: string, outputPath: string, secondaryEntryPoin function addIdToGlob(outputPath: string, entryPointId: number): void { glob(join(outputPath, '**/*.+(js|d.ts|metadata.json)')).forEach(filePath => { let fileContent = readFileSync(filePath, 'utf-8'); - fileContent = fileContent.replace(/(ɵ[a-z]+)/g, `$1${entryPointId}`); + // We check for double ɵ to avoid mangling symbols like `ɵɵdefineInjectable`. + fileContent = fileContent.replace(/ɵ(ɵ)?[a-z]+/g, + (match, isDoubleTheta) => { + return isDoubleTheta ? match : match + entryPointId; + }); writeFileSync(filePath, fileContent, 'utf-8'); }); } + diff --git a/tools/public_api_guard/generate-guard-tests.bzl b/tools/public_api_guard/generate-guard-tests.bzl index 16f7898bdce..7a248f8c024 100644 --- a/tools/public_api_guard/generate-guard-tests.bzl +++ b/tools/public_api_guard/generate-guard-tests.bzl @@ -1,4 +1,4 @@ -load("@angular//tools/ts-api-guardian:index.bzl", "ts_api_guardian_test") +load("@npm_ts_api_guardian//:index.bzl", "ts_api_guardian_test") """ Macro for generating ts-api-guardian Bazel test targets. Since there are multiple golden files diff --git a/yarn.lock b/yarn.lock index a0137b1b749..af01c406fda 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,116 +2,85 @@ # yarn lockfile v1 -"@angular-devkit/architect@^0.13.4": - version "0.13.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.6.tgz#7758ab9f288cfd4f64d8b88b0700bac5c4961d06" - integrity sha512-Cg9z4lmCvjt5uD00E/0tBRz3ESjYicmqT3NL/BIsNVNb+s1GwCCoPSOIM8Ss4nyGDtrdono1XKSOmkJnlzF3Cw== +"@angular-devkit/architect@^0.800.0-beta.15": + version "0.800.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.0-rc.0.tgz#76b5722606b25061b18bde219740e6f1f1b2de33" + integrity sha512-oXnXky8D79KLD/rTY9Xsh0UaqJ05USinxMxEy8nE5NP8YB9q9N2SrSmrEZrWZFtDP4fgcnU9ravWoIkNg+o4WA== dependencies: - "@angular-devkit/core" "7.3.6" - rxjs "6.3.3" + "@angular-devkit/core" "8.0.0-rc.0" + rxjs "6.4.0" -"@angular-devkit/core@7.3.3": - version "7.3.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.3.tgz#cd6d5a8eca25ef07b6394bc2b08133d90d08d39f" - integrity sha512-fosULDtMoDWrOyUzTmBkJccOy7zodo02kENyKai7vOv9EWfv9jytkVdNc+jl0ys9OE2QadvSYBo49jhnZxFXfQ== +"@angular-devkit/core@8.0.0-rc.0", "@angular-devkit/core@^8.0.0-beta.15": + version "8.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.0-rc.0.tgz#88002abac814f133aa14d8b2499fe02f6effc9d8" + integrity sha512-7ZCyhpihDnZJ6dMyF/Ux1qGFmTo98KeX6D6YsFcRpFCTirJeLqFmRslwNO9weydgITbvvfiKHsGrkRinJTy2ZQ== dependencies: - ajv "6.9.1" - chokidar "2.0.4" + ajv "6.10.0" fast-json-stable-stringify "2.0.0" - rxjs "6.3.3" + magic-string "0.25.2" + rxjs "6.4.0" source-map "0.7.3" -"@angular-devkit/core@7.3.6": - version "7.3.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.6.tgz#bc11ca571187f0f0ce9df012332794907e0b8133" - integrity sha512-aoarMK0DJIdwjVA0OuQIN7b8nKPcF9n5vSMF7MFmhKpTw5/uV3SynQZbm3YCgylu/2CMuiTzKuAunnWWdli//g== +"@angular-devkit/core@8.0.0-rc.1", "@angular-devkit/core@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.0-rc.1.tgz#25d744ea40eb292bb5fa23ee8246a5ad161c8533" + integrity sha512-kbB03aHCZMgzxditHynGTM7qa0+jPOXPhDn7Lntmaz4p5fkJyY+Y97fKAoTGmNZlpIqziHpAZFlVq2Qjgsktsw== dependencies: - ajv "6.9.1" - chokidar "2.0.4" + ajv "6.10.0" fast-json-stable-stringify "2.0.0" - rxjs "6.3.3" + magic-string "0.25.2" + rxjs "6.4.0" source-map "0.7.3" -"@angular-devkit/core@7.3.7": - version "7.3.7" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41" - integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg== +"@angular-devkit/schematics@8.0.0-rc.0", "@angular-devkit/schematics@^8.0.0-beta.15": + version "8.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.0-rc.0.tgz#c3cfdaf81bd1cf32f85527f9d831e3e8f3226d62" + integrity sha512-QbXzDI7TgGoD4bU8kB3eJ67LoxUvZA9jdo/GQCtHlvvVIrZhazODya5SOTBxgz1i4pGmzYSpygEj/CPSeFxQdw== dependencies: - ajv "6.9.1" - chokidar "2.0.4" - fast-json-stable-stringify "2.0.0" - rxjs "6.3.3" - source-map "0.7.3" + "@angular-devkit/core" "8.0.0-rc.0" + rxjs "6.4.0" -"@angular-devkit/core@^7.0.4": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.1.1.tgz#ce0a674f16188072988502cc3f073b15efcfe194" - integrity sha512-rODqECpOiV6vX+L1qd63GLiF3SG+V1O+d8WYtnKPOxnsMM9yWpWmqmroHtXfisjucu/zwoqj8HoO/noJZCfynw== +"@angular-devkit/schematics@8.0.0-rc.1", "@angular-devkit/schematics@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.0-rc.1.tgz#c9bd70416ed9074f1566358db14cc311aba83ef8" + integrity sha512-tlAk4w9803+WDP4So6CvDyFvWkHbMxqdo80gvWL57z/XXcvGEgvI+NYliW2hOyqI5xNQ4P25Js5+Zgz9TATMoQ== dependencies: - ajv "6.5.3" - chokidar "2.0.4" - fast-json-stable-stringify "2.0.0" - rxjs "6.3.3" - source-map "0.7.3" + "@angular-devkit/core" "8.0.0-rc.1" + rxjs "6.4.0" -"@angular-devkit/schematics@7.3.6": - version "7.3.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.6.tgz#5580b730b1bae5397f5860cfb0d7270fec6e6deb" - integrity sha512-YXF7QusmMy3D9H0vNczc1n5BkuEHLwt7cW33euNeGNgTIsD0n6DrUhgClurXicnr2GNPSDYE5+3115lmJkhyrg== - dependencies: - "@angular-devkit/core" "7.3.6" - rxjs "6.3.3" - -"@angular-devkit/schematics@7.3.7": - version "7.3.7" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581" - integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg== - dependencies: - "@angular-devkit/core" "7.3.7" - rxjs "6.3.3" - -"@angular-devkit/schematics@^7.3.0-rc.0": - version "7.3.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.3.tgz#80e9dc3197a3181f32edfb5c07e7ac016eace7d3" - integrity sha512-SdDq9eKwceb6WLwci1fywtZ/kARR5CYyzi5dZIR1lOxrz00682uUBqH/X39mKdqc6eVqR7rtPceqNm6nQpOIMg== - dependencies: - "@angular-devkit/core" "7.3.3" - rxjs "6.3.3" - -"@angular/animations@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.10.tgz#7f053d57ee242a162cd4e8422032656646b5c8d6" - integrity sha512-Imum1d47Yd2FBfDPt1xUI0ZNsHq/H8S2uAPFlj6tRg0+ZnAKwdO0b0XOiTKSpgrnrTd895aGjRzzSg7lertszw== +"@angular/animations@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-rc.1.tgz#b613da3b474daa3d982dd08cbe744cbbce763e3f" + integrity sha512-Ue16jCa27+TyebCaPFPcTiI7pVe+qreLXCyxxRjumVCb64v2FOAxU3YYqs8AFhSBObYvMXasXwf/VjARyel8nw== dependencies: tslib "^1.9.0" -"@angular/bazel@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-8.0.0-beta.10.tgz#12bfaa42425e92d5e63841b01ed521940c6746ad" - integrity sha512-IIVezd3VRT4GcnBO4F8pgpwv66F6pxiK1opk36ImML4eaHbO3fqXZakO9zgTYBEReSHBG38xNZCxpURm8k+ZQg== +"@angular/bazel@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-8.0.0-rc.1.tgz#740e1595da6fcaebc06dc93a94e750a069e071c6" + integrity sha512-66PUDFpYbcQYBoTM07v3tVXW4D9Gq8ZazLtTKme4Tx2flpUDQAOv3UwXUbankvKRmZIebZlg0M/3hlMggNtL1w== dependencies: - "@angular-devkit/architect" "^0.13.4" - "@angular-devkit/core" "^7.0.4" - "@angular-devkit/schematics" "^7.3.0-rc.0" - "@bazel/typescript" "^0.27.7" + "@angular-devkit/architect" "^0.800.0-beta.15" + "@angular-devkit/core" "^8.0.0-beta.15" + "@angular-devkit/schematics" "^8.0.0-beta.15" "@microsoft/api-extractor" "^7.0.21" - "@schematics/angular" "^7.3.5" + "@schematics/angular" "^8.0.0-beta.15" "@types/node" "6.0.84" semver "^5.6.0" shelljs "0.8.2" - tsickle "0.34.3" + tsickle "^0.35.0" -"@angular/common@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.10.tgz#9f23ea67a24234cdcd86612227a6ff411479cd67" - integrity sha512-L/tnuPTQvdoDGqBizaPN51lTOzK0zPsQDx0uAi7CKM+97nfc1qOlqwYzEh8rnJ1Rad4dbPEwtflpYRmlvqCmoQ== +"@angular/common@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-rc.1.tgz#530223cacccd9c266f922b8525f06617c78242d1" + integrity sha512-/eVx+8mAKibfhPPRm9vhM85YVx8ZSQ01FbwHW9nqKZYUNuJtdZcg6QL/eyraVCi29/GebLKO1LmlNYZWNxOrjA== dependencies: tslib "^1.9.0" -"@angular/compiler-cli@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.10.tgz#29ae5d5ba426026dec57681f8de0e45e4e149cc2" - integrity sha512-t0Ru/dvVve8ZXt16vJlCG8KuH00BM5ilZjnT1EYv4mgf2Yhn23e8vbmS098a6Xmm3MWryp/2nmab0Lu/fHJV5A== +"@angular/compiler-cli@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-rc.1.tgz#0f38ded2ee5523ea68d193a780800c89b70b88b3" + integrity sha512-1VdS3tbGLG76ZqGiTBdFpoGY8CvMbEhrNBtzHzRGVgaUh3nBbup37pg4tsuJyXP3jWHD8TSvveP4f7yWDPyo4w== dependencies: canonical-path "1.0.0" chokidar "^2.1.1" @@ -125,75 +94,68 @@ tslib "^1.9.0" yargs "9.0.1" -"@angular/compiler@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.10.tgz#58867d30c17f2265ff25c1bffbb9e8c38d88684a" - integrity sha512-BBcspibJ4iB4JwFXz+NT/8QVbMR8Dcl+Kn3Q/ZRiDEi57KlongagBNqX2Ve1oVQ7xHooVEz0hSUeF7v9+iipew== +"@angular/compiler@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-rc.1.tgz#8059beebc3c649f5338c567e109bcae4f1ef100e" + integrity sha512-XqbR8KBIK6BBKiTI/lvgvEOIxpRiSIbDlXNixZF9dKqZLEw2u66ONC1avnXi6wUaN1laLavRA0dsQ0Vh34vitA== dependencies: tslib "^1.9.0" -"@angular/core@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.10.tgz#157f0ca07760d43ea92a347cf65e8d8a70e042df" - integrity sha512-Z5jUS++z9uynIha/Xgy+4COo8utAEpMg9rHN7Ha+J9SXRjpdu9iSCdTQAZrHqIMGSq89MjWl5ZN/1u5txm/ICQ== +"@angular/core@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-rc.1.tgz#1e04709846dc8c13008adec8909c5f01ce044cea" + integrity sha512-sx5IMqfzE5OUqWNo1zbp/WzNogDOfBcLPPHCoCIjRArn8yYIql57ItbDkx0pTIQIpYDBP2GMhCnw3jkaqfZmhw== dependencies: tslib "^1.9.0" -"@angular/elements@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-8.0.0-beta.10.tgz#94275ac70a68df44c439cacc38b596d32dc5765b" - integrity sha512-OBjH5rBZQgZQFtSf8Bo5ceyWLFi8s5+iQYt1yKEbu68VAWlZkfXLkzdhgiCAtYRhjBUCGGu4mD/TVh8iRHT4Aw== +"@angular/elements@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-8.0.0-rc.1.tgz#404f59d03c03e7e21eedd4ae9975d4a9c7fb1fb9" + integrity sha512-LjHJJ5VX6aM3GDLnuuFx7IQfhBEQUPEd/BI3Wlnc+H8d+TnNsffatangIWNkkQoURPdU+j510WebDTUOqXS6DA== dependencies: tslib "^1.9.0" -"@angular/forms@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0-beta.10.tgz#d0471fe831f763113c34808e5c3511dda5a47b2d" - integrity sha512-XedT7j6S4zI3ir+X4tRCb45SpQi4hkcR4KJRt+tFHvL0AAer8YXnOlXeaaN1s75gI+tLsJ9r03lNYguMwPswjg== +"@angular/forms@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0-rc.1.tgz#1367d396803fc349d0ad3b9c531db718b15ac1a7" + integrity sha512-kwr/HAInBGC0bsK89Q1TgQrOkU82ZQWIXH7+xK/mzBAFABC4h+T6y4a35IXcuY8nD/YWjOqOreeJkPz5OD0A7g== dependencies: tslib "^1.9.0" -"@angular/http@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/http/-/http-8.0.0-beta.10.tgz#3d30c98aa64603daa3fc5675413c2dc3da3868b2" - integrity sha512-NV2TGnrpivJvOa4/1O/GQfFocPSib4NUieh2umNpJYa2CYjyYfgWpmh+0wDqh23ThPPxRufywZQkkSeb+X9PRA== +"@angular/platform-browser-dynamic@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-rc.1.tgz#0d0b8a469283be13a54a4f0973c3f8ea6644eb34" + integrity sha512-eplgio+52sEX2+UWsaodGTdT6R71NclMOpNW4Cxua8ZkQ05fQWkInx1peMdNbCeYvISOMxMIHlJ9PNxQtOJF0A== dependencies: tslib "^1.9.0" -"@angular/platform-browser-dynamic@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.10.tgz#bb32819dae8aeb430fe247cbbe30dcab8ae9f455" - integrity sha512-1GJdG766uuYx7NkA2aJ4pf/ennsaq0LT+nyM+h79nvsDxqVJA6A3Jq4JQm/mL/VdEr5zIHHiYafERhKWCKGMtw== +"@angular/platform-browser@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-rc.1.tgz#2711d83357f13f4d95831b3e0cca60720c00fabb" + integrity sha512-PIL3e6grfJspFpzMibEETfNEeeJS0aHTBjbrgQRjCVlHXw+VZ3nDM4Kw9PKZ9KMDNmKR13x32Jhwij9nl+xdQQ== dependencies: tslib "^1.9.0" -"@angular/platform-browser@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.10.tgz#0faa0ebedcc5e7e0009e8560112f7b43eff7bca5" - integrity sha512-+Ic5vtBZNiFjq/tLwKEmsQ46/lBJeiOWiFwmktCQRjodkPnOiGwkryoynx7yx05A3ZB0pYignkjJPdtkPVySwA== - dependencies: - tslib "^1.9.0" - -"@angular/platform-server@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.10.tgz#0fc6914b9a9ecb97788a564b0db5e87843c6cc55" - integrity sha512-1l+kB6Kgvdo+cGDI6G9NK21v3bam5++Vwmdp3ww7VkBHwEKx6a+3vAIrgO8tobYzIK/hy8HFLqkelUJQK4dW3Q== +"@angular/platform-server@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-rc.1.tgz#4bd3d4fa21aff4eb0b3d837e2dece0f5489276cd" + integrity sha512-sz20inbCe9SFXoRiKjt8hrf910SnTlF9kf5iDkvBg8ovY0883Kz2BppjQoldMH4q4SKlL6DSutxTiU0FqgTCIQ== dependencies: domino "^2.1.2" tslib "^1.9.0" xhr2 "^0.1.4" -"@angular/router@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.10.tgz#387e9e68eee27bc416dc4d66b87d60ae5c4ef70d" - integrity sha512-LskdWFbMvxNPwzcvl6esxl1LQ6Q4qupEGVJ7e4Tc9QlbzrULnyDTomLJFkDwk1zm+QLxz0JMiXWlfM81RA0uXg== +"@angular/router@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-rc.1.tgz#9dd8b6d47a7ef1766faea6e7df747a8304b1a88d" + integrity sha512-UR6cI3eEh0XBkuAPdp9S+LHa+JN6hqokU5dCptiBhdAh+POpjqGzBiq85XyXc9q8P5BOku6kdcEYcIlodgzzCA== dependencies: tslib "^1.9.0" -"@angular/upgrade@8.0.0-beta.10": - version "8.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-8.0.0-beta.10.tgz#3ba59802f783440c5cd566af1c0d101b2575c3b5" - integrity sha512-CgaUon5RYqbOkpvWwV/vT7lni+P+wCGQA0SxJyre5BMMzdxfyi+auoxEqhOc3F9Kxm6EGQ04eZ1x8ANe//WJKQ== +"@angular/upgrade@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-8.0.0-rc.1.tgz#0c9480a36d4578a9d91a5b7b2313daab55d295d1" + integrity sha512-LCQRF7Rn5tUP+5DEu9+vkg8PzGDahA1zu7nZgPwKGsnw9rQ0PgEzpm9MjwfFs8fBbwDl5V1/ZYkY3RALhEiDjA== dependencies: tslib "^1.9.0" @@ -363,6 +325,30 @@ lodash "^4.17.11" to-fast-properties "^2.0.0" +"@bazel/bazel-darwin_x64@0.24.1": + version "0.24.1" + resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.24.1.tgz#11479d0548d83fea22e664452d3e70c5f2edf94e" + integrity sha512-EF2WlPIQeq4zhkwwSCDJncG/rA1C2xnjUynabzB04KOxEBj0lveqYLgoCvs6L3Y+1vp2TQJmKGVEG6GpYb4uUA== + +"@bazel/bazel-linux_x64@0.24.1": + version "0.24.1" + resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.24.1.tgz#59c61c4ed885fd7ceed1bc9d605db563a51b83bd" + integrity sha512-oFLpfUOzZK4VSOM49FMJjb5UOJ5HXpTZ+zBOVO0hfK+oAkRaRfZjQZoKm6wa67MxfvU4tP/LDWcw7uj6swaGLw== + +"@bazel/bazel-win32_x64@0.24.1": + version "0.24.1" + resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.24.1.tgz#ebc7b9958a5d0bb5ccca761852bcc750d07ec343" + integrity sha512-s+zFYNawvzDLnb0TBY4LmkT+8ZfjMJ6/dyVnH6w8Q24mevnJqTBflcPJUlXoLRCAtaK/S3+1KOfKPccIwDNDDg== + +"@bazel/bazel@^0.24.1": + version "0.24.1" + resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.24.1.tgz#15380c4d5945de47c7be1e3a83e9a8d1607aa33b" + integrity sha512-iTTUqdI2dX4S+fQOGbhr84jRRv9FbYr8GX3L69Z/HurgcDrgErOKo1LGtOuSYqZYaEvQ+ZpV0aP7OzaUsv59WA== + optionalDependencies: + "@bazel/bazel-darwin_x64" "0.24.1" + "@bazel/bazel-linux_x64" "0.24.1" + "@bazel/bazel-win32_x64" "0.24.1" + "@bazel/ibazel@^0.9.0": version "0.9.0" resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.9.0.tgz#fd60023acd36313d304cc2f8c2e181b88b5445cd" @@ -392,12 +378,12 @@ semver "5.6.0" tmp "0.0.33" -"@bazel/typescript@0.27.8", "@bazel/typescript@^0.27.7": - version "0.27.8" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.27.8.tgz#b9a566e4a95c0425b52961e9e899b59c7b22efcf" - integrity sha512-beApzTtgm+lKrhQf5OgPk1amGfi5PJ1DCVVWYbNsbJP/Joi+NgCrgykG55NbaJIzEc+6IQoh8y0QUVMYRt562Q== +"@bazel/typescript@^0.27.12": + version "0.27.12" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.27.12.tgz#79a6468cd8da096c4da151fac658f7f801a59948" + integrity sha512-5cH+x7rvO8P9MCrd8YwJrTyzkET6MLajzngoV5yLDWwcokzs+b3yD9yoa5Vw3Dth2MdKRp+lyGMO7PwyAM3ebw== dependencies: - protobufjs "5.0.3" + protobufjs "6.8.8" semver "5.6.0" source-map-support "0.5.9" tsutils "2.27.2" @@ -972,29 +958,29 @@ dependencies: "@material/feature-targeting" "^0.44.1" -"@microsoft/api-extractor-model@7.0.28": - version "7.0.28" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.0.28.tgz#691b077415143a9015ed1656bca6d0b9a77f58cb" - integrity sha512-kZJaWwdu3z5A1DugJpOZ9dI5+DjIEhqQJwHn2/kLTpsKT7gOyqNRbGHlDGG8xSiJ6/m994+cwh3qSGYDC17dtw== +"@microsoft/api-extractor-model@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.1.0.tgz#57e9805ba0f2322dd12945bb0588eeda522519cd" + integrity sha512-DvaJ1fEpwega9TVMR4xR0jeNV/9JHNMxN/t8TuBftZHSLZzTczh8HyqyFxKo2IwDDCoZy5FmXZsq/vo5JQvRMQ== dependencies: "@microsoft/node-core-library" "3.13.0" - "@microsoft/tsdoc" "0.12.8" + "@microsoft/tsdoc" "0.12.9" "@types/node" "8.5.8" "@microsoft/api-extractor@^7.0.21": - version "7.0.33" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.0.33.tgz#8c209907289765bf67aab09f97d82eb96ed07b70" - integrity sha512-HaOnscz6Cj+LCxa2CLR2COH70HN7yJ3ahqBQjucOeFB45gdZ496sreOTZXLVgmbY520g9FyfppSB3CaHzj68Vw== + version "7.1.0" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.1.0.tgz#5def019a10d9ffa689ce72b1da22894b7d454177" + integrity sha512-hWxDowI0eO33OAROt2Uchej8skajNsjAs3xn0c99EoZ1I9sD3QTicPADvCuxEb584jxkyxuBPHcIF3KXLmgs6Q== dependencies: - "@microsoft/api-extractor-model" "7.0.28" + "@microsoft/api-extractor-model" "7.1.0" "@microsoft/node-core-library" "3.13.0" "@microsoft/ts-command-line" "4.2.3" - "@microsoft/tsdoc" "0.12.8" + "@microsoft/tsdoc" "0.12.9" colors "~1.2.1" lodash "~4.17.5" resolve "1.8.1" source-map "~0.6.1" - typescript "~3.1.6" + typescript "~3.4.3" "@microsoft/node-core-library@3.13.0": version "3.13.0" @@ -1020,10 +1006,10 @@ argparse "~1.0.9" colors "~1.2.1" -"@microsoft/tsdoc@0.12.8": - version "0.12.8" - resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.8.tgz#e9646c91c650d536f37b04762eaa81afdc9a19d3" - integrity sha512-0smzAmVIUCsssAqDSPn9AfOPKUobq2WXMygbzC5JNswAJOs4uJK6DTZgfnHC8QLE2q374sPNwWU5D5LuoAJQSA== +"@microsoft/tsdoc@0.12.9": + version "0.12.9" + resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.9.tgz#f92538bebf649b1b9d00bdd34a9c9971aef17d01" + integrity sha512-sDhulvuVk65eMppYOE6fr6mMI6RUqs53KUg9deYzNCBpP+2FhR0OFB5innEfdtSedk0LK+1Ppu6MxkfiNjS/Cw== "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" @@ -1053,23 +1039,74 @@ universal-user-agent "^2.0.0" url-template "^2.0.8" -"@schematics/angular@7.3.7": - version "7.3.7" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91" - integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw== - dependencies: - "@angular-devkit/core" "7.3.7" - "@angular-devkit/schematics" "7.3.7" - typescript "3.2.4" +"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" + integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78= -"@schematics/angular@^7.3.5": - version "7.3.6" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.6.tgz#e827111e7d3cdf950efcca504389cbade3c9c59a" - integrity sha512-Q4VXAjVaCDb2zXFXoIdOfNPsn+EQjqDBHK4a97omytnSNAmu1erl3l2FkEMi6x/VuzK2mQSzBbmHJIgauMmOAA== +"@protobufjs/base64@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" + integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== + +"@protobufjs/codegen@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" + integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== + +"@protobufjs/eventemitter@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" + integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A= + +"@protobufjs/fetch@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" + integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU= dependencies: - "@angular-devkit/core" "7.3.6" - "@angular-devkit/schematics" "7.3.6" - typescript "3.2.4" + "@protobufjs/aspromise" "^1.1.1" + "@protobufjs/inquire" "^1.1.0" + +"@protobufjs/float@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" + integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E= + +"@protobufjs/inquire@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" + integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik= + +"@protobufjs/path@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" + integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= + +"@protobufjs/pool@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" + integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q= + +"@protobufjs/utf8@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" + integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= + +"@schematics/angular@^8.0.0-beta.15": + version "8.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.0-rc.0.tgz#3d4e626642f56160f176a6877e76322cdd775fc8" + integrity sha512-LY9GcGAgPjSwXIt2MKqLIoeA5hOsrWHSbVUqyHZOV7G4vbHH9tGRI5svU3aqdaAuJ7GXCi5cOJsAXdSL1KazGg== + dependencies: + "@angular-devkit/core" "8.0.0-rc.0" + "@angular-devkit/schematics" "8.0.0-rc.0" + +"@schematics/angular@^8.0.0-rc.1": + version "8.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.0-rc.1.tgz#e55469127de0231961f5ceb4f8f18b8f83f94a9f" + integrity sha512-roi4ehUSVQ7aHHqIkO1NQDilpaBLBuLpgIRBc20dRh3rUHFeELuUTWSG2N+lqz4b5/rn+HP7UxQic48zeOO7zQ== + dependencies: + "@angular-devkit/core" "8.0.0-rc.1" + "@angular-devkit/schematics" "8.0.0-rc.1" "@sindresorhus/is@^0.7.0": version "0.7.0" @@ -1209,6 +1246,11 @@ resolved "https://registry.yarnpkg.com/@types/jju/-/jju-1.4.1.tgz#0a39f5f8e84fec46150a7b9ca985c3f89ad98e9f" integrity sha512-LFt+YA7Lv2IZROMwokZKiPNORAV5N3huMs3IKnzlE430HWhWYZ8b+78HiwJXJJP1V2IEjinyJURuRJfGoaFSIA== +"@types/long@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz#719551d2352d301ac8b81db732acb6bdc28dbdef" + integrity sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q== + "@types/marked@^0.4.2": version "0.4.2" resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.4.2.tgz#64a89e53ea37f61cc0f3ee1732c555c2dbf6452f" @@ -1251,9 +1293,9 @@ "@types/node" "*" "@types/node@*": - version "10.12.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.12.tgz#e15a9d034d9210f00320ef718a50c4a799417c47" - integrity sha512-Pr+6JRiKkfsFvmU/LK68oBRCQeEg36TyAbPhc2xpez24OOZZCuoIhWGTd39VZy6nGafSbxzGouFPTFD/rR1A0A== + version "11.13.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.7.tgz#85dbb71c510442d00c0631f99dae957ce44fd104" + integrity sha512-suFHr6hcA9mp8vFrZTgrmqW2ZU3mbWsryQtQlY/QvwTISCw7nw/j+bCQPPohqmskhmqa5wLNuMHTTsc+xf1MQg== "@types/node@6.0.84": version "6.0.84" @@ -1265,6 +1307,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.8.tgz#92509422653f10e9c0ac18d87e0610b39f9821c7" integrity sha512-8KmlRxwbKZfjUHFIt3q8TF5S2B+/E5BaAoo/3mgc5h6FJzqxXkCK/VMetO+IRDtwtU6HUvovHMBn+XRj7SV9Qg== +"@types/node@^10.1.0": + version "10.14.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.5.tgz#27733a949f5d9972d87109297cffb62207ace70f" + integrity sha512-Ja7d4s0qyGFxjGeDq5S7Si25OFibSAHUi6i17UWnwNnpitADN7hah9q0Tl25gxuV5R1u2Bx+np6w4LHXfHyj/g== + "@types/node@^6.0.46": version "6.14.2" resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.2.tgz#40b3dbb1221c7d66802cbcc32fe3b85e54569c77" @@ -1562,20 +1609,10 @@ agent-base@4, agent-base@^4.1.0: dependencies: es6-promisify "^5.0.0" -ajv@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9" - integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg== - dependencies: - fast-deep-equal "^2.0.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@6.9.1: - version "6.9.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1" - integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA== +ajv@6.10.0: + version "6.10.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1" + integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg== dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -1873,14 +1910,6 @@ asap@^2.0.3, asap@~2.0.6: resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= -ascli@~1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc" - integrity sha1-vPpZdKYvGOgcq660lzKrSoj5Brw= - dependencies: - colour "~0.7.1" - optjs "~3.2.2" - asn1@~0.2.3: version "0.2.4" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" @@ -1914,9 +1943,9 @@ async-each-series@0.1.1: integrity sha1-dhfBkXQB/Yykooqtzj266Yr+tDI= async-each@^1.0.0, async-each@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" - integrity sha1-GdOGodntxufByF04iu28xW0zYC0= + version "1.0.3" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" + integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== async-foreach@^0.1.3: version "0.1.3" @@ -2136,9 +2165,9 @@ big-integer@^1.6.17: integrity sha512-JgwrfTfdSxDQGRPx3j9hHrag/Ih2oCQwE/kMHW5tujSyjLFLk3hbum5ZJhaginvQ2LBw2YxGgP73AquAWNW/ZA== binary-extensions@^1.0.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14" - integrity sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg== + version "1.13.1" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" + integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== binary@~0.3.0: version "0.3.0" @@ -2434,13 +2463,6 @@ builtin-modules@^2.0.0: resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e" integrity sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg== -bytebuffer@~5: - version "5.0.1" - resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd" - integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0= - dependencies: - long "~3" - bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -2636,7 +2658,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.4.2: +chalk@^2.3.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== @@ -2699,7 +2721,7 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== -chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.3, chokidar@^2.0.4: +chokidar@^2.0.0, chokidar@^2.0.3, chokidar@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26" integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ== @@ -2720,9 +2742,9 @@ chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.3, chokidar@^2.0.4: fsevents "^1.2.2" chokidar@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058" - integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg== + version "2.1.5" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d" + integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A== dependencies: anymatch "^2.0.0" async-each "^1.0.1" @@ -2734,7 +2756,7 @@ chokidar@^2.1.1: normalize-path "^3.0.0" path-is-absolute "^1.0.0" readdirp "^2.2.1" - upath "^1.1.0" + upath "^1.1.1" optionalDependencies: fsevents "^1.2.7" @@ -2976,11 +2998,6 @@ colors@~1.2.1: resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc" integrity sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg== -colour@~0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778" - integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g= - combine-lists@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6" @@ -3000,11 +3017,16 @@ commander@2.17.x, commander@~2.17.1: resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.11.0, commander@^2.12.1, commander@^2.2.0, commander@^2.7.1, commander@^2.8.1: +commander@^2.11.0, commander@^2.12.1, commander@^2.2.0, commander@^2.8.1: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== +commander@^2.7.1: + version "2.20.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" + integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== + compare-func@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648" @@ -3025,11 +3047,16 @@ component-bind@1.0.0: resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= -component-emitter@1.2.1, component-emitter@^1.2.1: +component-emitter@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= +component-emitter@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + component-inherit@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" @@ -3511,7 +3538,7 @@ dateformat@^3.0.0: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3: +debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -3746,7 +3773,7 @@ didyoumean@^1.2.1: resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.1.tgz#e92edfdada6537d484d73c0172fd1eba0c4976ff" integrity sha1-6S7f2tplN9SE1zwBcv0eugxJdv8= -diff@^3.1.0, diff@^3.2.0: +diff@^3.1.0, diff@^3.2.0, diff@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== @@ -4793,21 +4820,13 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@^1.2.2: - version "1.2.4" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" - integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg== +fsevents@^1.2.2, fsevents@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.8.tgz#57ea5320f762cd4696e5e8e87120eccc8b11cacf" + integrity sha512-tPvHgPGB7m40CZ68xqFGkKuzN+RnpGmSV+hgeKxhRpbxdqKXUFJGC3yonBOLzQBcJyGpdZFDfCsdOC2KFsXzeA== dependencies: - nan "^2.9.2" - node-pre-gyp "^0.10.0" - -fsevents@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4" - integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw== - dependencies: - nan "^2.9.2" - node-pre-gyp "^0.10.0" + nan "^2.12.1" + node-pre-gyp "^0.12.0" fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10: version "1.0.11" @@ -5984,7 +6003,12 @@ inquirer@^6.2.0: strip-ansi "^5.0.0" through "^2.3.6" -interpret@^1.0.0, interpret@^1.1.0: +interpret@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" + integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== + +interpret@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ= @@ -6200,9 +6224,9 @@ is-glob@^3.1.0: is-extglob "^2.1.0" is-glob@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" - integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A= + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== dependencies: is-extglob "^2.1.1" @@ -7368,10 +7392,10 @@ log4js@^3.0.0: rfdc "^1.1.2" streamroller "0.7.0" -long@~3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" - integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s= +long@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" + integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== longest-streak@^2.0.1: version "2.0.2" @@ -7438,6 +7462,13 @@ macos-release@^2.0.0: resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.0.0.tgz#7dddf4caf79001a851eb4fba7fb6034f251276ab" integrity sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A== +magic-string@0.25.2, magic-string@^0.25.0: + version "0.25.2" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9" + integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg== + dependencies: + sourcemap-codec "^1.4.4" + magic-string@^0.22.4: version "0.22.5" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e" @@ -7445,13 +7476,6 @@ magic-string@^0.22.4: dependencies: vlq "^0.2.2" -magic-string@^0.25.0: - version "0.25.1" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e" - integrity sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg== - dependencies: - sourcemap-codec "^1.4.1" - make-dir@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -7826,9 +7850,9 @@ minipass@^2.2.1, minipass@^2.3.4: yallist "^3.0.0" minizlib@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42" - integrity sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg== + version "1.2.1" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614" + integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA== dependencies: minipass "^2.2.1" @@ -7922,11 +7946,16 @@ mute-stream@0.0.7, mute-stream@~0.0.4: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= -nan@^2.10.0, nan@^2.9.2: +nan@^2.10.0: version "2.11.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766" integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA== +nan@^2.12.1: + version "2.13.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7" + integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw== + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -7965,11 +7994,11 @@ ncp@1.0.x: integrity sha1-0VNn5cuHQyuhF9K/gP30Wuz7QkY= needle@^2.2.1: - version "2.2.4" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e" - integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA== + version "2.3.1" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.1.tgz#d272f2f4034afb9c4c9ab1379aabc17fc85c9388" + integrity sha512-CaLXV3W8Vnbps8ZANqDGz7j4x7Yj1LW4TWF/TQuDfj7Cfx4nAPTvw98qgTevtto1oHDrh3pQkaODbqupXlsWTg== dependencies: - debug "^2.1.2" + debug "^4.1.0" iconv-lite "^0.4.4" sax "^1.2.4" @@ -8035,10 +8064,10 @@ node-html-encoder@0.0.2: resolved "https://registry.yarnpkg.com/node-html-encoder/-/node-html-encoder-0.0.2.tgz#8973618d727da5526a830b47d07c0d803e0a15c6" integrity sha1-iXNhjXJ9pVJqgwtH0HwNgD4KFcY= -node-pre-gyp@^0.10.0: - version "0.10.3" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" - integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A== +node-pre-gyp@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" + integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A== dependencies: detect-libc "^1.0.2" mkdirp "^0.5.1" @@ -8123,7 +8152,7 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5: +normalize-package-data@^2.3.0, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== @@ -8133,6 +8162,16 @@ normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package- semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-package-data@^2.3.2: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" @@ -8165,14 +8204,14 @@ normalize-url@2.0.1: sort-keys "^2.0.0" npm-bundled@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979" - integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g== + version "1.0.6" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd" + integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g== npm-packlist@^1.1.6: - version "1.1.12" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a" - integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g== + version "1.4.1" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc" + integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw== dependencies: ignore-walk "^3.0.1" npm-bundled "^1.0.1" @@ -8382,11 +8421,6 @@ optionator@^0.8.1: type-check "~0.3.2" wordwrap "~1.0.0" -optjs@~3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee" - integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4= - ora@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4" @@ -8680,7 +8714,7 @@ path-key@^2.0.0, path-key@^2.0.1: resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= -path-parse@^1.0.5: +path-parse@^1.0.5, path-parse@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== @@ -9007,15 +9041,24 @@ prompt@1.0.0: utile "0.3.x" winston "2.1.x" -protobufjs@5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17" - integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA== +protobufjs@6.8.8: + version "6.8.8" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.8.tgz#c8b4f1282fd7a90e6f5b109ed11c84af82908e7c" + integrity sha512-AAmHtD5pXgZfi7GMpllpO3q1Xw1OYldr+dMUlAnffGTAhqkg72WdmSY71uKBF/JuyiKs8psYbtKrhi0ASCD8qw== dependencies: - ascli "~1" - bytebuffer "~5" - glob "^7.0.5" - yargs "^3.10.0" + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.0" + "@types/node" "^10.1.0" + long "^4.0.0" protochain@^1.0.5: version "1.0.5" @@ -9355,9 +9398,9 @@ redent@^2.0.0: strip-indent "^2.0.0" reflect-metadata@^0.1.2: - version "0.1.12" - resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2" - integrity sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A== + version "0.1.13" + resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" + integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== regenerate@^1.2.1: version "1.4.0" @@ -9604,13 +9647,20 @@ resolve@1.1.x: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@1.8.1, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.4.0: +resolve@1.8.1, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.4.0: version "1.8.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26" integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA== dependencies: path-parse "^1.0.5" +resolve@^1.1.6, resolve@^1.10.0: + version "1.10.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.1.tgz#664842ac960795bbe758221cdccda61fb64b5f18" + integrity sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA== + dependencies: + path-parse "^1.0.6" + resp-modifier@6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f" @@ -9677,14 +9727,14 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@2.6.2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1: +rimraf@2, rimraf@2.6.2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w== dependencies: glob "^7.0.5" -rimraf@2.6.3: +rimraf@2.6.3, rimraf@^2.6.1: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== @@ -9767,10 +9817,10 @@ rx@4.1.0: resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= -rxjs@6.3.3, rxjs@^6.1.0: - version "6.3.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55" - integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw== +rxjs@6.4.0, rxjs@^6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504" + integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw== dependencies: tslib "^1.9.0" @@ -9781,10 +9831,10 @@ rxjs@^5.5.6: dependencies: symbol-observable "1.0.1" -rxjs@^6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504" - integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw== +rxjs@^6.1.0: + version "6.3.3" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55" + integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw== dependencies: tslib "^1.9.0" @@ -9915,16 +9965,21 @@ semver-greatest-satisfied-range@^1.1.0: dependencies: sver-compat "^1.5.0" -"semver@2 || 3 || 4 || 5", semver@5.6.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.2.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" - integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.6.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" + integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== semver@5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== +semver@5.6.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.2.0, semver@^5.4.1, semver@^5.5.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" + integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== + semver@^4.1.0: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" @@ -10309,7 +10364,7 @@ source-map@~0.2.0: dependencies: amdefine ">=0.0.4" -sourcemap-codec@^1.3.0, sourcemap-codec@^1.4.1: +sourcemap-codec@^1.3.0, sourcemap-codec@^1.4.4: version "1.4.4" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f" integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg== @@ -10320,9 +10375,9 @@ sparkles@^1.0.0: integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw== spdx-correct@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.2.tgz#19bb409e91b47b1ad54159243f7312a858db3c2e" - integrity sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ== + version "3.1.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" + integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q== dependencies: spdx-expression-parse "^3.0.0" spdx-license-ids "^3.0.0" @@ -10341,9 +10396,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz#a59efc09784c2a5bada13cfeaf5c75dd214044d2" - integrity sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg== + version "3.0.4" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1" + integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA== spdx-license-list@^2.1.0: version "2.1.0" @@ -11103,6 +11158,15 @@ tryit@^1.0.1: resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb" integrity sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics= +ts-api-guardian@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/ts-api-guardian/-/ts-api-guardian-0.4.4.tgz#12dfcfa5c5d6c5a8cb2f1b7cc322b9510a81814c" + integrity sha512-nWJQRNSeV+er9/deUo/tdYD7Rm7tKOwbcexI8UbqrzC3uAGm2UWncZ9USK0i6kTvT5hCvhW5VNw76JQ8L7Aq8A== + dependencies: + chalk "^2.3.1" + diff "^3.5.0" + minimist "^1.2.0" + ts-node@^3.0.4: version "3.3.0" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-3.3.0.tgz#c13c6a3024e30be1180dd53038fc209289d4bf69" @@ -11136,19 +11200,10 @@ tsconfig@^6.0.0: strip-bom "^3.0.0" strip-json-comments "^2.0.0" -tsickle@0.34.3: - version "0.34.3" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.34.3.tgz#8085067a26d7bff466ddadb2eba18849b49159b8" - integrity sha512-mb1v3nsr6rYaZky22xj0d6qv4ogAR40Bc6r37jwWOg3bEIO/ZppEFZiEADs/NNVLcWTPgmNmPZgaX5CfAH6oXA== - dependencies: - minimist "^1.2.0" - mkdirp "^0.5.1" - source-map "^0.7.3" - -tsickle@^0.34.0: - version "0.34.0" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.34.0.tgz#10187fa6401a288a65efb93a60bf28b2ff95f90b" - integrity sha512-O3wCPRtL18Hc/ZBnaiKwmmjVzeCWTOTpsi0btfC7FWL3RnXpxLPxD6hoJ0QEXuSfG/0QJk+MWNjqT9N6fOyyIg== +tsickle@^0.35.0: + version "0.35.0" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.35.0.tgz#59235df45937c0ec5d072c616c26d2d97fba54b9" + integrity sha512-irsZLX4293YUl9TuwNC5Fy020eLSc4bC3LfKnxnx1oq5wmZD9zSP8qvNNTiwRmf2/rxH+58JINcTARDjuvn+oQ== dependencies: minimist "^1.2.0" mkdirp "^0.5.1" @@ -11231,25 +11286,15 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d" - integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg== - typescript@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5" integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg== -typescript@~3.1.6: - version "3.1.6" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68" - integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA== - -typescript@~3.3.3333: - version "3.3.4000" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0" - integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA== +typescript@~3.4, typescript@~3.4.3: + version "3.4.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99" + integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw== ua-parser-js@0.7.17: version "0.7.17" @@ -11442,10 +11487,10 @@ unzipper@^0.9.3: readable-stream "~2.3.6" setimmediate "~1.0.4" -upath@^1.0.5, upath@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" - integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw== +upath@^1.0.5, upath@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068" + integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q== update-notifier@^0.5.0: version "0.5.0" @@ -12142,7 +12187,7 @@ yargs@^11.0.0: y18n "^3.2.1" yargs-parser "^9.0.2" -yargs@^3.10.0, yargs@^3.32.0: +yargs@^3.32.0: version "3.32.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=