Skip to content

Commit 691bf19

Browse files
committed
fix(git): cleanup after merge conflicts with main
1 parent 701117a commit 691bf19

File tree

4 files changed

+3
-1
lines changed

4 files changed

+3
-1
lines changed

src/compiler/config/outputs/validate-custom-element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import type {
88
OutputTargetDistTypes,
99
ValidatedConfig,
1010
} from '../../../declarations';
11+
import { CustomElementsExportBehaviorOptions } from '../../../declarations';
1112
import { COPY, DIST_TYPES, isOutputTargetDistCustomElements } from '../../output-targets/output-utils';
1213
import { getAbsolutePath } from '../config-utils';
1314
import { validateCopy } from '../validate-copy';

src/compiler/output-targets/dist-custom-elements-bundle/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// TODO(STENCIL-561): fully delete dist-custom-elements-bundle code
12
import {
23
catchError,
34
dashToPascalCase,

src/compiler/output-targets/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { outputCustomElements } from './dist-custom-elements';
77
import { outputCustomElementsBundle } from './dist-custom-elements-bundle';
88
import { outputHydrateScript } from './dist-hydrate-script';
99
import { outputLazy } from './dist-lazy/lazy-output';
10-
import { outputAngular } from './output-angular';
1110
import { outputDocs } from './output-docs';
1211
import { outputLazyLoader } from './output-lazy-loader';
1312
import { outputTypes } from './output-types';

src/compiler/output-targets/test/output-targets-dist-custom-elements.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
outputCustomElements,
2020
} from '../dist-custom-elements';
2121
import * as outputCustomElementsMod from '../dist-custom-elements';
22+
// TODO(STENCIL-561): fully delete dist-custom-elements-bundle code
2223
import { DIST_CUSTOM_ELEMENTS, DIST_CUSTOM_ELEMENTS_BUNDLE } from '../output-utils';
2324

2425
const setup = () => {

0 commit comments

Comments
 (0)