diff --git a/packages/core/schematics/migrations/google3/BUILD.bazel b/packages/core/schematics/migrations/google3/BUILD.bazel index ca1a699ddd..e749de292e 100644 --- a/packages/core/schematics/migrations/google3/BUILD.bazel +++ b/packages/core/schematics/migrations/google3/BUILD.bazel @@ -9,6 +9,7 @@ ts_library( "//packages/core/schematics/migrations/injectable-pipe", "//packages/core/schematics/migrations/missing-injectable", "//packages/core/schematics/migrations/missing-injectable/google3", + "//packages/core/schematics/migrations/renderer-to-renderer2", "//packages/core/schematics/migrations/static-queries", "//packages/core/schematics/migrations/template-var-assignment", "//packages/core/schematics/utils", diff --git a/packages/core/schematics/migrations/renderer-to-renderer2/google3/rendererToRenderer2Rule.ts b/packages/core/schematics/migrations/google3/rendererToRenderer2Rule.ts similarity index 95% rename from packages/core/schematics/migrations/renderer-to-renderer2/google3/rendererToRenderer2Rule.ts rename to packages/core/schematics/migrations/google3/rendererToRenderer2Rule.ts index a6eaed901c..767621218f 100644 --- a/packages/core/schematics/migrations/renderer-to-renderer2/google3/rendererToRenderer2Rule.ts +++ b/packages/core/schematics/migrations/google3/rendererToRenderer2Rule.ts @@ -9,9 +9,9 @@ import {Replacement, RuleFailure, Rules} from 'tslint'; import * as ts from 'typescript'; -import {HelperFunction, getHelper} from '../helpers'; -import {migrateExpression, replaceImport} from '../migration'; -import {findCoreImport, findRendererReferences} from '../util'; +import {HelperFunction, getHelper} from '../renderer-to-renderer2/helpers'; +import {migrateExpression, replaceImport} from '../renderer-to-renderer2/migration'; +import {findCoreImport, findRendererReferences} from '../renderer-to-renderer2/util'; /** * TSLint rule that migrates from `Renderer` to `Renderer2`. More information on how it works: diff --git a/packages/core/schematics/migrations/renderer-to-renderer2/BUILD.bazel b/packages/core/schematics/migrations/renderer-to-renderer2/BUILD.bazel index ab755c17f6..58b6c7c695 100644 --- a/packages/core/schematics/migrations/renderer-to-renderer2/BUILD.bazel +++ b/packages/core/schematics/migrations/renderer-to-renderer2/BUILD.bazel @@ -6,7 +6,7 @@ ts_library( tsconfig = "//packages/core/schematics:tsconfig.json", visibility = [ "//packages/core/schematics:__pkg__", - "//packages/core/schematics/migrations/renderer-to-renderer2/google3:__pkg__", + "//packages/core/schematics/migrations/google3:__pkg__", "//packages/core/schematics/test:__pkg__", ], deps = [ diff --git a/packages/core/schematics/migrations/renderer-to-renderer2/google3/BUILD.bazel b/packages/core/schematics/migrations/renderer-to-renderer2/google3/BUILD.bazel deleted file mode 100644 index 9b5b5db39f..0000000000 --- a/packages/core/schematics/migrations/renderer-to-renderer2/google3/BUILD.bazel +++ /dev/null @@ -1,13 +0,0 @@ -load("//tools:defaults.bzl", "ts_library") - -ts_library( - name = "google3", - srcs = glob(["**/*.ts"]), - tsconfig = "//packages/core/schematics:tsconfig.json", - visibility = ["//packages/core/schematics/test/google3:__pkg__"], - deps = [ - "//packages/core/schematics/migrations/renderer-to-renderer2", - "@npm//tslint", - "@npm//typescript", - ], -) diff --git a/packages/core/schematics/test/google3/BUILD.bazel b/packages/core/schematics/test/google3/BUILD.bazel index 9fba95bc3d..8effc74710 100644 --- a/packages/core/schematics/test/google3/BUILD.bazel +++ b/packages/core/schematics/test/google3/BUILD.bazel @@ -6,7 +6,6 @@ ts_library( srcs = glob(["**/*.ts"]), deps = [ "//packages/core/schematics/migrations/google3", - "//packages/core/schematics/migrations/renderer-to-renderer2/google3", "@npm//@types/shelljs", "@npm//tslint", ], diff --git a/packages/core/schematics/test/google3/renderer_to_renderer2_spec.ts b/packages/core/schematics/test/google3/renderer_to_renderer2_spec.ts index 6fb9961738..54733c118a 100644 --- a/packages/core/schematics/test/google3/renderer_to_renderer2_spec.ts +++ b/packages/core/schematics/test/google3/renderer_to_renderer2_spec.ts @@ -12,8 +12,8 @@ import * as shx from 'shelljs'; import {Configuration, Linter} from 'tslint'; describe('Google3 Renderer to Renderer2 TSLint rule', () => { - const rulesDirectory = dirname( - require.resolve('../../migrations/renderer-to-renderer2/google3/rendererToRenderer2Rule')); + const rulesDirectory = + dirname(require.resolve('../../migrations/google3/rendererToRenderer2Rule')); let tmpDir: string;