Skip to content

Commit 22b9edf

Browse files
josephperrottclydin
authored andcommitted
refactor(@schematics/angular): fix dependencies and import paths for strict deps requirements
1 parent 6890422 commit 22b9edf

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

packages/schematics/angular/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ ts_project(
8686
for (src, _) in ALL_SCHEMA_TARGETS
8787
],
8888
data = RUNTIME_ASSETS,
89-
# TODO: Fix strict_deps failure
90-
ignore_strict_deps = True,
9189
module_name = "@schematics/angular",
9290
deps = [
9391
":node_modules/@angular-devkit/core",

packages/schematics/angular/config/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ import {
1717
strings,
1818
url,
1919
} from '@angular-devkit/schematics';
20-
import { AngularBuilder, readWorkspace, updateWorkspace } from '@schematics/angular/utility';
2120
import { posix as path } from 'node:path';
2221
import { relativePathToWorkspaceRoot } from '../utility/paths';
22+
import { getWorkspace as readWorkspace, updateWorkspace } from '../utility/workspace';
23+
import { Builders as AngularBuilder } from '../utility/workspace-models';
2324
import { Schema as ConfigOptions, Type as ConfigType } from './schema';
2425

2526
export default function (options: ConfigOptions): Rule {

packages/schematics/angular/e2e/index.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@ import {
1717
strings,
1818
url,
1919
} from '@angular-devkit/schematics';
20-
import {
21-
AngularBuilder,
22-
DependencyType,
23-
ExistingBehavior,
24-
addDependency,
25-
addRootProvider,
26-
updateWorkspace,
27-
} from '@schematics/angular/utility';
2820
import { posix as path } from 'node:path';
21+
import { DependencyType, ExistingBehavior, addDependency } from '../utility/dependency';
2922
import { JSONFile } from '../utility/json-file';
3023
import { latestVersions } from '../utility/latest-versions';
24+
import { addRootProvider } from '../utility/standalone';
25+
import { updateWorkspace } from '../utility/workspace';
26+
import { Builders as AngularBuilder } from '../utility/workspace-models';
3127
import { Schema as E2eOptions } from './schema';
3228

3329
/**

packages/schematics/angular/environments/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
*/
88

99
import { Rule, SchematicsException, chain } from '@angular-devkit/schematics';
10-
import { AngularBuilder, TargetDefinition, updateWorkspace } from '@schematics/angular/utility';
1110
import { posix as path } from 'node:path';
11+
import { TargetDefinition, updateWorkspace } from '../utility/workspace';
12+
import { Builders as AngularBuilder } from '../utility/workspace-models';
1213
import { Schema as EnvironmentOptions } from './schema';
1314

1415
const ENVIRONMENTS_DIRECTORY = 'environments';

0 commit comments

Comments
 (0)