create-analog 1.7.0-beta.2 → 1.7.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-analog",
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-beta.3",
   "type": "module",
   "license": "MIT",
   "author": "Brandon Roberts",

package/template-angular-v16/package.json

@@ -15,8 +15,8 @@
     "test": "ng test"
   },
   "dependencies": {
-    "@analogjs/content": "^1.7.0-beta.2",
-    "@analogjs/router": "^1.7.0-beta.2",
+    "@analogjs/content": "^1.7.0-beta.3",
+    "@analogjs/router": "^1.7.0-beta.3",
     "@angular/animations": "^16.2.0",
     "@angular/common": "^16.2.0",
     "@angular/compiler": "^16.2.0",
@@ -38,9 +38,9 @@
     "zone.js": "~0.13.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^1.7.0-beta.2",
-    "@analogjs/vite-plugin-angular": "^1.7.0-beta.2",
-    "@analogjs/vitest-angular": "^1.7.0-beta.2",
+    "@analogjs/platform": "^1.7.0-beta.3",
+    "@analogjs/vite-plugin-angular": "^1.7.0-beta.3",
+    "@analogjs/vitest-angular": "^1.7.0-beta.3",
     "@angular-devkit/build-angular": "^16.2.0",
     "@angular/cli": "^16.2.0",
     "@angular/compiler-cli": "^16.2.0",

package/template-angular-v17/package.json

@@ -15,8 +15,8 @@
     "test": "ng test"
   },
   "dependencies": {
-    "@analogjs/content": "^1.7.0-beta.2",
-    "@analogjs/router": "^1.7.0-beta.2",
+    "@analogjs/content": "^1.7.0-beta.3",
+    "@analogjs/router": "^1.7.0-beta.3",
     "@angular/animations": "^17.2.0",
     "@angular/common": "^17.2.0",
     "@angular/compiler": "^17.2.0",
@@ -38,9 +38,9 @@
     "zone.js": "~0.14.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^1.7.0-beta.2",
-    "@analogjs/vite-plugin-angular": "^1.7.0-beta.2",
-    "@analogjs/vitest-angular": "^1.7.0-beta.2",
+    "@analogjs/platform": "^1.7.0-beta.3",
+    "@analogjs/vite-plugin-angular": "^1.7.0-beta.3",
+    "@analogjs/vitest-angular": "^1.7.0-beta.3",
     "@angular-devkit/build-angular": "^17.2.0",
     "@angular/cli": "^17.2.0",
     "@angular/compiler-cli": "^17.2.0",

package/template-blog/package.json

@@ -15,8 +15,8 @@
     "test": "ng test"
   },
   "dependencies": {
-    "@analogjs/content": "^1.7.0-beta.2",
-    "@analogjs/router": "^1.7.0-beta.2",
+    "@analogjs/content": "^1.7.0-beta.3",
+    "@analogjs/router": "^1.7.0-beta.3",
     "@angular/animations": "^18.0.0",
     "@angular/common": "^18.0.0",
     "@angular/compiler": "^18.0.0",
@@ -35,9 +35,9 @@
     "zone.js": "~0.14.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^1.7.0-beta.2",
-    "@analogjs/vite-plugin-angular": "^1.7.0-beta.2",
-    "@analogjs/vitest-angular": "^1.7.0-beta.2",
+    "@analogjs/platform": "^1.7.0-beta.3",
+    "@analogjs/vite-plugin-angular": "^1.7.0-beta.3",
+    "@analogjs/vitest-angular": "^1.7.0-beta.3",
     "@angular-devkit/build-angular": "^18.0.0",
     "@angular/cli": "^18.0.0",
     "@angular/compiler-cli": "^18.0.0",

package/template-blog/src/app/app.config.server.ts

@@ -1,15 +1,9 @@
 import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
-import {
-  provideServerRendering,
-  ɵSERVER_CONTEXT as SERVER_CONTEXT,
-} from '@angular/platform-server';
+import { provideServerRendering } from '@angular/platform-server';
 import { appConfig } from './app.config';
 
 const serverConfig: ApplicationConfig = {
-  providers: [
-    provideServerRendering(),
-    { provide: SERVER_CONTEXT, useValue: 'ssr-analog' },
-  ],
+  providers: [provideServerRendering()],
 };
 
 export const config = mergeApplicationConfig(appConfig, serverConfig);

package/template-blog/src/app/app.config.ts

@@ -1,7 +1,11 @@
-import { provideHttpClient, withFetch } from '@angular/common/http';
+import {
+  provideHttpClient,
+  withFetch,
+  withInterceptors,
+} from '@angular/common/http';
 import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
 import { provideClientHydration } from '@angular/platform-browser';
-import { provideFileRouter } from '@analogjs/router';
+import { provideFileRouter, requestContextInterceptor } from '@analogjs/router';
 import { provideContent, withMarkdownRenderer } from '@analogjs/content';
 import { __HIGHLIGHTER__ } from '@analogjs/content/__HIGHLIGHTER_ENTRY_POINT__';
 
@@ -9,7 +13,10 @@ export const appConfig: ApplicationConfig = {
   providers: [
     provideZoneChangeDetection({ eventCoalescing: true }),
     provideFileRouter(),
-    provideHttpClient(withFetch()),
+    provideHttpClient(
+      withFetch(),
+      withInterceptors([requestContextInterceptor])
+    ),
     provideClientHydration(),
     provideContent(withMarkdownRenderer(), __HIGHLIGHTER__()),
   ],

package/template-blog/src/main.server.ts

@@ -1,7 +1,10 @@
 import 'zone.js/node';
+import '@angular/platform-server/init';
 import { enableProdMode } from '@angular/core';
 import { bootstrapApplication } from '@angular/platform-browser';
 import { renderApplication } from '@angular/platform-server';
+import { provideServerContext } from '@analogjs/router/server';
+import { ServerContext } from '@analogjs/router/tokens';
 
 import { config } from './app/app.config.server';
 import { AppComponent } from './app/app.component';
@@ -14,10 +17,15 @@ export function bootstrap() {
   return bootstrapApplication(AppComponent, config);
 }
 
-export default async function render(url: string, document: string) {
+export default async function render(
+  url: string,
+  document: string,
+  serverContext: ServerContext
+) {
   const html = await renderApplication(bootstrap, {
     document,
     url,
+    platformProviders: [provideServerContext(serverContext)],
   });
 
   return html;

package/template-latest/package.json

@@ -15,8 +15,8 @@
   },
   "private": true,
   "dependencies": {
-    "@analogjs/content": "^1.7.0-beta.2",
-    "@analogjs/router": "^1.7.0-beta.2",
+    "@analogjs/content": "^1.7.0-beta.3",
+    "@analogjs/router": "^1.7.0-beta.3",
     "@angular/animations": "^18.0.0",
     "@angular/common": "^18.0.0",
     "@angular/compiler": "^18.0.0",
@@ -37,9 +37,9 @@
     "zone.js": "~0.14.3"
   },
   "devDependencies": {
-    "@analogjs/platform": "^1.7.0-beta.2",
-    "@analogjs/vite-plugin-angular": "^1.7.0-beta.2",
-    "@analogjs/vitest-angular": "^1.7.0-beta.2",
+    "@analogjs/platform": "^1.7.0-beta.3",
+    "@analogjs/vite-plugin-angular": "^1.7.0-beta.3",
+    "@analogjs/vitest-angular": "^1.7.0-beta.3",
     "@angular-devkit/build-angular": "^18.0.0",
     "@angular/cli": "^18.0.0",
     "@angular/compiler-cli": "^18.0.0",

package/template-latest/src/app/app.config.server.ts

@@ -1,16 +1,10 @@
 import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
-import {
-  provideServerRendering,
-  ɵSERVER_CONTEXT as SERVER_CONTEXT,
-} from '@angular/platform-server';
+import { provideServerRendering } from '@angular/platform-server';
 
 import { appConfig } from './app.config';
 
 const serverConfig: ApplicationConfig = {
-  providers: [
-    provideServerRendering(),
-    { provide: SERVER_CONTEXT, useValue: 'ssr-analog' },
-  ],
+  providers: [provideServerRendering()],
 };
 
 export const config = mergeApplicationConfig(appConfig, serverConfig);

package/template-latest/src/app/app.config.ts

@@ -1,13 +1,20 @@
-import { provideHttpClient, withFetch } from '@angular/common/http';
+import {
+  provideHttpClient,
+  withFetch,
+  withInterceptors,
+} from '@angular/common/http';
 import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
 import { provideClientHydration } from '@angular/platform-browser';
-import { provideFileRouter } from '@analogjs/router';
+import { provideFileRouter, requestContextInterceptor } from '@analogjs/router';
 
 export const appConfig: ApplicationConfig = {
   providers: [
     provideZoneChangeDetection({ eventCoalescing: true }),
     provideFileRouter(),
-    provideHttpClient(withFetch()),
+    provideHttpClient(
+      withFetch(),
+      withInterceptors([requestContextInterceptor])
+    ),
     provideClientHydration(),
   ],
 };

package/template-latest/src/main.server.ts

@@ -1,9 +1,10 @@
 import 'zone.js/node';
 import '@angular/platform-server/init';
-
 import { enableProdMode } from '@angular/core';
 import { bootstrapApplication } from '@angular/platform-browser';
 import { renderApplication } from '@angular/platform-server';
+import { provideServerContext } from '@analogjs/router/server';
+import { ServerContext } from '@analogjs/router/tokens';
 
 import { config } from './app/app.config.server';
 import { AppComponent } from './app/app.component';
@@ -16,10 +17,15 @@ export function bootstrap() {
   return bootstrapApplication(AppComponent, config);
 }
 
-export default async function render(url: string, document: string) {
+export default async function render(
+  url: string,
+  document: string,
+  serverContext: ServerContext
+) {
   const html = await renderApplication(bootstrap, {
     document,
     url,
+    platformProviders: [provideServerContext(serverContext)],
   });
 
   return html;