create-analog 2.0.0-alpha.2 → 2.0.0-alpha.21

package/template-latest/src/app/pages/analog-welcome.ts

@@ -0,0 +1,263 @@
+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-latest/src/app/pages/index.page.ts

@@ -1,55 +1,13 @@
-import { Component, signal } from '@angular/core';
+import { Component } from '@angular/core';
+
+import { AnalogWelcome } from './analog-welcome';
 
 @Component({
   selector: 'app-home',
-  standalone: true,
+  imports: [AnalogWelcome],
   template: `
-    <div>
-      <a href="https://analogjs.org/" target="_blank">
-        <img alt="Analog Logo" class="logo analog" src="/analog.svg" />
-      </a>
-    </div>
-
-    <h2>Analog</h2>
-
-    <h3>The fullstack meta-framework for Angular!</h3>
-
-    <div class="card">
-      <button type="button" (click)="increment()">Count {{ count() }}</button>
-    </div>
-
-    <p class="read-the-docs">
-      <a href="https://analogjs.org" target="_blank">Docs</a> |
-      <a href="https://github.com/analogjs/analog" target="_blank">GitHub</a> |
-      <a href="https://github.com/sponsors/brandonroberts" target="_blank">
-        Sponsor
-      </a>
-    </p>
-  `,
-  styles: `
-    .logo {
-      will-change: filter;
-    }
-
-    .logo:hover {
-      filter: drop-shadow(0 0 2em #646cffaa);
-    }
-
-    .read-the-docs > * {
-      color: #fff;
-    }
-
-    @media (prefers-color-scheme: light) {
-      .read-the-docs > * {
-        color: #213547;
-      }
-    }
+     <app-analog-welcome/>
   `,
 })
 export default class HomeComponent {
-  count = signal(0);
-
-  increment() {
-    this.count.update((count) => count + 1);
-  }
 }

package/template-latest/src/styles.css

@@ -1,80 +1,4 @@
-/* You can add global styles to this file, and also import other style files */
-:root {
-  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
-  font-size: 16px;
-  line-height: 24px;
-  font-weight: 400;
-
-  color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
-
-  font-synthesis: none;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-text-size-adjust: 100%;
-}
-
-a {
-  font-weight: 500;
-  color: #646cff;
-  text-decoration: inherit;
-}
-
-a:hover {
-  color: #535bf2;
-}
-
-body {
-  margin: 0;
-  display: flex;
-  place-items: center;
-  min-width: 320px;
-  min-height: 100vh;
-}
-
-h1 {
-  font-size: 3.2em;
-  line-height: 1.1;
-}
-
-button {
-  border-radius: 8px;
-  border: 1px solid transparent;
-  padding: 0.6em 1.2em;
-  font-size: 1em;
-  font-weight: 500;
-  font-family: inherit;
-  background-color: #1a1a1a;
-  cursor: pointer;
-  transition: border-color 0.25s;
-}
-
-button:hover {
-  border-color: #646cff;
-}
-
-button:focus,
-button:focus-visible {
-  outline: 4px auto -webkit-focus-ring-color;
-}
-
-.card {
-  padding: 2em;
-}
-
-@media (prefers-color-scheme: light) {
-  :root {
-    color: #213547;
-    background-color: #ffffff;
-  }
-
-  a:hover {
-    color: #747bff;
-  }
-
-  button {
-    background-color: #f9f9f9;
-  }
+html, body {
+  display: block;
+  height: 100%;
 }

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

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

package/template-latest/tsconfig.json

@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "compileOnSave": false,
   "compilerOptions": {
@@ -14,7 +13,7 @@
     "declaration": false,
     "downlevelIteration": true,
     "experimentalDecorators": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "isolatedModules": true,
     "importHelpers": true,
     "target": "ES2022",
@@ -28,5 +27,8 @@
     "strictInjectionParameters": true,
     "strictInputAccessModifiers": true,
     "strictTemplates": true
-  }
+  },
+  "references": [
+    { "path": "tsconfig.spec.json" }
+  ]
 }

package/template-latest/vite.config.ts

@@ -1,7 +1,7 @@
 /// <reference types="vitest" />
 
 import { defineConfig } from 'vite';
