fixup! fix(core): Remove static dependency from @angular/core to @ang…

…ular/compiler
angular · Oct 29, 2018 · 98f38b6 · 98f38b6
1 parent db531c9
commit 98f38b6
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 20 deletions.
diff --git a/packages/core/src/render3/jit/directive.ts b/packages/core/src/render3/jit/directive.ts
@@ -6,15 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ViewEncapsulation} from '../../core';
 import {Component, Directive} from '../../metadata/directives';
 import {componentNeedsResolution, maybeQueueResolutionOfComponentResources} from '../../metadata/resource_loading';
+import {ViewEncapsulation} from '../../metadata/view';
 import {Type} from '../../type';
 import {stringify} from '../../util';
 import {EMPTY_ARRAY} from '../definition';
 import {NG_COMPONENT_DEF, NG_DIRECTIVE_DEF} from '../fields';
 
-import {R3DirectiveMetadataFacade, StringMap, getCompilerFacade} from './compiler_facade';
+import {R3DirectiveMetadataFacade, getCompilerFacade} from './compiler_facade';
 import {R3ComponentMetadataFacade} from './compiler_facade_interface';
 import {angularCoreEnv} from './environment';
 import {patchComponentDefWithScope, transitiveScopesFor} from './module';

diff --git a/packages/core/test/bundling/animation_world/bundle.golden_symbols.json b/packages/core/test/bundling/animation_world/bundle.golden_symbols.json
@@ -54,7 +54,7 @@
     "name": "EMPTY_ARR"
   },
   {
-    "name": "EMPTY_ARRAY$1"
+    "name": "EMPTY_ARRAY"
   },
   {
     "name": "EMPTY_OBJ"
@@ -216,7 +216,7 @@
     "name": "ViewContainerRef"
   },
   {
-    "name": "ViewEncapsulation$1"
+    "name": "ViewEncapsulation"
   },
   {
     "name": "ViewRef"
@@ -396,7 +396,7 @@
     "name": "createNodeAtIndex"
   },
   {
-    "name": "createOutput$1"
+    "name": "createOutput"
   },
   {
     "name": "createRootComponent"
@@ -1113,10 +1113,10 @@
     "name": "storeCleanupWithContext"
   },
   {
-    "name": "stringify$1"
+    "name": "stringify"
   },
   {
-    "name": "stringify$2"
+    "name": "stringify$1"
   },
   {
     "name": "swapMultiContextEntries"

diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -27,7 +27,7 @@
     "name": "EMPTY"
   },
   {
-    "name": "EMPTY_ARRAY$1"
+    "name": "EMPTY_ARRAY"
   },
   {
     "name": "EmptyErrorImpl"
@@ -117,7 +117,7 @@
     "name": "VIEWS"
   },
   {
-    "name": "ViewEncapsulation$1"
+    "name": "ViewEncapsulation"
   },
   {
     "name": "_renderCompCount"
@@ -432,7 +432,7 @@
     "name": "setUpAttributes"
   },
   {
-    "name": "stringify$2"
+    "name": "stringify$1"
   },
   {
     "name": "syncViewWithBlueprint"

diff --git a/packages/core/test/bundling/injection/bundle.golden_symbols.json b/packages/core/test/bundling/injection/bundle.golden_symbols.json
@@ -6,7 +6,7 @@
     "name": "CIRCULAR$1"
   },
   {
-    "name": "EMPTY_ARRAY$2"
+    "name": "EMPTY_ARRAY$1"
   },
   {
     "name": "EmptyErrorImpl"
@@ -60,7 +60,7 @@
     "name": "THROW_IF_NOT_FOUND"
   },
   {
-    "name": "USE_VALUE$1"
+    "name": "USE_VALUE"
   },
   {
     "name": "UnsubscriptionErrorImpl"
@@ -159,12 +159,12 @@
     "name": "providerToRecord"
   },
   {
-    "name": "resolveForwardRef$1"
+    "name": "resolveForwardRef"
   },
   {
     "name": "setCurrentInjector"
   },
   {
-    "name": "stringify$1"
+    "name": "stringify"
   }
 ]
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -45,7 +45,7 @@
     "name": "EMPTY"
   },
   {
-    "name": "EMPTY_ARRAY$1"
+    "name": "EMPTY_ARRAY"
   },
   {
     "name": "ElementRef"
@@ -231,7 +231,7 @@
     "name": "ViewContainerRef"
   },
   {
-    "name": "ViewEncapsulation$1"
+    "name": "ViewEncapsulation"
   },
   {
     "name": "ViewRef"
@@ -453,7 +453,7 @@
     "name": "createNodeAtIndex"
   },
   {
-    "name": "createOutput$1"
+    "name": "createOutput"
   },
   {
     "name": "createRootComponent"
@@ -1134,10 +1134,10 @@
     "name": "storeCleanupWithContext"
   },
   {
-    "name": "stringify$1"
+    "name": "stringify"
   },
   {
-    "name": "stringify$2"
+    "name": "stringify$1"
   },
   {
     "name": "syncViewWithBlueprint"

diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel
@@ -38,9 +38,9 @@ ts_library(
         "load_domino.ts",
     ],
     deps = [
+        "//packages/compiler",
         "//packages/platform-browser",
         "//packages/platform-server",
-        "//packages/compiler",
         "@ngdeps//zone.js",
     ],
 )

diff --git a/tools/testing/BUILD.bazel b/tools/testing/BUILD.bazel
@@ -7,6 +7,7 @@ ts_library(
     testonly = 1,
     srcs = ["init_browser_spec.ts"],
     deps = [
+        "//packages/compiler",
         "//packages/core/testing",
         "//packages/platform-browser-dynamic/testing",
         "//packages/platform-browser/animations",
@@ -18,6 +19,7 @@ ts_library(
     testonly = 1,
     srcs = ["init_node_spec.ts"],
     deps = [
+        "//packages/compiler",
         "//packages/core/testing",
         "//packages/platform-server",
         "//packages/platform-server/testing",

diff --git a/tools/testing/init_browser_spec.ts b/tools/testing/init_browser_spec.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import '@angular/compiler'; // For JIT mode. Must be in front of any other @angular/* imports.
 import {TestBed} from '@angular/core/testing';
 import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';

diff --git a/tools/testing/init_node_spec.ts b/tools/testing/init_node_spec.ts
@@ -36,6 +36,7 @@ import 'zone.js/dist/jasmine-patch.js';
 (global as any).isNode = true;
 (global as any).isBrowser = false;
 
+import '@angular/compiler'; // For JIT mode. Must be in front of any other @angular/* imports.
 // Init TestBed
 import {TestBed} from '@angular/core/testing';
 import {ServerTestingModule, platformServerTesting} from '@angular/platform-server/testing/src/server';