From d52bf4f75203094ebf2d0d7f6b54fb95b7f98d33 Mon Sep 17 00:00:00 2001
From: mgechev <mgechev@gmail.com>
Date: Thu, 2 Jul 2020 10:40:31 -0700
Subject: [PATCH] feat: use angular as direct dependency

---
 package-lock.json                     | 50 ++++++++++++++++++---------
 package.json                          | 10 +++---
 src/angular/templates/jitReflector.ts |  2 --
 3 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 267ddb6c5..7c3357ee7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,16 +5,14 @@
   "requires": true,
   "dependencies": {
     "@angular/compiler": {
-      "version": "9.0.0-next.12",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.0.0-next.12.tgz",
-      "integrity": "sha512-mMpsuq8jD50kKZixYRqhoIl9hNRlkrsUeGWLW0NJlVCErH89B4jhF1w2tGG4WbRvFPyaw+NfuvcGFViGXwjpMw==",
-      "dev": true
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.0.0.tgz",
+      "integrity": "sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ=="
     },
     "@angular/core": {
-      "version": "9.0.0-next.12",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.0.0-next.12.tgz",
-      "integrity": "sha512-+QZqp7uVVLKoTgZ4yM8haX56D2Zo3Za4mSFhFtci3CacfGxzf3lxS57IcjWJUOplbA2DaCv5nPYbQTBh5zKKFQ==",
-      "dev": true
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.0.0.tgz",
+      "integrity": "sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w=="
     },
     "@babel/code-frame": {
       "version": "7.0.0",
@@ -4408,6 +4406,14 @@
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.13.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+          "dev": true
+        }
       }
     },
     "safe-buffer": {
@@ -5229,10 +5235,9 @@
       }
     },
     "tslib": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
-      "dev": true
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
     },
     "tslint": {
       "version": "5.20.0",
@@ -5260,6 +5265,12 @@
           "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
           "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
           "dev": true
+        },
+        "tslib": {
+          "version": "1.13.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+          "dev": true
         }
       }
     },
@@ -5270,6 +5281,14 @@
       "dev": true,
       "requires": {
         "tslib": "^1.8.1"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.13.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+          "dev": true
+        }
       }
     },
     "tunnel-agent": {
@@ -5615,10 +5634,9 @@
       "dev": true
     },
     "zone.js": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.2.tgz",
-      "integrity": "sha512-UAYfiuvxLN4oyuqhJwd21Uxb4CNawrq6fPS/05Su5L4G+1TN+HVDJMUHNMobVQDFJRir2cLAODXwluaOKB7HFg==",
-      "dev": true
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
+      "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg=="
     }
   }
 }
diff --git a/package.json b/package.json
index 14c94db1d..e769f7f3e 100644
--- a/package.json
+++ b/package.json
@@ -62,8 +62,6 @@
   },
   "homepage": "https://github.com/mgechev/codelyzer#readme",
   "devDependencies": {
-    "@angular/compiler": "9.0.0-next.12",
-    "@angular/core": "9.0.0-next.12",
     "@commitlint/cli": "8.2.0",
     "@commitlint/config-angular": "8.2.0",
     "@types/chai": "4.2.4",
@@ -88,8 +86,7 @@
     "standard-version": "7.1.0",
     "ts-node": "8.5.4",
     "tslint": "5.20.0",
-    "typescript": "3.9.6",
-    "zone.js": "0.10.2"
+    "typescript": "3.9.6"
   },
   "peerDependencies": {
     "@angular/compiler": ">=2.3.1 <11.0.0 || >9.0.0-beta <11.0.0 || >9.1.0-beta <11.0.0 || >9.2.0-beta <11.0.0",
@@ -97,6 +94,11 @@
     "tslint": "^5.0.0 || ^6.0.0"
   },
   "dependencies": {
+    "@angular/core": "9.0.0",
+    "@angular/compiler": "9.0.0",
+    "tslib": "^1.10.0",
+    "zone.js": "~0.10.3",
+    "rxjs": "^6.5.3",
     "app-root-path": "^3.0.0",
     "aria-query": "^3.0.0",
     "axobject-query": "2.0.2",
diff --git a/src/angular/templates/jitReflector.ts b/src/angular/templates/jitReflector.ts
index 402c393eb..48143d459 100644
--- a/src/angular/templates/jitReflector.ts
+++ b/src/angular/templates/jitReflector.ts
@@ -1,6 +1,5 @@
 import { CompileReflector, ExternalReference, Identifiers, getUrlScheme, syntaxError } from '@angular/compiler';
 import {
-  ANALYZE_FOR_ENTRY_COMPONENTS,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
@@ -105,7 +104,6 @@ export class JitReflector implements CompileReflector {
 
 function createBuiltinExternalReferencesMap() {
   const map = new Map<ExternalReference, any>();
-  map.set(Identifiers.ANALYZE_FOR_ENTRY_COMPONENTS, ANALYZE_FOR_ENTRY_COMPONENTS);
   map.set(Identifiers.ElementRef, ElementRef);
   map.set(Identifiers.NgModuleRef, NgModuleRef);
   map.set(Identifiers.ViewContainerRef, ViewContainerRef);