create-analog 2.0.0-alpha.19 → 2.0.0-alpha.20

package/index.js

@@ -65,7 +65,6 @@ async function init() {
   let targetDir = formatTargetDir(argv._[0]);
   let template = argv.template || argv.t;
   let skipTailwind = fromBoolArg(argv.skipTailwind);
-  let useAnalogSFC = fromBoolArg(argv.analogSFC);
 
   const defaultTargetDir = 'analog-project';
   const getProjectName = () =>
@@ -158,7 +157,6 @@ async function init() {
     overwrite,
     packageName,
     variant,
-    analogSFC,
     tailwind,
     syntaxHighlighter,
   } = result;
@@ -176,7 +174,6 @@ async function init() {
   // determine syntax highlighter
   let highlighter = syntaxHighlighter ?? (template === 'blog' ? 'prism' : null);
   skipTailwind = skipTailwind ?? !tailwind;
-  useAnalogSFC = useAnalogSFC ?? analogSFC;
 
   console.log(`\nScaffolding project in ${root}...`);
 
@@ -243,7 +240,6 @@ async function init() {
   write('package.json', JSON.stringify(pkg, null, 2));
 
   setProjectTitle(root, getProjectName());
-  setComponentFormat(root, filesDir, write, template, useAnalogSFC);
 
   console.log(`\nInitializing git repository:`);
   execSync(`git init ${targetDir} && cd ${targetDir} && git add .`);
@@ -419,47 +415,6 @@ function setProjectTitle(root, title) {
   });
 }
 
-function setComponentFormat(root, filesDir, write, template, useAnalogSFC) {
-  const getSFCConfig = () => {
-    const sfcConfigOption =
-      'vite: { experimental: { supportAnalogFormat: true } }';
-
-    return template === 'latest'
-      ? `{ ${sfcConfigOption} }`
-      : `\n      ${sfcConfigOption},`;
-  };
-
-  replacePlaceholders(root, 'vite.config.ts', {
-    __ANALOG_SFC_CONFIG__: useAnalogSFC ? getSFCConfig() : '',
-  });
-  replacePlaceholders(root, ['src/main.ts', 'src/main.server.ts'], {
-    __APP_COMPONENT__: useAnalogSFC ? 'App' : 'AppComponent',
-    __APP_COMPONENT_IMPORT__: useAnalogSFC
-      ? "import App from './app/app-root.ag';"
-      : "import { AppComponent } from './app/app';",
-  });
-
-  const cmpForDelete = useAnalogSFC ? 'app' : 'app-root';
-  const deleteExt = useAnalogSFC ? 'ts' : 'ag';
-  deleteFiles(root, [
-    useAnalogSFC ? `src/app/${cmpForDelete}.ts` : `src/app/${cmpForDelete}.ag`,
-    template === 'blog'
-      ? [
-          `src/app/pages/blog/index.page.${deleteExt}`,
-          `src/app/pages/blog/[slug].page.${deleteExt}`,
-        ]
-      : `src/app/pages/index.page.${deleteExt}`,
-    template !== 'minimal' && `src/app/${cmpForDelete}.spec.ts`,
-  ]);
-
-  if (useAnalogSFC) {
-    write(
-      'src/analog-env.d.ts',
-      fs.readFileSync(path.join(filesDir, 'analog-env.d.ts'), 'utf-8'),
-    );
-  }
-}
-
 function replacePlaceholders(root, files, config) {
   for (const file of toFlatArray(files)) {
     const filePath = path.join(root, file);
@@ -473,12 +428,6 @@ function replacePlaceholders(root, files, config) {
   }
 }
 
-function deleteFiles(root, files) {
-  for (const file of toFlatArray(files)) {
-    fs.unlinkSync(path.join(root, file));
-  }
-}
-
 function toFlatArray(value) {
   return (Array.isArray(value) ? value : [value]).filter(Boolean).flat();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-analog",
-  "version": "2.0.0-alpha.19",
+  "version": "2.0.0-alpha.20",
   "type": "module",
   "license": "MIT",
   "author": "Brandon Roberts",

package/template-angular-v17/package.json

@@ -15,8 +15,8 @@
     "test": "ng test"
   },
   "dependencies": {
-    "@analogjs/content": "^2.0.0-alpha.19",
-    "@analogjs/router": "^2.0.0-alpha.19",
+    "@analogjs/content": "^2.0.0-alpha.20",
+    "@analogjs/router": "^2.0.0-alpha.20",
     "@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": "^2.0.0-alpha.19",
-    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.19",
-    "@analogjs/vitest-angular": "^2.0.0-alpha.19",
+    "@analogjs/platform": "^2.0.0-alpha.20",
+    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.20",
+    "@analogjs/vitest-angular": "^2.0.0-alpha.20",
     "@angular-devkit/build-angular": "^17.2.0",
     "@angular/cli": "^17.2.0",
     "@angular/compiler-cli": "^17.2.0",

package/template-angular-v18/package.json

@@ -15,8 +15,8 @@
   },
   "private": true,
   "dependencies": {
-    "@analogjs/content": "^2.0.0-alpha.19",
-    "@analogjs/router": "^2.0.0-alpha.19",
+    "@analogjs/content": "^2.0.0-alpha.20",
+    "@analogjs/router": "^2.0.0-alpha.20",
     "@angular/animations": "^18.0.0",
     "@angular/build": "^18.0.0",
     "@angular/common": "^18.0.0",
@@ -38,9 +38,9 @@
     "zone.js": "~0.14.3"
   },
   "devDependencies": {
-    "@analogjs/platform": "^2.0.0-alpha.19",
-    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.19",
-    "@analogjs/vitest-angular": "^2.0.0-alpha.19",
+    "@analogjs/platform": "^2.0.0-alpha.20",
+    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.20",
+    "@analogjs/vitest-angular": "^2.0.0-alpha.20",
     "@angular/cli": "^18.0.0",
     "@angular/compiler-cli": "^18.0.0",
     "jsdom": "^22.0.0",

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

@@ -11,7 +11,7 @@ export default defineConfig(({ mode }) => ({
   resolve: {
     mainFields: ['module'],
   },
-  plugins: [analog(__ANALOG_SFC_CONFIG__)],
+  plugins: [analog()],
   test: {
     globals: true,
     environment: 'jsdom',

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

@@ -12,7 +12,7 @@ export default defineConfig(({ mode }) => ({
     mainFields: ['module'],
   },
   plugins: [
-    analog(__ANALOG_SFC_CONFIG__),__TAILWIND_PLUGIN__
+    analog(),__TAILWIND_PLUGIN__
   ],
   test: {
     globals: true,

package/template-blog/package.json

@@ -16,8 +16,8 @@
   },
   "private": true,
   "dependencies": {
-    "@analogjs/content": "^2.0.0-alpha.19",
-    "@analogjs/router": "^2.0.0-alpha.19",
+    "@analogjs/content": "^2.0.0-alpha.20",
+    "@analogjs/router": "^2.0.0-alpha.20",
     "@angular/animations": "^19.0.0",
     "@angular/common": "^19.0.0",
     "@angular/compiler": "^19.0.0",
@@ -37,9 +37,9 @@
     "zone.js": "~0.15.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^2.0.0-alpha.19",
-    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.19",
-    "@analogjs/vitest-angular": "^2.0.0-alpha.19",
+    "@analogjs/platform": "^2.0.0-alpha.20",
+    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.20",
+    "@analogjs/vitest-angular": "^2.0.0-alpha.20",
     "@angular-devkit/build-angular": "^19.0.0",
     "@angular/build": "^19.0.0",
     "@angular/cli": "^19.0.0",

package/template-blog/vite.config.ts

@@ -18,7 +18,7 @@ export default defineConfig(({ mode }) => ({
       },
       prerender: {
         routes: ['/blog', '/blog/2022-12-27-my-first-post'],
-      },__ANALOG_SFC_CONFIG__
+      },
     }),__TAILWIND_PLUGIN__
   ],
   test: {

package/template-latest/package.json

@@ -16,8 +16,8 @@
   },
   "private": true,
   "dependencies": {
-    "@analogjs/content": "^2.0.0-alpha.19",
-    "@analogjs/router": "^2.0.0-alpha.19",
+    "@analogjs/content": "^2.0.0-alpha.20",
+    "@analogjs/router": "^2.0.0-alpha.20",
     "@angular/animations": "^19.0.0",
     "@angular/common": "^19.0.0",
     "@angular/compiler": "^19.0.0",
@@ -38,9 +38,9 @@
     "zone.js": "~0.15.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^2.0.0-alpha.19",
-    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.19",
-    "@analogjs/vitest-angular": "^2.0.0-alpha.19",
+    "@analogjs/platform": "^2.0.0-alpha.20",
+    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.20",
+    "@analogjs/vitest-angular": "^2.0.0-alpha.20",
     "@angular-devkit/build-angular": "^19.0.0",
     "@angular/build": "^19.0.0",
     "@angular/cli": "^19.0.0",

package/template-latest/vite.config.ts

@@ -12,7 +12,7 @@ export default defineConfig(({ mode }) => ({
     mainFields: ['module'],
   },
   plugins: [
-    analog(__ANALOG_SFC_CONFIG__),__TAILWIND_PLUGIN__
+    analog(),__TAILWIND_PLUGIN__
   ],
   test: {
     globals: true,

package/template-minimal/package.json

@@ -16,8 +16,8 @@
   },
   "private": true,
   "dependencies": {
-    "@analogjs/content": "^2.0.0-alpha.19",
-    "@analogjs/router": "^2.0.0-alpha.19",
+    "@analogjs/content": "^2.0.0-alpha.20",
+    "@analogjs/router": "^2.0.0-alpha.20",
     "@angular/animations": "^19.0.0",
     "@angular/common": "^19.0.0",
     "@angular/compiler": "^19.0.0",
@@ -38,9 +38,9 @@
     "zone.js": "~0.15.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^2.0.0-alpha.19",
-    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.19",
-    "@analogjs/vitest-angular": "^2.0.0-alpha.19",
+    "@analogjs/platform": "^2.0.0-alpha.20",
+    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.20",
+    "@analogjs/vitest-angular": "^2.0.0-alpha.20",
     "@angular-devkit/build-angular": "^19.0.0",
     "@angular/build": "^19.0.0",
     "@angular/cli": "^19.0.0",

package/template-minimal/vite.config.ts

@@ -17,7 +17,7 @@ export default defineConfig(({ mode }) => ({
       static: true,
       prerender: {
         routes: [],
-      },__ANALOG_SFC_CONFIG__
+      },
     }),__TAILWIND_PLUGIN__
   ],
 }));

package/files/analog-env.d.ts

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

package/template-angular-v18/src/app/app-root.ag

@@ -1,16 +0,0 @@
-<script lang="ts">
-  import { RouterOutlet } from '@angular/router' with { analog: 'imports' };
-</script>
-
-<template>
-  <router-outlet />
-</template>
-
-<style>
-  :host {
-    max-width: 1280px;
-    margin: 0 auto;
-    padding: 2rem;
-    text-align: center;
-  }
-</style>

package/template-angular-v18/src/app/app-root.spec.ts

@@ -1,20 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { provideRouter } from '@angular/router';
-import { provideLocationMocks } from '@angular/common/testing';
-
-import App from './app-root.ag';
-
-describe('App', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [App],
-      providers: [provideRouter([]), provideLocationMocks()],
-    }).compileComponents();
-  });
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(App);
-    const app = fixture.componentInstance;
-    expect(app).toBeTruthy();
-  });
-});

package/template-angular-v18/src/app/pages/index.page.ag

@@ -1,53 +0,0 @@
-<script lang="ts">
-  import { signal } from '@angular/core';
-
-  const count = signal(0);
-
-  function increment() {
-    this.count.update((count) => count + 1);
-  }
-</script>
-
-<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>
-</template>
-
-<style>
-  .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;
-    }
-  }
-</style>

