create-analog 0.2.54 → 0.2.56

package/index.js

@@ -20,12 +20,12 @@ const APPS = [
     color: yellow,
     variants: [
       {
-        name: 'angular-v16',
+        name: 'angular-v17-prerelease',
         display: 'TypeScript',
         color: green,
       },
       {
-        name: 'angular-v15',
+        name: 'angular-v16',
         display: 'TypeScript',
         color: green,
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-analog",
-  "version": "0.2.54",
+  "version": "0.2.56",
   "type": "module",
   "license": "MIT",
   "author": "Brandon Roberts",
@@ -12,6 +12,7 @@
     "index.js",
     "template-angular-v15",
     "template-angular-v16",
+    "template-angular-v17-prerelease",
     "files"
   ],
   "main": "index.js",

package/template-angular-v16/package.json

@@ -41,7 +41,7 @@
     "@angular-devkit/build-angular": "^16.2.0",
     "@angular/cli": "^16.2.0",
     "@angular/compiler-cli": "^16.2.0",
-    "@nx/vite": "^17.0.0",
+    "@nx/vite": "~16.8.1",
     "nx": "^17.0.0",
     "jsdom": "^22.1.0",
     "typescript": "~5.0.2",

package/{template-angular-v15 → template-angular-v17-prerelease}/README.md

@@ -20,8 +20,7 @@ Run `npm run test` to run unit tests with [Vitest](https://vitest.dev).
 
 ## Community
 
-- Join the [Discord](https://discord.gg/mKC2Ec48U5)
 - Visit and Star the [GitHub Repo](https://github.com/analogjs/analog)
-- Visit the [Website](https://analogjs.org/)
+- Join the [Discord](https://chat.analogjs.org)
 - Follow us on [Twitter](https://twitter.com/analogjs)
 - Become a [Sponsor](https://github.com/sponsors/brandonroberts)

package/{template-angular-v15 → template-angular-v17-prerelease}/_gitignore

@@ -30,6 +30,7 @@ yarn-error.log
 
 # Miscellaneous
 /.angular/cache
+/.nx/cache
 .sass-cache/
 /connect.lock
 /coverage

package/{template-angular-v15 → template-angular-v17-prerelease}/angular.json

@@ -10,11 +10,12 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@nrwl/vite:build",
+          "builder": "@analogjs/platform:vite",
           "options": {
             "configFile": "vite.config.ts",
             "main": "src/main.ts",
-            "outputPath": "dist/client"
+            "outputPath": "dist/client",
+            "tsConfig": "tsconfig.app.json"
           },
           "defaultConfiguration": "production",
           "configurations": {
@@ -28,7 +29,7 @@
           }
         },
         "serve": {
-          "builder": "@nrwl/vite:dev-server",
+          "builder": "@analogjs/platform:vite-dev-server",
           "defaultConfiguration": "development",
           "options": {
             "buildTarget": "my-app:build",
@@ -45,7 +46,7 @@
           }
         },
         "test": {
-          "builder": "@nrwl/vite:test"
+          "builder": "@analogjs/platform:vitest"
         }
       }
     }

package/template-angular-v17-prerelease/package.json

@@ -0,0 +1,51 @@
+{
+  "name": "my-app",
+  "version": "0.0.0",
+  "private": true,
+  "engines": {
+    "node": ">=18.13.0"
+  },
+  "scripts": {
+    "dev": "ng serve",
+    "ng": "ng",
+    "start": "ng serve",
+    "build": "ng build",
+    "watch": "ng build --watch",
+    "test": "ng test"
+  },
+  "dependencies": {
+    "@analogjs/content": "^0.2.0",
+    "@analogjs/router": "^0.2.0",
+    "@angular/animations": "^17.0.0-rc.0",
+    "@angular/common": "^17.0.0-rc.0",
+    "@angular/compiler": "^17.0.0-rc.0",
+    "@angular/core": "^17.0.0-rc.0",
+    "@angular/forms": "^17.0.0-rc.0",
+    "@angular/platform-browser": "^17.0.0-rc.0",
+    "@angular/platform-browser-dynamic": "^17.0.0-rc.0",
+    "@angular/platform-server": "^17.0.0-rc.0",
+    "@angular/router": "^17.0.0-rc.0",
+    "@nx/angular": "^17.0.0",
+    "front-matter": "^4.0.2",
+    "marked": "^5.0.2",
+    "marked-gfm-heading-id": "^3.1.0",
+    "marked-highlight": "^2.0.1",
+    "mermaid": "^10.2.4",
+    "prismjs": "^1.29.0",
+    "rxjs": "~7.5.6",
+    "tslib": "^2.4.0",
+    "zone.js": "~0.14.0"
+  },
+  "devDependencies": {
+    "@analogjs/platform": "^0.2.0",
+    "@angular-devkit/build-angular": "^17.0.0-rc.0",
+    "@angular/cli": "^17.0.0-rc.0",
+    "@angular/compiler-cli": "^17.0.0-rc.0",
+    "@nx/vite": "~16.8.1",
+    "nx": "^17.0.0",
+    "jsdom": "^22.1.0",
+    "typescript": "~5.2.0",
+    "vite": "^4.4.8",
+    "vitest": "^0.32.0"
+  }
+}

package/{template-angular-v15 → template-angular-v17-prerelease}/src/app/app.component.spec.ts

@@ -1,5 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {

package/template-angular-v17-prerelease/src/app/app.config.server.ts

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

package/template-angular-v17-prerelease/src/app/app.config.ts

@@ -0,0 +1,12 @@
+import { provideHttpClient, withFetch } from '@angular/common/http';
+import { ApplicationConfig } from '@angular/core';
+import { provideClientHydration } from '@angular/platform-browser';
+import { provideFileRouter } from '@analogjs/router';
+
+export const appConfig: ApplicationConfig = {
+  providers: [
+    provideFileRouter(),
+    provideHttpClient(withFetch()),
+    provideClientHydration(),
+  ],
+};

package/template-angular-v17-prerelease/src/main.server.ts

@@ -0,0 +1,24 @@
+import 'zone.js/node';
+import { enableProdMode } from '@angular/core';
+import { bootstrapApplication } from '@angular/platform-browser';
+import { renderApplication } from '@angular/platform-server';
+
+import { config } from './app/app.config.server';
+import { AppComponent } from './app/app.component';
+
+if (import.meta.env.PROD) {
+  enableProdMode();
+}
+
+export function bootstrap() {
+  return bootstrapApplication(AppComponent, config);
+}
+
+export default async function render(url: string, document: string) {
+  const html = await renderApplication(bootstrap, {
+    document,
+    url,
+  });
+
+  return html;
+}

package/template-angular-v17-prerelease/src/main.ts

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

package/template-angular-v15/package.json

@@ -1,49 +0,0 @@
-{
-  "name": "my-app",
-  "version": "0.0.0",
-  "private": true,
-  "engines": {
-    "node": "^16.14.0 || >=18.10.0"
-  },
-  "scripts": {
-    "dev": "ng serve",
-    "ng": "ng",
-    "start": "ng serve",
-    "build": "ng build",
-    "watch": "ng build --watch",
-    "test": "ng test"
-  },
-  "dependencies": {
-    "@analogjs/content": "^0.2.0",
-    "@analogjs/router": "^0.2.0",
-    "@angular/animations": "^15.0.0",
-    "@angular/common": "^15.0.0",
-    "@angular/compiler": "^15.0.0",
-    "@angular/core": "^15.0.0",
-    "@angular/forms": "^15.0.0",
-    "@angular/platform-browser": "^15.0.0",
-    "@angular/platform-browser-dynamic": "^15.0.0",
-    "@angular/platform-server": "^15.0.0",
-    "@angular/router": "^15.0.0",
-    "@nrwl/angular": "^15.0.0",
-    "front-matter": "^4.0.2",
-    "marked": "^5.0.2",
-    "mermaid": "^10.2.4",
-    "prismjs": "^1.29.0",
-    "rxjs": "~7.5.6",
-    "tslib": "^2.4.0",
-    "zone.js": "~0.11.8"
-  },
-  "devDependencies": {
-    "@analogjs/platform": "0.1.0-beta.23",
-    "@angular-devkit/build-angular": "^15.0.0",
-    "@angular/cli": "~15.0.0",
-    "@angular/compiler-cli": "^15.0.0",
-    "@nrwl/vite": "^15.0.0",
-    "nx": "^15.7.0",
-    "jsdom": "^20.0.0",
-    "typescript": "~4.8.4",
-    "vite": "^4.0.3",
-    "vitest": "^0.25.8"
-  }
-}

package/template-angular-v15/src/main.providers.ts

@@ -1,5 +0,0 @@
-/**
- * Common providers shared with client and server-side.
- */
-
-export const mainProviders = [];

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

@@ -1,26 +0,0 @@
-import 'zone.js/node';
-import { enableProdMode } from '@angular/core';
-import { renderApplication } from '@angular/platform-server';
-import { provideFileRouter } from '@analogjs/router';
-import { withEnabledBlockingInitialNavigation } from '@angular/router';
-
-import { AppComponent } from './app/app.component';
-import { mainProviders } from './main.providers';
-
-if (import.meta.env.PROD) {
-  enableProdMode();
-}
-
-export default async function render(url: string, document: string) {
-  const html = await renderApplication(AppComponent, {
-    appId: 'analog-app',
-    document,
-    url,
-    providers: [
-      provideFileRouter(withEnabledBlockingInitialNavigation()),
-      ...mainProviders,
-    ],
-  });
-
-  return html;
-}

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

@@ -1,10 +0,0 @@
-import 'zone.js';
-import { bootstrapApplication } from '@angular/platform-browser';
-import { provideFileRouter } from '@analogjs/router';
-
-import { AppComponent } from './app/app.component';
-import { mainProviders } from './main.providers';
-
-bootstrapApplication(AppComponent, {
-  providers: [provideFileRouter(), ...mainProviders],
-});