@contentful/create-contentful-app 2.2.0 → 2.2.2

package/lib/index.js

@@ -130,7 +130,7 @@ async function initProject(appName, options) {
             manager: packageManager,
             interactive: isInteractive,
         });
-        await (0, template_1.cloneTemplateIn)(fullAppFolder, templateSource);
+        (0, template_1.cloneTemplateIn)(templateSource, fullAppFolder);
         if (!isInteractive && (0, utils_1.isContentfulTemplate)(templateSource) && normalizedOptions.function) {
             // If function flag is specified, but no function name is provided, we default to external-references
             // for legacy support

package/lib/template.js

@@ -22,33 +22,108 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cloneTemplateIn = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
-const tiged_1 = __importDefault(require("tiged"));
+const os_1 = require("os");
 const rimraf = __importStar(require("rimraf"));
+const child_process_1 = require("child_process");
 const logger_1 = require("./logger");
 const utils_1 = require("./utils");
-async function clone(source, destination) {
-    const d = (0, tiged_1.default)(source, { mode: 'tar', disableCache: true });
+function clone(source, destination) {
     try {
-        await d.clone(destination);
+        if ((0, fs_1.existsSync)(destination)) {
+            try {
+                const files = (0, child_process_1.execSync)(`ls -la "${destination}"`, { encoding: 'utf8' });
+                if (files.split('\n').length > 3) {
+                    throw new Error('Destination directory is not empty.');
+                }
+            }
+            catch {
+                // Ignore
+            }
+        }
+        if (isContentfulTemplate(source)) {
+            cloneContentfulTemplate(source, destination);
+        }
+        else {
+            // Try to handle external repositories
+            (0, child_process_1.execSync)(`git clone --depth 1 "${source}" "${destination}"`, { stdio: 'ignore' });
+            try {
+                (0, child_process_1.execSync)(`rm -rf "${destination}/.git"`);
+            }
+            catch {
+                // Ignore
+            }
+        }
     }
     catch (e) {
-        if (e.code === 'DEST_NOT_EMPTY') {
-            // In this case, we know that tiged will suggest users
-            // provide a 'force' flag - this is a flag for tiged though
-            // and not CCA. So we swallow the details of this error
-            // to avoid confusing people.
-            throw new Error('Destination directory is not empty.');
+        if (e.message?.includes('Destination directory is not empty')) {
+            throw e;
         }
-        throw e;
+        if (e.message?.includes('not found') || e.message?.includes('does not exist')) {
+            throw new Error(`Repository not found: ${source}`);
+        }
+        throw new Error(`Failed to clone repository: ${e.message}`);
     }
 }
+function cloneContentfulTemplate(source, destination) {
+    const templatePath = source.replace('contentful/apps/', '');
+    const tempDir = (0, path_1.resolve)((0, os_1.tmpdir)(), `contentful-clone-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`);
+    try {
+        (0, child_process_1.execSync)(`git clone --depth 1 https://github.com/contentful/apps.git "${tempDir}"`, {
+            stdio: 'ignore',
+        });
+        try {
+            (0, child_process_1.execSync)(`mkdir -p "${destination}"`);
+        }
+        catch {
+            // Windows fallback
+            try {
+                (0, child_process_1.execSync)(`mkdir "${destination}"`);
+            }
+            catch {
+                // Ignore
+            }
+        }
+        const sourcePath = (0, path_1.resolve)(tempDir, templatePath);
+        try {
+            (0, child_process_1.execSync)(`cp -r "${sourcePath}"/* "${destination}"/`);
+        }
+        catch {
+            (0, child_process_1.execSync)(`xcopy "${sourcePath}\\*" "${destination}\\" /E /I /Y`);
+        }
+        try {
+            (0, child_process_1.execSync)(`rm -rf "${tempDir}"`);
+        }
+        catch {
+            try {
+                (0, child_process_1.execSync)(`rmdir /S /Q "${tempDir}"`);
+            }
+            catch {
+                // Ignore
+            }
+        }
+    }
+    catch (error) {
+        try {
+            (0, child_process_1.execSync)(`rm -rf "${tempDir}"`);
+        }
+        catch {
+            try {
+                (0, child_process_1.execSync)(`rmdir /S /Q "${tempDir}"`);
+            }
+            catch {
+                // Ignore
+            }
+        }
+        throw error;
+    }
+}
+function isContentfulTemplate(source) {
+    return source.startsWith('contentful/apps/');
+}
 function validate(destination) {
     const packageJSONLocation = `${destination}/package.json`;
     if (!(0, fs_1.existsSync)(packageJSONLocation)) {
@@ -66,8 +141,8 @@ function cleanUp(destination) {
     (0, utils_1.rmIfExists)((0, path_1.resolve)(destination, 'package-lock.json'));
     (0, utils_1.rmIfExists)((0, path_1.resolve)(destination, 'yarn.lock'));
 }
-async function cloneTemplateIn(destination, source) {
-    await clone(source, destination);
+function cloneTemplateIn(source, destination) {
+    clone(source, destination);
     try {
         validate(destination);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/create-contentful-app",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "A template for building Contentful Apps",
   "keywords": [
     "contentful",
@@ -36,7 +36,7 @@
     "test": "mocha 'test/**/*.spec.{js,ts}'"
   },
   "dependencies": {
-    "@contentful/app-scripts": "2.5.5",
+    "@contentful/app-scripts": "2.5.6",
     "@segment/analytics-node": "^2.2.0",
     "chalk": "4.1.2",
     "commander": "12.1.0",
@@ -44,7 +44,6 @@
     "merge-options": "^3.0.4",
     "node-fetch": "2.6.7",
     "rimraf": "5.0.8",
-    "tiged": "^2.12.7",
     "tildify": "2.0.0",
     "validate-npm-package-name": "6.0.2"
   },
@@ -74,11 +73,11 @@
     "@types/validate-npm-package-name": "4.0.2",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "contentful-management": "11.54.4",
+    "contentful-management": "11.61.0",
     "mocha": "^11.2.2",
     "sinon": "^21.0.0",
     "sinon-chai": "^3.7.0",
     "ts-node": "^10.9.2"
   },
-  "gitHead": "4c69fe11610e734125777512ec1322e26f4e5456"
+  "gitHead": "b44c54a3301e10a7d6b8e4b0e745f697f7be4681"
 }