fix(git): cleanup after merge conflicts with main

stenciljs · Jan 23, 2023 · aa1e1cb · aa1e1cb
1 parent c1acc4a
commit aa1e1cb
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/src/compiler/config/outputs/validate-custom-element.ts b/src/compiler/config/outputs/validate-custom-element.ts
@@ -8,6 +8,7 @@ import type {
   OutputTargetDistTypes,
   ValidatedConfig,
 } from '../../../declarations';
+import { CustomElementsExportBehaviorOptions } from '../../../declarations';
 import { COPY, DIST_TYPES, isOutputTargetDistCustomElements } from '../../output-targets/output-utils';
 import { getAbsolutePath } from '../config-utils';
 import { validateCopy } from '../validate-copy';

diff --git a/src/compiler/output-targets/dist-custom-elements-bundle/index.ts b/src/compiler/output-targets/dist-custom-elements-bundle/index.ts
@@ -1,3 +1,4 @@
+// TODO(STENCIL-561): fully delete dist-custom-elements-bundle code
 import {
   catchError,
   dashToPascalCase,

diff --git a/src/compiler/output-targets/index.ts b/src/compiler/output-targets/index.ts
@@ -7,7 +7,6 @@ import { outputCustomElements } from './dist-custom-elements';
 import { outputCustomElementsBundle } from './dist-custom-elements-bundle';
 import { outputHydrateScript } from './dist-hydrate-script';
 import { outputLazy } from './dist-lazy/lazy-output';
-import { outputAngular } from './output-angular';
 import { outputDocs } from './output-docs';
 import { outputLazyLoader } from './output-lazy-loader';
 import { outputTypes } from './output-types';

diff --git a/src/compiler/output-targets/test/output-targets-dist-custom-elements.spec.ts b/src/compiler/output-targets/test/output-targets-dist-custom-elements.spec.ts
@@ -19,6 +19,7 @@ import {
   outputCustomElements,
 } from '../dist-custom-elements';
 import * as outputCustomElementsMod from '../dist-custom-elements';
+// TODO(STENCIL-561): fully delete dist-custom-elements-bundle code
 import { DIST_CUSTOM_ELEMENTS, DIST_CUSTOM_ELEMENTS_BUNDLE } from '../output-utils';
 
 const setup = () => {