@contentful/create-contentful-app 1.8.0 → 1.8.2

package/lib/includeAppAction.js

@@ -17,37 +17,39 @@ const inquirer_1 = __importDefault(require("inquirer"));
 const fs_1 = require("fs");
 const path_1 = require("path");
 const constants_1 = require("./constants");
-function cloneAppAction(templateIsTypescript, destination) {
-    const actionPath = (0, path_1.resolve)(templateIsTypescript
-        ? 'src/app-actions/typescript/index.ts'
-        : 'src/app-actions/javascript/index.js');
-    const manifestPath = (0, path_1.resolve)(templateIsTypescript
-        ? `src/app-actions/typescript/${constants_1.CONTENTFUL_APP_MANIFEST}`
-        : `src/app-actions/javascript/${constants_1.CONTENTFUL_APP_MANIFEST}`);
-    // write the action
-    const appAction = (0, fs_1.readFileSync)(actionPath, { encoding: 'utf-8' }).toString();
-    const appActionDirectoryPath = `${destination}/actions`;
-    (0, fs_1.mkdirSync)(appActionDirectoryPath);
-    (0, fs_1.writeFileSync)(`${appActionDirectoryPath}/example${templateIsTypescript ? '.ts' : '.js'}`, appAction);
-    // write the manifest
-    const manifest = JSON.parse((0, fs_1.readFileSync)(manifestPath, { encoding: 'utf-8' }));
-    (0, fs_1.writeFileSync)(`${destination}/${constants_1.CONTENTFUL_APP_MANIFEST}`, JSON.stringify(manifest));
-    // write the build file if necessary
-    if (!templateIsTypescript) {
-        const buildFilePath = 'src/app-actions/javascript/build-actions.js';
-        const buildFile = (0, fs_1.readFileSync)(buildFilePath, { encoding: 'utf-8' }).toString();
-        (0, fs_1.writeFileSync)(`${destination}/build-actions.js`, buildFile);
-    }
-    // modify package.json build commands
-    const packageJsonLocation = `${destination}/package.json`;
-    const packageJsonExists = (0, fs_1.existsSync)(packageJsonLocation);
-    if (!packageJsonExists) {
-        console.error('Failed to add app action build commands.');
-        return;
-    }
-    const packageJson = JSON.parse((0, fs_1.readFileSync)(packageJsonLocation, { encoding: 'utf-8' }));
-    const updatedPackageJson = Object.assign(Object.assign({}, packageJson), { scripts: Object.assign(Object.assign({}, packageJson.scripts), { 'build-actions': `${templateIsTypescript ? 'tsc actions/*.ts --outDir build/actions' : 'node build-actions.js'}`, build: `${packageJson.scripts.build} && npm run build-actions` }) });
-    (0, fs_1.writeFileSync)(packageJsonLocation, JSON.stringify(updatedPackageJson, null, '  '));
+const degit_1 = __importDefault(require("degit"));
+const logger_1 = require("./logger");
+function cloneAppAction(destination, templateIsTypescript) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            console.log((0, logger_1.highlight)('---- Cloning hosted app action.'));
+            // Clone the app actions template to the created directory under the folder 'actions'
+            const templateSource = (0, path_1.join)('contentful/apps/examples/hosted-app-action-templates', templateIsTypescript ? 'typescript' : 'javascript');
+            const appActionDirectoryPath = (0, path_1.resolve)(`${destination}/actions`);
+            const d = yield (0, degit_1.default)(templateSource, { mode: 'tar', cache: false });
+            yield d.clone(appActionDirectoryPath);
+            // move the manifest from the actions folder to the root folder
+            (0, fs_1.renameSync)(`${appActionDirectoryPath}/${constants_1.CONTENTFUL_APP_MANIFEST}`, `${destination}/${constants_1.CONTENTFUL_APP_MANIFEST}`);
+            // move the build file from the actions folder to the root folder, if necessary
+            if (!templateIsTypescript) {
+                (0, fs_1.renameSync)(`${appActionDirectoryPath}/build-actions.js`, `${destination}/build-actions.js`);
+            }
+            // modify package.json build commands
+            const packageJsonLocation = (0, path_1.resolve)(`${destination}/package.json`);
+            const packageJsonExists = (0, fs_1.existsSync)(packageJsonLocation);
+            if (!packageJsonExists) {
+                console.error('Failed to add app action build commands.');
+                return;
+            }
+            const packageJson = JSON.parse((0, fs_1.readFileSync)(packageJsonLocation, { encoding: 'utf-8' }));
+            const updatedPackageJson = Object.assign(Object.assign({}, packageJson), { scripts: Object.assign(Object.assign({}, packageJson.scripts), { 'build-actions': `${templateIsTypescript ? 'tsc actions/*.ts --outDir build/actions' : 'node build-actions.js'}`, build: `${packageJson.scripts.build} && npm run build-actions` }) });
+            (0, fs_1.writeFileSync)(packageJsonLocation, JSON.stringify(updatedPackageJson, null, '  '));
+        }
+        catch (e) {
+            console.log(e);
+            process.exit(1);
+        }
+    });
 }
 exports.cloneAppAction = cloneAppAction;
 const promptIncludeActionInTemplate = ({ fullAppFolder, templateSource, }) => __awaiter(void 0, void 0, void 0, function* () {
@@ -62,7 +64,7 @@ const promptIncludeActionInTemplate = ({ fullAppFolder, templateSource, }) => __
     // put app action into the template
     if (includeAppAction) {
         const templateIsTypescript = templateSource.includes('typescript');
-        cloneAppAction(templateIsTypescript, fullAppFolder);
+        cloneAppAction(fullAppFolder, templateIsTypescript);
     }
 });
 exports.promptIncludeActionInTemplate = promptIncludeActionInTemplate;

