Skip to content

Commit 9058846

Browse files
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents 9306bd0 + cefcad7 commit 9058846

12 files changed

+298
-77
lines changed

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ after_script:
3232
matrix:
3333
include:
3434

35-
- node_js: 8
35+
- node_js: 10
3636
env:
3737
- TEST_SUITE=lint
3838
script:
3939
- if has_testable_files; then npm run lint && npm run test:feature-targeting; else log_untestable_files; fi
4040

41-
- node_js: 8
41+
- node_js: 10
4242
env:
4343
- TEST_SUITE=build
4444
script:
4545
- if has_testable_files; then npm run dist; else log_untestable_files; fi
4646

47-
- node_js: 8
47+
- node_js: 10
4848
env:
4949
- TEST_SUITE=unit
5050
addons:
@@ -60,7 +60,7 @@ matrix:
6060
script:
6161
- if has_testable_files; then npm run test:site; else log_untestable_files; fi
6262

63-
- node_js: 8
63+
- node_js: 10
6464
env:
6565
- TEST_SUITE=screenshot
6666
git:

docs/integrating-into-frameworks.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@ are working as hard as we can to make writing adapters as easy and predictable a
8989
- We plan on creating Type Definitions for our adapters in the future so that TypeScript users can
9090
validate that their interface conforms correctly to the adapter's specification.
9191

92-
> Please file an issue with us if there are certain snags you've ran into trying to implement an
92+
> Please [file an issue](https://github.com/material-components/material-components-web/issues/new/choose) with us if there are certain snags you've ran into trying to implement an
9393
adapter, or if you feel that we can provide better guidance on a particular problem. This is
9494
definitely something we want to know about.

karma.conf.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
const path = require('path');
25-
const webpackConfig = require('./webpack.config')[0];
25+
const webpackConfig = require('./webpack.config')[1];
2626

2727
const USING_TRAVISCI = Boolean(process.env.TRAVIS);
2828
const USING_SL = Boolean(process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY);
@@ -76,7 +76,7 @@ module.exports = function(config) {
7676
preprocessors: {
7777
'test/unit/index.js': ['webpack', 'sourcemap'],
7878
},
79-
reporters: ['dots', 'coverage-istanbul'],
79+
reporters: ['progress', 'coverage-istanbul'],
8080
port: 9876,
8181
colors: true,
8282
logLevel: config.LOG_INFO,
@@ -118,6 +118,7 @@ module.exports = function(config) {
118118
// Refer https://github.com/webpack-contrib/karma-webpack
119119
webpack: Object.assign({}, webpackConfig, {
120120
plugins: [], // Exclude UglifyJs plugin from test build.
121+
mode: 'development',
121122
module: Object.assign({}, webpackConfig.module, {
122123
// Cover source files when not debugging tests. Otherwise, omit coverage instrumenting to get
123124
// uncluttered source maps.
@@ -132,6 +133,7 @@ module.exports = function(config) {
132133

133134
webpackMiddleware: {
134135
noInfo: true,
136+
stats: 'minimal',
135137
},
136138
});
137139

lerna.json

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
"version": "3.2.0",
33
"command": {
44
"version": {
5-
"allowBranch": [
6-
"master"
7-
],
85
"conventionalCommits": true
96
},
107
"publish": {

0 commit comments

Comments
 (0)