Skip to content
This repository has been archived by the owner on Jan 24, 2023. It is now read-only.

Update moment imports to remove warning when building library #4534

Merged
merged 5 commits into from
Aug 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as moment from 'moment-timezone';
import moment from 'moment-timezone';

import { PaginationResponse } from '../../../../cloud-foundry/src/store/types/cf-api.types';
import {
AppAutoscalerMetricBasicInfo,
AppAutoscalerMetricData,
Expand All @@ -10,7 +11,6 @@ import {
AppScalingTrigger,
} from '../../store/app-autoscaler.types';
import { AutoscalerConstants, getScaleType } from './autoscaler-util';
import { PaginationResponse } from '../../../../cloud-foundry/src/store/types/cf-api.types';

function initMetricData(metricName: string): AppAutoscalerMetricDataLocal {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as moment from 'moment-timezone';
import moment from 'moment-timezone';

import {
AppAutoscalerPolicy,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as moment from 'moment-timezone';
import moment from 'moment-timezone';

import {
AppAutoscalerMetricDataPoint,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as intersect from 'intersect';
import * as moment from 'moment-timezone';
import intersect from 'intersect';
import moment from 'moment-timezone';

import { AppRecurringSchedule, AppScalingRule, AppSpecificDate } from '../../store/app-autoscaler.types';
import { AutoscalerConstants } from './autoscaler-util';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import * as moment from 'moment-timezone';
import moment from 'moment-timezone';
import { BehaviorSubject, Observable } from 'rxjs';
import { filter, first } from 'rxjs/operators';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms';
import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
import { ActivatedRoute } from '@angular/router';
import * as moment from 'moment-timezone';
import moment from 'moment-timezone';
import { of as observableOf } from 'rxjs';
import { map } from 'rxjs/operators';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms';
import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
import { ActivatedRoute } from '@angular/router';
import * as moment from 'moment-timezone';
import moment from 'moment-timezone';

import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
import { AutoscalerConstants, PolicyAlert, shiftArray } from '../../../core/autoscaler-helpers/autoscaler-util';
Expand All @@ -12,11 +12,7 @@ import {
recurringSchedulesOverlapping,
timeIsSameOrAfter,
} from '../../../core/autoscaler-helpers/autoscaler-validation';
import {
AppAutoscalerInvalidPolicyError,
AppAutoscalerPolicy,
AppAutoscalerPolicyLocal,
} from '../../../store/app-autoscaler.types';
import { AppAutoscalerInvalidPolicyError, AppAutoscalerPolicyLocal } from '../../../store/app-autoscaler.types';
import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step';
import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from
import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
import { ActivatedRoute } from '@angular/router';
import { Store } from '@ngrx/store';
import * as moment from 'moment-timezone';
import moment from 'moment-timezone';
import { of as observableOf } from 'rxjs';
import { filter, first, map, pairwise } from 'rxjs/operators';

import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
import { EntityService } from '../../../../../store/src/entity-service';
import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
import { StepOnNextFunction } from '../../../../../core/src/shared/components/stepper/step/step.component';
import { AppState } from '../../../../../store/src/app-state';
import { EntityService } from '../../../../../store/src/entity-service';
import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
import { AutoscalerConstants, PolicyAlert } from '../../../core/autoscaler-helpers/autoscaler-util';
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { DatePipe } from '@angular/common';
import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store';
import * as moment from 'moment';
import moment from 'moment';

import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store';
import * as moment from 'moment';
import moment from 'moment';

import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Action, Store } from '@ngrx/store';
import * as moment from 'moment';
import moment from 'moment';
import { combineLatest, Observable, of } from 'rxjs';
import { first, map } from 'rxjs/operators';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { NgModel } from '@angular/forms';
import { Store } from '@ngrx/store';
import * as moment from 'moment';
import moment from 'moment';
import { NEVER, Observable, Subject } from 'rxjs';
import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
import { catchError, share, switchMap, map, first, startWith, debounceTime } from 'rxjs/operators';
import { catchError, debounceTime, first, map, share, startWith, switchMap } from 'rxjs/operators';

import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
import { LoggerService } from '../../../../../../../../core/src/core/logger.service';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/**
* Formats log messages from the Cloud Foundry firehose
*/
import * as moment from 'moment';
import moment from 'moment';

import { LoggerService } from '../../../../../../core/src/core/logger.service';
import { UtilsService } from '../../../../../../core/src/core/utils.service';
import { AnsiColorizer } from '../../../../../../core/src/shared/components/log-viewer/ansi-colorizer';
import { FireHoseItem, HTTP_METHODS } from './cloud-foundry-firehose.types';

/**
* Formats log messages from the Cloud Foundry firehose
*/

/* eslint-disable no-control-regex */
const ANSI_ESCAPE_MATCHER = new RegExp('\x1B\\[([0-9;]*)m', 'g');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { DatePipe } from '@angular/common';
import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store';
import * as moment from 'moment';
import moment from 'moment';
import { Observable } from 'rxjs';
import { combineLatest, filter, first, map } from 'rxjs/operators';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component } from '@angular/core';
import { FormControl, FormGroup, Validators } from '@angular/forms';
import * as moment from 'moment';
import moment from 'moment';
import { Observable, of, Subject } from 'rxjs';
import { filter, first, map } from 'rxjs/operators';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { SetupModule } from './../../../features/setup/setup.module';
import { Component, OnInit, Output, OnDestroy, Input, EventEmitter } from '@angular/core';
import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core';
import { FormControl } from '@angular/forms';
import * as moment from 'moment';
import { tap, map, filter, shareReplay, debounceTime } from 'rxjs/operators';
import { combineLatest, Subscription, Observable } from 'rxjs';
import moment from 'moment';
import { combineLatest, Observable, Subscription } from 'rxjs';
import { debounceTime, filter, map, shareReplay, tap } from 'rxjs/operators';

@Component({
selector: 'app-date-time',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Type } from '@angular/core';
import * as moment from 'moment';
import { Injectable, Type } from '@angular/core';
import moment from 'moment';
import { BehaviorSubject, combineLatest, Observable, of as observableOf } from 'rxjs';
import { map, startWith } from 'rxjs/operators';

Expand All @@ -13,7 +13,6 @@ import { ListDataSource } from './data-sources-controllers/list-data-source';
import { IListDataSource } from './data-sources-controllers/list-data-source-types';
import { CardTypes } from './list-cards/card/card.component';
import { ITableColumn, ITableText } from './list-table/table.types';
import { Injectable } from "@angular/core";
import { CardCell } from './list.types';

export enum ListViewTypes {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { HttpClient } from '@angular/common/http';
import { Component, ElementRef, Input, SecurityContext, ViewChild } from '@angular/core';
import { DomSanitizer } from '@angular/platform-browser';
import * as markdown from 'marked';
import markdown from 'marked';

import { LoggerService } from '../../../core/logger.service';
import { PreviewableComponent } from '../../previewable-component';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core';
import * as moment from 'moment';
import moment from 'moment';
import { Subscription } from 'rxjs';

import { MetricsAction } from '../../../../../store/src/actions/metrics.actions';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { TemplatePortal } from '@angular/cdk/portal';
import { AfterViewInit, Component, Input, OnDestroy, TemplateRef, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Store } from '@ngrx/store';
import * as moment from 'moment';
import moment from 'moment';
import { Observable } from 'rxjs';
import { map, startWith } from 'rxjs/operators';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Input } from '@angular/core';
import { Store } from '@ngrx/store';
import * as moment from 'moment';
import moment from 'moment';
import { Observable, of as observableOf } from 'rxjs';
import { map } from 'rxjs/operators';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import * as moment from 'moment';
import moment from 'moment';

import { SharedModule } from './../../shared.module';
import { StartEndDateComponent } from './start-end-date.component';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
import * as moment from 'moment';
import moment from 'moment';

@Component({
selector: 'app-start-end-date',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Injectable, NgZone } from '@angular/core';
import * as moment from 'moment';
import moment from 'moment';
import { Subject, Subscription } from 'rxjs';
import { debounceTime, takeWhile, tap } from 'rxjs/operators';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import * as moment from 'moment';
import moment from 'moment';

import { MetricQueryConfig, MetricsAction } from '../../../../store/src/actions/metrics.actions';
import { IMetrics } from '../../../../store/src/types/base-metric.types';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as moment from 'moment';
import moment from 'moment';

import { MetricQueryType } from '../../../../store/src/types/metric.types';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Action } from '@ngrx/store';
import * as moment from 'moment';
import moment from 'moment';

import {
CLEAR_ENDPOINT_ERROR_EVENTS,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { NgZone } from '@angular/core';
import * as moment from 'moment';
import moment from 'moment';
import { combineLatest, Observable, of as observableOf } from 'rxjs';
import { distinctUntilChanged, map, share, startWith } from 'rxjs/operators';

import {
InternalEventSeverity,
InternalEventsState,
InternalEventSubjectState,
InternalEventState,
InternalEventSubjectState,
} from '../types/internal-events.types';

export function newNonAngularInterval(ngZone: NgZone, intervalTime: number) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as moment from 'moment-timezone';
import moment from 'moment-timezone';
import { browser, promise } from 'protractor';
import { timer } from 'rxjs';
import { switchMap } from 'rxjs/operators';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as path from 'path';
import path from 'path';
import { browser, by, element, protractor } from 'protractor';

import { ApplicationsPage } from '../applications/applications.po';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as moment from 'moment-timezone';
import moment from 'moment-timezone';
import { by, ElementArrayFinder, ElementFinder, promise } from 'protractor';

import { FormComponent } from '../../po/form.po';
Expand Down
6 changes: 3 additions & 3 deletions src/test-e2e/helpers/request-helpers.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { existsSync, readFileSync } from 'fs';
import { join } from 'path';
import { browser, promise } from 'protractor';
import * as request from 'request-promise-native';
import request from 'request-promise-native';

import { E2E, e2e } from '../e2e';
import { ConsoleUserType } from './e2e-helpers';
Expand Down Expand Up @@ -125,8 +125,8 @@ export class RequestHelpers {
Object.keys(options).forEach(key => {
const v = options[key];
if (typeof v === 'string' && key === 'password') {
options[key]='******';
} else if (typeof v === 'object') {
options[key] = '******';
} else if (typeof v === 'object') {
this.sanitizeOption(options[key]);
}
});
Expand Down
2 changes: 1 addition & 1 deletion src/test-e2e/helpers/uaa-request-helpers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { promise } from 'protractor';
import * as request from 'request-promise-native';
import request from 'request-promise-native';

import { e2e } from '../e2e';
import { E2EUaa } from '../e2e.types';
Expand Down
2 changes: 1 addition & 1 deletion src/test-e2e/locale.helper.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as moment from 'moment';
import moment from 'moment';
import { browser, promise } from 'protractor';

export class LocaleHelper {
Expand Down
2 changes: 2 additions & 0 deletions src/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"importHelpers": true,
"target": "es2015",
"module": "esnext",
Expand Down