From 08da7720d9ae5d13dcc8af22281dcf5dfd0eebb7 Mon Sep 17 00:00:00 2001 From: Trevor Burch Date: Tue, 8 Oct 2024 17:15:24 -0400 Subject: [PATCH] fix(components/icon): reorganize internal file structure for correct documentation output (#2810) --- libs/components/icon/src/index.ts | 12 ++++++------ .../icon/fixtures/icon-fixtures.module.ts | 0 .../icon/fixtures/icon-stack.component.fixture.html | 0 .../icon/fixtures/icon-stack.component.fixture.ts | 0 .../icon/fixtures/icon.component.fixture.html | 0 .../icon/fixtures/icon.component.fixture.ts | 0 .../lib/{ => modules}/icon/icon-class-list.pipe.ts | 0 .../{ => modules}/icon/icon-resolver.service.spec.ts | 0 .../lib/{ => modules}/icon/icon-resolver.service.ts | 0 .../src/lib/{ => modules}/icon/icon-stack-item.ts | 0 .../lib/{ => modules}/icon/icon-stack.component.html | 0 .../lib/{ => modules}/icon/icon-stack.component.scss | 0 .../{ => modules}/icon/icon-stack.component.spec.ts | 0 .../lib/{ => modules}/icon/icon-stack.component.ts | 0 .../icon/icon-svg-resolver.service.spec.ts | 0 .../{ => modules}/icon/icon-svg-resolver.service.ts | 0 .../lib/{ => modules}/icon/icon-svg.component.html | 0 .../{ => modules}/icon/icon-svg.component.spec.ts | 0 .../src/lib/{ => modules}/icon/icon-svg.component.ts | 0 .../icon/icon-svg.default.component.scss | 0 .../icon/icon-svg.modern.component.scss | 0 .../icon/src/lib/{ => modules}/icon/icon-variant.ts | 0 .../src/lib/{ => modules}/icon/icon.component.html | 0 .../src/lib/{ => modules}/icon/icon.component.scss | 0 .../lib/{ => modules}/icon/icon.component.spec.ts | 0 .../src/lib/{ => modules}/icon/icon.component.ts | 0 .../icon/src/lib/{ => modules}/icon/icon.module.ts | 0 .../lib/{ => modules}/icon/types/icon-resolved.ts | 0 .../src/lib/{ => modules}/icon/types/icon-type.ts | 0 .../{ => modules}/icon/types/icon-variant-type.ts | 0 libs/components/icon/testing/ng-package.json | 2 +- .../icon/testing/src/icon/icon-harness.spec.ts | 4 ++-- .../icon/testing/src/{index.ts => public-api.ts} | 0 tsconfig.base.json | 2 +- 34 files changed, 10 insertions(+), 10 deletions(-) rename libs/components/icon/src/lib/{ => modules}/icon/fixtures/icon-fixtures.module.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/fixtures/icon-stack.component.fixture.html (100%) rename libs/components/icon/src/lib/{ => modules}/icon/fixtures/icon-stack.component.fixture.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/fixtures/icon.component.fixture.html (100%) rename libs/components/icon/src/lib/{ => modules}/icon/fixtures/icon.component.fixture.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-class-list.pipe.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-resolver.service.spec.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-resolver.service.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-stack-item.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-stack.component.html (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-stack.component.scss (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-stack.component.spec.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-stack.component.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-svg-resolver.service.spec.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-svg-resolver.service.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-svg.component.html (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-svg.component.spec.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-svg.component.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-svg.default.component.scss (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-svg.modern.component.scss (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon-variant.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon.component.html (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon.component.scss (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon.component.spec.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon.component.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/icon.module.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/types/icon-resolved.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/types/icon-type.ts (100%) rename libs/components/icon/src/lib/{ => modules}/icon/types/icon-variant-type.ts (100%) rename libs/components/icon/testing/src/{index.ts => public-api.ts} (100%) diff --git a/libs/components/icon/src/index.ts b/libs/components/icon/src/index.ts index 30e8eeaa21..c5c677fe39 100644 --- a/libs/components/icon/src/index.ts +++ b/libs/components/icon/src/index.ts @@ -1,7 +1,7 @@ -export { SkyIconStackItem } from './lib/icon/icon-stack-item'; -export { SkyIconModule } from './lib/icon/icon.module'; -export { SkyIconType } from './lib/icon/types/icon-type'; -export { SkyIconVariantType } from './lib/icon/types/icon-variant-type'; +export { SkyIconStackItem } from './lib/modules/icon/icon-stack-item'; +export { SkyIconModule } from './lib/modules/icon/icon.module'; +export { SkyIconType } from './lib/modules/icon/types/icon-type'; +export { SkyIconVariantType } from './lib/modules/icon/types/icon-variant-type'; -export { SkyIconComponent as λ1 } from './lib/icon/icon.component'; -export { SkyIconStackComponent as λ2 } from './lib/icon/icon-stack.component'; +export { SkyIconComponent as λ1 } from './lib/modules/icon/icon.component'; +export { SkyIconStackComponent as λ2 } from './lib/modules/icon/icon-stack.component'; diff --git a/libs/components/icon/src/lib/icon/fixtures/icon-fixtures.module.ts b/libs/components/icon/src/lib/modules/icon/fixtures/icon-fixtures.module.ts similarity index 100% rename from libs/components/icon/src/lib/icon/fixtures/icon-fixtures.module.ts rename to libs/components/icon/src/lib/modules/icon/fixtures/icon-fixtures.module.ts diff --git a/libs/components/icon/src/lib/icon/fixtures/icon-stack.component.fixture.html b/libs/components/icon/src/lib/modules/icon/fixtures/icon-stack.component.fixture.html similarity index 100% rename from libs/components/icon/src/lib/icon/fixtures/icon-stack.component.fixture.html rename to libs/components/icon/src/lib/modules/icon/fixtures/icon-stack.component.fixture.html diff --git a/libs/components/icon/src/lib/icon/fixtures/icon-stack.component.fixture.ts b/libs/components/icon/src/lib/modules/icon/fixtures/icon-stack.component.fixture.ts similarity index 100% rename from libs/components/icon/src/lib/icon/fixtures/icon-stack.component.fixture.ts rename to libs/components/icon/src/lib/modules/icon/fixtures/icon-stack.component.fixture.ts diff --git a/libs/components/icon/src/lib/icon/fixtures/icon.component.fixture.html b/libs/components/icon/src/lib/modules/icon/fixtures/icon.component.fixture.html similarity index 100% rename from libs/components/icon/src/lib/icon/fixtures/icon.component.fixture.html rename to libs/components/icon/src/lib/modules/icon/fixtures/icon.component.fixture.html diff --git a/libs/components/icon/src/lib/icon/fixtures/icon.component.fixture.ts b/libs/components/icon/src/lib/modules/icon/fixtures/icon.component.fixture.ts similarity index 100% rename from libs/components/icon/src/lib/icon/fixtures/icon.component.fixture.ts rename to libs/components/icon/src/lib/modules/icon/fixtures/icon.component.fixture.ts diff --git a/libs/components/icon/src/lib/icon/icon-class-list.pipe.ts b/libs/components/icon/src/lib/modules/icon/icon-class-list.pipe.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon-class-list.pipe.ts rename to libs/components/icon/src/lib/modules/icon/icon-class-list.pipe.ts diff --git a/libs/components/icon/src/lib/icon/icon-resolver.service.spec.ts b/libs/components/icon/src/lib/modules/icon/icon-resolver.service.spec.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon-resolver.service.spec.ts rename to libs/components/icon/src/lib/modules/icon/icon-resolver.service.spec.ts diff --git a/libs/components/icon/src/lib/icon/icon-resolver.service.ts b/libs/components/icon/src/lib/modules/icon/icon-resolver.service.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon-resolver.service.ts rename to libs/components/icon/src/lib/modules/icon/icon-resolver.service.ts diff --git a/libs/components/icon/src/lib/icon/icon-stack-item.ts b/libs/components/icon/src/lib/modules/icon/icon-stack-item.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon-stack-item.ts rename to libs/components/icon/src/lib/modules/icon/icon-stack-item.ts diff --git a/libs/components/icon/src/lib/icon/icon-stack.component.html b/libs/components/icon/src/lib/modules/icon/icon-stack.component.html similarity index 100% rename from libs/components/icon/src/lib/icon/icon-stack.component.html rename to libs/components/icon/src/lib/modules/icon/icon-stack.component.html diff --git a/libs/components/icon/src/lib/icon/icon-stack.component.scss b/libs/components/icon/src/lib/modules/icon/icon-stack.component.scss similarity index 100% rename from libs/components/icon/src/lib/icon/icon-stack.component.scss rename to libs/components/icon/src/lib/modules/icon/icon-stack.component.scss diff --git a/libs/components/icon/src/lib/icon/icon-stack.component.spec.ts b/libs/components/icon/src/lib/modules/icon/icon-stack.component.spec.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon-stack.component.spec.ts rename to libs/components/icon/src/lib/modules/icon/icon-stack.component.spec.ts diff --git a/libs/components/icon/src/lib/icon/icon-stack.component.ts b/libs/components/icon/src/lib/modules/icon/icon-stack.component.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon-stack.component.ts rename to libs/components/icon/src/lib/modules/icon/icon-stack.component.ts diff --git a/libs/components/icon/src/lib/icon/icon-svg-resolver.service.spec.ts b/libs/components/icon/src/lib/modules/icon/icon-svg-resolver.service.spec.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon-svg-resolver.service.spec.ts rename to libs/components/icon/src/lib/modules/icon/icon-svg-resolver.service.spec.ts diff --git a/libs/components/icon/src/lib/icon/icon-svg-resolver.service.ts b/libs/components/icon/src/lib/modules/icon/icon-svg-resolver.service.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon-svg-resolver.service.ts rename to libs/components/icon/src/lib/modules/icon/icon-svg-resolver.service.ts diff --git a/libs/components/icon/src/lib/icon/icon-svg.component.html b/libs/components/icon/src/lib/modules/icon/icon-svg.component.html similarity index 100% rename from libs/components/icon/src/lib/icon/icon-svg.component.html rename to libs/components/icon/src/lib/modules/icon/icon-svg.component.html diff --git a/libs/components/icon/src/lib/icon/icon-svg.component.spec.ts b/libs/components/icon/src/lib/modules/icon/icon-svg.component.spec.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon-svg.component.spec.ts rename to libs/components/icon/src/lib/modules/icon/icon-svg.component.spec.ts diff --git a/libs/components/icon/src/lib/icon/icon-svg.component.ts b/libs/components/icon/src/lib/modules/icon/icon-svg.component.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon-svg.component.ts rename to libs/components/icon/src/lib/modules/icon/icon-svg.component.ts diff --git a/libs/components/icon/src/lib/icon/icon-svg.default.component.scss b/libs/components/icon/src/lib/modules/icon/icon-svg.default.component.scss similarity index 100% rename from libs/components/icon/src/lib/icon/icon-svg.default.component.scss rename to libs/components/icon/src/lib/modules/icon/icon-svg.default.component.scss diff --git a/libs/components/icon/src/lib/icon/icon-svg.modern.component.scss b/libs/components/icon/src/lib/modules/icon/icon-svg.modern.component.scss similarity index 100% rename from libs/components/icon/src/lib/icon/icon-svg.modern.component.scss rename to libs/components/icon/src/lib/modules/icon/icon-svg.modern.component.scss diff --git a/libs/components/icon/src/lib/icon/icon-variant.ts b/libs/components/icon/src/lib/modules/icon/icon-variant.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon-variant.ts rename to libs/components/icon/src/lib/modules/icon/icon-variant.ts diff --git a/libs/components/icon/src/lib/icon/icon.component.html b/libs/components/icon/src/lib/modules/icon/icon.component.html similarity index 100% rename from libs/components/icon/src/lib/icon/icon.component.html rename to libs/components/icon/src/lib/modules/icon/icon.component.html diff --git a/libs/components/icon/src/lib/icon/icon.component.scss b/libs/components/icon/src/lib/modules/icon/icon.component.scss similarity index 100% rename from libs/components/icon/src/lib/icon/icon.component.scss rename to libs/components/icon/src/lib/modules/icon/icon.component.scss diff --git a/libs/components/icon/src/lib/icon/icon.component.spec.ts b/libs/components/icon/src/lib/modules/icon/icon.component.spec.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon.component.spec.ts rename to libs/components/icon/src/lib/modules/icon/icon.component.spec.ts diff --git a/libs/components/icon/src/lib/icon/icon.component.ts b/libs/components/icon/src/lib/modules/icon/icon.component.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon.component.ts rename to libs/components/icon/src/lib/modules/icon/icon.component.ts diff --git a/libs/components/icon/src/lib/icon/icon.module.ts b/libs/components/icon/src/lib/modules/icon/icon.module.ts similarity index 100% rename from libs/components/icon/src/lib/icon/icon.module.ts rename to libs/components/icon/src/lib/modules/icon/icon.module.ts diff --git a/libs/components/icon/src/lib/icon/types/icon-resolved.ts b/libs/components/icon/src/lib/modules/icon/types/icon-resolved.ts similarity index 100% rename from libs/components/icon/src/lib/icon/types/icon-resolved.ts rename to libs/components/icon/src/lib/modules/icon/types/icon-resolved.ts diff --git a/libs/components/icon/src/lib/icon/types/icon-type.ts b/libs/components/icon/src/lib/modules/icon/types/icon-type.ts similarity index 100% rename from libs/components/icon/src/lib/icon/types/icon-type.ts rename to libs/components/icon/src/lib/modules/icon/types/icon-type.ts diff --git a/libs/components/icon/src/lib/icon/types/icon-variant-type.ts b/libs/components/icon/src/lib/modules/icon/types/icon-variant-type.ts similarity index 100% rename from libs/components/icon/src/lib/icon/types/icon-variant-type.ts rename to libs/components/icon/src/lib/modules/icon/types/icon-variant-type.ts diff --git a/libs/components/icon/testing/ng-package.json b/libs/components/icon/testing/ng-package.json index c781f0df46..fbafcc4448 100644 --- a/libs/components/icon/testing/ng-package.json +++ b/libs/components/icon/testing/ng-package.json @@ -1,5 +1,5 @@ { "lib": { - "entryFile": "src/index.ts" + "entryFile": "src/public-api.ts" } } diff --git a/libs/components/icon/testing/src/icon/icon-harness.spec.ts b/libs/components/icon/testing/src/icon/icon-harness.spec.ts index b51eb2247d..78fa24d63b 100644 --- a/libs/components/icon/testing/src/icon/icon-harness.spec.ts +++ b/libs/components/icon/testing/src/icon/icon-harness.spec.ts @@ -2,6 +2,8 @@ import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +// eslint-disable-next-line @nx/enforce-module-boundaries +import { SkyIconModule } from '@skyux/icon'; import { SkyTheme, SkyThemeMode, @@ -12,8 +14,6 @@ import { import { BehaviorSubject } from 'rxjs'; -import { SkyIconModule } from '../../../src/lib/icon/icon.module'; - import { SkyIconHarness } from './icon-harness'; //#region Test component diff --git a/libs/components/icon/testing/src/index.ts b/libs/components/icon/testing/src/public-api.ts similarity index 100% rename from libs/components/icon/testing/src/index.ts rename to libs/components/icon/testing/src/public-api.ts diff --git a/tsconfig.base.json b/tsconfig.base.json index b5879718ae..e5db309402 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -79,7 +79,7 @@ ], "@skyux/i18n": ["libs/components/i18n/src/index.ts"], "@skyux/icon": ["libs/components/icon/src/index.ts"], - "@skyux/icon/testing": ["libs/components/icon/testing/src/index.ts"], + "@skyux/icon/testing": ["libs/components/icon/testing/src/public-api.ts"], "@skyux/indicators": ["libs/components/indicators/src/index.ts"], "@skyux/indicators/testing": [ "libs/components/indicators/testing/src/public-api.ts"