Skip to content

Commit

Permalink
Merge 26e8add into 1a9e510
Browse files Browse the repository at this point in the history
  • Loading branch information
thijstriemstra committed Oct 25, 2020
2 parents 1a9e510 + 26e8add commit 37f3bb6
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 14 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ services:
- xvfb
cache: npm
install:
- npm prune
- npm install
- npm update
- npm install --legacy-peer-deps
script:
- npm run lint || travis_terminate 1
- npm run build || travis_terminate 1
Expand Down
6 changes: 6 additions & 0 deletions build-config/fragments/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ const datefns = require('date-fns');
const rootDir = path.resolve(__dirname, '..', '..');
const pckg = require(path.join(rootDir, 'package.json'));

// enable logging of deprecation warnings stacktrace
process.traceDeprecation = true;

// inject JS version number
const jsVersionPlugin = new webpack.DefinePlugin({
__VERSION__: JSON.stringify(pckg.version)
Expand All @@ -23,6 +26,9 @@ module.exports = {
performance: {
hints: false
},
stats: {
colors: true
},
module: {
rules: [
{
Expand Down
2 changes: 0 additions & 2 deletions build-config/fragments/min.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ module.exports = {
minimize: true,
minimizer: [
new TerserPlugin({
sourceMap: true,
parallel: true,
cache: './.build_cache/terser',
extractComments: false,
terserOptions: {
output: {
Expand Down
7 changes: 4 additions & 3 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint-env node */

const fs = require('fs');
const path = require('path');

process.env.BABEL_ENV = 'test';
process.traceDeprecation = true;
Expand All @@ -16,7 +17,7 @@ const chromeFlags = [
'--no-first-run',
'--noerrdialogs',
'--no-default-browser-check',
'--user-data-dir=.chrome',
'--user-data-dir=' + path.resolve('.chrome'),
'--disable-translate',
'--disable-extensions',
'--disable-infobars',
Expand All @@ -37,7 +38,7 @@ const firefoxFlags = {
module.exports = function(config) {
var configuration = {
basePath: '',
frameworks: ['jasmine', 'jasmine-matchers'],
frameworks: ['jasmine', 'jasmine-matchers', 'webpack'],
hostname: 'localhost',
port: 9876,
logLevel: config.LOG_INFO,
Expand Down Expand Up @@ -125,7 +126,7 @@ module.exports = function(config) {
};

if (ci) {
configuration.browsers = ['Firefox_ci'];
configuration.browsers = ['Firefox_ci', 'Chrome_ci'];

if (process.env.TRAVIS) {
// enable coveralls
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
"esdoc-ecmascript-proposal-plugin": "^1.0.0",
"esdoc-integrate-test-plugin": "^1.0.0",
"esdoc-standard-plugin": "^1.0.0",
"eslint": "^7.11.0",
"eslint": "^7.12.0",
"htmlhint": "^0.14.1",
"in-publish": "^2.0.1",
"jasmine-core": "^3.6.0",
"karma": "^5.2.3",
"karma-chrome-launcher": "3.1.0",
"karma-coverage": "^2.0.3",
"karma-coveralls": "^2.1.0",
"karma-firefox-launcher": "^1.3.0",
"karma-firefox-launcher": "^2.0.0",
"karma-jasmine": "4.0.1",
"karma-jasmine-matchers": "4.0.2",
"karma-verbose-reporter": "0.0.6",
"karma-webpack": "^4.0.2",
"karma-webpack": "github:appzuka/karma-webpack#next",
"lint-staged": "^10.4.2",
"load-script": "^1.0.0",
"pre-commit": "^1.2.2",
"terser-webpack-plugin": "^4.2.2",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12",
"terser-webpack-plugin": "^5.0.1",
"webpack": "^5.2.0",
"webpack-cli": "^4.1.0",
"webpack-dev-server": "^3.11.0",
"webpack-merge": "^5.2.0"
},
Expand Down

0 comments on commit 37f3bb6

Please sign in to comment.