From 24c8f853cbadb96659efe7befaf07be0c15b7794 Mon Sep 17 00:00:00 2001 From: ErlendHer Date: Thu, 13 Jun 2024 11:37:57 +0200 Subject: [PATCH 1/2] fix: avoid copying node_modules folder for increased performance --- .../amplify-helpers/update-amplify-meta.ts | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/packages/amplify-cli/src/extensions/amplify-helpers/update-amplify-meta.ts b/packages/amplify-cli/src/extensions/amplify-helpers/update-amplify-meta.ts index fd05291a6b2..d638c5485d9 100644 --- a/packages/amplify-cli/src/extensions/amplify-helpers/update-amplify-meta.ts +++ b/packages/amplify-cli/src/extensions/amplify-helpers/update-amplify-meta.ts @@ -77,13 +77,13 @@ const moveBackendResourcesToCurrentCloudBackend = (resources: $TSObject[]): void } fs.ensureDirSync(targetDir); + const isLambdaOrCustom = + resource?.service === ServiceName.LambdaFunction || (resource?.service && resource?.service.includes('custom')); // in the case that the resource is being deleted, the sourceDir won't exist if (fs.pathExistsSync(sourceDir)) { - fs.copySync(sourceDir, targetDir); - if (resource?.service === ServiceName.LambdaFunction || (resource?.service && resource?.service.includes('custom'))) { - removeNodeModulesDir(targetDir); - } + const nodeModulesFilterFn = (src: string): boolean => path.basename(src) !== 'node_modules'; + fs.copySync(sourceDir, targetDir, { ...(isLambdaOrCustom ? { filter: nodeModulesFilterFn } : {}) }); } } @@ -109,18 +109,6 @@ const moveBackendResourcesToCurrentCloudBackend = (resources: $TSObject[]): void } }; -const removeNodeModulesDir = (currentCloudBackendDir: string): void => { - const nodeModulesDirs = glob.sync('**/node_modules', { - cwd: currentCloudBackendDir, - absolute: true, - }); - for (const nodeModulesPath of nodeModulesDirs) { - if (fs.existsSync(nodeModulesPath)) { - fs.removeSync(nodeModulesPath); - } - } -}; - /** * Update amplify-meta.json and backend-config.json */ From eb2ada878d1fae47cc3ac5b5a77c5a1c98112490 Mon Sep 17 00:00:00 2001 From: Praveen Gupta Date: Mon, 23 Sep 2024 15:14:03 +0200 Subject: [PATCH 2/2] lint fix --- .../src/extensions/amplify-helpers/update-amplify-meta.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/amplify-cli/src/extensions/amplify-helpers/update-amplify-meta.ts b/packages/amplify-cli/src/extensions/amplify-helpers/update-amplify-meta.ts index d638c5485d9..a5c69375946 100644 --- a/packages/amplify-cli/src/extensions/amplify-helpers/update-amplify-meta.ts +++ b/packages/amplify-cli/src/extensions/amplify-helpers/update-amplify-meta.ts @@ -5,7 +5,6 @@ import { buildTypeKeyMap, ServiceName } from '@aws-amplify/amplify-category-func import { $TSAny, $TSMeta, $TSObject, JSONUtilities, pathManager, ResourceTuple, stateManager } from '@aws-amplify/amplify-cli-core'; import { BuildType } from '@aws-amplify/amplify-function-plugin-interface'; import * as fs from 'fs-extra'; -import glob from 'glob'; import _ from 'lodash'; import * as path from 'path'; import { ensureAmplifyMetaFrontendConfig } from './on-category-outputs-change';