-import analog from '@analogjs/platform';
+import analog from '@analogjs/platform';__TAILWIND_IMPORT__
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => ({
@@ -11,7 +11,9 @@ export default defineConfig(({ mode }) => ({
   resolve: {
     mainFields: ['module'],
   },
-  plugins: [analog(__ANALOG_SFC_CONFIG__)],
+  plugins: [
+    analog(),__TAILWIND_PLUGIN__
+  ],
   test: {
     globals: true,
     environment: 'jsdom',

package/template-minimal/.vscode/extensions.json

@@ -1,4 +1,4 @@
 {
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
-  "recommendations": ["angular.ng-template", "analogjs.vscode-analog"]
+  "recommendations": ["angular.ng-template", "analogjs.vscode-analog", "vitest.explorer"]
 }

package/template-minimal/angular.json

@@ -5,7 +5,7 @@
   "projects": {
     "my-app": {
       "projectType": "application",
-      "root": "",
+      "root": ".",
       "sourceRoot": "src",
       "prefix": "app",
       "architect": {

package/template-minimal/package.json

@@ -3,20 +3,21 @@
   "version": "0.0.0",
   "type": "module",
   "engines": {
-    "node": ">=18.19.1"
+    "node": ">=20.19.1"
   },
   "scripts": {
     "ng": "ng",
-    "dev": "ng serve",
-    "start": "ng serve",
-    "build": "ng build",
-    "watch": "ng build --watch --configuration development",
-    "test": "ng test"
+    "dev": "vite",
+    "start": "vite",
+    "build": "vite build",
+    "watch": "vite build --watch",
+    "test": "vitest",
+    "preview": "node dist/analog/server/index.mjs"
   },
   "private": true,
   "dependencies": {
-    "@analogjs/content": "^2.0.0-alpha.2",
-    "@analogjs/router": "^2.0.0-alpha.2",
+    "@analogjs/content": "^2.0.0-alpha.21",
+    "@analogjs/router": "^2.0.0-alpha.21",
     "@angular/animations": "^19.0.0",
     "@angular/common": "^19.0.0",
     "@angular/compiler": "^19.0.0",
@@ -27,27 +28,32 @@
     "@angular/platform-server": "^19.0.0",
     "@angular/router": "^19.0.0",
     "front-matter": "^4.0.2",
-    "marked": "^5.0.2",
-    "marked-gfm-heading-id": "^3.1.0",
-    "marked-highlight": "^2.0.1",
-    "marked-mangle": "^1.1.7",
+    "marked": "^15.0.7",
+    "marked-gfm-heading-id": "^4.1.1",
+    "marked-highlight": "^2.2.1",
+    "marked-mangle": "^1.1.10",
     "prismjs": "^1.29.0",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.15.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^2.0.0-alpha.2",
-    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.2",
-    "@analogjs/vitest-angular": "^2.0.0-alpha.2",
+    "@analogjs/platform": "^2.0.0-alpha.21",
+    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.21",
+    "@analogjs/vitest-angular": "^2.0.0-alpha.21",
     "@angular-devkit/build-angular": "^19.0.0",
     "@angular/build": "^19.0.0",
     "@angular/cli": "^19.0.0",
     "@angular/compiler-cli": "^19.0.0",
     "jsdom": "^22.0.0",
-    "typescript": "~5.5.0",
-    "vite": "^6.0.0",
+    "typescript": "~5.8.0",
+    "vite": "^7.0.0",
     "vite-tsconfig-paths": "^4.2.0",
-    "vitest": "^2.0.0"
+    "vitest": "^3.0.0"
+  },
+  "overrides": {
+    "@analogjs/platform": {
+      "vite": "$vite"
+    }
   }
 }

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

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

package/template-minimal/src/app/{app.component.ts → app.ts}

@@ -3,7 +3,6 @@ import { RouterOutlet } from '@angular/router';
 
 @Component({
   selector: 'app-root',
-  standalone: true,
   imports: [RouterOutlet],
   template: `<router-outlet />`,
 })

package/template-minimal/src/app/pages/index.page.ts

@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 
 @Component({
   selector: 'app-home',
-  standalone: true,
   template: `
     <h2>Analog</h2>
 

package/template-minimal/tsconfig.json

@@ -14,7 +14,7 @@
     "declaration": false,
     "downlevelIteration": true,
     "experimentalDecorators": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "isolatedModules": true,
     "importHelpers": true,
     "target": "ES2022",

package/template-minimal/vite.config.ts

@@ -1,7 +1,7 @@
 /// <reference types="vitest" />
 
 import { defineConfig } from 'vite';
-import analog from '@analogjs/platform';
+import analog from '@analogjs/platform';__TAILWIND_IMPORT__
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => ({
@@ -17,7 +17,7 @@ export default defineConfig(({ mode }) => ({
       static: true,
       prerender: {
         routes: [],
-      },__ANALOG_SFC_CONFIG__
-    }),
+      },
+    }),__TAILWIND_PLUGIN__
   ],
 }));

package/files/analog-env.d.ts

@@ -1,13 +0,0 @@
-declare module '*.analog' {
-  import { Type } from '@angular/core';
-
-  const cmp: Type<unknown>;
-  export default cmp;
-}
-
-declare module '*.ag' {
-  import { Type } from '@angular/core';
-
-  const cmp: Type<unknown>;
-  export default cmp;
-}

package/files/postcss.config.cjs

@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-};

package/files/tailwind.config.ts

@@ -1,9 +0,0 @@
-import type { Config } from 'tailwindcss';
-
-export default {
-  content: ['./index.html', './src/**/*.{html,ts,md,analog,ag}'],
-  theme: {
-    extend: {},
-  },
-  plugins: [],
-} satisfies Config;