Commit 22b9edf

josephperrottclydin

authored and

committed

refactor(@schematics/angular): fix dependencies and import paths for strict deps requirements

1 parent 6890422 commit 22b9edfCopy full SHA for 22b9edf

File tree

-12

lines changed

-12

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,6 @@ ts_project(`
`86`	`86`	`for (src, _) in ALL_SCHEMA_TARGETS`
`87`	`87`	`],`
`88`	`88`	`data = RUNTIME_ASSETS,`
`89`		`- # TODO: Fix strict_deps failure`
`90`		`- ignore_strict_deps = True,`
`91`	`89`	`module_name = "@schematics/angular",`
`92`	`90`	`deps = [`
`93`	`91`	`":node_modules/@angular-devkit/core",`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,10 @@ import {`
`17`	`17`	`strings,`
`18`	`18`	`url,`
`19`	`19`	`} from '@angular-devkit/schematics';`
`20`		`-import { AngularBuilder, readWorkspace, updateWorkspace } from '@schematics/angular/utility';`
`21`	`20`	`import { posix as path } from 'node:path';`
`22`	`21`	`import { relativePathToWorkspaceRoot } from '../utility/paths';`
	`22`	`+import { getWorkspace as readWorkspace, updateWorkspace } from '../utility/workspace';`
	`23`	`+import { Builders as AngularBuilder } from '../utility/workspace-models';`
`23`	`24`	`import { Schema as ConfigOptions, Type as ConfigType } from './schema';`
`24`	`25`
`25`	`26`	`export default function (options: ConfigOptions): Rule {`

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,17 +17,13 @@ import {`
`17`	`17`	`strings,`
`18`	`18`	`url,`
`19`	`19`	`} from '@angular-devkit/schematics';`
`20`		`-import {`
`21`		`- AngularBuilder,`
`22`		`- DependencyType,`
`23`		`- ExistingBehavior,`
`24`		`- addDependency,`
`25`		`- addRootProvider,`
`26`		`- updateWorkspace,`
`27`		`-} from '@schematics/angular/utility';`
`28`	`20`	`import { posix as path } from 'node:path';`
	`21`	`+import { DependencyType, ExistingBehavior, addDependency } from '../utility/dependency';`
`29`	`22`	`import { JSONFile } from '../utility/json-file';`
`30`	`23`	`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';`
`31`	`27`	`import { Schema as E2eOptions } from './schema';`
`32`	`28`
`33`	`29`	`/**`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,9 @@`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`	`import { Rule, SchematicsException, chain } from '@angular-devkit/schematics';`
`10`		`-import { AngularBuilder, TargetDefinition, updateWorkspace } from '@schematics/angular/utility';`
`11`	`10`	`import { posix as path } from 'node:path';`
	`11`	`+import { TargetDefinition, updateWorkspace } from '../utility/workspace';`
	`12`	`+import { Builders as AngularBuilder } from '../utility/workspace-models';`
`12`	`13`	`import { Schema as EnvironmentOptions } from './schema';`
`13`	`14`
`14`	`15`	`const ENVIRONMENTS_DIRECTORY = 'environments';`

Comments

(0)