Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

feat: angular 4 compatibility #135

Merged
merged 1 commit into from
Apr 13, 2017
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
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License

Copyright (c) 2016 Google, Inc.
Copyright (c) 2017 Google, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
10 changes: 5 additions & 5 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ const path = require('path');
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', 'angular-cli'],
frameworks: ['jasmine', '@angular/cli'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-remap-istanbul'),
require('angular-cli/plugins/karma'),
require('@angular/cli/plugins/karma'),
require('karma-browserstack-launcher'),
require('karma-sauce-launcher'),
],
files: [
{ pattern: './src/test.ts', watched: false }
],
preprocessors: {
'./src/test.ts': ['angular-cli']
'./src/test.ts': ['@angular/cli']
},
mime: {
'text/x-typescript': ['ts','tsx']
Expand Down Expand Up @@ -66,7 +66,7 @@ module.exports = function (config) {
pollingTimeout: 20000
},
});

if (process.env['TRAVIS']) {

let buildId = `TRAVIS #${process.env.TRAVIS_BUILD_NUMBER} (${process.env.TRAVIS_BUILD_ID})`;
Expand All @@ -87,5 +87,5 @@ module.exports = function (config) {
}

config.browsers = platformMap[platformType];
}
}
};
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "angular-io-v42",
"name": "material-angular-io",
"version": "0.0.0",
"license": "MIT",
"angular-cli": {},
Expand Down Expand Up @@ -28,7 +28,7 @@
"@angular/router": "~4.0.0",
"core-js": "^2.4.1",
"rxjs": "^5.1.0",
"zone.js": "^0.7.7"
"zone.js": "^0.8.4"
},
"devDependencies": {
"@angular/cli": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/footer/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>

<div class="docs-footer-copyright">
<p>Powered by Google ©2010-2016. Code licensed under an MIT-style License. Documentation licensed under CC BY 4.0.</p>
<p>Powered by Google ©2010-2017. Code licensed under an MIT-style License. Documentation licensed under CC BY 4.0.</p>
</div>
</div>
</footer>
4 changes: 2 additions & 2 deletions src/app/shared/plunker/plunker-writer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ describe('PlunkerWriter', () => {
it('should append correct copyright', () => {
expect(plunkerWriter._appendCopyright('test.ts', 'NoContent')).toBe(`NoContent

/** Copyright 2016 Google Inc. All Rights Reserved.
/** Copyright 2017 Google Inc. All Rights Reserved.
Use of this source code is governed by an MIT-style license that
can be found in the LICENSE file at http://angular.io/license */`);

expect(plunkerWriter._appendCopyright('test.html', 'NoContent')).toBe(`NoContent

<!-- Copyright 2016 Google Inc. All Rights Reserved.
<!-- Copyright 2017 Google Inc. All Rights Reserved.
Use of this source code is governed by an MIT-style license that
can be found in the LICENSE file at http://angular.io/license -->`);

Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/plunker/plunker-writer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'rxjs/add/operator/toPromise';
const PLUNKER_URL = 'https://plnkr.co/edit/?p=preview';

const COPYRIGHT =
`Copyright 2016 Google Inc. All Rights Reserved.
`Copyright 2017 Google Inc. All Rights Reserved.
Use of this source code is governed by an MIT-style license that
can be found in the LICENSE file at http://angular.io/license`;

Expand Down