Fix double core issue (#586)

wawyed · web-flow · commit 686da2a26da3 · 2023-04-04T22:51:52.000+01:00
* Revert "ensure $q is available during init" This reverts commit a76654e. * fix: use correct core version
diff --git a/downstream_projects.json b/downstream_projects.json
@@ -1,4 +1,4 @@
 {
   "example": "./example",
-  "sample-app-angular-hybrid": "https://github.com/ui-router/sample-app-angular-hybrid.git"
+  "sample-app-angular-hybrid": "https://github.com/ui-router/sample-app-angular-hybrid.git@fix_incorrect_core_version"
 }
diff --git a/example/index.html b/example/index.html
@@ -1,14 +1,14 @@
 <html>
-<head>
+  <head>
     <script src="//unpkg.com/angular@1.6.4/angular.js"></script>
-    <script src="//unpkg.com/reflect-metadata"></script>
-    <script src="//unpkg.com/zone.js"></script>
-</head>
-<body>
+    <script src="//unpkg.com/reflect-metadata@0.1.13"></script>
+    <script src="//unpkg.com/zone.js@0.13.0"></script>
+  </head>
+  <body>
     <!-- the app will fill this ui-view -->
     <ui-view></ui-view>
 
     <!-- load webpack bundle in body tag after document.body is ready -->
     <script src="_bundles/app.js"></script>
-</body>
+  </body>
 </html>
diff --git a/example/package.json b/example/package.json
@@ -34,6 +34,12 @@
     "typescript": "4.8.4",
     "zone.js": "0.11.4"
   },
+  "overrides": {
+    "@uirouter/core": "6.1.0"
+  },
+  "resolutions": {
+    "@uirouter/core": "^6.1.0"
+  },
   "devDependencies": {
     "@uirouter/cypress-runner": "^3.0.0",
     "ts-loader": "9.4.2",
diff --git a/package.json b/package.json
@@ -21,8 +21,12 @@
     "@angular/upgrade": "^14.0.0 || ^15.0.0",
     "@uirouter/angular": "^11.0.0",
     "@uirouter/angularjs": "^1.0.30",
+    "@uirouter/core": "^6.1.0",
     "angular": "^1.5.0"
   },
+  "resolutions": {
+    "@uirouter/core": "^6.1.0"
+  },
   "devDependencies": {
     "@angular/animations": "^15.2.3",
     "@angular/common": "^15.2.3",
@@ -36,7 +40,7 @@
     "@types/jquery": "^3.5.6",
     "@uirouter/angular": "11.0.0",
     "@uirouter/angularjs": "^1.0.30",
-    "@uirouter/core": "6.0.8",
+    "@uirouter/core": "^6.1.0",
     "@uirouter/publish-scripts": "^2.6.0",
     "@uirouter/rx": "^1.0.0",
     "angular": "^1.8.3",
diff --git a/src/angular-hybrid.ts b/src/angular-hybrid.ts
@@ -10,8 +10,6 @@ import {
   UIRouter,
   ViewConfig,
   ViewService,
-  ServicesPlugin,
-  servicesPlugin,
 } from '@uirouter/core';
 
 import {
@@ -241,7 +239,6 @@ upgradeModule.run([
 
     /** Add support for observable state and param changes */
     $uiRouter.plugin(UIRouterRx);
-    $uiRouter.plugin<ServicesPlugin>(servicesPlugin);
 
     // Expose a merged ng1/ng2 injector as a Resolvable (on the root state).
     // This mimics how ui-router-ng2 exposes the root ng2 Injector, but
diff --git a/yarn.lock b/yarn.lock
@@ -550,10 +550,10 @@
   dependencies:
     "@uirouter/core" "6.0.8"
 
-"@uirouter/core@6.0.8":
-  version "6.0.8"
-  resolved "https://registry.npmjs.org/@uirouter/core/-/core-6.0.8.tgz"
-  integrity sha512-Gc/BAW47i4L54p8dqYCJJZuv2s3tqlXQ0fvl6Zp2xrblELPVfxmjnc0eurx3XwfQdaqm3T6uls6tQKkof/4QMw==
+"@uirouter/core@6.0.8", "@uirouter/core@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@uirouter/core/-/core-6.1.0.tgz#ca90ae476c85805e7d70add461e91738ae383bd5"
+  integrity sha512-WFYh5NPAqRX4L2qlI4k62tgR6pxoqOBSW1CM1uBWCau4mAmgasYd5etJ9RoSJrSnCpCQ2km2Jltf0n5ql684MQ==
 
 "@uirouter/publish-scripts@^2.6.0":
   version "2.6.0"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"example": "./example",`
`3`		`- "sample-app-angular-hybrid": "https://github.com/ui-router/sample-app-angular-hybrid.git"`
	`3`	`+ "sample-app-angular-hybrid": "https://github.com/ui-router/sample-app-angular-hybrid.git@fix_incorrect_core_version"`
`4`	`4`	`}`