fix: Clone functions through function-examples [EXT-6257] (#2370)

* fix: Including function uses app-scripts generate-function

* fix: merge conflicts

* fix: Remove dashes from function name when cloning

* chore: prettier

* chore: remove console log

Author: michaelpineirocontentful

packages/contentful--create-contentful-app/package.json

@@ -28,7 +28,7 @@
     "create-contentful-app": "lib/index.js"
   },
   "scripts": {
-    "prettier": "prettier **/*.js --write --ignore-path .gitignore",
+    "prettier": "prettier **/*.ts --write --ignore-path .gitignore",
     "lint": "eslint ./src",
     "lint:fix": "npm run lint -- --fix",
     "pre-commit": "lint-staged",

packages/contentful--create-contentful-app/src/getTemplateSource.ts

@@ -45,10 +45,12 @@ async function promptExampleSelection(): Promise<string> {
     // get available templates from examples
     const availableTemplates = await getGithubFolderNames();
     // filter out the ignored ones that are listed as templates instead of examples
-    const filteredTemplates = availableTemplates.filter(
-      (template) =>
-        !IGNORED_EXAMPLE_FOLDERS.includes(template as (typeof IGNORED_EXAMPLE_FOLDERS)[number])
-    );
+    const filteredTemplates = availableTemplates
+      .filter(
+        (template) =>
+          !IGNORED_EXAMPLE_FOLDERS.includes(template as (typeof IGNORED_EXAMPLE_FOLDERS)[number])
+      )
+      .filter((template) => !template.includes('function'));
     console.log(availableTemplates.length, filteredTemplates.length);
 
     // ask user to select a template from the available examples

packages/contentful--create-contentful-app/src/includeFunction.ts

@@ -14,7 +14,7 @@ import chalk from 'chalk';
 import { CREATE_APP_DEFINITION_GUIDE_URL, EXAMPLES_REPO_URL } from './constants';
 import { getTemplateSource } from './getTemplateSource';
 import { track } from './analytics';
-import { cloneFunction } from './includeFunction';
+import { generateFunction } from '@contentful/app-scripts';
 
 const DEFAULT_APP_NAME = 'contentful-app';
 
@@ -130,12 +130,23 @@ async function initProject(appName: string, options: CLIOptions) {
       if (normalizedOptions.function === true) {
         normalizedOptions.function = 'external-references';
       }
-
-      await cloneFunction(
-        fullAppFolder,
-        !!normalizedOptions.javascript,
-        normalizedOptions.function
-      );
+      process.chdir(fullAppFolder);
+      `To add additional function templates to your app, use ${highlight(
+        chalk.green(`
+          npx @contentful/app-scripts@latest generate-function \\
+            --ci \\
+            --name <name> \\
+            --example <example> \\
+            --language <typescript/javascript>`)
+      )}`;
+      const functionName = normalizedOptions.function
+        .toLowerCase()
+        .replace(/-([a-z])/g, (match, letter) => letter.toUpperCase());
+      await generateFunction.nonInteractive({
+        example: normalizedOptions.function,
+        language: 'typescript',
+        name: functionName,
+      });
     }
 
     updatePackageName(fullAppFolder);

packages/contentful--create-contentful-app/src/index.ts

@@ -1 +1 @@
-declare module 'tiged';
+declare module 'tiged';