fix: fixup for import statements for logger and workspace

Author: timdeschryver

modules/component-store/migrations/18_0_0-beta/index.spec.ts

@@ -5,7 +5,7 @@ import {
 import { createWorkspace } from '@ngrx/schematics-core/testing';
 import { tags } from '@angular-devkit/core';
 import * as path from 'path';
-import { LogEntry } from '@angular-devkit/core/src/logger/index';
+import { logging } from '@angular-devkit/core';
 
 describe('ComponentStore Migration to 18.0.0-beta', () => {
   const collectionPath = path.join(__dirname, '../migration.json');
@@ -196,7 +196,7 @@ class SomeEffects {}
       `;
 
     appTree.create('main.ts', input);
-    const logEntries: LogEntry[] = [];
+    const logEntries: logging.LogEntry[] = [];
     schematicRunner.logger.subscribe((logEntry) => logEntries.push(logEntry));
     await schematicRunner.runSchematic(
       `ngrx-component-store-migration-18-beta`,

modules/component-store/schematics-core/utility/project.ts

@@ -1,12 +1,12 @@
-import { TargetDefinition } from '@angular-devkit/core/src/workspace/definitions';
+import { workspaces } from '@angular-devkit/core';
 import { getWorkspace } from './config';
 import { SchematicsException, Tree } from '@angular-devkit/schematics';
 
 export interface WorkspaceProject {
   root: string;
   projectType: string;
   architect: {
-    [key: string]: TargetDefinition;
+    [key: string]: workspaces.TargetDefinition;
   };
 }
 

modules/component/schematics-core/utility/project.ts

@@ -1,12 +1,12 @@
-import { TargetDefinition } from '@angular-devkit/core/src/workspace/definitions';
+import { workspaces } from '@angular-devkit/core';
 import { getWorkspace } from './config';
 import { SchematicsException, Tree } from '@angular-devkit/schematics';
 
 export interface WorkspaceProject {
   root: string;
   projectType: string;
   architect: {
-    [key: string]: TargetDefinition;
+    [key: string]: workspaces.TargetDefinition;
   };
 }
 

modules/data/schematics-core/utility/project.ts

@@ -1,12 +1,12 @@
-import { TargetDefinition } from '@angular-devkit/core/src/workspace/definitions';
+import { workspaces } from '@angular-devkit/core';
 import { getWorkspace } from './config';
 import { SchematicsException, Tree } from '@angular-devkit/schematics';
 
 export interface WorkspaceProject {
   root: string;
   projectType: string;
   architect: {
-    [key: string]: TargetDefinition;
+    [key: string]: workspaces.TargetDefinition;
   };
 }
 

modules/effects/migrations/18_0_0-beta/index.spec.ts

@@ -3,9 +3,8 @@ import {
   UnitTestTree,
 } from '@angular-devkit/schematics/testing';
 import { createWorkspace } from '@ngrx/schematics-core/testing';
-import { tags } from '@angular-devkit/core';
+import { tags, logging } from '@angular-devkit/core';
 import * as path from 'path';
-import { LogEntry } from '@angular-devkit/core/src/logger/logger';
 
 describe('Effects Migration to 18.0.0-beta', () => {
   const collectionPath = path.join(__dirname, '../migration.json');
@@ -194,7 +193,7 @@ class SomeEffects {}
       `;
 
     appTree.create('main.ts', input);
-    const logEntries: LogEntry[] = [];
+    const logEntries: logging.LogEntry[] = [];
     schematicRunner.logger.subscribe((logEntry) => logEntries.push(logEntry));
     await schematicRunner.runSchematic(
       `ngrx-effects-migration-18-beta`,

modules/effects/schematics-core/utility/project.ts

@@ -1,12 +1,12 @@
-import { TargetDefinition } from '@angular-devkit/core/src/workspace/definitions';
+import { workspaces } from '@angular-devkit/core';
 import { getWorkspace } from './config';
 import { SchematicsException, Tree } from '@angular-devkit/schematics';
 
 export interface WorkspaceProject {
   root: string;
   projectType: string;
   architect: {
-    [key: string]: TargetDefinition;
+    [key: string]: workspaces.TargetDefinition;
   };
 }
 

modules/entity/schematics-core/utility/project.ts

@@ -1,12 +1,12 @@
-import { TargetDefinition } from '@angular-devkit/core/src/workspace/definitions';
+import { workspaces } from '@angular-devkit/core';
 import { getWorkspace } from './config';
 import { SchematicsException, Tree } from '@angular-devkit/schematics';
 
 export interface WorkspaceProject {
   root: string;
   projectType: string;
   architect: {
-    [key: string]: TargetDefinition;
+    [key: string]: workspaces.TargetDefinition;
   };
 }
 

modules/operators/schematics-core/utility/project.ts

@@ -1,12 +1,12 @@
-import { TargetDefinition } from '@angular-devkit/core/src/workspace/definitions';
+import { workspaces } from '@angular-devkit/core';
 import { getWorkspace } from './config';
 import { SchematicsException, Tree } from '@angular-devkit/schematics';
 
 export interface WorkspaceProject {
   root: string;
   projectType: string;
   architect: {
-    [key: string]: TargetDefinition;
+    [key: string]: workspaces.TargetDefinition;
   };
 }
 

modules/router-store/schematics-core/utility/project.ts

@@ -1,12 +1,12 @@
-import { TargetDefinition } from '@angular-devkit/core/src/workspace/definitions';
+import { workspaces } from '@angular-devkit/core';
 import { getWorkspace } from './config';
 import { SchematicsException, Tree } from '@angular-devkit/schematics';
 
 export interface WorkspaceProject {
   root: string;
   projectType: string;
   architect: {
-    [key: string]: TargetDefinition;
+    [key: string]: workspaces.TargetDefinition;
   };
 }
 

modules/schematics-core/utility/project.ts

@@ -1,12 +1,12 @@
-import { TargetDefinition } from '@angular-devkit/core/src/workspace/definitions';
+import { workspaces } from '@angular-devkit/core';
 import { getWorkspace } from './config';
 import { SchematicsException, Tree } from '@angular-devkit/schematics';
 
 export interface WorkspaceProject {
   root: string;
   projectType: string;
   architect: {
-    [key: string]: TargetDefinition;
+    [key: string]: workspaces.TargetDefinition;
   };
 }