Skip to content

Commit 0d7a262

Browse files
authored
Merge pull request #160 from SpringRoll/release/2.4.4
quick version update to fix release
2 parents d009787 + 62b37db commit 0d7a262

11 files changed

+10150
-550
lines changed

dist/SpringRoll-Container-umd.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/SpringRoll-Container-umd.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

karma.conf.bs.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
const [umd] = require('./rollup.config');
2-
require('dotenv').config();
1+
// const [umd] = require('./rollup.config.mjs');
2+
import { umd } from './rollup.config.mjs';
3+
// require('dotenv').config();
34
module.exports = function(config) {
45
config.set({
56
customLaunchers: {

karma.conf.e2e.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const [umd] = require('./rollup.config');
1+
// const [umd] = require('./rollup.config.mjs');
2+
import { umd } from './rollup.config.mjs';
23
module.exports = function(config) {
34
config.set({
45
frameworks: ['mocha', 'chai'],

karma.conf.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
1-
const [umd] = require('./rollup.config');
1+
22
module.exports = function(config) {
33
config.set({
4-
frameworks: ['mocha', 'chai'],
4+
frameworks: ['mocha','chai', 'webpack'],
5+
plugins: [
6+
'karma-webpack',
7+
'karma-mocha',
8+
'karma-chai',
9+
'karma-chrome-launcher',
10+
'karma-firefox-launcher'
11+
],
512
files: [{ pattern: 'src/index.spec.js', watched: true }],
6-
preprocessors: { 'src/**/*.js': ['babel', 'rollup'] },
7-
rollupPreprocessor: umd,
13+
preprocessors: { 'src/**/*.js': ['webpack'] },
814
reporters: ['progress'],
915
port: 9876, // karma web server port
1016
colors: true,
1117
logLevel: config.LOG_INFO,
1218
browsers: ['ChromeHeadless', 'FirefoxHeadless'],
1319
autoWatch: true,
14-
concurrency: Infinity
20+
concurrency: Infinity,
21+
webpack: {
22+
// karma watches the test entry points
23+
stats: 'errors-only'
24+
},
1525
});
1626
};

0 commit comments

Comments
 (0)