From 291bbffcc9f2ad17993f6de82500d128b607de8b Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 20 Apr 2022 10:58:57 -0400
Subject: [PATCH] refactor(@schematics/angular): use string helper re-export
 from `@angular-devkit/schematics`

By using the `strings` re-export from `@angular-devkit/schematics` instead of from `@angular-devkit/core`,
the number of imports from `@angular-devkit/core` has been reduced and lowers the direct dependency count
for many of the individual schematics.
---
 packages/schematics/angular/application/index.ts           | 3 ++-
 packages/schematics/angular/component/index.ts             | 2 +-
 packages/schematics/angular/directive/index.ts             | 2 +-
 packages/schematics/angular/e2e/index.ts                   | 3 ++-
 packages/schematics/angular/library/index.ts               | 3 ++-
 packages/schematics/angular/module/index.ts                | 3 ++-
 packages/schematics/angular/pipe/index.ts                  | 2 +-
 packages/schematics/angular/universal/index.ts             | 3 ++-
 packages/schematics/angular/utility/generate-from-files.ts | 2 +-
 packages/schematics/angular/web-worker/index.ts            | 3 ++-
 packages/schematics/angular/workspace/index.ts             | 2 +-
 11 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 7fb420f7f7..f5dae7b33b 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { JsonObject, join, normalize, strings } from '@angular-devkit/core';
+import { JsonObject, join, normalize } from '@angular-devkit/core';
 import {
   MergeStrategy,
   Rule,
@@ -20,6 +20,7 @@ import {
   move,
   noop,
   schematic,
+  strings,
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
index 74a8e57930..177b5eac27 100644
--- a/packages/schematics/angular/component/index.ts
+++ b/packages/schematics/angular/component/index.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { strings } from '@angular-devkit/core';
 import {
   FileOperator,
   Rule,
@@ -20,6 +19,7 @@ import {
   mergeWith,
   move,
   noop,
+  strings,
   url,
 } from '@angular-devkit/schematics';
 import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
diff --git a/packages/schematics/angular/directive/index.ts b/packages/schematics/angular/directive/index.ts
index 18a16e9936..666a181b5b 100644
--- a/packages/schematics/angular/directive/index.ts
+++ b/packages/schematics/angular/directive/index.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicsException,
@@ -18,6 +17,7 @@ import {
   mergeWith,
   move,
   noop,
+  strings,
   url,
 } from '@angular-devkit/schematics';
 import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
diff --git a/packages/schematics/angular/e2e/index.ts b/packages/schematics/angular/e2e/index.ts
index 6a44140278..de24c20c25 100644
--- a/packages/schematics/angular/e2e/index.ts
+++ b/packages/schematics/angular/e2e/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { join, normalize, strings } from '@angular-devkit/core';
+import { join, normalize } from '@angular-devkit/core';
 import {
   Rule,
   SchematicsException,
@@ -16,6 +16,7 @@ import {
   chain,
   mergeWith,
   move,
+  strings,
   url,
 } from '@angular-devkit/schematics';
 import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index aafb2853e1..90126c44be 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { join, normalize, strings } from '@angular-devkit/core';
+import { join, normalize } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -18,6 +18,7 @@ import {
   move,
   noop,
   schematic,
+  strings,
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index 3f9cf17e3f..4c6840011c 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Path, normalize, strings } from '@angular-devkit/core';
+import { Path, normalize } from '@angular-devkit/core';
 import {
   Rule,
   SchematicsException,
@@ -19,6 +19,7 @@ import {
   move,
   noop,
   schematic,
+  strings,
   url,
 } from '@angular-devkit/schematics';
 import { Schema as ComponentOptions } from '../component/schema';
diff --git a/packages/schematics/angular/pipe/index.ts b/packages/schematics/angular/pipe/index.ts
index 6aa5c516d3..e18c432eab 100644
--- a/packages/schematics/angular/pipe/index.ts
+++ b/packages/schematics/angular/pipe/index.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicsException,
@@ -18,6 +17,7 @@ import {
   mergeWith,
   move,
   noop,
+  strings,
   url,
 } from '@angular-devkit/schematics';
 import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index 6cf251ab49..95fe3d26e9 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { JsonValue, Path, basename, join, normalize, strings } from '@angular-devkit/core';
+import { JsonValue, Path, basename, join, normalize } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -17,6 +17,7 @@ import {
   chain,
   mergeWith,
   move,
+  strings,
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
diff --git a/packages/schematics/angular/utility/generate-from-files.ts b/packages/schematics/angular/utility/generate-from-files.ts
index 5392bb5450..b4be7c66ea 100644
--- a/packages/schematics/angular/utility/generate-from-files.ts
+++ b/packages/schematics/angular/utility/generate-from-files.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { strings } from '@angular-devkit/core';
 import {
   Rule,
   Tree,
@@ -17,6 +16,7 @@ import {
   mergeWith,
   move,
   noop,
+  strings,
   url,
 } from '@angular-devkit/schematics';
 import { parseName } from './parse-name';
diff --git a/packages/schematics/angular/web-worker/index.ts b/packages/schematics/angular/web-worker/index.ts
index d296064d34..bda1d47408 100644
--- a/packages/schematics/angular/web-worker/index.ts
+++ b/packages/schematics/angular/web-worker/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { join, normalize, strings, tags } from '@angular-devkit/core';
+import { join, normalize, tags } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -18,6 +18,7 @@ import {
   mergeWith,
   move,
   noop,
+  strings,
   url,
 } from '@angular-devkit/schematics';
 import { parseName } from '../utility/parse-name';
diff --git a/packages/schematics/angular/workspace/index.ts b/packages/schematics/angular/workspace/index.ts
index e686b4d218..d226468633 100644
--- a/packages/schematics/angular/workspace/index.ts
+++ b/packages/schematics/angular/workspace/index.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { strings } from '@angular-devkit/core';
 import {
   Rule,
   apply,
@@ -14,6 +13,7 @@ import {
   filter,
   mergeWith,
   noop,
+  strings,
   url,
 } from '@angular-devkit/schematics';
 import { latestVersions } from '../utility/latest-versions';