fix(deps): update dependency cpy to v9 (#5011)

Author: renovate[bot]

package-lock.json

@@ -124,7 +124,7 @@
     "ava": "^4.0.0",
     "c8": "^7.12.0",
     "copyfiles": "^2.4.1",
-    "cpy": "^8.1.0",
+    "cpy": "^9.0.0",
     "fast-safe-stringify": "^2.0.7",
     "get-bin-path": "^6.0.0",
     "get-node": "^12.0.0",

packages/build/package.json

@@ -71,7 +71,7 @@ test('Use plugins cached in .netlify/plugins/', async (t) => {
 test('Do not use plugins cached in .netlify/plugins/ if outdated', async (t) => {
   const pluginsDir = `${FIXTURES_DIR}/plugins_cache_outdated/.netlify/plugins`
   await removeDir(pluginsDir)
-  await cpy('**', '../plugins', { cwd: `${pluginsDir}-old`, parents: true })
+  await cpy('**', '../plugins', { cwd: `${pluginsDir}-old` })
   try {
     await runWithApiMock(t, 'plugins_cache_outdated')
   } finally {

packages/build/tests/plugins_list/tests.js

@@ -50,7 +50,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "cpy": "^8.1.0",
+    "cpy": "^9.0.0",
     "get-stream": "^6.0.0",
     "globby": "^13.0.0",
     "junk": "^4.0.0",

packages/cache-utils/package.json

@@ -1,5 +1,5 @@
 import { promises as fs, Stats } from 'fs'
-import { basename, dirname } from 'path'
+import { basename, dirname, join } from 'path'
 
 import cpy from 'cpy'
 import { Options, globby } from 'globby'
@@ -18,17 +18,18 @@ export const moveCacheFile = async function (src: string, dest: string, move = f
     return moveFile(src, dest, { overwrite: false })
   }
 
-  const { srcGlob, ...options } = await getSrcGlob(src)
-  if (srcGlob) {
-    return cpy(srcGlob, dirname(dest), { ...options, parents: true, overwrite: false })
+  const { srcGlob, dest: matchedDest, ...options } = await getSrcAndDest(src, dirname(dest))
+  if (srcGlob && matchedDest) {
+    return cpy(srcGlob, matchedDest, { ...options, overwrite: false })
   }
 }
 
 /**
  * Non-existing files and empty directories are always skipped
  */
 export const hasFiles = async function (src: string): Promise<boolean> {
-  const { srcGlob, isDir, ...options } = await getSrcGlob(src)
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const { srcGlob, isDir, dest, ...options } = await getSrcAndDest(src, '')
   return srcGlob !== undefined && !(await isEmptyDir(srcGlob, isDir, options))
 }
 
@@ -45,6 +46,7 @@ const isEmptyDir = async function (globPattern: string, isDir: boolean, options:
 
 type GlobOptions = {
   srcGlob?: string
+  dest?: string
   isDir: boolean
   cwd: string
   dot?: boolean
@@ -53,7 +55,7 @@ type GlobOptions = {
 /**
  * Get globbing pattern with files to move/copy
  */
-const getSrcGlob = async function (src: string): Promise<GlobOptions> {
+const getSrcAndDest = async function (src: string, dest: string): Promise<GlobOptions> {
   const srcStat = await getStat(src)
 
   if (srcStat === undefined) {
@@ -66,13 +68,14 @@ const getSrcGlob = async function (src: string): Promise<GlobOptions> {
 
   const baseOptions: GlobOptions = {
     srcGlob: srcBasename,
+    dest,
     isDir,
     cwd,
     dot: true, // collect .dot directories as well
   }
 
   if (isDir) {
-    return { ...baseOptions, srcGlob: `${srcBasename}/**` }
+    return { ...baseOptions, srcGlob: `${srcBasename}/**`, dest: join(dest, srcBasename) }
   }
 
   return baseOptions

packages/cache-utils/src/fs.ts

@@ -51,7 +51,7 @@
   "license": "MIT",
   "dependencies": {
     "@netlify/zip-it-and-ship-it": "9.5.0",
-    "cpy": "^8.1.0",
+    "cpy": "^9.0.0",
     "path-exists": "^5.0.0"
   },
   "devDependencies": {

packages/functions-utils/package.json

@@ -1,5 +1,5 @@
 import { promises as fs } from 'fs'
-import { basename, dirname } from 'path'
+import { basename, dirname, join } from 'path'
 
 import { listFunctions, listFunctionsFiles } from '@netlify/zip-it-and-ship-it'
 import cpy from 'cpy'
@@ -21,18 +21,18 @@ export const add = async function (src?: string, dist?: string, { fail = default
   }
 
   const srcBasename = basename(src)
-  const srcGlob = await getSrcGlob(src, srcBasename)
-  await cpy(srcGlob, dist, { cwd: dirname(src), parents: true, overwrite: true })
+  const [srcGlob, dest] = await getSrcAndDest(src, srcBasename, dist)
+  await cpy(srcGlob, dest, { cwd: dirname(src), overwrite: true })
 }
 
-const getSrcGlob = async function (src, srcBasename) {
+const getSrcAndDest = async function (src: string, srcBasename: string, dist: string): Promise<[string, string]> {
   const srcStat = await fs.stat(src)
 
   if (srcStat.isDirectory()) {
-    return `${srcBasename}/**`
+    return [`${srcBasename}/**`, join(dist, srcBasename)]
   }
 
-  return srcBasename
+  return [srcBasename, dist]
 }
 
 export const list = async function (functionsSrc, { fail = defaultFail } = {} as any) {

packages/functions-utils/src/main.ts

@@ -22,7 +22,7 @@
     "@types/node": "^18.14.2",
     "ava": "^4.0.0",
     "c8": "^7.12.0",
-    "cpy": "^8.1.0",
+    "cpy": "^9.0.0",
     "execa": "^6.0.0",
     "fast-safe-stringify": "^2.0.7",
     "figures": "^4.0.0",

packages/testing/package.json

@@ -147,7 +147,7 @@ export class Fixture {
     } = { git: true },
   ): Promise<this> {
     this.copyRootDir = normalize(createRepoDir(copyRoot.git))
-    await cpy('**', this.copyRootDir, { cwd: this.repositoryRoot, parents: true })
+    await cpy('./**', this.copyRootDir, { cwd: this.repositoryRoot })
 
     if (copyRoot.branch !== undefined) {
       await execaCommand(`git checkout -b ${copyRoot.branch}`, { cwd: this.copyRootDir })

packages/testing/src/fixture.ts

@@ -0,0 +1,8 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["github>netlify/renovate-config:esm"],
+  "ignorePresets": [":prHourlyLimit2"],
+  "semanticCommits": "enabled",
+  "dependencyDashboard": true,
+  "automerge": true
+}