Skip to content

Commit 3fe9d71

Browse files
committed
material demo app is running
1 parent 03d6a84 commit 3fe9d71

File tree

21 files changed

+266
-38
lines changed

21 files changed

+266
-38
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ yarn-error.log
4040
testem.log
4141
/.chrome
4242
/.git
43-
/.firebase
43+
/.firebase

scripts/ivy/build.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ echo ">>> Build Material"
66
rm -rf dist
77
gulp build:devapp
88

9-
echo ">>> Rebuild demo-app with ngtsc"
10-
node_modules/.bin/ngc -p src/demo-app/tsconfig-build.json
9+
echo ">>> Rebuild dev-app with ngtsc"
10+
node_modules/.bin/ngc -p src/dev-app/tsconfig-build.json
1111

1212
echo ">>> Bundle demo-app with SystemJS"
13-
node ./src/demo-app/systemjs-bundle.js
13+
node ./src/dev-app/systemjs-bundle.js
1414

1515
echo ">>> Assembling app"
1616
mkdir dist/demo
17-
cp dist/packages/demo-app/bundle.js dist/demo
18-
cp src/demo-app/index.html dist/demo
19-
cp dist/packages/demo-app/theme.css dist/demo
17+
cp dist/packages/dev-app/bundle.js dist/demo
18+
cp src/dev-app/index.html dist/demo
19+
cp dist/packages/dev-app/theme.css dist/demo
2020
cp 'node_modules/@webcomponents/custom-elements/custom-elements.min.js' dist/demo
2121
cp node_modules/core-js/client/core.js dist/demo
2222
cp node_modules/systemjs/dist/system.src.js dist/demo

scripts/ivy/install-angular.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ function buildNgPackages() {
1313
ngDir=$1
1414
echo ">>> Building @angular packages (from $ngDir)"
1515
pushd $ngDir
16-
bazel build --define=compile=local //packages/{animations,common,compiler,compiler-cli,core,elements,forms,platform-browser,platform-browser-dynamic,router,upgrade}:npm_package
17-
outputPath=`bazel info 2>&1 | grep output_path | cut -d ':' -f 2 | cut -c 2-`/darwin-fastbuild/bin/packages
16+
yarn bazel build --define=compile=aot //packages/{animations,common,compiler,compiler-cli,core,elements,forms,platform-browser,platform-browser-dynamic,router,upgrade}:npm_package
17+
outputPath=`yarn bazel info 2>&1 | grep output_path | cut -d ':' -f 2 | cut -c 2-`/darwin-fastbuild/bin/packages
1818
popd
1919
}
2020

src/cdk-experimental/tsconfig-tests.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323

