@abcnews/aunty 17.0.0-next.6 → 17.0.0-next.7

package/dist/bin/aunty.js

@@ -851,10 +851,13 @@ async function getGitUser() {
     return null;
   }
 }
+function getAuntyRoot() {
+  return path5.resolve(import.meta.dirname, "../../");
+}
 async function installAunty(baseDir) {
   const localDev = isLocalDevelopment();
   let auntyDepValue = "";
-  const auntyRoot = path5.resolve(import.meta.dirname, "../../");
+  const auntyRoot = getAuntyRoot();
   if (localDev) {
     auntyDepValue = `file:${auntyRoot}`;
   } else {
@@ -905,7 +908,7 @@ var init_initHelpers = __esm({
 // templates/svelte/base/init.ts
 import path6 from "node:path";
 async function init({ projectName, baseDir }) {
-  const contentsDir = path6.resolve(import.meta.dirname, "contents");
+  const contentsDir = path6.resolve(getAuntyRoot(), "templates/svelte/base/contents");
   await copyContents(contentsDir, baseDir);
   await replaceInFiles(
     baseDir,
@@ -951,7 +954,7 @@ var init_init2 = __esm({
 // templates/svelte/patch-scrollyteller/init.ts
 import path7 from "node:path";
 async function init3({ projectName, baseDir }) {
-  const contentsDir = path7.resolve(import.meta.dirname, "contents");
+  const contentsDir = path7.resolve(getAuntyRoot(), "templates/svelte/patch-scrollyteller/contents");
   await copyContents(contentsDir, baseDir);
   await editPackageJson(baseDir, (pkg2) => {
     pkg2.dependencies = pkg2.dependencies || {};
@@ -977,7 +980,7 @@ __export(init_exports, {
 import path8 from "node:path";
 import fs3 from "node:fs/promises";
 async function init4({ projectName, baseDir }) {
-  const contentsDir = path8.resolve(import.meta.dirname, "contents");
+  const contentsDir = path8.resolve(getAuntyRoot(), "templates/svelte/patch-builder/contents");
   await copyContents(contentsDir, baseDir);
   await replaceInFile(baseDir, "builder/index.html", {
     __PROJECT_NAME__: projectName
@@ -1112,7 +1115,7 @@ var init_svelte = __esm({
 // templates/vanilla/base/init.ts
 import path9 from "node:path";
 async function init6({ projectName, baseDir }) {
-  const contentsDir = path9.resolve(import.meta.dirname, "contents");
+  const contentsDir = path9.resolve(getAuntyRoot(), "templates/vanilla/base/contents");
   await copyContents(contentsDir, baseDir);
   await replaceInFiles(baseDir, ["index.html", "src/index.ts"], {
     __PROJECT_NAME__: projectName,
@@ -1517,8 +1520,8 @@ async function run9(options = {}) {
   const migrationSpinner = spin("Migrating configuration files...");
   try {
     const templateDir = path11.resolve(
-      import.meta.dirname,
-      "../../../templates/svelte/base/contents"
+      getAuntyRoot(),
+      "templates/svelte/base/contents"
     );
     const filesToCopy = [
       "vite.config.ts",
@@ -1572,8 +1575,8 @@ async function run9(options = {}) {
   const pkgSpinner = spin("Updating package.json dependencies and scripts...");
   try {
     const templateDir = path11.resolve(
-      import.meta.dirname,
-      "../../../templates/svelte/base/contents"
+      getAuntyRoot(),
+      "templates/svelte/base/contents"
     );
     const pkgPath2 = path11.join(baseDir, "package.json");
     const pkg2 = await loadJson(pkgPath2);

package/dist/bin/commander.js

@@ -242,10 +242,13 @@ async function getGitUser() {
     return null;
   }
 }
+function getAuntyRoot() {
+  return path5.resolve(import.meta.dirname, "../../");
+}
 async function installAunty(baseDir) {
   const localDev = isLocalDevelopment();
   let auntyDepValue = "";
-  const auntyRoot = path5.resolve(import.meta.dirname, "../../");
+  const auntyRoot = getAuntyRoot();
   if (localDev) {
     auntyDepValue = `file:${auntyRoot}`;
   } else {
@@ -301,7 +304,7 @@ __export(init_exports, {
 import path8 from "node:path";
 import fs3 from "node:fs/promises";
 async function init4({ projectName, baseDir }) {
-  const contentsDir = path8.resolve(import.meta.dirname, "contents");
+  const contentsDir = path8.resolve(getAuntyRoot(), "templates/svelte/patch-builder/contents");
   await copyContents(contentsDir, baseDir);
   await replaceInFile(baseDir, "builder/index.html", {
     __PROJECT_NAME__: projectName
@@ -1004,7 +1007,7 @@ import { multiselect, cancel as cancel3, isCancel as isCancel3 } from "@clack/pr
 init_initHelpers();
 import path6 from "node:path";
 async function init({ projectName, baseDir }) {
-  const contentsDir = path6.resolve(import.meta.dirname, "contents");
+  const contentsDir = path6.resolve(getAuntyRoot(), "templates/svelte/base/contents");
   await copyContents(contentsDir, baseDir);
   await replaceInFiles(
     baseDir,
@@ -1040,7 +1043,7 @@ async function init2({ baseDir }) {
 init_initHelpers();
 import path7 from "node:path";
 async function init3({ projectName, baseDir }) {
-  const contentsDir = path7.resolve(import.meta.dirname, "contents");
+  const contentsDir = path7.resolve(getAuntyRoot(), "templates/svelte/patch-scrollyteller/contents");
   await copyContents(contentsDir, baseDir);
   await editPackageJson(baseDir, (pkg2) => {
     pkg2.dependencies = pkg2.dependencies || {};
@@ -1097,7 +1100,7 @@ import { select as select2, confirm as confirm2, cancel as cancel4, isCancel as
 init_initHelpers();
 import path9 from "node:path";
 async function init6({ projectName, baseDir }) {
-  const contentsDir = path9.resolve(import.meta.dirname, "contents");
+  const contentsDir = path9.resolve(getAuntyRoot(), "templates/vanilla/base/contents");
   await copyContents(contentsDir, baseDir);
   await replaceInFiles(baseDir, ["index.html", "src/index.ts"], {
     __PROJECT_NAME__: projectName,
@@ -1426,8 +1429,8 @@ async function run9(options = {}) {
   const migrationSpinner = spin("Migrating configuration files...");
   try {
     const templateDir = path11.resolve(
-      import.meta.dirname,
-      "../../../templates/svelte/base/contents"
+      getAuntyRoot(),
+      "templates/svelte/base/contents"
     );
     const filesToCopy = [
       "vite.config.ts",
@@ -1481,8 +1484,8 @@ async function run9(options = {}) {
   const pkgSpinner = spin("Updating package.json dependencies and scripts...");
   try {
     const templateDir = path11.resolve(
-      import.meta.dirname,
-      "../../../templates/svelte/base/contents"
+      getAuntyRoot(),
+      "templates/svelte/base/contents"
     );
     const pkgPath2 = path11.join(baseDir, "package.json");
     const pkg2 = await loadJson(pkgPath2);

package/dist/src/lib/initHelpers.d.ts

@@ -46,6 +46,12 @@ export declare function getGitUser(): Promise<{
     name: string;
     email: string;
 } | null>;
+/**
+ * Gets the root directory of the aunty package.
+ * Resolves relative to the root since template scripts get bundled by esbuild
+ * into `dist/bin/commander.js`, altering their local directory context.
+ */
+export declare function getAuntyRoot(): string;
 /**
  * Adds @abcnews/aunty to the package.json devDependencies of the target directory.
  * Resolves to the local development path if running in local development mode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abcnews/aunty",
-  "version": "17.0.0-next.6",
+  "version": "17.0.0-next.7",
   "type": "module",
   "description": "ABC News Digital developer toolkit",
   "repository": {

package/src/commands/migrate/index.ts

@@ -12,7 +12,7 @@ import { $, glob } from "zx";
 import { getHeader, spin } from "../../lib/terminal.ts";
 import { findProjectDetails, loadJson } from "../../lib/util.ts";
 import * as git from "../../lib/git.ts";
-import { installAunty } from "../../lib/initHelpers.ts";
+import { installAunty, getAuntyRoot } from "../../lib/initHelpers.ts";
 
 interface MigrateOptions {
   yes?: boolean;
@@ -176,8 +176,8 @@ export async function run(options: MigrateOptions = {}): Promise<number> {
   const migrationSpinner = spin("Migrating configuration files...");
   try {
     const templateDir = path.resolve(
-      import.meta.dirname,
-      "../../../templates/svelte/base/contents",
+      getAuntyRoot(),
+      "templates/svelte/base/contents",
     );
 
     // Copy Vite config files
@@ -251,8 +251,8 @@ export async function run(options: MigrateOptions = {}): Promise<number> {
   const pkgSpinner = spin("Updating package.json dependencies and scripts...");
   try {
     const templateDir = path.resolve(
-      import.meta.dirname,
-      "../../../templates/svelte/base/contents",
+      getAuntyRoot(),
+      "templates/svelte/base/contents",
     );
     const pkgPath = path.join(baseDir, "package.json");
     const pkg = await loadJson<any>(pkgPath);

package/src/lib/initHelpers.ts

@@ -125,6 +125,15 @@ export async function getGitUser(): Promise<{
   }
 }
 
+/**
+ * Gets the root directory of the aunty package.
+ * Resolves relative to the root since template scripts get bundled by esbuild
+ * into `dist/bin/commander.js`, altering their local directory context.
+ */
+export function getAuntyRoot(): string {
+  return path.resolve(import.meta.dirname, "../../");
+}
+
 /**
  * Adds @abcnews/aunty to the package.json devDependencies of the target directory.
  * Resolves to the local development path if running in local development mode,
@@ -139,8 +148,7 @@ export async function installAunty(baseDir: string): Promise<void> {
   const localDev = isLocalDevelopment();
   let auntyDepValue = "";
 
-  // The running aunty's root directory is 2 levels up relative to this file
-  const auntyRoot = path.resolve(import.meta.dirname, "../../");
+  const auntyRoot = getAuntyRoot();
 
   if (localDev) {
     auntyDepValue = `file:${auntyRoot}`;

package/templates/svelte/base/init.ts

@@ -6,7 +6,7 @@ import type { InitOptions } from "../../../src/commands/create/types.ts";
 
 export async function init({ projectName, baseDir }: InitOptions) {
   // Copy template to destination
-  const contentsDir = path.resolve(import.meta.dirname, "contents");
+  const contentsDir = path.resolve(helpers.getAuntyRoot(), "templates/svelte/base/contents");
   await helpers.copyContents(contentsDir, baseDir);
 
   // String replacements

package/templates/svelte/patch-builder/init.ts

@@ -8,7 +8,7 @@ import fs from "node:fs/promises";
  */
 export async function init({ projectName, baseDir }: InitOptions) {
   // Copy patch-builder files to target
-  const contentsDir = path.resolve(import.meta.dirname, "contents");
+  const contentsDir = path.resolve(helpers.getAuntyRoot(), "templates/svelte/patch-builder/contents");
   await helpers.copyContents(contentsDir, baseDir);
 
   // Update builder/index.html with project name

package/templates/svelte/patch-scrollyteller/init.ts

@@ -4,7 +4,7 @@ import type { InitOptions } from "../../../src/commands/create/types.ts";
 
 export async function init({ projectName, baseDir }: InitOptions) {
   // Copy template to destination
-  const contentsDir = path.resolve(import.meta.dirname, "contents");
+  const contentsDir = path.resolve(helpers.getAuntyRoot(), "templates/svelte/patch-scrollyteller/contents");
   await helpers.copyContents(contentsDir, baseDir);
 
   await helpers.editPackageJson(baseDir, (pkg) => {

package/templates/vanilla/base/init.ts

@@ -5,7 +5,7 @@ import type { InitOptions } from "../../../src/commands/create/types.ts";
 
 export async function init({ projectName, baseDir }: InitOptions) {
   // Copy template to destination
-  const contentsDir = path.resolve(import.meta.dirname, "contents");
+  const contentsDir = path.resolve(helpers.getAuntyRoot(), "templates/vanilla/base/contents");
   await helpers.copyContents(contentsDir, baseDir);
 
   // String replacements