Skip to content

Commit 0c8eaf7

Browse files
committed
feat: support web standard modules
1 parent d787879 commit 0c8eaf7

File tree

294 files changed

+2399
-2673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+2399
-2673
lines changed

apps/rxjs.dev/src/app/app.module.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import { CustomElementsModule } from 'app/custom-elements/custom-elements.module
4141
import { SharedModule } from 'app/shared/shared.module';
4242
import { SwUpdatesModule } from 'app/sw-updates/sw-updates.module';
4343

44-
import {environment} from '../environments/environment';
44+
import { environment } from '../environments/environment.js';
4545

4646
// These are the hardcoded inline svg sources to be used by the `<mat-icon>` component.
4747
// tslint:disable: max-line-length
@@ -52,8 +52,8 @@ export const svgIconProviders = [
5252
name: 'close',
5353
svgSource:
5454
'<svg fill="#ffffff" focusable="false" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">' +
55-
'<path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z" />' +
56-
'<path d="M0 0h24v24H0z" fill="none" />' +
55+
'<path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z" />' +
56+
'<path d="M0 0h24v24H0z" fill="none" />' +
5757
'</svg>',
5858
},
5959
multi: true,
@@ -64,8 +64,8 @@ export const svgIconProviders = [
6464
name: 'error_outline',
6565
svgSource:
6666
'<svg focusable="false" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">' +
67-
'<path d="M0 0h24v24H0V0z" fill="none" />' +
68-
'<path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" />' +
67+
'<path d="M0 0h24v24H0V0z" fill="none" />' +
68+
'<path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" />' +
6969
'</svg>',
7070
},
7171
multi: true,
@@ -76,8 +76,8 @@ export const svgIconProviders = [
7676
name: 'insert_comment',
7777
svgSource:
7878
'<svg fill="#ffffff" focusable="false" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">' +
79-
'<path d="M20 2H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14l4 4V4c0-1.1-.9-2-2-2zm-2 12H6v-2h12v2zm0-3H6V9h12v2zm0-3H6V6h12v2z" />' +
80-
'<path d="M0 0h24v24H0z" fill="none" />' +
79+
'<path d="M20 2H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14l4 4V4c0-1.1-.9-2-2-2zm-2 12H6v-2h12v2zm0-3H6V9h12v2zm0-3H6V6h12v2z" />' +
80+
'<path d="M0 0h24v24H0z" fill="none" />' +
8181
'</svg>',
8282
},
8383
multi: true,
@@ -88,7 +88,7 @@ export const svgIconProviders = [
8888
name: 'keyboard_arrow_right',
8989
svgSource:
9090
'<svg focusable="false" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">' +
91-
'<path d="M8.59 16.34l4.58-4.59-4.58-4.59L10 5.75l6 6-6 6z" />' +
91+
'<path d="M8.59 16.34l4.58-4.59-4.58-4.59L10 5.75l6 6-6 6z" />' +
9292
'</svg>',
9393
},
9494
multi: true,
@@ -99,7 +99,7 @@ export const svgIconProviders = [
9999
name: 'menu',
100100
svgSource:
101101
'<svg focusable="false" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">' +
102-
'<path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" />' +
102+
'<path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" />' +
103103
'</svg>',
104104
},
105105
multi: true,
@@ -120,7 +120,7 @@ export const svgIconProviders = [
120120
MatToolbarModule,
121121
SwUpdatesModule,
122122
SharedModule,
123-
ServiceWorkerModule.register('/ngsw-worker.js', {enabled: environment.production}),
123+
ServiceWorkerModule.register('/ngsw-worker.js', { enabled: environment.production }),
124124
],
125125
declarations: [
126126
AppComponent,
@@ -153,6 +153,6 @@ export const svgIconProviders = [
153153
{ provide: CurrentDateToken, useFactory: currentDateProvider },
154154
{ provide: WindowToken, useFactory: windowProvider },
155155
],
156-
bootstrap: [ AppComponent ]
156+
bootstrap: [AppComponent],
157157
})
158-
export class AppModule { }
158+
export class AppModule {}

apps/rxjs.dev/src/app/custom-elements/announcement-bar/announcement-bar.component.spec.ts

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
22
import { ComponentFixture, TestBed } from '@angular/core/testing';
33
import { Logger } from 'app/shared/logger.service';
44
import { MockLogger } from 'testing/logger.service';
5-
import { AnnouncementBarComponent } from './announcement-bar.component';
5+
import { AnnouncementBarComponent } from './announcement-bar.component.js';
66

