fix(nx): 8.0.0 schematic expected workspace.json

nrwl · Aug 6, 2019 · 238236a · 238236a
1 parent 07d963b
commit 238236a
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 17 deletions.
diff --git a/packages/schematics/migrations/legacy-migrations/20180507-create-nx-json.ts b/packages/schematics/migrations/legacy-migrations/20180507-create-nx-json.ts
@@ -5,7 +5,7 @@ import { stripIndents } from '@angular-devkit/core/src/utils/literals';
 export default {
   description: `Create nx.json before migrating to Angular CLI 6.`,
   run: () => {
-    if (!existsSync('.angular-cli.json') && existsSync('workspace.json')) {
+    if (!existsSync('.angular-cli.json') && existsSync('angular.json')) {
       console.warn(stripIndents`
         You have already upgraded to Angular CLI 6.
         We will not be able to recover information about your project's tags for you.

diff --git a/packages/schematics/migrations/legacy-migrations/20180515-switch-to-nx6.ts b/packages/schematics/migrations/legacy-migrations/20180515-switch-to-nx6.ts
@@ -7,7 +7,7 @@ import { join } from 'path';
 export default {
   description: `Switch to Nx 6.0`,
   run: () => {
-    if (!existsSync('.angular-cli.json') && existsSync('workspace.json')) {
+    if (!existsSync('.angular-cli.json') && existsSync('angular.json')) {
       console.warn(stripIndents`
         You have already upgraded to Angular CLI 6.
         We will not be able to recover information about your project's tags for you.

diff --git a/packages/schematics/migrations/update-6-0-0/update-6-0-0.ts b/packages/schematics/migrations/update-6-0-0/update-6-0-0.ts
@@ -257,7 +257,7 @@ function createTsconfigLibJson(host: Tree, project: any) {
 }
 
 function createAdditionalFiles(host: Tree) {
-  const workspaceJson = readJsonInTree(host, 'workspace.json');
+  const workspaceJson = readJsonInTree(host, 'angular.json');
   Object.entries<any>(workspaceJson.projects).forEach(([key, project]) => {
     if (project.architect.test) {
       createTsconfigSpecJson(host, project);
@@ -283,7 +283,7 @@ function createAdditionalFiles(host: Tree) {
 }
 
 function moveE2eTests(host: Tree, context: SchematicContext) {
-  const workspaceJson = readJsonInTree(host, 'workspace.json');
+  const workspaceJson = readJsonInTree(host, 'angular.json');
 
   Object.entries<any>(workspaceJson.projects).forEach(([key, p]) => {
     if (p.projectType === 'application' && !p.architect.e2e) {
@@ -321,7 +321,7 @@ function deleteUnneededFiles(host: Tree) {
 }
 
 function patchLibIndexFiles(host: Tree, context: SchematicContext) {
-  const workspaceJson = readJsonInTree(host, 'workspace.json');
+  const workspaceJson = readJsonInTree(host, 'angular.json');
 
   Object.entries<any>(workspaceJson.projects).forEach(([key, p]) => {
     if (p.projectType === 'library') {
@@ -490,7 +490,7 @@ function createDefaultE2eTsConfig(host: Tree, project: any) {
 }
 
 function updateTsConfigs(host: Tree) {
-  const workspaceJson = readJsonInTree(host, 'workspace.json');
+  const workspaceJson = readJsonInTree(host, 'angular.json');
   Object.entries<any>(workspaceJson.projects).forEach(([key, project]) => {
     if (
       project.architect.build &&
@@ -682,7 +682,7 @@ function addInstallTask(host: Tree, context: SchematicContext) {
 }
 
 function checkCli6Upgraded(host: Tree) {
-  if (!host.exists('workspace.json') && host.exists('.angular-cli.json')) {
+  if (!host.exists('angular.json') && host.exists('.angular-cli.json')) {
     throw new Error(
       'Please install the latest version and run ng update @angular/cli first'
     );

diff --git a/packages/schematics/migrations/update-6-1-0/update-6-1-0.ts b/packages/schematics/migrations/update-6-1-0/update-6-1-0.ts
@@ -25,7 +25,7 @@ const addImplicitDependencies = updateJsonInTree<NxJson>('nx.json', nxJson => {
   return {
     ...nxJson,
     implicitDependencies: {
-      'workspace.json': '*',
+      'angular.json': '*',
       'package.json': '*',
       'tsconfig.json': '*',
       'tslint.json': '*',

diff --git a/packages/schematics/migrations/update-7-2-0/update-7-2-0.spec.ts b/packages/schematics/migrations/update-7-2-0/update-7-2-0.spec.ts
@@ -15,7 +15,7 @@ describe('Update 7.2.0', () => {
       scripts: {}
     });
     createJson('tsconfig.json', {});
-    createJson('workspace.json', {
+    createJson('angular.json', {
       projects: {
         app1: {
           root: 'apps/app1',
@@ -321,7 +321,7 @@ describe('Update 7.2.0', () => {
   it('should fix cypress lint configs', async () => {
     initialTree = await schematicRunner
       .callRule(
-        updateJsonInTree('workspace.json', json => {
+        updateJsonInTree('angular.json', json => {
           json.projects['app2-e2e'].architect.lint.options.tsConfig =
             'e2e/tsconfig.e2e.json';
           return json;
@@ -333,8 +333,8 @@ describe('Update 7.2.0', () => {
       .runSchematicAsync('update-7.2.0', {}, initialTree)
       .toPromise();
     expect(
-      readJsonInTree(result, 'workspace.json').projects['app2-e2e'].architect
-        .lint.options.tsConfig
+      readJsonInTree(result, 'angular.json').projects['app2-e2e'].architect.lint
+        .options.tsConfig
     ).toEqual('apps/app2-e2e/tsconfig.e2e.json');
     [
       '/apps/app1/tsconfig.app.json',
@@ -358,7 +358,7 @@ describe('Update 7.2.0', () => {
   it('should not fail for non-existing tsconfigs', async () => {
     initialTree = await schematicRunner
       .callRule(
-        updateJsonInTree('workspace.json', json => {
+        updateJsonInTree('angular.json', json => {
           json.projects['app2'].architect.lint.options.tsConfig =
             'apps/nonexistent/tsconfig.app.json';
           return json;

diff --git a/packages/schematics/migrations/update-7-2-0/update-7-2-0.ts b/packages/schematics/migrations/update-7-2-0/update-7-2-0.ts
@@ -163,7 +163,7 @@ function updateTsConfigs(project: any): Rule {
 }
 
 function fixCypressConfigs(host: Tree, context: SchematicContext): Rule {
-  const workspaceJson = readJsonInTree(host, 'workspace.json');
+  const workspaceJson = readJsonInTree(host, 'angular.json');
   return chain(
     Object.entries<any>(workspaceJson.projects)
       .filter(

diff --git a/packages/schematics/migrations/update-8-0-0/update-8-0-0.ts b/packages/schematics/migrations/update-8-0-0/update-8-0-0.ts
@@ -12,7 +12,8 @@ import {
   readJsonInTree,
   updateJsonInTree,
   addUpdateTask,
-  updateWorkspaceInTree
+  updateWorkspaceInTree,
+  readWorkspace
 } from '@nrwl/workspace';
 import {
   createSourceFile,
@@ -32,7 +33,7 @@ function addDependencies() {
   return (host: Tree, context: SchematicContext) => {
     const dependencies = readJsonInTree(host, 'package.json').dependencies;
     const builders = new Set<string>();
-    const projects = readJsonInTree(host, 'workspace.json').projects;
+    const projects = readWorkspace(host).projects;
     Object.values<any>(projects)
       .filter(
         project =>

diff --git a/packages/workspace/index.ts b/packages/workspace/index.ts
@@ -43,7 +43,8 @@ export {
   addParameterToConstructor,
   createOrUpdate,
   findNodes,
-  updatePackageJsonDependencies
+  updatePackageJsonDependencies,
+  readWorkspace
 } from './src/utils/ast-utils';
 
 export {

diff --git a/packages/workspace/src/utils/ast-utils.ts b/packages/workspace/src/utils/ast-utils.ts
@@ -407,6 +407,11 @@ export function updateWorkspaceInTree<T = any, O = T>(
   };
 }
 
+export function readWorkspace(host: Tree): any {
+  const path = getWorkspacePath(host);
+  return readJsonInTree(host, path);
+}
+
 let installAdded = false;
 
 export function addDepsToPackageJson(