create-analog 2.1.0-beta.4 → 2.1.0-beta.6

package/template-angular-v20/src/app/pages/analog-welcome.ts

@@ -0,0 +1,264 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-analog-welcome',
+  styles: [
+    `
+      :host {
+        font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
+          'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif,
+          'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
+          'Noto Color Emoji';
+        display: flex;
+        padding: 2rem 1rem 8rem;
+        flex-direction: column;
+        background: rgb(250 250 250);
+        height: 100%;
+      }
+      a {
+        color: inherit;
+        text-decoration: inherit;
+      }
+      .main {
+        margin: 0 auto;
+        flex: 1 1 0;
+      }
+      .intro-section {
+        padding-top: 1.5rem;
+        padding-bottom: 2rem;
+      }
+      .intro-section > * + * {
+        margin-top: 1.5rem;
+      }
+      @media (min-width: 768px) {
+        .intro-section {
+          padding-top: 2.5rem;
+          padding-bottom: 3rem;
+        }
+      }
+      @media (min-width: 1024px) {
+        .intro-section {
+          padding-top: 8rem;
+          padding-bottom: 8rem;
+        }
+      }
+      .intro-container {
+        display: flex;
+        flex-direction: column;
+        text-align: center;
+        gap: 1rem;
+        align-items: center;
+        max-width: 64rem;
+      }
+      .intro-logo {
+        height: 3rem;
+        width: 3rem;
+      }
+      .intro-badge {
+        transition-property: color, background-color, border-color,
+          text-decoration-color, fill, stroke;
+        transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+        transition-duration: 150ms;
+        font-weight: 500;
+        font-size: 0.875rem;
+        line-height: 1.25rem;
+        padding: 0.375rem 1rem;
+        background-color: rgb(228 228 231);
+        border-radius: 1rem;
+      }
+      .intro-heading {
+        margin: 0;
+        font-weight: 500;
+      }
+
+      @media (min-width: 640px) {
+        .intro-heading {
+          font-size: 3rem;
+          line-height: 1;
+        }
+      }
+      @media (min-width: 768px) {
+        .intro-heading {
+          font-size: 3.75rem;
+          line-height: 1;
+        }
+      }
+      @media (min-width: 1024px) {
+        .intro-heading {
+          font-size: 4.5rem;
+          line-height: 1;
+        }
+      }
+      .intro-analog {
+        color: #dd0031;
+      }
+      .intro-description {
+        line-height: 1.5;
+        max-width: 42rem;
+        margin: 0;
+      }
+
+      @media (min-width: 640px) {
+        .intro-description {
+          line-height: 2rem;
+          font-size: 1.25rem;
+        }
+      }
+      .btn-container > * + * {
+        margin-left: 1rem;
+      }
+      .darkBtn {
+        transition-property: color, background-color, border-color,
+          text-decoration-color, fill, stroke;
+        transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+        transition-duration: 150ms;
+        color: rgb(250 250 250);
+        font-weight: 500;
+        font-size: 0.875rem;
+        line-height: 1.25rem;
+        padding-left: 2rem;
+        padding-right: 2rem;
+        background-color: rgb(9 9 11);
+        border-radius: 0.375rem;
+        justify-content: center;
+        align-items: center;
+        height: 2.75rem;
+        cursor: pointer;
+        display: inline-flex;
+      }
+      .darkBtn:hover {
+        background-color: rgb(9 9 11 / 0.9);
+      }
+      .lightBtn {
+        transition-property: color, background-color, border-color,
+          text-decoration-color, fill, stroke;
+        transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+        transition-duration: 150ms;
+        color: rgb(24, 24, 27);
+        background: rgb(250 250 250);
+        font-weight: 500;
+        font-size: 0.875rem;
+        line-height: 1.25rem;
+        padding-left: 2rem;
+        padding-right: 2rem;
+        border-radius: 0.375rem;
+        border: 1px solid rgb(229, 231, 235);
+        justify-content: center;
+        align-items: center;
+        height: 2.75rem;
+        display: inline-flex;
+        cursor: pointer;
+      }
+      .lightBtn:hover {
+        background-color: rgb(244 244 245);
+      }
+      .counter-section {
+        padding-top: 2rem;
+        padding-bottom: 2rem;
+      }
+
+      @media (min-width: 768px) {
+        .counter-section {
+          padding-top: 3rem;
+          padding-bottom: 3rem;
+        }
+      }
+
+      @media (min-width: 1024px) {
+        .counter-section {
+          padding-top: 6rem;
+          padding-bottom: 6rem;
+        }
+      }
+      .counter-container {
+        text-align: center;
+        gap: 1rem;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+        max-width: 58rem;
+        display: flex;
+        margin-left: auto;
+        margin-right: auto;
+      }
+      .counter-heading {
+        color: #dd0031;
+        line-height: 1.1;
+        font-weight: 500;
+        font-size: 1.875rem;
+        margin: 0;
+      }
+      .counter-description {
+        line-height: 1.5;
+        max-width: 85%;
+        margin: 0;
+      }
+
+      @media (min-width: 640px) {
+        .counter-description {
+          line-height: 1.75rem;
+          font-size: 1.125rem;
+        }
+      }
+      .count {
+        margin-left: 0.25rem;
+        font-family: Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace;
+      }
+    `,
+  ],
+  template: `
+    <main class="main">
+      <section class="intro-section">
+        <div class="intro-container">
+          <img
+            class="intro-logo"
+            src="https://analogjs.org/img/logos/analog-logo.svg"
+            alt="AnalogJs logo. Two red triangles and a white analog wave in front"
+          />
+          <a
+            class="intro-badge"
+            target="_blank"
+            href="https://twitter.com/analogjs"
+            >Follow along on Twitter</a
+          >
+          <h1 class="intro-heading">
+            <span class="intro-analog">Analog.</span> The fullstack Angular
+            meta-framework
+          </h1>
+          <p class="intro-description">
+            Analog is for building applications and websites with Angular.
+            <br />Powered by Vite.
+          </p>
+          <div class="btn-container">
+            <a class="darkBtn" href="https://analogjs.org">Read the docs</a>
+            <a
+              target="_blank"
+              rel="noreferrer"
+              class="lightBtn"
+              href="https://github.com/analogjs/analog"
+              >Star on GitHub</a
+            >
+          </div>
+        </div>
+      </section>
+    <section id="counter-demo" class="section">
+        <div class="counter-container">
+          <h2 class="counter-heading">Counter</h2>
+          <p class="counter-description">
+            This is a simple interactive counter. Powered by Angular.
+          </p>
+          <button (click)="increment()" class="lightBtn">
+            Count: <span class="count">{{ count }}</span>
+          </button>
+        </div>
+      </section>
+    </main>
+  `,
+})
+export class AnalogWelcome {
+  count = 0;
+
+  increment() {
+    this.count++;
+  }
+}

