create-analog 1.5.0-beta.5 → 1.5.0-beta.7

package/index.js

@@ -4,8 +4,8 @@
 import { green, red, reset, yellow } from 'kolorist';
 import minimist from 'minimist';
 import { execSync } from 'node:child_process';
-import fs from 'node:fs';
-import path from 'node:path';
+import fs, { readdirSync } from 'node:fs';
+import path, { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import prompts from 'prompts';
 
@@ -45,6 +45,7 @@ const HIGHLIGHTERS = {
     highlighter: 'withShikiHighlighter',
     entryPoint: 'shiki-highlighter',
     dependencies: {
+      marked: '^7.0.0',
       'marked-shiki': '^1.1.0',
       shiki: '^1.6.1',
     },
@@ -185,10 +186,6 @@ async function init() {
       ? path.join(root, renameFiles[file])
       : path.join(root, file);
 
-    if (file.includes('app.config.ts') && variant === 'blog' && highlighter) {
-      content = addHighlighter(path.join(templateDir, file), highlighter);
-    }
-
     if (content) {
       fs.writeFileSync(targetPath, content);
     } else {
@@ -216,11 +213,14 @@ async function init() {
   pkg.name = packageName || getProjectName();
   pkg.scripts.start = getStartCommand(pkgManager);
 
+  if (template === 'blog' && highlighter) {
+    ensureSyntaxHighlighter(root, pkg, highlighter);
+  }
+
   if (!skipTailwind) addTailwindDevDependencies(pkg);
-  if (variant === 'blog' && highlighter)
-    addHighlighterDependencies(pkg, highlighter);
-  if (pkgManager === 'yarn' && variant === 'angular-v17')
-    addYarnDevDependencies(pkg);
+  if (pkgManager === 'yarn') {
+    addYarnDevDependencies(pkg, template);
+  }
 
   write('package.json', JSON.stringify(pkg, null, 2));
 
@@ -372,22 +372,33 @@ function addTailwindDevDependencies(pkg) {
   );
 }
 
-function addYarnDevDependencies(pkg) {
-  pkg.devDependencies['@angular-devkit/build-angular'] = ['^17.3.5'];
+function addYarnDevDependencies(pkg, template) {
+  // v18
+  if (template === 'latest' || template === 'blog') {
+    pkg.devDependencies['@nx/angular'] = ['^19.1.0'];
+    pkg.devDependencies['@nx/devkit'] = ['^19.1.0'];
+    pkg.devDependencies['@nx/vite'] = ['^19.1.0'];
+    pkg.devDependencies['nx'] = ['^19.1.0'];
+  } else if (template === 'angular-v17') {
+    pkg.devDependencies['@angular-devkit/build-angular'] = ['^17.3.5'];
+  }
 }
 
-function addHighlighter(file, syntaxHighlighter) {
-  const content = fs.readFileSync(file, 'utf-8');
-  return content
-    .replace('__HIGHLIGHTER__', HIGHLIGHTERS[syntaxHighlighter].highlighter)
-    .replace(
-      '__HIGHLIGHTER_ENTRY_POINT__',
-      HIGHLIGHTERS[syntaxHighlighter].entryPoint
-    );
-}
+function ensureSyntaxHighlighter(root, pkg, highlighter) {
+  const appConfigPath = path.join(root, 'src/app/app.config.ts');
+  const appConfigContent = fs.readFileSync(appConfigPath, 'utf-8');
+
+  fs.writeFileSync(
+    appConfigPath,
+    appConfigContent
+      .replace(/__HIGHLIGHTER__/g, HIGHLIGHTERS[highlighter].highlighter)
+      .replace(
+        /__HIGHLIGHTER_ENTRY_POINT__/g,
+        HIGHLIGHTERS[highlighter].entryPoint
+      )
+  );
 
-function addHighlighterDependencies(pkg, syntaxHighlighter) {
-  const dependencies = HIGHLIGHTERS[syntaxHighlighter].dependencies;
+  const dependencies = HIGHLIGHTERS[highlighter].dependencies;
   for (const [name, version] of Object.entries(dependencies)) {
     pkg.dependencies[name] = version;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-analog",
-  "version": "1.5.0-beta.5",
+  "version": "1.5.0-beta.7",
   "type": "module",
   "license": "MIT",
   "author": "Brandon Roberts",

package/template-angular-v17/package.json

@@ -15,8 +15,8 @@
     "test": "ng test"
   },
   "dependencies": {
-    "@analogjs/content": "^1.5.0-beta.5",
-    "@analogjs/router": "^1.5.0-beta.5",
+    "@analogjs/content": "^1.5.0-beta.7",
+    "@analogjs/router": "^1.5.0-beta.7",
     "@angular/animations": "^17.2.0",
     "@angular/common": "^17.2.0",
     "@angular/compiler": "^17.2.0",
@@ -38,8 +38,8 @@
     "zone.js": "~0.14.0"
   },
   "devDependencies": {
-    "@analogjs/platform": "^1.5.0-beta.5",
-    "@analogjs/vite-plugin-angular": "^1.5.0-beta.5",
+    "@analogjs/platform": "^1.5.0-beta.7",
+    "@analogjs/vite-plugin-angular": "^1.5.0-beta.7",
     "@angular/cli": "^17.2.0",
     "@angular/compiler-cli": "^17.2.0",
     "@nx/vite": "~18.0.0",

package/template-blog/package.json

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

package/template-latest/package.json

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