build(aio): upgrade to CLI beta.32 and MD beta.2
This commit is contained in:
Ward Bell
Igor Minar
parent
a26eb4c04e
commit
9a2ea55bff
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"project": {
|
||||
"version": "1.0.0-beta.26",
|
||||
"version": "1.0.0-beta.32.3",
|
||||
"name": "site"
|
||||
},
|
||||
"apps": [
|
||||
|
|
@ -24,8 +24,8 @@
|
|||
"scripts": [
|
||||
|
||||
],
|
||||
"environmentSource": "environments/environment.ts",
|
||||
"environments": {
|
||||
"source": "environments/environment.ts",
|
||||
"dev": "environments/environment.ts",
|
||||
"prod": "environments/environment.prod.ts"
|
||||
}
|
||||
|
|
@ -36,13 +36,24 @@
|
|||
"config": "./protractor.conf.js"
|
||||
}
|
||||
},
|
||||
"lint": [
|
||||
{
|
||||
"files": "src/**/*.ts",
|
||||
"project": "src/tsconfig.json"
|
||||
},
|
||||
{
|
||||
"files": "e2e/**/*.ts",
|
||||
"project": "e2e/tsconfig.json"
|
||||
}
|
||||
],
|
||||
"test": {
|
||||
"karma": {
|
||||
"config": "./karma.conf.js"
|
||||
}
|
||||
},
|
||||
"defaults": {
|
||||
"styleExt": "css",
|
||||
"styleExt": "scss",
|
||||
"component": {},
|
||||
"prefixInterfaces": false,
|
||||
"inline": {
|
||||
"style": false,
|
||||
|
|
@ -7,9 +7,13 @@ module.exports = function (config) {
|
|||
plugins: [
|
||||
require('karma-jasmine'),
|
||||
require('karma-chrome-launcher'),
|
||||
require('karma-remap-istanbul'),
|
||||
require('karma-jasmine-html-reporter'),
|
||||
require('karma-coverage-istanbul-reporter'),
|
||||
require('@angular/cli/plugins/karma')
|
||||
],
|
||||
client:{
|
||||
clearContext: false // leave Jasmine Spec Runner output visible in browser
|
||||
},
|
||||
files: [
|
||||
{ pattern: './src/test.ts', watched: false }
|
||||
],
|
||||
|
|
@ -19,19 +23,17 @@ module.exports = function (config) {
|
|||
mime: {
|
||||
'text/x-typescript': ['ts','tsx']
|
||||
},
|
||||
remapIstanbulReporter: {
|
||||
reports: {
|
||||
html: 'coverage',
|
||||
lcovonly: './coverage/coverage.lcov'
|
||||
}
|
||||
coverageIstanbulReporter: {
|
||||
reports: [ 'html', 'lcovonly' ],
|
||||
fixWebpackSourcePaths: true
|
||||
},
|
||||
angularCli: {
|
||||
config: './angular-cli.json',
|
||||
config: './.angular-cli.json',
|
||||
environment: 'dev'
|
||||
},
|
||||
reporters: config.angularCli && config.angularCli.codeCoverage
|
||||
? ['progress', 'karma-remap-istanbul']
|
||||
: ['progress'],
|
||||
? ['progress', 'coverage-istanbul']
|
||||
: ['progress', 'kjhtml'],
|
||||
port: 9876,
|
||||
colors: true,
|
||||
logLevel: config.LOG_INFO,
|
||||
|
|
|
|||
|
|
@ -10,54 +10,55 @@
|
|||
"ng": "ng",
|
||||
"start": "ng serve",
|
||||
"build": "ng build",
|
||||
"lint": "tslint \"src/**/*.ts\" --project src/tsconfig.json --type-check && tslint \"e2e/**/*.ts\" --project e2e/tsconfig.json --type-check",
|
||||
"test": "ng test",
|
||||
"lint": "ng lint",
|
||||
"pree2e": "webdriver-manager update --standalone false --gecko false",
|
||||
"e2e": "protractor",
|
||||
"e2e": "ng e2e --no-webdriver-update",
|
||||
"deploy-staging": "firebase use staging --token \"$FIREBASE_TOKEN\" && yarn run ~~deploy",
|
||||
"pre~~deploy": "ng build --prod",
|
||||
"~~deploy": "firebase deploy --message \"Commit: $TRAVIS_COMMIT\" --non-interactive --token \"$FIREBASE_TOKEN\""
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular/cli": "^1.0.0-beta.31",
|
||||
"@angular/common": "^2.4.7",
|
||||
"@angular/compiler": "^2.4.7",
|
||||
"@angular/core": "^2.4.7",
|
||||
"@angular/forms": "^2.4.7",
|
||||
"@angular/http": "^2.4.7",
|
||||
"@angular/material": "^2.0.0-beta.1",
|
||||
"@angular/platform-browser": "^2.4.7",
|
||||
"@angular/platform-browser-dynamic": "^2.4.7",
|
||||
"@angular/router": "^3.4.7",
|
||||
"@angular/common": "^2.4.0",
|
||||
"@angular/compiler": "^2.4.0",
|
||||
"@angular/core": "^2.4.0",
|
||||
"@angular/forms": "^2.4.0",
|
||||
"@angular/http": "^2.4.0",
|
||||
"@angular/material": "https://github.com/angular/material2-builds",
|
||||
"@angular/platform-browser": "^2.4.0",
|
||||
"@angular/platform-browser-dynamic": "^2.4.0",
|
||||
"@angular/router": "^3.4.0",
|
||||
"core-js": "^2.4.1",
|
||||
"rxjs": "^5.0.1",
|
||||
"rxjs": "^5.1.0",
|
||||
"ts-helpers": "^1.1.1",
|
||||
"zone.js": "^0.7.2"
|
||||
"zone.js": "^0.7.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular/compiler-cli": "^2.4.7",
|
||||
"@angular/cli": "^1.0.0-beta.32.3",
|
||||
"@angular/compiler-cli": "^2.4.0",
|
||||
"@types/jasmine": "2.5.38",
|
||||
"@types/node": "^6.0.42",
|
||||
"@types/node": "~6.0.60",
|
||||
"canonical-path": "^0.0.2",
|
||||
"codelyzer": "~2.0.0-beta.1",
|
||||
"codelyzer": "~2.0.0-beta.4",
|
||||
"dgeni": "^0.4.7",
|
||||
"dgeni-packages": "^0.16.8",
|
||||
"entities": "^1.1.1",
|
||||
"firebase-tools": "^3.2.1",
|
||||
"gulp": "^3.9.1",
|
||||
"jasmine-core": "2.5.2",
|
||||
"jasmine-spec-reporter": "2.5.0",
|
||||
"karma": "1.2.0",
|
||||
"karma-chrome-launcher": "^2.0.0",
|
||||
"karma-cli": "^1.0.1",
|
||||
"karma-jasmine": "^1.0.2",
|
||||
"karma-remap-istanbul": "^0.2.1",
|
||||
"jasmine-core": "~2.5.2",
|
||||
"jasmine-spec-reporter": "~3.2.0",
|
||||
"karma": "~1.4.1",
|
||||
"karma-chrome-launcher": "~2.0.0",
|
||||
"karma-cli": "~1.0.1",
|
||||
"karma-coverage-istanbul-reporter": "^0.2.0",
|
||||
"karma-jasmine": "~1.1.0",
|
||||
"karma-jasmine-html-reporter": "^0.2.2",
|
||||
"lodash": "^4.17.4",
|
||||
"protractor": "~4.0.13",
|
||||
"protractor": "~5.1.0",
|
||||
"rho": "^0.3.0",
|
||||
"ts-node": "1.2.1",
|
||||
"tslint": "^4.3.0",
|
||||
"typescript": "2.0.10"
|
||||
"ts-node": "~2.0.0",
|
||||
"tslint": "~4.4.2",
|
||||
"typescript": "~2.0.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
// https://github.com/angular/protractor/blob/master/lib/config.ts
|
||||
|
||||
/*global jasmine */
|
||||
var SpecReporter = require('jasmine-spec-reporter');
|
||||
const { SpecReporter } = require('jasmine-spec-reporter');
|
||||
|
||||
exports.config = {
|
||||
allScriptsTimeout: 11000,
|
||||
getPageTimeout: 30000,
|
||||
specs: [
|
||||
'./e2e/**/*.e2e-spec.ts'
|
||||
],
|
||||
capabilities: {
|
||||
browserName: 'chrome',
|
||||
// For Travis
|
||||
chromeOptions: {
|
||||
binary: process.env.CHROME_BIN
|
||||
}
|
||||
|
|
@ -24,13 +24,12 @@ exports.config = {
|
|||
defaultTimeoutInterval: 30000,
|
||||
print: function() {}
|
||||
},
|
||||
useAllAngular2AppRoots: true,
|
||||
beforeLaunch: function() {
|
||||
require('ts-node').register({
|
||||
project: 'e2e'
|
||||
});
|
||||
},
|
||||
onPrepare: function() {
|
||||
jasmine.getEnv().addReporter(new SpecReporter());
|
||||
onPrepare() {
|
||||
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<button *ngIf="isHamburgerVisible" class="hamburger" md-button (click)="toggleSideNav()"><md-icon>menu</md-icon></button>
|
||||
<aio-menu></aio-menu>
|
||||
<md-input-container >
|
||||
<input #search md-input placeholder="Search">
|
||||
<input #search mdInput placeholder="Search">
|
||||
</md-input-container>
|
||||
<span class="fill-remaining-space"></span>
|
||||
</md-toolbar>
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@ import { MenuComponent } from './sidenav/menu.component';
|
|||
imports: [
|
||||
BrowserModule,
|
||||
HttpModule,
|
||||
MdButtonModule.forRoot(),
|
||||
MdIconModule.forRoot(),
|
||||
MdInputModule.forRoot(),
|
||||
MdToolbarModule.forRoot(),
|
||||
MdSidenavModule.forRoot()
|
||||
MdButtonModule,
|
||||
MdIconModule,
|
||||
MdInputModule,
|
||||
MdToolbarModule,
|
||||
MdSidenavModule
|
||||
],
|
||||
declarations: [
|
||||
AppComponent,
|
||||
|
|
|
|||
|
|
@ -59,6 +59,6 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="cta-bar"><a href="/docs/ts/latest/quickstart.html" md-button="md-button"
|
||||
class="button button-large button-shield md-raised md-primary">Get
|
||||
class="button button-large button-shield mat-raised mat-primary">Get
|
||||
Started</a></div>
|
||||
</article>
|
||||
</article>
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
src="assets/images/logos/angular2/angular.svg" class="hero-logo"/>
|
||||
<h1 class="text-headline">One framework.<br>Mobile & desktop.</h1><a
|
||||
href="/docs/ts/latest/quickstart.html" md-button="md-button"
|
||||
class="hero-cta md-raised button button-large button-plain">Get Started</a></div>
|
||||
class="hero-cta mat-raised button button-large button-plain">Get Started</a></div>
|
||||
<announcement-bar class="announcement-bar">
|
||||
<div class="announcement-bar-slide cleafix is-visible"><img
|
||||
src="assets/images/logos/anglebrackets/devintersection.png" width="64"/>
|
||||
<p>Join us for <strong>DEVintersection Amsterdam</strong> Nov 14-16!</p><a
|
||||
href="https://www.devintersectioneurope.com/#!/" target="_blank" class="button md-button">Register
|
||||
href="https://www.devintersectioneurope.com/#!/" target="_blank" class="button mat-button">Register
|
||||
now</a></div>
|
||||
</announcement-bar>
|
||||
</header>
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="cta-bar"><a href="/docs/ts/latest/quickstart.html" md-button="md-button"
|
||||
class="button button-large button-shield md-raised md-primary">Get
|
||||
class="button button-large button-shield mat-raised mat-primary">Get
|
||||
Started</a></div>
|
||||
</div>
|
||||
</article>
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
.docs-component-viewer-tabbed-content,
|
||||
.docs-guide-content {
|
||||
h1 {
|
||||
color: md-color($primary, 800);
|
||||
background: rgba(md-color($foreground, secondary-text), .03);
|
||||
color: mat-color($primary, 800);
|
||||
background: rgba(mat-color($foreground, secondary-text), .03);
|
||||
}
|
||||
|
||||
h3, h2, h4, h5, p, ol, li{
|
||||
color: md-color($foreground, secondary-text);
|
||||
color: mat-color($foreground, secondary-text);
|
||||
}
|
||||
|
||||
a {
|
||||
color: md-color($primary);
|
||||
color: mat-color($primary);
|
||||
}
|
||||
|
||||
table {
|
||||
|
|
@ -27,17 +27,17 @@
|
|||
}
|
||||
|
||||
table tbody th{
|
||||
border: 1px solid rgba(md-color($foreground, secondary-text), .03);
|
||||
border: 1px solid rgba(mat-color($foreground, secondary-text), .03);
|
||||
}
|
||||
|
||||
td {
|
||||
color: md-color($foreground, secondary-text);
|
||||
border: 1px solid rgba(md-color($foreground, secondary-text), .03);
|
||||
color: mat-color($foreground, secondary-text);
|
||||
border: 1px solid rgba(mat-color($foreground, secondary-text), .03);
|
||||
}
|
||||
|
||||
th {
|
||||
color: md-color($foreground, secondary-text);
|
||||
background: rgba(md-color($foreground, secondary-text), .03);
|
||||
color: mat-color($foreground, secondary-text);
|
||||
background: rgba(mat-color($foreground, secondary-text), .03);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
font-size: 16px;
|
||||
}
|
||||
|
||||
.md-tab-body-wrapper h2 {
|
||||
.mat-tab-body-wrapper h2 {
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,15 +4,15 @@
|
|||
|
||||
|
||||
// Include material core styles.
|
||||
@include md-core();
|
||||
@include mat-core();
|
||||
@include docs-site-typography();
|
||||
|
||||
|
||||
// Define the light theme.
|
||||
$primary: md-palette($md-cyan);
|
||||
$accent: md-palette($md-amber, A200, A100, A400);
|
||||
$primary: mat-palette($mat-cyan);
|
||||
$accent: mat-palette($mat-amber, A200, A100, A400);
|
||||
|
||||
$theme: md-light-theme($primary, $accent);
|
||||
$theme: mat-light-theme($primary, $accent);
|
||||
@include angular-material-theme($theme);
|
||||
|
||||
body {
|
||||
|
|
@ -20,7 +20,7 @@ body {
|
|||
margin: 0;
|
||||
}
|
||||
|
||||
[md-button], [md-raised-button] {
|
||||
[md-button], [md-raised-button], [mat-button], [mat-raised-button] {
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,20 +3,20 @@
|
|||
|
||||
// Include the base styles for Angular Material core. We include this here so that you only
|
||||
// have to load a single css file for Angular Material in your app.
|
||||
@include md-core();
|
||||
@include mat-core();
|
||||
|
||||
|
||||
// Define the palettes for your theme using the Material Design palettes available in palette.scss
|
||||
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
|
||||
// hue.
|
||||
$ng-io-primary: md-palette($md-indigo);
|
||||
$ng-io-accent: md-palette($md-pink, A200, A100, A400);
|
||||
$ng-io-primary: mat-palette($mat-indigo);
|
||||
$ng-io-accent: mat-palette($mat-pink, A200, A100, A400);
|
||||
|
||||
// The warn palette is optional (defaults to red).
|
||||
$ng-io-warn: md-palette($md-red);
|
||||
$ng-io-warn: mat-palette($mat-red);
|
||||
|
||||
// Create the theme object (a Sass map containing all of the palettes).
|
||||
$ng-io-theme: md-light-theme($ng-io-primary, $ng-io-accent, $ng-io-warn);
|
||||
$ng-io-theme: mat-light-theme($ng-io-primary, $ng-io-accent, $ng-io-warn);
|
||||
|
||||
// Include theme styles for core and each component used in your app.
|
||||
// Alternatively, you can import and @include the theme mixins for each component
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
"no-empty": false,
|
||||
"no-empty-interface": true,
|
||||
"no-eval": true,
|
||||
"no-inferrable-types": true,
|
||||
"no-inferrable-types": [true, "ignore-params"],
|
||||
"no-shadowed-variable": true,
|
||||
"no-string-literal": false,
|
||||
"no-string-throw": true,
|
||||
|
|
|
|||
1156
aio/yarn.lock
1156
aio/yarn.lock
File diff suppressed because it is too large
Load Diff
|
|
@ -50,7 +50,6 @@ echo 'travis_fold:end:test.aio.unit'
|
|||
echo 'travis_fold:start:test.aio.e2e'
|
||||
# Run e2e tests
|
||||
cd ../../aio
|
||||
yarn start &
|
||||
yarn run e2e
|
||||
cd -
|
||||
echo 'travis_fold:end:test.aio.e2e'
|
||||
|
|
|
|||
Loading…
Reference in New Issue