fix: no longer copy build-functions script, copy build script from example package [EXT-6084] (#2267)

fix: lint

chore: comment change

Author: BobHemphill76

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

@@ -1,14 +1,14 @@
-import { rename } from 'fs/promises';
 import { resolve, join } from 'path';
 import { CONTENTFUL_APP_MANIFEST, IGNORED_CLONED_FILES } from './constants';
 import tiged from 'tiged';
 import { highlight } from './logger';
 import { exists, mergeJsonIntoFile } from './utils/file';
 import { getAddBuildCommandFn } from './utils/package';
 
+// TODO: after appActions work we can change this getAddBuildCommandFn params from command -> defaultCommand as examples will have build commands
 const addBuildCommand = getAddBuildCommandFn({
   name: 'build:functions',
-  command: 'node build-functions.js',
+  command: 'contentful-app-scripts build-functions --ci',
 });
 
 const VALID_FUNCTION_TEMPLATES_DIRS = [
@@ -57,12 +57,6 @@ export async function cloneFunction(
       destination: `${destination}/${CONTENTFUL_APP_MANIFEST}`,
     });
 
-    // move the build file from the actions folder to the root folder
-    const copyBuildFile = rename(
-      `${functionDirectoryPath}/build-functions.js`,
-      `${destination}/build-functions.js`
-    );
-
     // modify package.json build commands
     const packageJsonLocation = resolve(`${destination}/package.json`);
     const packageJsonExists = await exists(packageJsonLocation);
@@ -80,7 +74,7 @@ export async function cloneFunction(
       mergeFn: addBuildCommand,
     });
 
-    await Promise.all([writeAppManifest, copyBuildFile, writeBuildCommand]);
+    await Promise.all([writeAppManifest, writeBuildCommand]);
 
     await d.remove(functionDirectoryPath, destination, {
       action: 'remove',

packages/contentful--create-contentful-app/src/utils/package.ts

@@ -10,17 +10,18 @@ export function getAddBuildCommandFn({ name, command }: BuildCommandOptions) {
     packageJson?: Record<string, any>,
     additionalProperties?: Record<string, any>,
   ): Record<string, any> => {
-    let buildCommand = packageJson?.scripts?.build ?? '';
+    let destBuildCommand = packageJson?.scripts?.build ?? '';
+    const sourceBuildCommand = additionalProperties?.scripts?.build ?? command;
     const triggerCommand = `npm run ${name}`;
 
-    if (buildCommand === '') {
-      buildCommand = triggerCommand;
-    } else if (!buildCommand.split(/\s*&+\s*/).includes(triggerCommand)) {
-      buildCommand += ` && ${triggerCommand}`;
+    if (destBuildCommand === '') {
+      destBuildCommand = triggerCommand;
+    } else if (!destBuildCommand.split(/\s*&+\s*/).includes(triggerCommand)) {
+      destBuildCommand += ` && ${triggerCommand}`;
     }
 
     return mergeOptions({}, packageJson, additionalProperties, {
-      scripts: { [name]: command, build: buildCommand },
+      scripts: { [name]: sourceBuildCommand, build: destBuildCommand },
     });
   };
 }