create-popular-site 0.10.0 → 0.11.0

package/index.mjs

@@ -93,37 +93,21 @@ function splitSiteBase(url) {
   return { site: parsed.origin, base: path === '' ? '/' : path };
 }
 
-const astroConfig = ({ site, base }) => `import { defineConfig } from 'astro/config';
-import mdx from '@astrojs/mdx';
-import popular from 'astro-theme-popular';
-
-/* \`site\` is your origin and \`base\` is the path your site is served from.
-   A GitHub project page lives at you.github.io/my-community/, so its base is
-   '/my-community'; leave it '/' for a site at a domain root. Every link, image
-   and feed URL the theme writes follows both, markdown bodies included. */
-export default defineConfig({
-  site: '${site}',
-  base: '${base}',
-  integrations: [mdx(), popular()],
-});
-`;
-
-const packageJson = (name) => `${JSON.stringify({
-  name,
-  private: true,
-  type: 'module',
-  scripts: { dev: 'astro dev', build: 'astro build', preview: 'astro preview' },
-  dependencies: {
-    '@astrojs/mdx': '^7.0.2',
-    astro: '^7.0.6',
-    'astro-theme-popular': `^${VERSION}`,
-  },
-}, null, 2)}\n`;
-
-const CONTENT_CONFIG = `// The theme package owns the content model; this file just adopts it.
-// Add your own collections here if you need them.
-export { collections } from 'astro-theme-popular/schemas';
-`;
+/* The project files come from scripts/templates/, the same files
+   scripts/setup.py renders, collected into templates/_shared/ at pack time.
+   Two generators writing the same file two ways is how they drift.
+
+   Those templates support conditional blocks and a social-links expansion for
+   the wizard's richer answer set; the three used here are placeholder-only,
+   so `${key|default}` substitution is the whole contract. Matches setup.py's
+   PLACEHOLDER_RE and its "unanswered falls back to the default" rule. */
+const PLACEHOLDER_RE = /\$\{(\w+)(?:\|([^}]*))?\}/g;
+
+const renderTemplate = (name, answers) =>
+  readFileSync(join(TEMPLATE_DIR, '_shared', name), 'utf8').replace(
+    PLACEHOLDER_RE,
+    (_match, key, fallback = '') => (answers[key] ?? fallback),
+  );
 
 const GITIGNORE = `dist/
 node_modules/
@@ -203,9 +187,19 @@ async function main() {
     mkdirSync(target, { recursive: true });
     cpSync(from, target, { recursive: true });
     mkdirSync(join(target, 'src'), { recursive: true });
-    writeFileSync(join(target, 'src', 'content.config.ts'), CONTENT_CONFIG);
-    writeFileSync(join(target, 'astro.config.mjs'), astroConfig(splitSiteBase(siteUrl)));
-    writeFileSync(join(target, 'package.json'), packageJson(name));
+    const { site: astroSite, base } = splitSiteBase(siteUrl);
+    const answers = {
+      __astro_site: astroSite,
+      __astro_base: base,
+      __repo_name: name,
+      __theme_version: VERSION,
+    };
+    writeFileSync(join(target, 'src', 'content.config.ts'),
+                  renderTemplate('content.config.ts.tmpl', answers));
+    writeFileSync(join(target, 'astro.config.mjs'),
+                  renderTemplate('astro.config.package.mjs.tmpl', answers));
+    writeFileSync(join(target, 'package.json'),
+                  renderTemplate('package.json.tmpl', answers));
     writeFileSync(join(target, '.gitignore'), GITIGNORE);
     writeFileSync(join(target, 'README.md'), readme(name, template));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-popular-site",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Start a community site on the Popular Astro theme: npm create popular-site@latest",
   "type": "module",
   "license": "MIT",

package/templates/_shared/astro.config.package.mjs.tmpl

@@ -0,0 +1,14 @@
+import { defineConfig } from 'astro/config';
+import mdx from '@astrojs/mdx';
+import popular from 'astro-theme-popular';
+
+/* `site` is your origin and `base` is the path your site is served from.
+   A GitHub project page lives at you.github.io/my-community/, so its base is
+   '/my-community'; leave it '/' for a site at a domain root. Every link, image
+   and feed URL the theme writes follows both, markdown bodies included.
+   Written for you when this site was created. */
+export default defineConfig({
+  site: '${__astro_site|https://example.com}',
+  base: '${__astro_base|/}',
+  integrations: [mdx(), popular()],
+});

package/templates/_shared/content.config.ts.tmpl

@@ -0,0 +1,3 @@
+// The theme package owns the content model; this file just adopts it.
+// Add your own collections here if you need them.
+export { collections } from 'astro-theme-popular/schemas';

package/templates/_shared/package.json.tmpl

@@ -0,0 +1,15 @@
+{
+  "name": "${__repo_name|my-community}",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "astro dev",
+    "build": "astro build",
+    "preview": "astro preview"
+  },
+  "dependencies": {
+    "@astrojs/mdx": "^7.0.2",
+    "astro": "^7.0.6",
+    "astro-theme-popular": "^${__theme_version|0.9.1}"
+  }
+}

package/templates/superfan/popular.config.ts

@@ -14,7 +14,6 @@ export const SITE = {
   favicon: '/images/logo.svg',
   ogImage: '/images/hero.svg',
   locale: 'en-US',
-  customCSS: ['https://fonts.googleapis.com/css2?family=Cinzel+Decorative:wght@700&family=Cinzel:wght@700&display=swap'],
   landAcknowledgement: "Fan-made and gloriously unofficial: this site is a love letter, not affiliated with anyone it adores.",
 };
 
@@ -134,7 +133,7 @@ export const BRAND: Record<string, string> = {
   textOnBrand: '#0A0E1A',    // dark text on gold buttons, not white
   borderSubtle: '#26304A',
   fontSans: 'Inter, system-ui, sans-serif',
-  fontDisplay: '"Cinzel Decorative", "Cinzel", Inter, sans-serif',
+  fontDisplay: 'Quantico, Inter, sans-serif',
 };
 
 export const NAV: {