@contentful/create-contentful-app 1.12.3 → 1.13.0

package/lib/includeFunction.js

@@ -24,12 +24,23 @@ const addBuildCommand = (0, package_1.getAddBuildCommandFn)({
     name: 'build:functions',
     command: 'node build-functions.js',
 });
-function cloneFunction(destination, templateIsJavascript) {
+const VALID_FUNCTION_TEMPLATES_DIRS = ['templates', 'appevent-filter'];
+function functionTemplateFromName(functionName) {
+    let dirName = functionName;
+    if (functionName === 'external-references')
+        dirName = 'templates'; // backwards compatible for the apps repo examples folder for delivery functions (external-references)
+    if (!VALID_FUNCTION_TEMPLATES_DIRS.includes(dirName)) {
+        console.error(`Invalid function template: ${functionName}. Must be one of ${VALID_FUNCTION_TEMPLATES_DIRS.join(', ')}.`);
+        process.exit(1);
+    }
+    return dirName;
+}
+function cloneFunction(destination, templateIsJavascript, functionName) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            console.log((0, logger_1.highlight)('---- Cloning function.'));
+            console.log((0, logger_1.highlight)(`---- Cloning function "${functionName}".`));
             // Clone the function template to the created directory under the folder 'actions'
-            const templateSource = (0, path_1.join)('contentful/apps/examples/function-templates', templateIsJavascript ? 'javascript' : 'typescript');
+            const templateSource = (0, path_1.join)(`contentful/apps/examples/function-${functionTemplateFromName(functionName)}`, templateIsJavascript ? 'javascript' : 'typescript');
             const functionDirectoryPath = (0, path_1.resolve)(`${destination}/functions`);
             const d = (0, degit_1.default)(templateSource, { mode: 'tar', cache: false });
             yield d.clone(functionDirectoryPath);
@@ -53,7 +64,10 @@ function cloneFunction(destination, templateIsJavascript) {
                 mergeFn: addBuildCommand,
             });
             yield Promise.all([writeAppManifest, copyBuildFile, writeBuildCommand]);
-            yield d.remove(functionDirectoryPath, destination, { action: "remove", files: constants_1.IGNORED_CLONED_FILES.map(fileName => `${functionDirectoryPath}/${fileName}`) });
+            yield d.remove(functionDirectoryPath, destination, {
+                action: 'remove',
+                files: constants_1.IGNORED_CLONED_FILES.map((fileName) => `${functionDirectoryPath}/${fileName}`),
+            });
         }
         catch (e) {
             console.error(e);

package/lib/index.js

@@ -116,7 +116,7 @@ function initProject(appName, options) {
             if (!isInteractive &&
                 (0, utils_1.isContentfulTemplate)(templateSource) &&
                 normalizedOptions.function) {
-                yield (0, includeFunction_1.cloneFunction)(fullAppFolder, !!normalizedOptions.javascript);
+                yield (0, includeFunction_1.cloneFunction)(fullAppFolder, !!normalizedOptions.javascript, normalizedOptions.function);
             }
             updatePackageName(fullAppFolder);
             const useYarn = normalizedOptions.yarn || (0, utils_1.detectManager)() === 'yarn';
@@ -162,7 +162,7 @@ function initProject(appName, options) {
             `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 the ts or js template')
-            .option('-f, --function', 'include a function template')
+            .option('-f, --function <function-template-name>', 'include the specified function template')
             .action(initProject);
         yield commander_1.program.parseAsync();
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/create-contentful-app",
-  "version": "1.12.3",
+  "version": "1.13.0",
   "description": "A template for building Contentful Apps",
   "keywords": [
     "contentful",
@@ -81,5 +81,5 @@
     "sinon-chai": "^3.7.0",
     "ts-node": "^10.9.1"
   },
-  "gitHead": "7576b84daf5069f42177cd8d43117f5f3c7056be"
+  "gitHead": "ea3442268d98eb87272b1e627b43cd2279590cbb"
 }