2424
// Unset options inherited from tsconfig-build
2525
"annotateForClosureCompiler": false,
26-
"flatModuleOutFile": null,
26+
"flatModuleOutFile": "",
2727
"flatModuleId": null,
28-
"enableIvy": "ngtsc"
28+
"enableIvy": "ngtsc",
29+
"fullTemplateTypeCheck": false
2930
},
3031
"include": [
3132
"./*/index.ts",

src/cdk/a11y/public-api.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ export * from './live-announcer/live-announcer-tokens';
1616
export * from './focus-monitor/focus-monitor';
1717
export * from './fake-mousedown';
1818
export * from './a11y-module';
19+
export {PlatformModule} from '@angular/cdk/platform';
20+
export {ObserversModule, CdkObserveContent} from '@angular/cdk/observers';

src/cdk/overlay/public-api.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9+
export {BidiModule, Dir} from '@angular/cdk/bidi';
910
export * from './overlay-config';
1011
export * from './position/connected-position';
1112
export * from './scroll/index';
@@ -16,7 +17,7 @@ export {CdkOverlayOrigin, CdkConnectedOverlay} from './overlay-directives';
1617
export {FullscreenOverlayContainer} from './fullscreen-overlay-container';
1718
export {OverlayRef, OverlaySizeConfig} from './overlay-ref';
1819
export {ViewportRuler} from '@angular/cdk/scrolling';
19-
export {ComponentType} from '@angular/cdk/portal';
20+
export {ComponentType, CdkPortal, PortalModule, CdkPortalOutlet} from '@angular/cdk/portal';
2021
export {OverlayKeyboardDispatcher} from './keyboard/overlay-keyboard-dispatcher';
2122
export {OverlayPositionBuilder} from './position/overlay-position-builder';
2223

@@ -28,4 +29,9 @@ export {
2829
ConnectedPosition,
2930
FlexibleConnectedPositionStrategy,
3031
} from './position/flexible-connected-position-strategy';
31-
export {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
32+
export {
33+
VIEWPORT_RULER_PROVIDER, CdkFixedSizeVirtualScroll,
34+
CdkVirtualScrollViewport, CdkVirtualForOf, ScrollingModule
35+
} from '@angular/cdk/scrolling';
36+
37+
export {PlatformModule} from '@angular/cdk/platform';

src/cdk/scrolling/public-api.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ export * from './viewport-ruler';
1414
export * from './virtual-for-of';
1515
export * from './virtual-scroll-strategy';
1616
export * from './virtual-scroll-viewport';
17+
18+
export {BidiModule, Dir} from '@angular/cdk/bidi';
19+
export {PlatformModule} from '@angular/cdk/platform';

src/cdk/stepper/public-api.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ export * from './step-label';
1111
export * from './stepper-button';
1212
export * from './stepper-module';
1313
export * from './step-header';
14+
15+
export {BidiModule, Dir} from '@angular/cdk/bidi';

src/cdk/text-field/public-api.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@
99
export * from './autofill';
1010
export * from './autosize';
1111
export * from './text-field-module';
12+
13+
export {PlatformModule} from '@angular/cdk/platform';

src/cdk/tsconfig-tests.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
"strictMetadataEmit": true,
2323
"skipTemplateCodegen": true,
2424
"emitDecoratorMetadata": true,
25-
"fullTemplateTypeCheck": true,
25+
"fullTemplateTypeCheck": false,
2626

2727
// Unset options inherited from tsconfig-build
2828
"annotateForClosureCompiler": false,
29-
"flatModuleOutFile": null,
29+
"flatModuleOutFile": "",
3030
"flatModuleId": null,
3131
"enableIvy": "ngtsc"
3232
},

src/dev-app/dev-app/dev-app-layout.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<mat-sidenav-container class="demo-container">
2-
<mat-sidenav #start role="navigation">
2+
<mat-sidenav #start role="navigation" opened>
33
<mat-nav-list>
44
<a *ngFor="let navItem of navItems"
55
mat-list-item

src/demo-app/systemjs-bundle.js renamed to src/dev-app/systemjs-bundle.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ builder.config({
1616
},
1717
map: {
1818
'rxjs': 'node:rxjs',
19-
'main': 'dist/packages/demo-app/main.js',
19+
'main': 'dist/packages/dev-app/main.js',
2020
'tslib': 'node:tslib/tslib.js',
2121
'moment': 'node:moment/min/moment-with-locales.min.js',
2222

@@ -109,12 +109,12 @@ builder.config({
109109
'rxjs': {main: 'index'},
110110
'rxjs/operators': {main: 'index'},
111111

112-
// Set the default extension for the root package, because otherwise the demo-app can't
112+
// Set the default extension for the root package, because otherwise the dev-app can't
113113
// be built within the production mode. Due to missing file extensions.
114114
'.': {
115115
defaultExtension: 'js'
116116
}
117117
}
118118
});
119119

120-
builder.buildStatic('main', 'dist/packages/demo-app/bundle.js');
120+
builder.buildStatic('main', 'dist/packages/dev-app/bundle.js');

src/dev-app/tsconfig-build.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
"typeRoots": [
2525
"../../node_modules/@types/!(node)"
2626
],
27+
"rootDirs": [
28+
".",
29+
"../../dist/packages/dev-app"
30+
],
2731
"baseUrl": ".",
2832
"paths": {
2933
"@angular/material/*": [

src/lib/datepicker/public-api.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@ export * from './datepicker-intl';
1616
export * from './datepicker-toggle';
1717
export * from './month-view';
1818
export * from './year-view';
19+
20+
// TODO(ivy): this needs to be exported in a way that makes it clear that it's not a
21+
// public API that people should use.
22+
export * from './multi-year-view';

src/lib/sidenav/drawer.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,11 @@ export class MatDrawerContent extends CdkScrollable implements AfterContentInit
116116
host: {
117117
'class': 'mat-drawer',
118118
'[@transform]': '_animationState',
119-
'(@transform.start)': '_animationStarted.next($event)',
120-
'(@transform.done)': '_animationEnd.next($event)',
119+
120+
// These are commented out until FW-943 can be resolved.
121+
// '(@transform.start)': '_animationStarted.next($event)',
122+
// '(@transform.done)': '_animationEnd.next($event)',
123+
121124
// must prevent the browser from aligning text based on value
122125
'[attr.align]': 'null',
123126
'[class.mat-drawer-end]': 'position === "end"',

src/lib/sidenav/sidenav.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,11 @@ export class MatSidenavContent extends MatDrawerContent {
6060
'class': 'mat-drawer mat-sidenav',
6161
'tabIndex': '-1',
6262
'[@transform]': '_animationState',
63-
'(@transform.start)': '_animationStarted.next($event)',
64-
'(@transform.done)': '_animationEnd.next($event)',
63+
64+
// These are commented out until FW-943 can be resolved.
65+
// '(@transform.start)': '_animationStarted.next($event)',
66+
// '(@transform.done)': '_animationEnd.next($event)',
67+
6568
// must prevent the browser from aligning text based on value
6669
'[attr.align]': 'null',
6770
'[class.mat-drawer-end]': 'position === "end"',

src/lib/tsconfig-tests.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
"strictMetadataEmit": true,
2121
"skipTemplateCodegen": true,
2222
"emitDecoratorMetadata": true,
23-
"fullTemplateTypeCheck": true,
23+
"fullTemplateTypeCheck": false,
2424

2525
// Unset options inherited from tsconfig-build
2626
"annotateForClosureCompiler": false,
27-
"flatModuleOutFile": null,
27+
"flatModuleOutFile": "",
2828
"flatModuleId": null,
2929
"enableIvy": "ngtsc"
3030
},

0 commit comments

Comments
 (0)