package/template-angular-v19/src/app/app-root.ag

@@ -1,16 +0,0 @@
-<script lang="ts">
-  import { RouterOutlet } from '@angular/router' with { analog: 'imports' };
-</script>
-
-<template>
-  <router-outlet />
-</template>
-
-<style>
-  :host {
-    max-width: 1280px;
-    margin: 0 auto;
-    padding: 2rem;
-    text-align: center;
-  }
-</style>

package/template-angular-v19/src/app/app-root.spec.ts

@@ -1,20 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { provideRouter } from '@angular/router';
-import { provideLocationMocks } from '@angular/common/testing';
-
-import App from './app-root.ag';
-
-describe('App', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [App],
-      providers: [provideRouter([]), provideLocationMocks()],
-    }).compileComponents();
-  });
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(App);
-    const app = fixture.componentInstance;
-    expect(app).toBeTruthy();
-  });
-});

package/template-angular-v19/src/app/pages/index.page.ag

@@ -1,53 +0,0 @@
-<script lang="ts">
-  import { signal } from '@angular/core';
-
-  const count = signal(0);
-
-  function increment() {
-    this.count.update((count) => count + 1);
-  }
-</script>
-
-<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>
-</template>
-
-<style>
-  .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;
-    }
-  }
-</style>

package/template-blog/src/app/app-root.ag

