Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
Merge branch 'master' into fix/textarea/warning-passive
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Goo authored Jun 14, 2019
2 parents 4dbc477 + ecdefca commit 3e774cf
Show file tree
Hide file tree
Showing 3 changed files with 289 additions and 6 deletions.
4 changes: 4 additions & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,11 @@ const istanbulInstrumenterLoader = {
module.exports = function(config) {
config.set({
basePath: '',
// Refer https://github.com/karma-runner/karma-mocha
frameworks: ['mocha'],
files: [
// Refer https://github.com/babel/karma-babel-preprocessor
'node_modules/@babel/polyfill/dist/polyfill.js',
'test/unit/index.js',
],
preprocessors: {
Expand Down Expand Up @@ -112,6 +115,7 @@ module.exports = function(config) {
},
},

// Refer https://github.com/webpack-contrib/karma-webpack
webpack: Object.assign({}, webpackConfig, {
module: Object.assign({}, webpackConfig.module, {
// Cover source files when not debugging tests. Otherwise, omit coverage instrumenting to get
Expand Down
288 changes: 282 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
"test:site": "npm run clean:site && ./scripts/site-generator-test.sh"
},
"devDependencies": {
"@babel/core": "^7.4.5",
"@babel/parser": "^7.2.3",
"@babel/polyfill": "^7.4.4",
"@babel/traverse": "^7.3.4",
"@babel/types": "^7.3.4",
"@google-cloud/datastore": "^3.0.1",
Expand Down Expand Up @@ -97,6 +99,7 @@
"jsdom": "^13.1.0",
"json-stable-stringify": "^1.0.1",
"karma": "^4.0.0",
"karma-babel-preprocessor": "^8.0.0",
"karma-chrome-launcher": "^2.0.0",
"karma-coverage-istanbul-reporter": "^2.0.4",
"karma-firefox-launcher": "^1.0.0",
Expand Down

0 comments on commit 3e774cf

Please sign in to comment.