diff --git a/package-lock.json b/package-lock.json index f7ea4414dbb..b906f59abb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@angular-devkit/core": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.7.1.tgz", - "integrity": "sha512-m+j1d+oMZRu0jUN7UyE4C8Kh8YoY9TP6ltjcrO2SzE89mzHg+apY1taf4EzOYKrrCZxw7Q4viPa8EXeF2AJ1cQ==", + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.7.4.tgz", + "integrity": "sha512-Blh44vzZVzE8B9xIwjRoo7hXPGSDdlrrax0rntvt3DDGVTjsSGm43qT95aDmXiwJruOCJNC5DsaP3+tTAkAyQQ==", "dev": true, "requires": { "ajv": "~6.4.0", @@ -25,12 +25,12 @@ } }, "@angular-devkit/schematics": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.7.1.tgz", - "integrity": "sha512-8G223dq6RgV1tvp3od6mn5TX3VH57OWCN+v6pz4o27pDOQUhxX94VeuetOrhe2oYu4nmcs8epCateG4CJF7phg==", + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.7.4.tgz", + "integrity": "sha512-Gkm2mBMm6a0mNKqZsAcS42VaO7zNSIXhIKbMyZQIcQ1ZMwbsx+Rs0dliQwFVfEVCNGc1pjh0Idc5O5V/g/N5Fw==", "dev": true, "requires": { - "@angular-devkit/core": "0.7.1", + "@angular-devkit/core": "0.7.4", "rxjs": "^6.0.0" } }, @@ -1027,20 +1027,20 @@ "dev": true }, "@schematics/angular": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.7.1.tgz", - "integrity": "sha512-wvP1ofwKVIbu3UCCsLTxdNZ7D0iVl0njoHvFEiMAQEVO+1VnhY3y+xpvnujhmU0pdYfIv17mc/hRNwEH6gQwkQ==", + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.7.4.tgz", + "integrity": "sha512-/KJH5fPv+40VdadWmVnXR2GlvFZKYH01eYw7XOi77gXM896gk2tGlWmm+6RjUaVyec49ivusmmhRJEjiTyA7NA==", "dev": true, "requires": { - "@angular-devkit/core": "0.7.1", - "@angular-devkit/schematics": "0.7.1", - "typescript": ">=2.6.2 <2.8" + "@angular-devkit/core": "0.7.4", + "@angular-devkit/schematics": "0.7.4", + "typescript": ">=2.6.2 <2.10" }, "dependencies": { "typescript": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", - "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", + "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==", "dev": true } } @@ -4001,7 +4001,7 @@ }, "typescript": { "version": "2.7.2", - "resolved": "http://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==", "dev": true } diff --git a/package.json b/package.json index f88b31ca8ba..4bb03b92d38 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,8 @@ "zone.js": "^0.8.26" }, "devDependencies": { - "@angular-devkit/core": "^0.7.1", - "@angular-devkit/schematics": "^0.7.1", + "@angular-devkit/core": "0.7.4", + "@angular-devkit/schematics": "0.7.4", "@angular/bazel": "7.0.0-beta.4", "@angular/compiler-cli": "7.0.0-beta.4", "@angular/http": "7.0.0-beta.4", @@ -56,7 +56,7 @@ "@bazel/ibazel": "0.3.1", "@google-cloud/storage": "^1.1.1", "@octokit/rest": "^15.9.4", - "@schematics/angular": "^0.7.1", + "@schematics/angular": "0.7.4", "@types/chalk": "^0.4.31", "@types/fs-extra": "^4.0.3", "@types/glob": "^5.0.33", diff --git a/src/lib/schematics/collection.json b/src/lib/schematics/collection.json index f0c18f03027..58ef352854a 100644 --- a/src/lib/schematics/collection.json +++ b/src/lib/schematics/collection.json @@ -7,7 +7,7 @@ "description": "Adds Angular Material to the application without affecting any templates", "factory": "./install", "schema": "./install/schema.json", - "aliases": ["material-shell"] + "aliases": ["material-shell", "install"] }, // Create a dashboard component "dashboard": { @@ -28,22 +28,21 @@ "description": "Create a component with a responsive sidenav for navigation", "factory": "./nav/index", "schema": "./nav/schema.json", - // TODO(devversion): re-add `materialNav` alias if we have the latest schematics version - // that includes https://github.com/angular/angular-cli/pull/11390 - "aliases": [ "material-nav"] + "aliases": ["material-nav", "materialNav"] }, // Create a file tree component "tree": { "description": "Create a file tree component.", "factory": "./tree/index", - "schema": "./tree/schema.json" + "schema": "./tree/schema.json", + "aliases": ["material-tree"] }, // Creates a address form component "addressForm": { "description": "Create a component with a address form", "factory": "./address-form/index", "schema": "./address-form/schema.json", - "aliases": ["address-form"] + "aliases": ["address-form", "material-address-form", "material-addressForm"] } } }