fix package initializer to add the package to devdependency and set global settings to actually work this time.

Author: brandtam

src/__tests__/unit/global-settings.test.ts

@@ -10,6 +10,11 @@ describe('global-settings', () => {
 
   beforeEach(() => {
     tempDir = createTempDir();
+    // Create shops directory for settings
+    const shopsDir = path.join(tempDir, 'shops');
+    if (!fs.existsSync(shopsDir)) {
+      fs.mkdirSync(shopsDir, { recursive: true });
+    }
   });
 
   afterEach(() => {
@@ -39,7 +44,7 @@ describe('global-settings', () => {
         version: '1.0.0'
       };
 
-      const settingsPath = path.join(tempDir, 'settings.json');
+      const settingsPath = path.join(tempDir, 'shops', 'settings.json');
       fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
 
       // Act
@@ -54,7 +59,7 @@ describe('global-settings', () => {
 
     test('handles corrupted settings file', async () => {
       // Arrange
-      const settingsPath = path.join(tempDir, 'settings.json');
+      const settingsPath = path.join(tempDir, 'shops', 'settings.json');
       fs.writeFileSync(settingsPath, '{ invalid json }');
 
       // Act
@@ -84,7 +89,7 @@ describe('global-settings', () => {
       // Assert
       expect(result.success).toBe(true);
 
-      const settingsPath = path.join(tempDir, 'settings.json');
+      const settingsPath = path.join(tempDir, 'shops', 'settings.json');
       expect(fs.existsSync(settingsPath)).toBe(true);
 
       const savedSettings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
@@ -119,7 +124,7 @@ describe('global-settings', () => {
       // Assert
       expect(result.success).toBe(true);
 
-      const settingsPath = path.join(tempDir, 'settings.json');
+      const settingsPath = path.join(tempDir, 'shops', 'settings.json');
       const savedSettings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
       expect(savedSettings.contentProtection.defaultMode).toBe('strict');
     });

src/lib/Initializer.ts

@@ -1,5 +1,6 @@
 import fs from "fs";
 import path from "path";
+import { createRequire } from "module";
 import {
   select,
   spinner,
@@ -10,6 +11,10 @@ import {
 import { logger } from "./core/logger.js";
 import { ShopConfigurationError } from "./errors/ShopError.js";
 
+// Get package version dynamically
+const require = createRequire(import.meta.url);
+const { version: CLI_VERSION } = require("../../package.json");
+
 /**
  * Initializes multi-shop setup in existing Shopify theme projects
  * Sets up directory structure, package.json scripts, and GitHub workflows
@@ -156,10 +161,25 @@ export class Initializer {
 
     packageJson.scripts = { ...packageJson.scripts, ...newScripts };
 
-    // Add devDependency if not already present
-    if (!packageJson.devDependencies?.["@shopdevs/multi-shop-cli"]) {
+    // Manage @shopdevs/multi-shop-cli dependency
+    const packageName = "@shopdevs/multi-shop-cli";
+    const existingDepVersion = packageJson.dependencies?.[packageName];
+    const existingDevDepVersion = packageJson.devDependencies?.[packageName];
+
+    // Remove from dependencies if present (should only be in devDependencies)
+    if (existingDepVersion) {
+      delete packageJson.dependencies[packageName];
+      this.logger.debug('Removed from dependencies', { package: packageName, version: existingDepVersion });
+    }
+
+    // Add to devDependencies if not already present, using existing version or current CLI version
+    if (!existingDevDepVersion) {
       packageJson.devDependencies = packageJson.devDependencies || {};
-      packageJson.devDependencies["@shopdevs/multi-shop-cli"] = "^1.0.0";
+      const versionToUse = existingDepVersion || `^${CLI_VERSION}`;
+      packageJson.devDependencies[packageName] = versionToUse;
+      this.logger.debug('Added to devDependencies', { package: packageName, version: versionToUse });
+    } else {
+      this.logger.debug('Already in devDependencies', { package: packageName, version: existingDevDepVersion });
     }
 
     fs.writeFileSync(this.packageJsonPath, JSON.stringify(packageJson, null, 2));

src/lib/core/global-settings.ts

@@ -18,7 +18,7 @@ const DEFAULT_SETTINGS: GlobalSettings = {
 
 export const loadGlobalSettings = async (cwd: string): Promise<Result<GlobalSettings>> => {
   try {
-    const settingsPath = path.join(cwd, 'settings.json');
+    const settingsPath = path.join(cwd, 'shops', 'settings.json');
 
     if (!fs.existsSync(settingsPath)) {
       return { success: true, data: DEFAULT_SETTINGS };
@@ -38,7 +38,7 @@ export const loadGlobalSettings = async (cwd: string): Promise<Result<GlobalSett
 
 export const saveGlobalSettings = async (cwd: string, settings: GlobalSettings): Promise<Result<void>> => {
   try {
-    const settingsPath = path.join(cwd, 'settings.json');
+    const settingsPath = path.join(cwd, 'shops', 'settings.json');
     fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
 
     return { success: true };

src/lib/core/shop-creation.ts

@@ -3,18 +3,19 @@ import type { ShopConfig } from "../../types/shop.js";
 import type { CLIContext, Result } from "./types.js";
 import { collectShopData, type ShopData } from "./shop-input.js";
 import { setupShopResources } from "./shop-setup.js";
+import { getDefaultContentProtection } from "./global-settings.js";
 
 /**
  * Shop creation workflow
  */
 
 export const createNewShop = async (context: CLIContext): Promise<Result<void>> => {
   intro("🆕 Create New Shop");
-  
+
   const shopDataResult = await collectShopData(context);
   if (!shopDataResult.success || !shopDataResult.data) return { success: false, error: shopDataResult.error || "Failed to collect shop data" };
 
-  const configResult = await buildShopConfig(shopDataResult.data);
+  const configResult = await buildShopConfig(shopDataResult.data, context.deps.cwd);
   if (!configResult.success || !configResult.data) return { success: false, error: configResult.error || "Failed to build config" };
 
   const saveResult = await context.shopOps.saveConfig(shopDataResult.data.shopId, configResult.data);
@@ -27,7 +28,10 @@ export const createNewShop = async (context: CLIContext): Promise<Result<void>>
   return { success: true };
 };
 
-const buildShopConfig = async (shopData: ShopData): Promise<Result<ShopConfig>> => {
+const buildShopConfig = async (shopData: ShopData, cwd: string): Promise<Result<ShopConfig>> => {
+  // Get default content protection settings from global config
+  const defaultProtection = await getDefaultContentProtection(cwd);
+
   const config: ShopConfig = {
     shopId: shopData.shopId,
     name: shopData.shopName,
@@ -45,6 +49,12 @@ const buildShopConfig = async (shopData: ShopData): Promise<Result<ShopConfig>>
       authentication: {
         method: shopData.authMethod
       }
+    },
+    // Apply default content protection settings if configured
+    contentProtection: {
+      enabled: true,
+      mode: defaultProtection.defaultMode,
+      verbosity: defaultProtection.defaultVerbosity
     }
   };