Skip to content
This repository was archived by the owner on Apr 4, 2025. It is now read-only.

Commit 08bd559

Browse files
hanslfilipesilva
authored andcommitted
ci: fix all circular dependencies
1 parent 1b14f7f commit 08bd559

File tree

7 files changed

+16
-15
lines changed

7 files changed

+16
-15
lines changed

packages/angular_devkit/core/src/json/schema/interface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88
import { Observable } from 'rxjs';
9-
import { JsonArray, JsonObject, JsonValue } from '..';
9+
import { JsonArray, JsonObject, JsonValue } from '../interface';
1010

1111
export type JsonPointer = string & {
1212
__PRIVATE_DEVKIT_JSON_POINTER: void;

packages/angular_devkit/core/src/json/schema/transforms.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import { JsonArray, JsonObject, JsonValue } from '..';
8+
import { JsonArray, JsonObject, JsonValue } from '../interface';
99
import { JsonPointer } from './interface';
1010

1111

packages/angular_devkit/core/src/json/schema/visitor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
*/
88
import { Observable, concat, from, of as observableOf } from 'rxjs';
99
import { concatMap, ignoreElements, mergeMap, tap } from 'rxjs/operators';
10-
import { JsonArray, JsonObject, JsonValue } from '..';
1110
import { isObservable } from '../../utils';
11+
import { JsonArray, JsonObject, JsonValue } from '../interface';
1212
import { JsonPointer } from './interface';
1313
import { buildJsonPointer, joinJsonPointer } from './pointer';
1414

packages/angular_devkit/core/src/virtual-fs/host/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import { Path, join, normalize } from '..';
8+
import { Path, join, normalize } from '../path';
99
import { stringToFileBuffer } from './buffer';
1010
import { SimpleMemoryHost } from './memory';
1111
import { SyncDelegateHost } from './sync';

packages/angular_devkit/schematics/tools/file-system-engine-host.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
import { existsSync } from 'fs';
99
import { join } from 'path';
1010
import { RuleFactory } from '../src';
11+
import { FileSystemCollectionDesc, FileSystemSchematicDesc } from './description';
12+
import { ExportStringRef } from './export-ref';
1113
import {
1214
CollectionCannotBeResolvedException,
1315
CollectionMissingSchematicsMapException,
16+
FileSystemEngineHostBase,
1417
SchematicMissingFieldsException,
15-
} from '../tools';
16-
import { FileSystemCollectionDesc, FileSystemSchematicDesc } from './description';
17-
import { ExportStringRef } from './export-ref';
18-
import { FileSystemEngineHostBase } from './file-system-engine-host-base';
18+
} from './file-system-engine-host-base';
1919

2020

2121
/**

packages/angular_devkit/schematics/tools/node-module-engine-host.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ import { BaseException } from '@angular-devkit/core';
99
import * as core from '@angular-devkit/core/node';
1010
import { dirname, join, resolve as resolvePath } from 'path';
1111
import { RuleFactory } from '../src';
12-
import {
13-
CollectionCannotBeResolvedException,
14-
CollectionMissingSchematicsMapException,
15-
SchematicMissingFieldsException,
16-
} from '../tools';
1712
import {
1813
FileSystemCollectionDesc,
1914
FileSystemSchematicDesc,
2015
} from './description';
2116
import { ExportStringRef } from './export-ref';
22-
import { FileSystemEngineHostBase } from './file-system-engine-host-base';
17+
import {
18+
CollectionCannotBeResolvedException,
19+
CollectionMissingSchematicsMapException,
20+
FileSystemEngineHostBase,
21+
SchematicMissingFieldsException,
22+
} from './file-system-engine-host-base';
2323
import { readJsonFile } from './file-system-utility';
2424

2525

packages/angular_devkit/schematics/tools/workflow/node-workflow.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ import {
1818
} from '@angular-devkit/schematics'; // tslint:disable-line:no-implicit-dependencies
1919
import { Observable, Subject, concat, of, throwError } from 'rxjs';
2020
import { concatMap, defaultIfEmpty, ignoreElements, last, map, tap } from 'rxjs/operators';
21-
import { NodeModulesEngineHost, validateOptionsWithSchema } from '..';
2221
import { DryRunEvent } from '../../src/sink/dryrun';
2322
import { BuiltinTaskExecutor } from '../../tasks/node';
23+
import { NodeModulesEngineHost } from '../node-module-engine-host';
24+
import { validateOptionsWithSchema } from '../schema-option-transform';
2425

2526
export class NodeWorkflow implements workflow.Workflow {
2627
protected _engine: SchematicEngine<{}, {}>;

0 commit comments

Comments
 (0)