package/template-angular-v20/src/app/pages/index.page.ts

@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+import { AnalogWelcome } from './analog-welcome';
+
+@Component({
+  selector: 'app-home',
+  imports: [AnalogWelcome],
+  template: `
+     <app-analog-welcome/>
+  `,
+})
+export default class Home {}

package/template-angular-v20/src/main.server.ts

@@ -0,0 +1,8 @@
+import 'zone.js/node';
+import '@angular/platform-server/init';
+import { render } from '@analogjs/router/server';
+
+import { App } from './app/app';
+import { config } from './app/app.config.server';
+
+export default render(App, config);

package/template-angular-v20/src/main.ts

@@ -0,0 +1,7 @@
+import 'zone.js';
+import { bootstrapApplication } from '@angular/platform-browser';
+
+import { App } from './app/app';
+import { appConfig } from './app/app.config';
+
+bootstrapApplication(App, appConfig);

package/template-angular-v20/src/server/routes/api/v1/hello.ts

@@ -0,0 +1,3 @@
+import { defineEventHandler } from 'h3';
+
+export default defineEventHandler(() => ({ message: 'Hello World' }));

package/template-angular-v20/src/styles.css

@@ -0,0 +1,4 @@
+html, body {
+  display: block;
+  height: 100%;
+}