package/lib/index.js

@@ -107,12 +107,8 @@ function initProject(appName, options) {
                 interactive: isInteractive,
             });
             yield (0, template_1.cloneTemplateIn)(fullAppFolder, templateSource);
-            // Ask to include a hosted app action if the user has selected a template
-            if (isInteractive && (0, utils_1.isContentfulTemplate)(templateSource)) {
-                yield (0, includeAppAction_1.promptIncludeActionInTemplate)({ fullAppFolder, templateSource });
-            }
             if (!isInteractive && (0, utils_1.isContentfulTemplate)(templateSource) && normalizedOptions.action) {
-                (0, includeAppAction_1.cloneAppAction)(!!normalizedOptions.typescript, fullAppFolder);
+                (0, includeAppAction_1.cloneAppAction)(fullAppFolder, !!normalizedOptions.typescript);
             }
             updatePackageName(fullAppFolder);
             const useYarn = normalizedOptions.yarn || (0, utils_1.detectManager)() === 'yarn';
@@ -157,7 +153,7 @@ function initProject(appName, options) {
             `provide a template by its source repository.`,
             `format: URL (HTTPS or SSH) or ${(0, logger_1.code)('vendor:user/repo')} (e.g., ${(0, logger_1.code)('github:user/repo')})`,
         ].join('\n'))
-            .option('-a, --action', 'include a hosted app action in your app')
+            .option('-a, --action', 'include a hosted app action in the ts or js template')
             .action(initProject);
         yield commander_1.program.parseAsync();
     });

package/lib/template.js

@@ -46,7 +46,7 @@ function validate(destination) {
         JSON.parse((0, fs_1.readFileSync)(packageJSONLocation, 'utf-8'));
     }
     catch (e) {
-        throw new Error(`Invalid template: invalid "${packageJSONLocation}".`);
+        throw new Error(`Invalid template: invalid ${packageJSONLocation}.`);
     }
 }
 function cleanUp(destination) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/create-contentful-app",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "A template for building Contentful Apps",
   "keywords": [
     "contentful",
@@ -69,5 +69,5 @@
     "@types/validate-npm-package-name": "4.0.0",
     "contentful-management": "10.32.0"
   },
-  "gitHead": "8904c6715a206de6298692d331c478a7bb90126e"
+  "gitHead": "f79e7a9fbde908b671d26e783ffeafd3d96a81e9"
 }

package/lib/app-actions/typescript/index.js

@@ -1,18 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handler = (payload) => __awaiter(void 0, void 0, void 0, function* () {
-    const { parameters } = payload;
-    const response = {
-        message: `Hello from your hosted app action. I received the following message as a paramater: ${JSON.stringify(parameters.message)} `,
-    };
-    return response;
-});