test: remove additional usages of experimental workspaces

Author: clydin

packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts

@@ -9,13 +9,12 @@ import { Architect, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestingArchitectHost } from '@angular-devkit/architect/testing';
 import {
-  experimental,
   logging,
   normalize,
   schema,
+  workspaces,
 } from '@angular-devkit/core';
-import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import * as fs from 'fs';
+import { NodeJsAsyncHost } from '@angular-devkit/core/node';
 import * as path from 'path';
 
 const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any
@@ -30,16 +29,13 @@ describe('Tslint Target', () => {
   let architect: Architect;
 
   beforeEach(async () => {
-    const vfHost = new NodeJsSyncHost();
-    const configPath = path.join(workspaceRoot, 'angular.json');
-    const configContent = fs.readFileSync(configPath, 'utf-8');
-    const workspaceJson = JSON.parse(configContent);
-
     const registry = new schema.CoreSchemaRegistry();
     registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 
-    const workspace = new experimental.workspace.Workspace(normalize(workspaceRoot), vfHost);
-    await workspace.loadWorkspaceFromJson(workspaceJson).toPromise();
+    const { workspace } = await workspaces.readWorkspace(
+      normalize(workspaceRoot),
+      workspaces.createWorkspaceHost(new NodeJsAsyncHost()),
+    );
 
     testArchitectHost = new TestingArchitectHost(
       workspaceRoot,

packages/angular_devkit/build_angular/test/utils.ts

@@ -10,13 +10,13 @@ import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/nod
 import { TestProjectHost, TestingArchitectHost } from '@angular-devkit/architect/testing';
 import {
   Path,
-  experimental,
   getSystemPath,
   join,
   json,
   normalize,
   schema,
   virtualFs,
+  workspaces,
 } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../src/browser';
 
@@ -42,7 +42,10 @@ export async function createArchitect(workspaceRoot: Path) {
   registry.addPostTransform(schema.transforms.addUndefinedDefaults);
   const workspaceSysPath = getSystemPath(workspaceRoot);
 
-  const workspace = await experimental.workspace.Workspace.fromPath(host, host.root(), registry);
+  const { workspace } = await workspaces.readWorkspace(
+    workspaceSysPath,
+    workspaces.createWorkspaceHost(host),
+  );
   const architectHost = new TestingArchitectHost(
     workspaceSysPath,
     workspaceSysPath,

packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts

@@ -9,12 +9,12 @@ import { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestProjectHost, TestingArchitectHost } from '@angular-devkit/architect/testing';
 import {
-  experimental,
   getSystemPath,
   join,
   normalize,
   schema,
   virtualFs,
+  workspaces,
 } from '@angular-devkit/core'; // tslint:disable-line:no-implicit-dependencies
 import { map, take, tap } from 'rxjs/operators';
 
@@ -37,7 +37,10 @@ describe('NgPackagr Builder', () => {
     registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 
     const workspaceSysPath = getSystemPath(host.root());
-    const workspace = await experimental.workspace.Workspace.fromPath(host, host.root(), registry);
+    const { workspace } = await workspaces.readWorkspace(
+      workspaceSysPath,
+      workspaces.createWorkspaceHost(host),
+    );
     const architectHost = new TestingArchitectHost(
       workspaceSysPath,
       workspaceSysPath,