fix(custom-elements): fix copy tasks

ionic-team · May 29, 2020 · d810649 · d810649
1 parent 39c0a99
commit d810649
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 322 deletions.
diff --git a/src/compiler/config/outputs/validate-custom-element-bundle.ts b/src/compiler/config/outputs/validate-custom-element-bundle.ts
@@ -1,10 +1,11 @@
 import * as d from '../../../declarations';
+import { COPY, isOutputTargetDistCustomElementsBundle } from '../../output-targets/output-utils';
 import { getAbsolutePath } from '../config-utils';
 import { isBoolean } from '@utils';
-import { isOutputTargetDistCustomElementsBundle } from '../../output-targets/output-utils';
+import { validateCopy } from '../validate-copy';
 
 export const validateCustomElementBundle = (config: d.Config, userOutputs: d.OutputTarget[]) => {
-  return userOutputs.filter(isOutputTargetDistCustomElementsBundle).map(o => {
+  return userOutputs.filter(isOutputTargetDistCustomElementsBundle).reduce((arr, o) => {
     const outputTarget = {
       ...o,
       dir: getAbsolutePath(config, o.dir || 'dist/custom-elements'),
@@ -15,6 +16,17 @@ export const validateCustomElementBundle = (config: d.Config, userOutputs: d.Out
     if (!isBoolean(outputTarget.externalRuntime)) {
       outputTarget.externalRuntime = true;
     }
-    return outputTarget;
-  });
+    outputTarget.copy = validateCopy(outputTarget.copy, config.copy);
+
+    if (outputTarget.copy.length > 0) {
+      arr.push({
+        type: COPY,
+        dir: config.rootDir,
+        copy: [...outputTarget.copy],
+      });
+    }
+    arr.push(outputTarget)
+
+    return arr;
+  }, [] as (d.OutputTargetDistCustomElementsBundle | d.OutputTargetCopy)[]);
 };
diff --git a/src/compiler/copy/assets-copy-tasks.ts b/src/compiler/copy/assets-copy-tasks.ts
diff --git a/src/compiler/copy/copy-tasks-worker.ts b/src/compiler/copy/copy-tasks-worker.ts
diff --git a/src/compiler/copy/hashed-copy.ts b/src/compiler/copy/hashed-copy.ts
diff --git a/src/compiler/copy/local-copy-tasks.ts b/src/compiler/copy/local-copy-tasks.ts
diff --git a/src/compiler/html/inline-esm-import.ts b/src/compiler/html/inline-esm-import.ts
@@ -1,6 +1,6 @@
 import * as d from '../../declarations';
 import { getAbsoluteBuildDir } from './html-utils';
-import { generateHashedCopy } from '../copy/hashed-copy';
+import { generateHashedCopy } from '../output-targets/copy/hashed-copy';
 import { injectModulePreloads } from './inject-module-preloads';
 import { isString } from '@utils';
 import { join } from 'path';

diff --git a/src/compiler/output-targets/output-www.ts b/src/compiler/output-targets/output-www.ts
@@ -3,7 +3,7 @@ import { addScriptDataAttribute } from '../html/add-script-attr';
 import { catchError, flatOne, unique } from '@utils';
 import { cloneDocument, serializeNodeToHtml } from '@stencil/core/mock-doc';
 import { generateEs5DisabledMessage } from '../app-core/app-es5-disabled';
-import { generateHashedCopy } from '../copy/hashed-copy';
+import { generateHashedCopy } from '../output-targets/copy/hashed-copy';
 import { getAbsoluteBuildDir } from '../html/html-utils';
 import { getScopeId } from '../style/scope-css';
 import { getUsedComponents } from '../html/used-components';