@@ -1,25 +0,0 @@
-<script lang="ts">
-  import { RouterLink, RouterOutlet } from '@angular/router' with { analog: 'imports' };
-</script>
-
-<template>
-  <nav>
-    <a routerLink="/">Home</a>
-  </nav>
-
-  <router-outlet />
-</template>
-
-<style>
-  :host {
-    max-width: 1280px;
-    margin: 0 auto;
-    padding: 2rem;
-    text-align: center;
-  }
-
-  nav {
-    text-align: left;
-    padding: 0 0 2rem 0;
-  }
-</style>

package/template-blog/src/app/app-root.spec.ts

@@ -1,20 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { provideRouter } from '@angular/router';
-import { provideLocationMocks } from '@angular/common/testing';
-
-import App from './app-root.ag';
-
-describe('App', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [App],
-      providers: [provideRouter([]), provideLocationMocks()],
-    }).compileComponents();
-  });
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(App);
-    const app = fixture.componentInstance;
-    expect(app).toBeTruthy();
-  });
-});

package/template-blog/src/app/pages/blog/[slug].page.ag

@@ -1,24 +0,0 @@
-<script lang="ts">
-  import { AsyncPipe } from '@angular/common' with { analog: 'imports' };
-  import { MarkdownComponent } from '@analogjs/content' with { analog: 'imports' };
-  import { injectContent } from '@analogjs/content';
-
-  import PostAttributes from '../../post-attributes';
-
-  const post$ = injectContent<PostAttributes>('slug');
-</script>
-
-<template>
-  @if (post$ | async; as post) {
-  <article>
-    <img class="post__image" [src]="post.attributes.coverImage" />
-    <analog-markdown [content]="post.content" />
-  </article>
-  }
-</template>
-
-<style>
-  .post__image {
-    max-height: 40vh;
-  }
-</style>

