Skip to content

Commit

Permalink
fix build and update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
cal-smith committed Mar 2, 2020
1 parent b5f759e commit c0f8494
Show file tree
Hide file tree
Showing 133 changed files with 2,095 additions and 2,408 deletions.
3,799 changes: 1,755 additions & 2,044 deletions package-lock.json

Large diffs are not rendered by default.

40 changes: 19 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,31 +54,27 @@
"license": "Apache-2.0",
"author": "IBM",
"peerDependencies": {
"@angular/animations": "^6.1.0 || ^7.0.0 || ^8.0.0",
"@angular/common": "^6.1.0 || ^7.0.0 || ^8.0.0",
"@angular/core": "^6.1.0 || ^7.0.0 || ^8.0.0",
"@angular/forms": "^6.1.0 || ^7.0.0 || ^8.0.0",
"@angular/common": "^7.0.0 || ^8.0.0 || ^9.0.0",
"@angular/core": "^7.0.0 || ^8.0.0 || ^9.0.0",
"@angular/forms": "^7.0.0 || ^8.0.0 || ^9.0.0",
"rxjs": "^6.0.0",
"zone.js": "^0.8.26 || ^0.9.0",
"carbon-components": "^10.0.0",
"@carbon/icons-angular": "^10.1.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.8.9",
"@angular-devkit/build-ng-packagr": "0.8.9",
"@angular-devkit/core": "0.8.9",
"@angular/animations": "6.1.10",
"@angular/cli": "6.2.9",
"@angular/common": "6.1.10",
"@angular/compiler": "6.1.10",
"@angular/compiler-cli": "6.1.10",
"@angular/core": "6.1.10",
"@angular/forms": "6.1.10",
"@angular/http": "6.1.10",
"@angular/platform-browser": "6.1.10",
"@angular/platform-browser-dynamic": "6.1.10",
"@angular/platform-server": "6.1.10",
"@angular/router": "6.1.10",
"@angular-devkit/build-angular": "0.13.9",
"@angular-devkit/build-ng-packagr": "0.13.9",
"@angular-devkit/core": "7.3.9",
"@angular/cli": "7.3.9",
"@angular/common": "7.2.16",
"@angular/compiler": "7.2.16",
"@angular/compiler-cli": "7.2.16",
"@angular/core": "7.2.16",
"@angular/forms": "7.2.16",
"@angular/platform-browser": "7.2.16",
"@angular/platform-browser-dynamic": "7.2.16",
"@angular/router": "7.2.16",
"@babel/core": "7.4.3",
"@carbon/icons-angular": "10.8.0",
"@commitlint/cli": "8.3.5",
Expand Down Expand Up @@ -120,7 +116,7 @@
"karma-coverage-istanbul-reporter": "2.0.5",
"karma-jasmine": "2.0.1",
"karma-jasmine-html-reporter": "1.4.2",
"ng-packagr": "9.0.2",
"ng-packagr": "4.7.1",
"postcss-loader": "3.0.0",
"raw-loader": "1.0.0",
"rxjs": "6.4.0",
Expand All @@ -135,7 +131,9 @@
"ts-loader": "5.3.3",
"tslint": "5.15.0",
"tslint-loader": "3.5.4",
"typescript": "2.9.2",
"tsickle": "0.35.0",
"tslib": "1.9.3",
"typescript": "3.2.4",
"wait-on": "3.2.0",
"webpack": "4.29.6",
"webpack-cli": "3.3.0",
Expand Down
2 changes: 2 additions & 0 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ rm -rf dist
# TODO enable with v4
ng build

exit 0;

# run the classic buld - TODO remove with v4/Carbon v11
# gulp build
# ngc -p tsconfig-aot.json
Expand Down
3 changes: 0 additions & 3 deletions src/accordion/accordion.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ import { ChevronRight16Module } from "@carbon/icons-angular/lib/chevron--right/1
import { Accordion } from "./accordion.component";
import { AccordionItem } from "./accordion-item.component";

export { Accordion } from "./accordion.component";
export { AccordionItem } from "./accordion-item.component";

@NgModule({
declarations: [
Accordion,
Expand Down
3 changes: 3 additions & 0 deletions src/accordion/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export * from "./accordion-item.component";
export * from "./accordion.component";
export * from "./accordion.module";
4 changes: 0 additions & 4 deletions src/breadcrumb/breadcrumb.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ import { DialogModule } from "../dialog/dialog.module";
import { Breadcrumb } from "./breadcrumb.component";
import { BreadcrumbItemComponent } from "./breadcrumb-item.component";

export { Breadcrumb } from "./breadcrumb.component";
export { BreadcrumbItemComponent } from "./breadcrumb-item.component";
export { BreadcrumbItem } from "./breadcrumb-item.interface";

@NgModule({
declarations: [
Breadcrumb,
Expand Down
4 changes: 4 additions & 0 deletions src/breadcrumb/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export * from "./breadcrumb.component";
export * from "./breadcrumb-item.component";
export * from "./breadcrumb-item.interface";
export * from "./breadcrumb.module";
2 changes: 0 additions & 2 deletions src/button/button.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import { CommonModule } from "@angular/common";

import { Button } from "./button.directive";

export { Button } from "./button.directive";

@NgModule({
declarations: [Button],
exports: [Button],
Expand Down
2 changes: 2 additions & 0 deletions src/button/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "./button.directive";
export * from "./button.module";
3 changes: 0 additions & 3 deletions src/checkbox/checkbox.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ import { CommonModule } from "@angular/common";
// imports
import { Checkbox } from "./checkbox.component";

// exports
export { Checkbox };

@NgModule({
declarations: [
Checkbox
Expand Down
2 changes: 2 additions & 0 deletions src/checkbox/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "./checkbox.component";
export * from "./checkbox.module";
2 changes: 1 addition & 1 deletion src/code-snippet/code-snippet.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { ComponentFixture, TestBed } from "@angular/core/testing";
import { I18nModule } from "../i18n/i18n.module";
import { I18nModule } from "../i18n/index";

import { CodeSnippet } from "./code-snippet.component";
import { Copy16Module } from "@carbon/icons-angular/lib/copy/16";
Expand Down
2 changes: 1 addition & 1 deletion src/code-snippet/code-snippet.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
AfterViewInit
} from "@angular/core";

import { I18n } from "../i18n/i18n.module";
import { I18n } from "../i18n/index";

export enum SnippetType {
single = "single",
Expand Down
5 changes: 1 addition & 4 deletions src/code-snippet/code-snippet.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,11 @@ import { CommonModule } from "@angular/common";
import { Copy16Module } from "@carbon/icons-angular/lib/copy/16";
import { ChevronDown16Module } from "@carbon/icons-angular/lib/chevron--down/16";

import { I18nModule } from "../i18n/i18n.module";
import { I18nModule } from "../i18n/index";

// imports
import { CodeSnippet } from "./code-snippet.component";

// exports
export { CodeSnippet } from "./code-snippet.component";

@NgModule({
declarations: [
CodeSnippet
Expand Down
2 changes: 2 additions & 0 deletions src/code-snippet/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { CodeSnippet } from "./code-snippet.component";
export * from "./code-snippet.module";
2 changes: 1 addition & 1 deletion src/combobox/combobox.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { By } from "@angular/platform-browser";
import { ChevronDown16Module } from "@carbon/icons-angular/lib/chevron--down/16";
import { WarningFilled16Module } from "@carbon/icons-angular/lib/warning--filled/16";
import { Close16Module } from "@carbon/icons-angular/lib/close/16";
import { I18nModule } from "../i18n/i18n.module";
import { I18nModule } from "../i18n/index";

import { ListItem } from "./../dropdown/list-item.interface";
import { ComboBox } from "./combobox.component";
Expand Down
3 changes: 0 additions & 3 deletions src/combobox/combobox.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ import { WarningFilled16Module } from "@carbon/icons-angular/lib/warning--filled
import { ComboBox } from "./combobox.component";
import { DropdownModule } from "../dropdown/dropdown.module";

export { ComboBox } from "./combobox.component";


@NgModule({
declarations: [
ComboBox
Expand Down
2 changes: 2 additions & 0 deletions src/combobox/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { ComboBox } from "./combobox.component";
export * from "./combobox.module";
3 changes: 0 additions & 3 deletions src/content-switcher/content-switcher.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ import { CommonModule } from "@angular/common";
import { ContentSwitcher } from "./content-switcher.component";
import { ContentSwitcherOption } from "./content-switcher-option.directive";

export { ContentSwitcher } from "./content-switcher.component";
export { ContentSwitcherOption } from "./content-switcher-option.directive";

@NgModule({
declarations: [
ContentSwitcher,
Expand Down
3 changes: 3 additions & 0 deletions src/content-switcher/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export { ContentSwitcher } from "./content-switcher.component";
export { ContentSwitcherOption } from "./content-switcher-option.directive";
export * from "./content-switcher.module";
2 changes: 2 additions & 0 deletions src/datepicker-input/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "./datepicker-input.module";
export * from "./datepicker-input.component";
2 changes: 2 additions & 0 deletions src/datepicker/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "./datepicker.component";
export * from "./datepicker.module";
2 changes: 1 addition & 1 deletion src/dialog/dialog-placeholder.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
ViewContainerRef,
ViewChild
} from "@angular/core";
import { PlaceholderService } from "./../placeholder/placeholder.module";
import { PlaceholderService } from "./../placeholder/index";

/**
* Deprecated as of v2.0, will be removed with v3.0
Expand Down
21 changes: 2 additions & 19 deletions src/dialog/dialog.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,11 @@ import { OverflowMenu } from "./overflow-menu/overflow-menu.component";
import { OverflowMenuPane } from "./overflow-menu/overflow-menu-pane.component";
import { OverflowMenuDirective } from "./overflow-menu/overflow-menu.directive";
import { OverflowMenuOption } from "./overflow-menu/overflow-menu-option.component";
import { I18nModule } from "./../i18n/i18n.module";
import { PlaceholderModule } from "./../placeholder/placeholder.module";
import { I18nModule } from "./../i18n/index";
import { PlaceholderModule } from "./../placeholder/index";
import { ExperimentalModule } from "./../experimental.module";
import { UtilsModule } from "./../utils/utils.module";

// exports
export { DialogService } from "./dialog.service";
export { Dialog } from "./dialog.component";
export { DialogDirective } from "./dialog.directive";
export { DialogPlaceholder } from "./dialog-placeholder.component";

export { Tooltip } from "./tooltip/tooltip.component";
export { TooltipDefinition } from "./tooltip/tooltip-definition.component";
export { TooltipIcon } from "./tooltip/tooltip-icon.component";
export { TooltipDirective } from "./tooltip/tooltip.directive";
export { EllipsisTooltip } from "./tooltip/ellipsis-tooltip.directive";

export { OverflowMenu } from "./overflow-menu/overflow-menu.component";
export { OverflowMenuPane } from "./overflow-menu/overflow-menu-pane.component";
export { OverflowMenuDirective } from "./overflow-menu/overflow-menu.directive";
export { OverflowMenuOption } from "./overflow-menu/overflow-menu-option.component";

@NgModule({
declarations: [
Dialog,
Expand Down
2 changes: 1 addition & 1 deletion src/dialog/dialog.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
} from "@angular/core";
import { Subscription } from "rxjs";
import { DialogConfig } from "./dialog-config.interface";
import { PlaceholderService } from "./../placeholder/placeholder.module";
import { PlaceholderService } from "./../placeholder/index";
import { Dialog } from "./dialog.component";
import { tabbableSelector } from "../common/tab.service";

Expand Down
17 changes: 17 additions & 0 deletions src/dialog/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
export { DialogService } from "./dialog.service";
export { Dialog } from "./dialog.component";
export { DialogDirective } from "./dialog.directive";
export { DialogPlaceholder } from "./dialog-placeholder.component";

export { Tooltip } from "./tooltip/tooltip.component";
export { TooltipDefinition } from "./tooltip/tooltip-definition.component";
export { TooltipIcon } from "./tooltip/tooltip-icon.component";
export { TooltipDirective } from "./tooltip/tooltip.directive";
export { EllipsisTooltip } from "./tooltip/ellipsis-tooltip.directive";

export { OverflowMenu } from "./overflow-menu/overflow-menu.component";
export { OverflowMenuPane } from "./overflow-menu/overflow-menu-pane.component";
export { OverflowMenuDirective } from "./overflow-menu/overflow-menu.directive";
export { OverflowMenuOption } from "./overflow-menu/overflow-menu-option.component";

export * from "./dialog.module";
2 changes: 1 addition & 1 deletion src/dialog/overflow-menu/overflow-menu-pane.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import { Dialog } from "../dialog.component";
import { position } from "@carbon/utils-position";
import { isFocusInLastItem, isFocusInFirstItem } from "./../../common/tab.service";
import { I18n } from "./../../i18n/i18n.module";
import { I18n } from "./../../i18n/index";
import { ExperimentalService } from "./../../experimental.module";
import { ElementService } from "./../../utils/utils.module";

Expand Down
2 changes: 1 addition & 1 deletion src/dialog/overflow-menu/overflow-menu.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
ViewEncapsulation,
ContentChild
} from "@angular/core";
import { I18n } from "./../../i18n/i18n.module";
import { I18n } from "./../../i18n/index";
import { OverflowMenuDirective } from "./overflow-menu.directive";

/**
Expand Down
4 changes: 2 additions & 2 deletions src/dialog/tooltip/tooltip.directive.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { TestBed, async } from "@angular/core/testing";
import { TooltipDirective } from "./tooltip.directive";
import { By } from "@angular/platform-browser";
import { DialogModule } from "./../dialog.module";
import { PlaceholderModule } from "../../placeholder/placeholder.module";
import { PlaceholderModule } from "../../placeholder/index";

@Component({
selector: "test-component",
Expand Down Expand Up @@ -69,7 +69,7 @@ describe("Tooltip directive", () => {
`
}
}).createComponent(TooltipTest);

fixture.detectChanges();

let button = fixture.debugElement.query(By.css("button"));
Expand Down
4 changes: 2 additions & 2 deletions src/dropdown/dropdown.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { Dropdown } from "./dropdown.component";
import { DropdownList } from "./list/dropdown-list.component";
import { ListItem } from "./list-item.interface";
import { ScrollableList } from "./scrollable-list.directive";
import { I18nModule } from "../i18n/i18n.module";
import { I18nModule } from "../i18n/index";
import { DropdownService } from "./dropdown.service";
import { PlaceholderModule } from "./../placeholder/placeholder.module";
import { PlaceholderModule } from "./../placeholder/index";
import { ChevronDown16Module } from "@carbon/icons-angular/lib/chevron--down/16";
import { FormsModule } from "@angular/forms";
import { WarningFilled16Module } from "@carbon/icons-angular/lib/warning--filled/16";
Expand Down
2 changes: 1 addition & 1 deletion src/dropdown/dropdown.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
} from "rxjs";

import { AbstractDropdownView } from "./abstract-dropdown-view.class";
import { I18n } from "./../i18n/i18n.module";
import { I18n } from "./../i18n/index";
import { ListItem } from "./list-item.interface";
import { DropdownService } from "./dropdown.service";
import { ElementService } from "./../utils/utils.module";
Expand Down
12 changes: 2 additions & 10 deletions src/dropdown/dropdown.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,13 @@ import { Dropdown } from "./dropdown.component";
import { DropdownList } from "./list/dropdown-list.component";

import { ScrollableList } from "./scrollable-list.directive";
import { I18nModule } from "./../i18n/i18n.module";
import { PlaceholderModule } from "./../placeholder/placeholder.module";
import { I18nModule } from "./../i18n/index";
import { PlaceholderModule } from "./../placeholder/index";
import { DropdownService } from "./dropdown.service";
import { ChevronDown16Module } from "@carbon/icons-angular/lib/chevron--down/16";
import { WarningFilled16Module } from "@carbon/icons-angular/lib/warning--filled/16";
import { UtilsModule } from "./../utils/utils.module";

export { Dropdown } from "./dropdown.component";
export { DropdownList } from "./list/dropdown-list.component";

export { ScrollableList } from "./scrollable-list.directive";
export { AbstractDropdownView } from "./abstract-dropdown-view.class";
export { ListItem } from "./list-item.interface";
export { DropdownService } from "./dropdown.service";

@NgModule({
declarations: [
Dropdown,
Expand Down
2 changes: 1 addition & 1 deletion src/dropdown/dropdown.service.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Injectable, ElementRef, OnDestroy } from "@angular/core";
import { PlaceholderService } from "./../placeholder/placeholder.module";
import { PlaceholderService } from "./../placeholder/index";
import { Subscription } from "rxjs";
import { position } from "@carbon/utils-position";
import { AnimationFrameService } from "./../utils/utils.module";
Expand Down
9 changes: 9 additions & 0 deletions src/dropdown/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
export { Dropdown } from "./dropdown.component";
export { DropdownList } from "./list/dropdown-list.component";

export { ScrollableList } from "./scrollable-list.directive";
export { AbstractDropdownView } from "./abstract-dropdown-view.class";
export { ListItem } from "./list-item.interface";
export { DropdownService } from "./dropdown.service";

export * from "./dropdown.module";
2 changes: 1 addition & 1 deletion src/dropdown/list/dropdown-list.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { By } from "@angular/platform-browser";
import { DropdownList } from "./dropdown-list.component";
import { ListItem } from "./../list-item.interface";
import { ScrollableList } from "./../scrollable-list.directive";
import { I18nModule } from "../../i18n/i18n.module";
import { I18nModule } from "../../i18n/index";

@Component({
template: `<ibm-dropdown-list [items]="items" (select)="onSelect($event)"></ibm-dropdown-list>`
Expand Down
2 changes: 1 addition & 1 deletion src/dropdown/list/dropdown-list.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
QueryList
} from "@angular/core";

import { I18n } from "../../i18n/i18n.module";
import { I18n } from "../../i18n/index";
import { AbstractDropdownView } from "./../abstract-dropdown-view.class";
import { ListItem } from "./../list-item.interface";
import { watchFocusJump } from "./../dropdowntools";
Expand Down
Loading

0 comments on commit c0f8494

Please sign in to comment.