feat(vite-plugin-nitro): upgrade Nitro dependency to 2.x (#431)

analogjs · May 24, 2023 · 6c3f387 · 6c3f387
1 parent 52c46e9
commit 6c3f387
Show file tree

Hide file tree

Showing 7 changed files with 513 additions and 422 deletions.
diff --git a/apps/blog-app/src/app/app.config.ts b/apps/blog-app/src/app/app.config.ts
@@ -1,7 +1,10 @@
 import { ApplicationConfig } from '@angular/core';
 import { provideClientHydration } from '@angular/platform-browser';
 import { provideHttpClient } from '@angular/common/http';
-import { withInMemoryScrolling } from '@angular/router';
+import {
+  withEnabledBlockingInitialNavigation,
+  withInMemoryScrolling,
+} from '@angular/router';
 import { provideFileRouter } from '@analogjs/router';
 import { provideContent, withMarkdownRenderer } from '@analogjs/content';
 
@@ -10,6 +13,9 @@ export const appConfig: ApplicationConfig = {
     provideHttpClient(),
     provideClientHydration(),
     provideContent(withMarkdownRenderer()),
-    provideFileRouter(withInMemoryScrolling({ anchorScrolling: 'enabled' })),
+    provideFileRouter(
+      withInMemoryScrolling({ anchorScrolling: 'enabled' }),
+      withEnabledBlockingInitialNavigation()
+    ),
   ],
 };
diff --git a/package.json b/package.json
@@ -112,7 +112,7 @@
     "lint-staged": "^13.1.0",
     "minimist": "^1.2.7",
     "ng-packagr": "^16.0.0",
-    "nitropack": "^1.0.0",
+    "nitropack": "^2.0.0",
     "nx": "16.1.0",
     "playwright": "^1.30.0",
     "postcss": "^8.4.21",

diff --git a/packages/platform/package.json b/packages/platform/package.json
@@ -24,7 +24,7 @@
     "url": "https://github.com/analogjs/analog.git"
   },
   "dependencies": {
-    "nitropack": "^1.0.0",
+    "nitropack": "^2.0.0",
     "@analogjs/vite-plugin-angular": "^0.2.0-beta.13",
     "@analogjs/vite-plugin-nitro": "^0.2.0-beta.13",
     "@nx/devkit": "^16.0.0"

diff --git a/packages/vite-plugin-nitro/package.json b/packages/vite-plugin-nitro/package.json
@@ -24,7 +24,7 @@
     "url": "https://github.com/analogjs/analog.git"
   },
   "dependencies": {
-    "nitropack": "^1.0.0"
+    "nitropack": "^2.0.0"
   },
   "ng-update": {
     "packageGroup": [

diff --git a/packages/vite-plugin-nitro/src/lib/vite-nitro-plugin.spec.data.ts b/packages/vite-plugin-nitro/src/lib/vite-nitro-plugin.spec.data.ts
@@ -20,7 +20,7 @@ export const mockNitroConfig: NitroConfig = {
   rootDir: '.',
   runtimeConfig: {},
   scanDirs: ['src/server'],
-  srcDir: 'src',
+  srcDir: 'src/server',
   prerender: {
     crawlLinks: undefined,
   },

diff --git a/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts b/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts
@@ -33,7 +33,7 @@ export function nitro(options?: Options, nitroOptions?: NitroConfig): Plugin {
       nitroConfig = {
         rootDir,
         logLevel: nitroOptions?.logLevel || 0,
-        srcDir: normalizePath(`${rootDir}/src`),
+        srcDir: normalizePath(`${rootDir}/src/server`),
         scanDirs: [normalizePath(`${rootDir}/src/server`)],
         output: {
           dir: normalizePath(

diff --git a/yarn.lock b/yarn.lock