feat(all): use targets instead of architect

ng-alain · Sep 9, 2018 · 8bcb619 · 8bcb619
1 parent b672c36
commit 8bcb619
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
diff --git a/angular.json b/angular.json
@@ -7,7 +7,7 @@
       "root": "",
       "sourceRoot": "src",
       "projectType": "application",
-      "architect": {
+      "targets": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
@@ -107,7 +107,7 @@
       "root": "",
       "sourceRoot": "",
       "projectType": "application",
-      "architect": {
+      "targets": {
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {

diff --git a/packages/schematics/plugin/plugin.g2.spec.ts b/packages/schematics/plugin/plugin.g2.spec.ts
@@ -19,7 +19,8 @@ describe('NgAlainSchematic: plugin: g2', () => {
     it(`should add scripts`, () => {
       const json = JSON.parse(tree.readContent('angular.json'));
       const scripts: string[] =
-        json.projects.foo.architect.build.options.scripts || [];
+        (json.projects.foo.architect || json.projects.foo.targets).build.options
+          .scripts || [];
       expect(scripts.filter(w => w.includes('g2')).length).toBeGreaterThan(0);
     });
   });
@@ -36,7 +37,8 @@ describe('NgAlainSchematic: plugin: g2', () => {
     it(`should add scripts`, () => {
       const json = JSON.parse(tree.readContent('angular.json'));
       const scripts: string[] =
-        json.projects.foo.architect.build.options.scripts || [];
+        (json.projects.foo.architect || json.projects.foo.targets).build.options
+          .scripts || [];
       expect(scripts.filter(w => w.includes('g2')).length).toBe(0);
     });
   });

diff --git a/packages/schematics/plugin/plugin.hmr.ts b/packages/schematics/plugin/plugin.hmr.ts
@@ -16,7 +16,7 @@ function configToAngularJson(host: Tree, options: PluginOptions) {
   const json = getAngular(host);
   const project = getProjectFromWorkspace(json, options.project);
   // add build config
-  project.architect!.build!.configurations['hmr'] = {
+  project.targets!.build!.configurations['hmr'] = {
     fileReplacements: [
       {
         replace: `${options.sourceRoot}/environments/environment.ts`,
@@ -25,7 +25,7 @@ function configToAngularJson(host: Tree, options: PluginOptions) {
     ],
   };
   // add serve config
-  project.architect!.serve!.configurations['hmr'] = {
+  project.targets!.serve!.configurations['hmr'] = {
     browserTarget: `${project.name}:build:hmr`,
     hmr: true,
   };

diff --git a/packages/schematics/update/update.ts b/packages/schematics/update/update.ts
@@ -48,9 +48,9 @@ function getTsConfigPaths(tree: Tree): string[] {
   const workspace = getWorkspace(tree);
 
   for (const project of Object.values(workspace.projects)) {
-    if (project && project.architect) {
+    if (project && (project.architect || project.targets)) {
       for (const taskName of ['build', 'test']) {
-        const task = project.architect[taskName];
+        const task = (project.architect || project.targets)[taskName];
         if (task && task.options && task.options.tsConfig) {
           const tsConfigOption = task.options.tsConfig;
           if (typeof tsConfigOption === 'string') {

diff --git a/packages/schematics/utils/html.ts b/packages/schematics/utils/html.ts
@@ -5,7 +5,7 @@ import { Project } from './project';
 
 /** Gets the app index.html file */
 export function getIndexHtmlPath(host: Tree, project: Project): string {
-  const buildTarget = project.architect.build.options;
+  const buildTarget = project.targets.build.options;
 
   if (buildTarget.index && buildTarget.index.endsWith('index.html')) {
     return buildTarget.index;

diff --git a/packages/schematics/utils/json.ts b/packages/schematics/utils/json.ts
@@ -93,8 +93,8 @@ export function scriptsToAngularJson(
   const json = getAngular(host);
   const project = getProjectFromWorkspace(json, projectName);
   types.forEach(type => {
-    const scriptsNode = project.architect[type]!.options!.scripts as string[];
-    const stylesNode = project.architect[type]!.options!.styles as string[];
+    const scriptsNode = project.targets[type]!.options!.scripts as string[];
+    const stylesNode = project.targets[type]!.options!.styles as string[];
     for (const path of resources) {
       const list = path.endsWith('.js') ? scriptsNode : stylesNode;
       if (behavior === 'add') {

diff --git a/packages/schematics/utils/project.ts b/packages/schematics/utils/project.ts
@@ -23,7 +23,7 @@ export interface Workspace {
     [k: string]: any;
   };
   /** Tool options. */
-  architect?: {
+  targets?: {
     /** Link to schema. */
     $schema?: string;
     [k: string]: any;
@@ -64,7 +64,7 @@ export interface Project {
     [k: string]: any;
   };
   /** Tool options. */
-  architect?: ProjectBuildOptions;
+  targets?: ProjectBuildOptions;
 }
 
 /** Architect options for an Angular CLI workspace. */

diff --git a/src/app/core/code.service.ts b/src/app/core/code.service.ts
@@ -31,7 +31,7 @@ export class CodeService {
       "projectType": "application",
       "prefix": "app",
       "schematics": {},
-      "architect": {
+      "targets": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
@@ -122,7 +122,7 @@ export class CodeService {
     "demo-e2e": {
       "root": "e2e/",
       "projectType": "application",
-      "architect": {
+      "targets": {
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {