Merge remote-tracking branch 'origin/stable' into merge-stable

# Conflicts:
#	package.json
#	pnpm-lock.yaml

Author: mansona

package.json

@@ -53,7 +53,7 @@
     "jest": "^29.2.1",
     "prettier": "^2.3.1",
     "release-plan": "^0.9.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

packages/shared-internals/src/rewritten-package-cache.ts

@@ -1,4 +1,5 @@
 import PackageCache from './package-cache';
+import type { V2AddonPackage, V2AppPackage, V2Package } from './package';
 import Package from './package';
 import { existsSync, readJSONSync, realpathSync } from 'fs-extra';
 import { resolve } from 'path';
@@ -240,15 +241,15 @@ class WrappedPackage implements PackageTheGoodParts {
     return this.plainPkg.isLazyEngine();
   }
 
-  isV2Ember() {
+  isV2Ember(): this is V2Package {
     return this.plainPkg.isV2Ember();
   }
 
-  isV2App() {
+  isV2App(): this is V2AppPackage {
     return this.plainPkg.isV2App();
   }
 
-  isV2Addon() {
+  isV2Addon(): this is V2AddonPackage {
     return this.plainPkg.isV2Addon();
   }