package/template-blog/src/app/pages/blog/index.page.ag

@@ -1,32 +0,0 @@
-<script lang="ts">
-  import { RouterLink } from '@angular/router' with { analog: 'imports' };
-  import { injectContentFiles } from '@analogjs/content';
-
-  import PostAttributes from '../../post-attributes';
-
-  const posts = injectContentFiles<PostAttributes>();
-</script>
-
-<template>
-  <h1>Blog Archive</h1>
-
-  @for (post of posts; track post.attributes.slug) {
-  <a [routerLink]="['/blog/', post.attributes.slug]">
-    <h2 class="post__title">{{ post.attributes.title }}</h2>
-    <p class="post__desc">{{ post.attributes.description }}</p>
-  </a>
-  }
-</template>
-
-<style>
-  a {
-    text-align: left;
-    display: block;
-    margin-bottom: 2rem;
-  }
-
-  .post__title,
-  .post__desc {
-    margin: 0;
-  }
-</style>

package/template-latest/src/app/app-root.ag

@@ -1,16 +0,0 @@
-<script lang="ts">
-  import { RouterOutlet } from '@angular/router' with { analog: 'imports' };
-</script>
-
-<template>
-  <router-outlet />
-</template>
-
-<style>
-  :host {
-    max-width: 1280px;
-    margin: 0 auto;
-    padding: 2rem;
-    text-align: center;
-  }
-</style>

package/template-latest/src/app/app-root.spec.ts

@@ -1,20 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { provideRouter } from '@angular/router';
-import { provideLocationMocks } from '@angular/common/testing';
-
-import App from './app-root.ag';
-
-describe('App', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [App],
-      providers: [provideRouter([]), provideLocationMocks()],
-    }).compileComponents();
-  });
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(App);
-    const app = fixture.componentInstance;
-    expect(app).toBeTruthy();
-  });
-});

package/template-latest/src/app/pages/index.page.ag

@@ -1,11 +0,0 @@
-<script lang="ts">
-  import { AnalogWelcome } from './analog-welcome';
-
-  defineMetadata({
-    imports: [AnalogWelcome]
-  });
-</script>
-
-<template>
-  <app-analog-welcome />
-</template>

package/template-minimal/src/app/app-root.ag

@@ -1,7 +0,0 @@
-<script lang="ts">
-  import { RouterOutlet } from '@angular/router' with { analog: 'imports' };
-</script>
-
-<template>
-  <router-outlet />
-</template>

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

@@ -1,32 +0,0 @@
-<template>
-  <h2>Analog</h2>
-
-  <h3>The fullstack meta-framework for Angular!</h3>
-
-  <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>
-</template>
-
-<style>
-  :host {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-  }
-
-  .read-the-docs > * {
-    color: #fff;
-  }
-
-  @media (prefers-color-scheme: light) {
-    .read-the-docs > * {
-      color: #213547;
-    }
-  }
-</style>