77
const today = new Date();
88
const lastWeek = changeDays(today, -7);
@@ -11,7 +11,6 @@ const tomorrow = changeDays(today, 1);
1111
const nextWeek = changeDays(today, 7);
1212

1313
describe('AnnouncementBarComponent', () => {
14-
1514
let element: HTMLElement;
1615
let fixture: ComponentFixture<AnnouncementBarComponent>;
1716
let component: AnnouncementBarComponent;
@@ -22,7 +21,7 @@ describe('AnnouncementBarComponent', () => {
2221
const injector = TestBed.configureTestingModule({
2322
imports: [HttpClientTestingModule],
2423
declarations: [AnnouncementBarComponent],
25-
providers: [{ provide: Logger, useClass: MockLogger }]
24+
providers: [{ provide: Logger, useClass: MockLogger }],
2625
});
2726

2827
httpMock = injector.get(HttpTestingController);
@@ -49,7 +48,7 @@ describe('AnnouncementBarComponent', () => {
4948
{ startDate: lastWeek, endDate: yesterday, message: 'Test Announcement 0' },
5049
{ startDate: tomorrow, endDate: nextWeek, message: 'Test Announcement 1' },
5150
{ startDate: yesterday, endDate: tomorrow, message: 'Test Announcement 2' },
52-
{ startDate: yesterday, endDate: tomorrow, message: 'Test Announcement 3' }
51+
{ startDate: yesterday, endDate: tomorrow, message: 'Test Announcement 3' },
5352
]);
5453
expect(component.announcement.message).toEqual('Test Announcement 2');
5554
});
@@ -66,9 +65,7 @@ describe('AnnouncementBarComponent', () => {
6665
const request = httpMock.expectOne('generated/announcements.json');
6766
request.flush('some random response');
6867
expect(component.announcement).toBeUndefined();
69-
expect(mockLogger.output.error).toEqual([
70-
[jasmine.any(Error)]
71-
]);
68+
expect(mockLogger.output.error).toEqual([[jasmine.any(Error)]]);
7269
expect(mockLogger.output.error[0][0].message).toMatch(/^generated\/announcements\.json contains invalid data:/);
7370
});
7471

@@ -77,9 +74,7 @@ describe('AnnouncementBarComponent', () => {
7774
const request = httpMock.expectOne('generated/announcements.json');
7875
request.error(new ErrorEvent('404'));
7976
expect(component.announcement).toBeUndefined();
80-
expect(mockLogger.output.error).toEqual([
81-
[jasmine.any(Error)]
82-
]);
77+
expect(mockLogger.output.error).toEqual([[jasmine.any(Error)]]);
8378
expect(mockLogger.output.error[0][0].message).toMatch(/^generated\/announcements\.json request failed:/);
8479
});
8580
});
@@ -91,7 +86,7 @@ describe('AnnouncementBarComponent', () => {
9186
linkUrl: 'link/to/website',
9287
message: 'this is an <b>important</b> message',
9388
endDate: '2018-03-01',
94-
startDate: '2018-02-01'
89+
startDate: '2018-02-01',
9590
};
9691
fixture.detectChanges();
9792
});
@@ -111,5 +106,5 @@ describe('AnnouncementBarComponent', () => {
111106
});
112107

113108
function changeDays(initial: Date, days: number) {
114-
return (new Date(initial.valueOf()).setDate(initial.getDate() + days));
109+
return new Date(initial.valueOf()).setDate(initial.getDate() + days);
115110
}

apps/rxjs.dev/src/app/custom-elements/announcement-bar/announcement-bar.module.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { NgModule, Type } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { HttpClientModule } from '@angular/common/http';
4-
import { SharedModule } from '../../shared/shared.module';
5-
import { AnnouncementBarComponent } from './announcement-bar.component';
6-
import { WithCustomElementComponent } from '../element-registry';
4+
import { SharedModule } from '../../shared/shared.module.js';
5+
import { AnnouncementBarComponent } from './announcement-bar.component.js';
6+
import { WithCustomElementComponent } from '../element-registry.js';
77

88
@NgModule({
9-
imports: [ CommonModule, SharedModule, HttpClientModule ],
10-
declarations: [ AnnouncementBarComponent ]
9+
imports: [CommonModule, SharedModule, HttpClientModule],
10+
declarations: [AnnouncementBarComponent],
1111
})
1212
export class AnnouncementBarModule implements WithCustomElementComponent {
1313
customElementComponent: Type<any> = AnnouncementBarComponent;

0 commit comments

Comments
 (0)