From 6cf313442b4a93a9da5265075223eede8aff4711 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 4 Aug 2020 13:49:49 -0500 Subject: [PATCH] feat(copy): remove deprecated copy config Copy configs on each output target should be used instead. --- .../outputs/validate-custom-element-bundle.ts | 4 ++-- src/compiler/config/outputs/validate-dist.ts | 2 +- src/compiler/config/outputs/validate-www.ts | 5 ++++- src/compiler/config/validate-config.ts | 3 --- src/declarations/stencil-public-compiler.ts | 15 --------------- 5 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/compiler/config/outputs/validate-custom-element-bundle.ts b/src/compiler/config/outputs/validate-custom-element-bundle.ts index 1687411ad05..84190508c73 100644 --- a/src/compiler/config/outputs/validate-custom-element-bundle.ts +++ b/src/compiler/config/outputs/validate-custom-element-bundle.ts @@ -16,7 +16,7 @@ export const validateCustomElementBundle = (config: d.Config, userOutputs: d.Out if (!isBoolean(outputTarget.externalRuntime)) { outputTarget.externalRuntime = true; } - outputTarget.copy = validateCopy(outputTarget.copy, config.copy); + outputTarget.copy = validateCopy(outputTarget.copy, []); if (outputTarget.copy.length > 0) { arr.push({ @@ -25,7 +25,7 @@ export const validateCustomElementBundle = (config: d.Config, userOutputs: d.Out copy: [...outputTarget.copy], }); } - arr.push(outputTarget) + arr.push(outputTarget); return arr; }, [] as (d.OutputTargetDistCustomElementsBundle | d.OutputTargetCopy)[]); diff --git a/src/compiler/config/outputs/validate-dist.ts b/src/compiler/config/outputs/validate-dist.ts index de5c164478a..712e6a3e6ef 100644 --- a/src/compiler/config/outputs/validate-dist.ts +++ b/src/compiler/config/outputs/validate-dist.ts @@ -144,7 +144,7 @@ const validateOutputTargetDist = (config: d.Config, o: d.OutputTargetDist) => { outputTarget.empty = true; } - outputTarget.copy = validateCopy(outputTarget.copy, config.copy); + outputTarget.copy = validateCopy(outputTarget.copy, []); return outputTarget; }; diff --git a/src/compiler/config/outputs/validate-www.ts b/src/compiler/config/outputs/validate-www.ts index bc22dd73967..2e278cc9634 100644 --- a/src/compiler/config/outputs/validate-www.ts +++ b/src/compiler/config/outputs/validate-www.ts @@ -48,7 +48,10 @@ export const validateWww = (config: d.Config, diagnostics: d.Diagnostic[], userO outputs.push({ type: COPY, dir: outputTarget.appDir, - copy: validateCopy(outputTarget.copy, [...(config.copy || []), { src: 'assets', warn: false }, { src: 'manifest.json', warn: false }]), + copy: validateCopy(outputTarget.copy, [ + { src: 'assets', warn: false }, + { src: 'manifest.json', warn: false }, + ]), }); // Generate global style with original name diff --git a/src/compiler/config/validate-config.ts b/src/compiler/config/validate-config.ts index dd7fdafc016..3176530334c 100644 --- a/src/compiler/config/validate-config.ts +++ b/src/compiler/config/validate-config.ts @@ -109,9 +109,6 @@ export const validateConfig = (userConfig?: Config) => { config.bundles = []; } - // Default copy - config.copy = config.copy || []; - // validate how many workers we can use validateWorkers(config); diff --git a/src/declarations/stencil-public-compiler.ts b/src/declarations/stencil-public-compiler.ts index 6bcbcee95bb..7a1c0c85029 100644 --- a/src/declarations/stencil-public-compiler.ts +++ b/src/declarations/stencil-public-compiler.ts @@ -34,21 +34,6 @@ export interface StencilConfig { */ bundles?: ConfigBundle[]; - /** - * The copy config is an array of objects that defines any files or folders that should - * be copied over to the build directory. - * - * Each object in the array must include a src property which can be either an absolute path, - * a relative path or a glob pattern. The config can also provide an optional dest property - * which can be either an absolute path or a path relative to the build directory. - * Also note that any files within src/assets are automatically copied to www/assets for convenience. - * - * In the copy config below, it will copy the entire directory from src/docs-content over to www/docs-content. - * - * @deprecated - */ - copy?: CopyTask[]; - /** * Stencil will cache build results in order to speed up rebuilds. * To disable this feature, set enableCache to false.