@batijs/cli 0.0.140 → 0.0.141

package/dist/boilerplates/@batijs/google-analytics/files/$.env.js

@@ -0,0 +1,16 @@
+// files/$.env.ts
+import { appendToEnv } from "@batijs/core";
+async function getEnv(props) {
+  const envContent = await props.readfile?.();
+  return appendToEnv(
+    envContent,
+    "PUBLIC_ENV__GOOGLE_ANALYTICS",
+    "G-XXXXXXXXXX",
+    `Google Analytics
+
+See the documentation https://support.google.com/analytics/answer/9304153?hl=en#zippy=%2Cweb`
+  );
+}
+export {
+  getEnv as default
+};

package/dist/boilerplates/@batijs/prettier/files/.prettierignore

@@ -5,6 +5,7 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
+.pnpm-debug.log*
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
@@ -41,8 +42,8 @@ build/Release
 node_modules/
 jspm_packages/
 
-# TypeScript v1 declaration files
-typings/
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
 
 # TypeScript cache
 *.tsbuildinfo
@@ -53,6 +54,9 @@ typings/
 # Optional eslint cache
 .eslintcache
 
+# Optional stylelint cache
+.stylelintcache
+
 # Microbundle cache
 .rpt2_cache/
 .rts2_cache_cjs/
@@ -68,15 +72,20 @@ typings/
 # Yarn Integrity file
 .yarn-integrity
 
-# dotenv environment variables file
+# dotenv environment variable files
 .env
-.env.test
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
 
 # parcel-bundler cache (https://parceljs.org/)
 .cache
+.parcel-cache
 
 # Next.js build output
 .next
+out
 
 # Nuxt.js build / generate output
 .nuxt
@@ -84,13 +93,19 @@ dist
 
 # Gatsby files
 .cache/
-# Comment in the public line in if your project uses Gatsby and *not* Next.js
+# Comment in the public line in if your project uses Gatsby and not Next.js
 # https://nextjs.org/blog/next-9-1#public-directory-support
 # public
 
 # vuepress build output
 .vuepress/dist
 
+# vuepress v2.x temp and cache directory
+.temp
+
+# Docusaurus cache and generated files
+.docusaurus
+
 # Serverless directories
 .serverless/
 
@@ -103,5 +118,12 @@ dist
 # TernJS port file
 .tern-port
 
-# IDEs
-.idea/
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*

package/dist/boilerplates/@batijs/prisma/files/$.env.js

@@ -1,24 +1,19 @@
 // files/$.env.ts
