Merge remote-tracking branch 'origin/dev' into stable

webiny · Jul 4, 2024 · 2529e55 · 2529e55
2 parents f30c8c4 + e741f10
commit 2529e55
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/api-page-builder/src/graphql/crud/install/utils/downloadInstallFiles.ts b/packages/api-page-builder/src/graphql/crud/install/utils/downloadInstallFiles.ts
@@ -20,7 +20,7 @@ function extractZip(zipPath: string, dir: string): Promise<void> {
 }
 
 export function deleteFile(path: string): Promise<void> {
-    return fs.unlink(path);
+    return fs.remove(path);
 }
 
 const INSTALL_DIR = "/tmp";

diff --git a/packages/cli-plugin-scaffold-extensions/src/generators/utils/getExtensionsFromFilesystem.ts b/packages/cli-plugin-scaffold-extensions/src/generators/utils/getExtensionsFromFilesystem.ts
@@ -12,7 +12,9 @@ export type ExtensionWorkspace = {
 };
 
 export const getExtensionsFromFilesystem = (): ExtensionWorkspace[] => {
-    const workspaces = glob.sync(`extensions/**/package.json`);
+    const workspaces = glob.sync(`extensions/**/package.json`, {
+        ignore: ["**/node_modules/**"]
+    });
     return workspaces
         .map(pkg => ({
             path: path.dirname(pkg),