diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json index c198cf94b934..d2a7edf80e50 100644 --- a/packages/angular/cli/lib/config/schema.json +++ b/packages/angular/cli/lib/config/schema.json @@ -1645,11 +1645,6 @@ "type": "string", "description": "Override suite in the protractor config." }, - "elementExplorer": { - "type": "boolean", - "description": "Start Protractor's Element Explorer for debugging.", - "default": false - }, "webdriverUpdate": { "type": "boolean", "description": "Try to update webdriver.", diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts index 40f6a78a558d..755324d83c78 100644 --- a/packages/angular_devkit/build_angular/src/protractor/index.ts +++ b/packages/angular_devkit/build_angular/src/protractor/index.ts @@ -26,7 +26,6 @@ interface JasmineNodeOpts { function runProtractor(root: string, options: ProtractorBuilderOptions): Promise { const additionalProtractorConfig: Partial & Partial = { - elementExplorer: options.elementExplorer, baseUrl: options.baseUrl, specs: options.specs && options.specs.length ? options.specs : undefined, suite: options.suite, diff --git a/packages/angular_devkit/build_angular/src/protractor/schema.json b/packages/angular_devkit/build_angular/src/protractor/schema.json index 4fbf3cf04cb6..c4fd14eff06a 100644 --- a/packages/angular_devkit/build_angular/src/protractor/schema.json +++ b/packages/angular_devkit/build_angular/src/protractor/schema.json @@ -35,11 +35,6 @@ "type": "string", "description": "Override suite in the protractor config." }, - "elementExplorer": { - "type": "boolean", - "description": "Start Protractor's Element Explorer for debugging.", - "default": false - }, "webdriverUpdate": { "type": "boolean", "description": "Try to update webdriver.", diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json index c8702d82b872..3ea6dfa9cf9c 100644 --- a/packages/schematics/angular/migrations/migration-collection.json +++ b/packages/schematics/angular/migrations/migration-collection.json @@ -65,11 +65,6 @@ "factory": "./update-10/rename-browserslist-config", "description": "Update Browserslist configurations to '.browserslistrc'." }, - "update-workspace-dependencies": { - "version": "10.0.0-beta.1", - "factory": "./update-10/update-dependencies", - "description": "Workspace dependencies updates." - }, "remove-es5-browser-support-option": { "version": "10.0.0-beta.2", "factory": "./update-10/remove-es5-browser-support", @@ -80,11 +75,6 @@ "factory": "./update-9/schematic-options", "description": "Replace deprecated 'styleext' and 'spec' Angular schematic options." }, - "update-angular-config": { - "version": "10.0.0-beta.3", - "factory": "./update-10/update-angular-config", - "description": "Remove various deprecated builders options from 'angular.json'." - }, "side-effects-package-json": { "version": "10.0.0-beta.3", "factory": "./update-10/side-effects-package-json", @@ -94,6 +84,16 @@ "version": "10.0.0-beta.3", "factory": "./update-10/update-module-and-target-compiler-options", "description": "Update 'module' and 'target' TypeScript compiler options." + }, + "update-workspace-dependencies": { + "version": "10.0.0-beta.6", + "factory": "./update-10/update-dependencies", + "description": "Workspace dependencies updates." + }, + "update-angular-config": { + "version": "10.0.0-beta.6", + "factory": "./update-10/update-angular-config", + "description": "Remove various deprecated builders options from 'angular.json'." } } } diff --git a/packages/schematics/angular/migrations/update-10/update-angular-config.ts b/packages/schematics/angular/migrations/update-10/update-angular-config.ts index 611f4210d431..c64101afdc1c 100644 --- a/packages/schematics/angular/migrations/update-10/update-angular-config.ts +++ b/packages/schematics/angular/migrations/update-10/update-angular-config.ts @@ -31,9 +31,16 @@ export default function (): Rule { continue; } - let extraOptionsToRemove = {}; + let optionsToRemove: Record = { + evalSourceMap: undefined, + skipAppShell: undefined, + profile: undefined, + elementExplorer: undefined, + }; + if (target.builder === Builders.Server) { - extraOptionsToRemove = { + optionsToRemove = { + ...optionsToRemove, vendorChunk: undefined, commonChunk: undefined, }; @@ -43,10 +50,7 @@ export default function (): Rule { if (target.options) { target.options = { ...updateVendorSourceMap(target.options), - evalSourceMap: undefined, - skipAppShell: undefined, - profile: undefined, - ...extraOptionsToRemove, + ...optionsToRemove, }; } @@ -58,10 +62,7 @@ export default function (): Rule { for (const configurationName of Object.keys(target.configurations)) { target.configurations[configurationName] = { ...updateVendorSourceMap(target.configurations[configurationName]), - evalSourceMap: undefined, - skipAppShell: undefined, - profile: undefined, - ...extraOptionsToRemove, + ...optionsToRemove, }; } } diff --git a/packages/schematics/angular/migrations/update-10/update-dependencies.ts b/packages/schematics/angular/migrations/update-10/update-dependencies.ts index a50952295f2e..4525a94cf5fc 100644 --- a/packages/schematics/angular/migrations/update-10/update-dependencies.ts +++ b/packages/schematics/angular/migrations/update-10/update-dependencies.ts @@ -16,7 +16,7 @@ export default function (): Rule { return (host, context) => { const dependenciesToUpdate: Record = { 'karma': '~5.0.0', - 'protractor': '~5.4.4', + 'protractor': '~7.0.0', 'ng-packagr': latestVersions.ngPackagr, }; diff --git a/packages/schematics/angular/workspace/files/package.json.template b/packages/schematics/angular/workspace/files/package.json.template index 8c086cd0a00c..ceb517186b35 100644 --- a/packages/schematics/angular/workspace/files/package.json.template +++ b/packages/schematics/angular/workspace/files/package.json.template @@ -37,7 +37,7 @@ "karma-coverage-istanbul-reporter": "~3.0.2", "karma-jasmine": "~3.1.1", "karma-jasmine-html-reporter": "^1.4.2", - "protractor": "~5.4.3",<% } %> + "protractor": "~7.0.0",<% } %> "ts-node": "~8.3.0", "tslint": "~6.1.0", "typescript": "<%= latestVersions.TypeScript %>" diff --git a/tests/legacy-cli/e2e/tests/basic/e2e.ts b/tests/legacy-cli/e2e/tests/basic/e2e.ts index c3c7db2d6c49..8f7ef2de0569 100644 --- a/tests/legacy-cli/e2e/tests/basic/e2e.ts +++ b/tests/legacy-cli/e2e/tests/basic/e2e.ts @@ -57,13 +57,6 @@ export default function () { }, `, `allScriptsTimeout: 11000,` )) - // Should start up Element Explorer - .then(() => execAndWaitForOutputToMatch('ng', ['e2e', 'test-project', '--element-explorer'], - /Element Explorer/)) - .then(() => killAllProcesses(), (err: any) => { - killAllProcesses(); - throw err; - }) // Should run side-by-side with `ng serve` .then(() => execAndWaitForOutputToMatch('ng', ['serve'], /: Compiled successfully./))