package/template-angular-v20/src/test-setup.ts

@@ -0,0 +1,13 @@
+import '@angular/compiler';
+import '@analogjs/vitest-angular/setup-zone';
+
+import {
+  BrowserTestingModule,
+  platformBrowserTesting,
+} from '@angular/platform-browser/testing';
+import { getTestBed } from '@angular/core/testing';
+
+getTestBed().initTestEnvironment(
+  BrowserTestingModule,
+  platformBrowserTesting()
+);

package/template-angular-v20/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

package/template-angular-v20/tsconfig.app.json

@@ -0,0 +1,14 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/app",
+    "types": []
+  },
+  "files": ["src/main.ts", "src/main.server.ts"],
+  "include": [
+    "src/**/*.d.ts",
+    "src/app/pages/**/*.page.ts",
+    "src/server/middleware/**/*.ts"
+  ]
+}

package/template-angular-v20/tsconfig.json

@@ -0,0 +1,34 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "moduleResolution": "bundler",
+    "isolatedModules": true,
+    "importHelpers": true,
+    "target": "ES2022",
+    "module": "ES2022",
+    "lib": ["ES2022", "dom"],
+    "useDefineForClassFields": false,
+    "skipLibCheck": true
+  },
+  "angularCompilerOptions": {
+    "enableI18nLegacyMessageIdFormat": false,
+    "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true,
+    "strictTemplates": true
+  },
+  "references": [
+    { "path": "tsconfig.spec.json" }
+  ]
+}

package/template-angular-v20/tsconfig.spec.json

@@ -0,0 +1,11 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/spec",
+    "target": "es2022",
+    "types": ["node", "vitest/globals"]
+  },
+  "files": ["src/test-setup.ts"],
+  "include": ["src/**/*.spec.ts", "src/**/*.d.ts"]
+}

package/template-angular-v20/vite.config.ts

@@ -0,0 +1,27 @@
+/// <reference types="vitest" />
+
+import { defineConfig } from 'vite';
+import analog from '@analogjs/platform';__TAILWIND_IMPORT__
+
+// https://vitejs.dev/config/
+export default defineConfig(({ mode }) => ({
+  build: {
+    target: ['es2020'],
+  },
+  resolve: {
+    mainFields: ['module'],
+  },
+  plugins: [
+    analog(),__TAILWIND_PLUGIN__
+  ],
+  test: {
+    globals: true,
+    environment: 'jsdom',
+    setupFiles: ['src/test-setup.ts'],
+    include: ['**/*.spec.ts'],
+    reporters: ['default'],
+  },
+  define: {
+    'import.meta.vitest': mode !== 'production',
+  },
+}));

package/template-blog/package.json

