Allow Angular 18

kamilkisiela · May 26, 2024 · 29b9fdc · 29b9fdc
1 parent 1be259a
commit 29b9fdc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/.changeset/light-pears-fix.md b/.changeset/light-pears-fix.md
@@ -0,0 +1,5 @@
+---
+'apollo-angular': patch
+---
+
+Allow Angular 18
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -115,9 +115,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        angular_version: [17]
+        angular_version: [17, 18]
         graphql_version: [15, 16]
-        node_version: [18]
+        node_version: [18, 20]
     steps:
       - name: Use Node.js ${{ matrix.node_version }}
         uses: actions/setup-node@master

diff --git a/packages/apollo-angular/package.json b/packages/apollo-angular/package.json
@@ -34,7 +34,7 @@
     "test": "NODE_OPTIONS=--experimental-modules jest --config jest.config.js"
   },
   "peerDependencies": {
-    "@angular/core": "^17.0.0",
+    "@angular/core": "^17.0.0 || ^18.0.0",
     "@apollo/client": "^3.0.0",
     "graphql": "^15.0.0 || ^16.0.0",
     "rxjs": "^6.0.0 || ^7.0.0"

diff --git a/packages/apollo-angular/schematics/utils/ast.ts b/packages/apollo-angular/schematics/utils/ast.ts
@@ -1,6 +1,6 @@
 import * as ts from 'typescript';
 import { SchematicsException, Tree } from '@angular-devkit/schematics';
-import { addFunctionalProvidersToStandaloneBootstrap } from '@schematics/angular/private/components';
+import { addRootProvider } from '@schematics/angular/utility';
 import { Change, InsertChange } from '@schematics/angular/utility/change';
 import { getAppModulePath, isStandaloneApp } from '@schematics/angular/utility/ng-ast-utils';
 import { getMainFilePath } from '@schematics/angular/utility/standalone/util';
@@ -21,12 +21,9 @@ export async function addModuleImportToRootModule(
 ) {
   const mainPath = await getMainFilePath(host, projectName);
   if (isStandaloneApp(host, mainPath)) {
-    addFunctionalProvidersToStandaloneBootstrap(
-      host,
-      mainPath,
-      importedModuleName,
-      importedModulePath,
-    );
+    addRootProvider(projectName, ({ code, external }) => {
+      return code`${external(importedModuleName, importedModulePath)}()`;
+    });
   } else {
     const appModulePath = getAppModulePath(host, mainPath);
     addModuleImportToModule(host, appModulePath, importedModuleName, importedModulePath);