fix(copy): if dest is specified copy task is not relative

fixes #1697

src/compiler/config/validate-copy.ts

@@ -8,8 +8,11 @@ export function validateCopy(copy: d.CopyTask[] | boolean, defaultCopy: d.CopyTa
   if (!Array.isArray(copy)) {
     copy = [];
   }
-  return unique([
-    ...copy,
-    ...defaultCopy,
-  ], task => task.src);
+  copy = copy.slice();
+  for (const task of defaultCopy) {
+    if (copy.every(t => t.src !== task.src)) {
+      copy.push(task);
+    }
+  }
+  return unique(copy, task => `${task.src}:${task.dest}:${task.relative}`);
 }

src/compiler/copy/assets-copy-tasks.ts

@@ -20,7 +20,8 @@ export function getComponentAssetsCopyTasks(config: d.Config, buildCtx: d.BuildC
           copyTasks.push({
             src: assetsMeta.absolutePath,
             dest: config.sys.path.join(dest, assetsMeta.cmpRelativePath),
-            warn: false
+            warn: false,
+            relative: false,
           });
         });
       } else if (!cmp.excludeFromCollection && !cmp.isCollectionDependency) {
@@ -32,7 +33,8 @@ export function getComponentAssetsCopyTasks(config: d.Config, buildCtx: d.BuildC
           copyTasks.push({
             src: assetsMeta.absolutePath,
             dest: collectionDirDestination,
-            warn: false
+            warn: false,
+            relative: false,
           });
         });
       }

src/compiler/copy/copy-tasks-worker.ts

@@ -19,7 +19,8 @@ export async function copyTasksWorker(copyTasks: Required<d.CopyTask>[], srcDir:
     copyTasks = flatOne(await Promise.all(
       copyTasks.map(task => processGlobs(task, srcDir))
     ));
-    copyTasks = unique(copyTasks, task => `${task.src}:::${task.dest}`);
+
+    copyTasks = unique(copyTasks, task => task.dest);
 
     const allCopyTasks: d.CopyTask[] = [];
 
@@ -63,8 +64,11 @@ async function processGlobs(copyTask: Required<d.CopyTask>, srcDir: string): Pro
     ? await processGlobTask(copyTask, srcDir)
     : [{
       src: getSrcAbsPath(srcDir, copyTask.src),
-      dest: copyTask.dest,
-      warn: copyTask.warn
+      dest: copyTask.relative
+        ? path.join(copyTask.dest, copyTask.src)
+        : copyTask.dest,
+      warn: copyTask.warn,
+      relative: copyTask.relative
     }];
 }
 
@@ -85,10 +89,15 @@ async function processGlobTask(copyTask: Required<d.CopyTask>, srcDir: string):
 
 
 function createGlobCopyTask(copyTask: Required<d.CopyTask>, srcDir: string, globRelPath: string): Required<d.CopyTask> {
+  const dest = path.join(copyTask.dest, copyTask.relative
+    ? globRelPath
+    : path.basename(globRelPath)
+  );
   return {
     src: path.join(srcDir, globRelPath),
-    dest: path.join(copyTask.dest, globRelPath),
-    warn: copyTask.warn
+    dest,
+    warn: copyTask.warn,
+    relative: copyTask.relative
   };
 }
 

src/compiler/copy/local-copy-tasks.ts

@@ -1,5 +1,4 @@
 import * as d from '../../declarations';
-import isGlob from 'is-glob';
 
 export function getSrcAbsPath(config: d.Config, src: string) {
   if (config.sys.path.isAbsolute(src)) {
@@ -23,7 +22,5 @@ export function getDestAbsPath(config: d.Config, src: string, destAbsPath: strin
     throw new Error(`copy task, "dest" property must exist if "src" property is an absolute path: ${src}`);
   }
 
-  return isGlob(src)
-    ? destAbsPath
-    : config.sys.path.join(destAbsPath, src);
+  return destAbsPath;
 }

src/compiler/output-targets/output-copy.ts

@@ -90,6 +90,7 @@ function transformToAbs(config: d.Config, copyTask: d.CopyTask, dest: string): R
   return {
     src: copyTask.src,
     dest: getDestAbsPath(config, copyTask.src, dest, copyTask.dest),
+    relative: typeof copyTask.relative === 'boolean' ? copyTask.relative : copyTask.dest == null,
     warn: copyTask.warn !== false
   };
 }

src/declarations/assets.ts

@@ -11,6 +11,7 @@ export interface CopyTask {
   src: string;
   dest?: string;
   warn?: boolean;
+  relative?: boolean;
 }