@@ -16,40 +16,36 @@
   },
   "private": true,
   "dependencies": {
-    "@analogjs/content": "^2.1.0-beta.4",
-    "@analogjs/router": "^2.1.0-beta.4",
-    "@angular/animations": "^20.0.0",
-    "@angular/common": "^20.0.0",
-    "@angular/compiler": "^20.0.0",
-    "@angular/core": "^20.0.0",
-    "@angular/forms": "^20.0.0",
-    "@angular/platform-browser": "^20.0.0",
-    "@angular/platform-server": "^20.0.0",
-    "@angular/router": "^20.0.0",
+    "@analogjs/content": "^2.1.0-beta.6",
+    "@analogjs/router": "^2.1.0-beta.6",
+    "@angular/animations": "^21.0.0",
+    "@angular/common": "^21.0.0",
+    "@angular/compiler": "^21.0.0",
+    "@angular/core": "^21.0.0",
+    "@angular/forms": "^21.0.0",
+    "@angular/platform-browser": "^21.0.0",
+    "@angular/platform-server": "^21.0.0",
+    "@angular/router": "^21.0.0",
     "front-matter": "^4.0.2",
     "marked": "^15.0.7",
     "marked-gfm-heading-id": "^4.1.1",
     "marked-highlight": "^2.2.1",
     "marked-mangle": "^1.1.10",
     "rxjs": "~7.8.0",
-    "tslib": "^2.3.0",
-    "zone.js": "~0.15.0"
+    "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^2.1.0-beta.4",
-    "@analogjs/vite-plugin-angular": "^2.1.0-beta.4",
-    "@analogjs/vitest-angular": "^2.1.0-beta.4",
-    "@angular-devkit/build-angular": "^20.0.0",
-    "@angular/build": "^20.0.0",
-    "@angular/cli": "^20.0.0",
-    "@angular/compiler-cli": "^20.0.0",
+    "@analogjs/platform": "^2.1.0-beta.6",
+    "@analogjs/vite-plugin-angular": "^2.1.0-beta.6",
+    "@analogjs/vitest-angular": "^2.1.0-beta.6",
+    "@angular-devkit/build-angular": "^21.0.0",
+    "@angular/build": "^21.0.0",
+    "@angular/cli": "^21.0.0",
+    "@angular/compiler-cli": "^21.0.0",
     "jsdom": "^22.0.0",
-    "typescript": "~5.8.0",
+    "typescript": "~5.9.0",
     "vite": "^7.0.0",
     "vite-tsconfig-paths": "^4.2.0",
     "vitest": "^4.0.0"
-  },
-  "overrides": {
-    "vitest": "$vitest"
   }
 }

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

@@ -1,4 +1,3 @@
-import 'zone.js/node';
 import '@angular/platform-server/init';
 import { render } from '@analogjs/router/server';
 

package/template-blog/src/main.ts

@@ -1,4 +1,3 @@
-import 'zone.js';
 import { bootstrapApplication } from '@angular/platform-browser';
 
 import { App } from './app/app';

package/template-blog/src/test-setup.ts

@@ -1,13 +1,5 @@
 import '@angular/compiler';
-import '@analogjs/vitest-angular/setup-zone';
+import '@analogjs/vitest-angular/setup-snapshots';
+import { setupTestBed } from '@analogjs/vitest-angular/setup-testbed';
 
-import {
-  BrowserTestingModule,
-  platformBrowserTesting,
-} from '@angular/platform-browser/testing';
-import { getTestBed } from '@angular/core/testing';
-
-getTestBed().initTestEnvironment(
-  BrowserTestingModule,
-  platformBrowserTesting()
-);
+setupTestBed();

package/template-blog/vite.config.ts

@@ -28,7 +28,4 @@ export default defineConfig(({ mode }) => ({
     include: ['**/*.spec.ts'],
     reporters: ['default'],
   },
-  define: {
-    'import.meta.vitest': mode !== 'production',
-  },
 }));

package/template-latest/package.json