-import "@batijs/core";
+import { appendToEnv } from "@batijs/core";
 async function getEnv(props) {
-  let envContent = await props.readfile?.() ?? "";
-  if (envContent.endsWith("\n\n")) {
-  } else if (envContent.endsWith("\n")) {
-    envContent = envContent + "\n";
-  } else if (envContent) {
-    envContent = envContent + "\n\n";
-  }
-  const prismaContent = `# Prisma
+  const envContent = await props.readfile?.();
+  return appendToEnv(
+    envContent,
+    "DATABASE_URL",
+    "postgresql://johndoe:randompassword@localhost:5432/mydb?schema=public",
+    `Prisma
 
-# Environment variables declared in this file are automatically made available to Prisma.
-# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
+Environment variables declared in this file are automatically made available to Prisma.
+See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
 
-# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
-# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
-
-DATABASE_URL="postgresql://johndoe:randompassword@localhost:5432/mydb?schema=public"
-`;
-  return envContent + prismaContent;
+Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
+See the documentation for all the connection string options: https://pris.ly/d/connection-strings`
+  );
 }
 export {
   getEnv as default

package/dist/boilerplates/@batijs/react/files/layouts/HeadDefault.tsx

@@ -12,6 +12,25 @@ export default function HeadDefault() {
         <script defer data-domain="yourdomain.com" src="https://plausible.io/js/script.js"></script>
       </>
     );
+  } else if (BATI.has("google-analytics")) {
+    return (
+      <>
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <script
+          async
+          src={`https://www.googletagmanager.com/gtag/js?id=${import.meta.env.PUBLIC_ENV__GOOGLE_ANALYTICS}`}
+        ></script>
+        <script
+          dangerouslySetInnerHTML={{
+            __html: `window.dataLayer = window.dataLayer || [];
+          function gtag(){dataLayer.push(arguments);}
+          gtag('js', new Date());
+
+          gtag('config', '${import.meta.env.PUBLIC_ENV__GOOGLE_ANALYTICS}');`,
+          }}
+        ></script>
+      </>
+    );
   } else {
     return (
       <>

package/dist/boilerplates/@batijs/solid/files/layouts/HeadDefault.tsx

@@ -1,3 +1,5 @@
+/* eslint-disable solid/no-innerhtml */
+
 // Default <head> (can be overridden by pages)
 
 import logoUrl from "../assets/logo.svg";
@@ -12,6 +14,23 @@ export default function HeadDefault() {
         <script defer data-domain="yourdomain.com" src="https://plausible.io/js/script.js" />
       </>
     );
+  } else if (BATI.has("google-analytics")) {
+    return (
+      <>
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <script
+          async
+          src={`https://www.googletagmanager.com/gtag/js?id=${import.meta.env.PUBLIC_ENV__GOOGLE_ANALYTICS}`}
+        />
+        <script
+          innerHTML={`window.dataLayer = window.dataLayer || [];
+          function gtag(){dataLayer.push(arguments);}
+          gtag('js', new Date());
+
+          gtag('config', '${import.meta.env.PUBLIC_ENV__GOOGLE_ANALYTICS}');`}
+        />
+      </>
+    );
   } else {
     return (
       <>

package/dist/boilerplates/@batijs/vue/files/$package.json.js

@@ -52,9 +52,10 @@ var require_package = __commonJS({
         typescript: "^5.3.3",
         "unplugin-vue-markdown": "^0.25.2",
         vike: "^0.4.156",
-        "vike-vue": "^0.5.3",
+        "vike-vue": "^0.5.4",
         vite: "^5.0.11",
-        vue: "^3.4.13"
+        vue: "^3.4.13",
+        "vue-gtag": "^2.0.1"
       },
       dependencies: {
         "@batijs/core": "workspace:*"
@@ -71,6 +72,9 @@ var require_package = __commonJS({
         "./pages/+config.h": {
           types: "./dist/types/pages/+config.h.d.ts"
         },
+        "./pages/+onCreateApp": {
+          types: "./dist/types/pages/+onCreateApp.d.ts"
+        },
         "./pages/+onPageTransitionEnd": {
           types: "./dist/types/pages/+onPageTransitionEnd.d.ts"
         },
@@ -95,6 +99,9 @@ var require_package = __commonJS({
           "pages/+config.h": [
             "./dist/types/pages/+config.h.d.ts"
           ],
+          "pages/+onCreateApp": [
+            "./dist/types/pages/+onCreateApp.d.ts"
+          ],
           "pages/+onPageTransitionEnd": [
             "./dist/types/pages/+onPageTransitionEnd.d.ts"
           ],
@@ -134,6 +141,11 @@ async function getPackageJson(props) {
       devDependencies: ["eslint-plugin-vue"]
     });
   }
+  if (props.meta.BATI.has("google-analytics")) {
+    addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
+      dependencies: ["vue-gtag"]
+    });
+  }
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
     devDependencies: ["vite"],
     dependencies: [

package/dist/boilerplates/@batijs/vue/files/layouts/HeadDefault.vue

@@ -1,17 +1,12 @@
 <!-- Default <head> (can be overridden by pages) -->
 
 <template>
-  <meta
-    name="viewport"
-    content="width=device-width, initial-scale=1"
-  >
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
 
   <!-- BATI.has("plausible.io") -->
   <!-- See https://plausible.io/docs/plausible-script -->
   <!-- TODO: update data-domain -->
-  <component :is="'script'" defer
-             data-domain="yourdomain.com"
-             src="https://plausible.io/js/script.js" />
+  <component :is="'script'" defer data-domain="yourdomain.com" src="https://plausible.io/js/script.js" />
 </template>
-<script setup lang="ts">
-</script>
+
+<script setup lang="ts"></script>

package/dist/boilerplates/@batijs/vue/files/pages/+onCreateApp.ts

@@ -0,0 +1,14 @@
+import type { OnCreateAppSync } from "vike-vue";
+import VueGtag from "vue-gtag";
+
+// BATI.has("google-analytics")
+export const onCreateApp: OnCreateAppSync = (pageContext): ReturnType<OnCreateAppSync> => {
+  const { app } = pageContext;
+
+  // See https://matteo-gabriele.gitbook.io/vue-gtag/
+  app.use(VueGtag, {
+    config: {
+      id: import.meta.env.PUBLIC_ENV__GOOGLE_ANALYTICS,
+    },
+  });
+};

package/dist/boilerplates/@batijs/vue/types/pages/+config.h.d.ts

@@ -42,6 +42,7 @@ declare const _default: {
             lang: {
                 env: {
                     server: true;
+                    client: true;
                 };
             };
             ssr: {
@@ -61,6 +62,29 @@ declare const _default: {
                     client: true;
                 };
             };
+            onCreateApp: {
+                env: {
+                    server: true;
+                    client: true;
+                };
+            };
+            onCreateAppPinia: {
+                env: {
+                    server: true;
+                    client: true;
+                };
+            };
+            onAfterRenderSSRApp: {
+                env: {
+                    server: true;
+                };
+            };
+            onBeforeMountApp: {
+                env: {
+                    server: false;
+                    client: true;
+                };
+            };
         };
     };
 };

package/dist/boilerplates/@batijs/vue/types/pages/+onCreateApp.d.ts

@@ -0,0 +1,2 @@
+import type { OnCreateAppSync } from "vike-vue";
+export declare const onCreateApp: OnCreateAppSync;

package/dist/boilerplates/boilerplates.json

@@ -44,6 +44,17 @@
       "files"
     ]
   },
+  {
+    "config": {
+      "if": {
+        "flag": "google-analytics"
+      }
+    },
+    "folder": "@batijs/google-analytics",
+    "subfolders": [
+      "files"
+    ]
+  },
   {
     "config": {
       "if": {

package/dist/index.js

@@ -499,20 +499,28 @@ function transformFileAfterExec(filepath, fileContent) {
   if (fileContent === void 0 || fileContent === null)
     return null;
   const parsed = path.parse(filepath);
-  const ext = parsed.ext || parsed.name;
-  switch (ext) {
-    case ".ts":
-    case ".js":
-    case ".tsx":
-    case ".jsx":
-    case ".env":
-    case ".html":
-      return fileContent;
-    case ".json":
-      return JSON.stringify(fileContent, null, 2);
-    default:
-      throw new Error(`Unsupported extension ${ext} (${filepath})`);
+  const toTest = [parsed.base, parsed.ext, parsed.name].filter(Boolean);
+  for (const ext of toTest) {
+    switch (ext) {
+      case ".ts":
+      case ".js":
+      case ".tsx":
+      case ".jsx":
+      case ".env":
+      case ".env.local":
+      case ".env.development":
+      case ".env.development.local":
+      case ".env.test":
+      case ".env.test.local":
+      case ".env.production":
+      case ".env.production.local":
+      case ".html":
+        return fileContent;
+      case ".json":
+        return JSON.stringify(fileContent, null, 2);
+    }
   }
+  throw new Error(`Unsupported file extension ${parsed.base} (${filepath})`);
 }
 async function importTransformer(p) {
   const importFile = isWin ? "file://" + p : p;
@@ -576,7 +584,7 @@ Please report this issue to https://github.com/magne4000/bati`
 // package.json
 var package_default = {
   name: "@batijs/cli",
-  version: "0.0.140",
+  version: "0.0.141",
   type: "module",
   scripts: {
     "check-types": "tsc --noEmit",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.140",
+  "version": "0.0.141",
   "type": "module",
   "keywords": [],
   "description": "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want",
@@ -19,12 +19,12 @@
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
     "vite": "^5.0.11",
-    "@batijs/compile": "0.0.140",
-    "@batijs/build": "0.0.140"
+    "@batijs/build": "0.0.141",
+    "@batijs/compile": "0.0.141"
   },
   "dependencies": {
-    "@batijs/core": "0.0.140",
-    "@batijs/features": "0.0.140"
+    "@batijs/core": "0.0.141",
+    "@batijs/features": "0.0.141"
   },
   "bin": "./dist/index.js",
   "exports": {