From 704e2e9217ebbfc8d922331be2f22dc38450982c Mon Sep 17 00:00:00 2001 From: Rafael Mestre Date: Fri, 15 Sep 2023 15:18:10 -0800 Subject: [PATCH] fix(astro-angular,vite-plugin-angular): update zone.js deep imports for compatibility (#651) --- package.json | 2 +- packages/astro-angular/src/client.ts | 2 +- packages/astro-angular/src/server.ts | 2 +- .../platform/src/lib/ssr/ssr-build-plugin.ts | 9 ----- packages/vite-plugin-angular/setup-vitest.ts | 8 ++--- .../src/lib/vite-plugin-nitro.ts | 2 +- pnpm-lock.yaml | 35 +++++++++---------- 7 files changed, 24 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index dc9391e5f..7fd617d20 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "ufo": "^1.1.2", "xhr2": "^0.2.1", "zod": "^3.21.4", - "zone.js": "0.13.1" + "zone.js": "^0.13.3" }, "devDependencies": { "@angular-devkit/build-angular": "16.2.0", diff --git a/packages/astro-angular/src/client.ts b/packages/astro-angular/src/client.ts index 63bec4092..9d7af2ddf 100644 --- a/packages/astro-angular/src/client.ts +++ b/packages/astro-angular/src/client.ts @@ -1,4 +1,4 @@ -import 'zone.js/dist/zone.js'; +import 'zone.js'; import { EnvironmentProviders, Provider, diff --git a/packages/astro-angular/src/server.ts b/packages/astro-angular/src/server.ts index 131997f12..355147d17 100644 --- a/packages/astro-angular/src/server.ts +++ b/packages/astro-angular/src/server.ts @@ -1,4 +1,4 @@ -import 'zone.js/bundles/zone-node.umd.js'; +import 'zone.js/node'; import type { ComponentMirror, EnvironmentProviders, diff --git a/packages/platform/src/lib/ssr/ssr-build-plugin.ts b/packages/platform/src/lib/ssr/ssr-build-plugin.ts index 92d2b1d7d..de9452b9d 100644 --- a/packages/platform/src/lib/ssr/ssr-build-plugin.ts +++ b/packages/platform/src/lib/ssr/ssr-build-plugin.ts @@ -3,15 +3,6 @@ import { normalizePath, Plugin } from 'vite'; export function ssrBuildPlugin(): Plugin { return { name: 'analogjs-ssr-build-plugin', - config(_config) { - return { - resolve: { - alias: { - 'zone.js/node': 'zone.js/bundles/zone-node.umd.js', - }, - }, - }; - }, transform(code, id) { if (id.includes('platform-server')) { code = code.replace(/global\./g, 'globalThis.'); diff --git a/packages/vite-plugin-angular/setup-vitest.ts b/packages/vite-plugin-angular/setup-vitest.ts index df47c7204..95e7fc0d4 100644 --- a/packages/vite-plugin-angular/setup-vitest.ts +++ b/packages/vite-plugin-angular/setup-vitest.ts @@ -1,6 +1,6 @@ import 'zone.js'; -import 'zone.js/dist/sync-test'; -import 'zone.js/dist/proxy'; +import 'zone.js/plugins/sync-test'; +import 'zone.js/plugins/proxy'; import 'zone.js/testing'; /** @@ -23,10 +23,10 @@ const SyncTestZoneSpec = Zone['SyncTestZoneSpec']; const ProxyZoneSpec = Zone['ProxyZoneSpec']; if (SyncTestZoneSpec === undefined) { - throw new Error('Missing: SyncTestZoneSpec (zone.js/dist/sync-test)'); + throw new Error('Missing: SyncTestZoneSpec (zone.js/plugins/sync-test)'); } if (ProxyZoneSpec === undefined) { - throw new Error('Missing: ProxyZoneSpec (zone.js/dist/proxy.js)'); + throw new Error('Missing: ProxyZoneSpec (zone.js/plugins/proxy.js)'); } const env = globalThis as any; diff --git a/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts b/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts index 4fb836781..950651f35 100644 --- a/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts +++ b/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts @@ -141,7 +141,7 @@ export function nitro(options?: Options, nitroOptions?: NitroConfig): Plugin[] { inline: ['zone.js/node'], external: ['rxjs', 'node-fetch-native/dist/polyfill', 'destr'], }, - moduleSideEffects: ['zone.js/bundles/zone-node.umd.js'], + moduleSideEffects: ['zone.js/node'], renderer: normalizePath(`${__dirname}/runtime/renderer`), handlers: [ { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b425e5c87..99e4f9269 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,7 +19,7 @@ importers: version: 16.2.2(@angular/core@16.2.2) '@angular/core': specifier: 16.2.2 - version: 16.2.2(rxjs@7.8.0)(zone.js@0.13.1) + version: 16.2.2(rxjs@7.8.0)(zone.js@0.13.3) '@angular/forms': specifier: 16.2.2 version: 16.2.2(@angular/common@16.2.2)(@angular/core@16.2.2)(@angular/platform-browser@16.2.2)(rxjs@7.8.0) @@ -120,8 +120,8 @@ importers: specifier: ^3.21.4 version: 3.21.4 zone.js: - specifier: 0.13.1 - version: 0.13.1 + specifier: ^0.13.3 + version: 0.13.3 devDependencies: '@angular-devkit/build-angular': specifier: 16.2.0 @@ -791,7 +791,7 @@ packages: peerDependencies: '@angular/core': 16.2.2 dependencies: - '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.1) + '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.3) tslib: 2.6.1 /@angular/cli@16.2.0: @@ -830,7 +830,7 @@ packages: '@angular/core': 16.2.2 rxjs: ^6.5.3 || ^7.4.0 dependencies: - '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.1) + '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.3) rxjs: 7.8.0 tslib: 2.6.1 @@ -864,10 +864,10 @@ packages: '@angular/core': optional: true dependencies: - '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.1) + '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.3) tslib: 2.6.1 - /@angular/core@16.2.2(rxjs@7.8.0)(zone.js@0.13.1): + /@angular/core@16.2.2(rxjs@7.8.0)(zone.js@0.13.3): resolution: {integrity: sha512-l6nJlppguroov7eByBIpbxn/mEPcQrL//Ru1TSPzTtXOLR1p41VqPMaeJXj7xYVx7im57YLTDPAjhtLzkUT/Ow==} engines: {node: ^16.14.0 || >=18.10.0} peerDependencies: @@ -876,7 +876,7 @@ packages: dependencies: rxjs: 7.8.0 tslib: 2.6.1 - zone.js: 0.13.1 + zone.js: 0.13.3 /@angular/forms@16.2.2(@angular/common@16.2.2)(@angular/core@16.2.2)(@angular/platform-browser@16.2.2)(rxjs@7.8.0): resolution: {integrity: sha512-Q3GmOCLSD5BXSjvlLkMsJLXWXb4SO0gA2Aya8JaG1y0doQT/CdGcYXrsCrCT3ot13wqp0HdGQ/ATNd0cNjmz2A==} @@ -888,7 +888,7 @@ packages: rxjs: ^6.5.3 || ^7.4.0 dependencies: '@angular/common': 16.2.2(@angular/core@16.2.2)(rxjs@7.8.0) - '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.1) + '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.3) '@angular/platform-browser': 16.2.2(@angular/animations@16.2.2)(@angular/common@16.2.2)(@angular/core@16.2.2) rxjs: 7.8.0 tslib: 2.6.1 @@ -910,7 +910,7 @@ packages: dependencies: '@angular/common': 16.2.2(@angular/core@16.2.2)(rxjs@7.8.0) '@angular/compiler': 16.2.2(@angular/core@16.2.2) - '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.1) + '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.3) '@angular/platform-browser': 16.2.2(@angular/animations@16.2.2)(@angular/common@16.2.2)(@angular/core@16.2.2) tslib: 2.6.1 dev: false @@ -928,7 +928,7 @@ packages: dependencies: '@angular/animations': 16.2.2(@angular/core@16.2.2) '@angular/common': 16.2.2(@angular/core@16.2.2)(rxjs@7.8.0) - '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.1) + '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.3) tslib: 2.6.1 /@angular/platform-server@16.2.2(@angular/animations@16.2.2)(@angular/common@16.2.2)(@angular/compiler@16.2.2)(@angular/core@16.2.2)(@angular/platform-browser@16.2.2): @@ -944,7 +944,7 @@ packages: '@angular/animations': 16.2.2(@angular/core@16.2.2) '@angular/common': 16.2.2(@angular/core@16.2.2)(rxjs@7.8.0) '@angular/compiler': 16.2.2(@angular/core@16.2.2) - '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.1) + '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.3) '@angular/platform-browser': 16.2.2(@angular/animations@16.2.2)(@angular/common@16.2.2)(@angular/core@16.2.2) tslib: 2.6.1 xhr2: 0.2.1 @@ -959,7 +959,7 @@ packages: rxjs: ^6.5.3 || ^7.4.0 dependencies: '@angular/common': 16.2.2(@angular/core@16.2.2)(rxjs@7.8.0) - '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.1) + '@angular/core': 16.2.2(rxjs@7.8.0)(zone.js@0.13.3) '@angular/platform-browser': 16.2.2(@angular/animations@16.2.2)(@angular/common@16.2.2)(@angular/core@16.2.2) rxjs: 7.8.0 tslib: 2.6.1 @@ -23718,9 +23718,6 @@ packages: /tslib@2.5.0: resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} - /tslib@2.5.3: - resolution: {integrity: sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==} - /tslib@2.6.1: resolution: {integrity: sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==} @@ -25487,10 +25484,10 @@ packages: resolution: {integrity: sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==} dev: false - /zone.js@0.13.1: - resolution: {integrity: sha512-+bIeDAFEBYuXRuU3qGQvzdPap+N1zjM4KkBAiiQuVVCrHrhjDuY6VkUhNa5+U27+9w0q3fbKiMCbpJ0XzMmSWA==} + /zone.js@0.13.3: + resolution: {integrity: sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==} dependencies: - tslib: 2.5.3 + tslib: 2.6.1 /zwitch@1.0.5: resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}