@@ -16,16 +16,16 @@
   },
   "private": true,
   "dependencies": {
-    "@analogjs/content": "^2.1.0-beta.4",
-    "@analogjs/router": "^2.1.0-beta.4",
-    "@angular/animations": "^20.0.0",
-    "@angular/common": "^20.0.0",
-    "@angular/compiler": "^20.0.0",
-    "@angular/core": "^20.0.0",
-    "@angular/forms": "^20.0.0",
-    "@angular/platform-browser": "^20.0.0",
-    "@angular/platform-server": "^20.0.0",
-    "@angular/router": "^20.0.0",
+    "@analogjs/content": "^2.1.0-beta.6",
+    "@analogjs/router": "^2.1.0-beta.6",
+    "@angular/animations": "^21.0.0",
+    "@angular/common": "^21.0.0",
+    "@angular/compiler": "^21.0.0",
+    "@angular/core": "^21.0.0",
+    "@angular/forms": "^21.0.0",
+    "@angular/platform-browser": "^21.0.0",
+    "@angular/platform-server": "^21.0.0",
+    "@angular/router": "^21.0.0",
     "front-matter": "^4.0.2",
     "marked": "^15.0.7",
     "marked-gfm-heading-id": "^4.1.1",
@@ -33,24 +33,20 @@
     "marked-mangle": "^1.1.10",
     "prismjs": "^1.29.0",
     "rxjs": "~7.8.0",
-    "tslib": "^2.3.0",
-    "zone.js": "~0.15.0"
+    "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^2.1.0-beta.4",
-    "@analogjs/vite-plugin-angular": "^2.1.0-beta.4",
-    "@analogjs/vitest-angular": "^2.1.0-beta.4",
-    "@angular-devkit/build-angular": "^20.0.0",
-    "@angular/build": "^20.0.0",
-    "@angular/cli": "^20.0.0",
-    "@angular/compiler-cli": "^20.0.0",
+    "@analogjs/platform": "^2.1.0-beta.6",
+    "@analogjs/vite-plugin-angular": "^2.1.0-beta.6",
+    "@analogjs/vitest-angular": "^2.1.0-beta.6",
+    "@angular-devkit/build-angular": "^21.0.0",
+    "@angular/build": "^21.0.0",
+    "@angular/cli": "^21.0.0",
+    "@angular/compiler-cli": "^21.0.0",
     "jsdom": "^22.0.0",
-    "typescript": "~5.8.0",
+    "typescript": "~5.9.0",
     "vite": "^7.0.0",
     "vite-tsconfig-paths": "^4.2.0",
     "vitest": "^4.0.0"
-  },
-  "overrides": {
-    "vitest": "$vitest"
   }
 }

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

@@ -6,7 +6,6 @@ import {
 import {
   ApplicationConfig,
   provideBrowserGlobalErrorListeners,
-  provideZoneChangeDetection
 } from '@angular/core';
 import { provideClientHydration, withEventReplay } from '@angular/platform-browser';
 import { provideFileRouter, requestContextInterceptor } from '@analogjs/router';
@@ -14,7 +13,6 @@ import { provideFileRouter, requestContextInterceptor } from '@analogjs/router';
 export const appConfig: ApplicationConfig = {
   providers: [
     provideBrowserGlobalErrorListeners(),
-    provideZoneChangeDetection({ eventCoalescing: true }),
     provideFileRouter(),
     provideHttpClient(
       withFetch(),

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

@@ -1,4 +1,3 @@
-import 'zone.js/node';
 import '@angular/platform-server/init';
 import { render } from '@analogjs/router/server';
 

package/template-latest/src/main.ts

@@ -1,4 +1,3 @@
-import 'zone.js';
 import { bootstrapApplication } from '@angular/platform-browser';
 
 import { App } from './app/app';

package/template-latest/src/test-setup.ts

@@ -1,13 +1,5 @@
 import '@angular/compiler';
-import '@analogjs/vitest-angular/setup-zone';
+import '@analogjs/vitest-angular/setup-snapshots';
+import { setupTestBed } from '@analogjs/vitest-angular/setup-testbed';
 
-import {
-  BrowserTestingModule,
-  platformBrowserTesting,
-} from '@angular/platform-browser/testing';
-import { getTestBed } from '@angular/core/testing';
-
-getTestBed().initTestEnvironment(
-  BrowserTestingModule,
-  platformBrowserTesting()
-);
+setupTestBed();

package/template-latest/vite.config.ts

@@ -21,7 +21,4 @@ export default defineConfig(({ mode }) => ({
     include: ['**/*.spec.ts'],
     reporters: ['default'],
   },
-  define: {
-    'import.meta.vitest': mode !== 'production',
-  },
 }));