Skip to content

Commit

Permalink
Merge pull request #160 from SpringRoll/release/2.4.4
Browse files Browse the repository at this point in the history
quick version update to fix release
  • Loading branch information
902seanryan authored Jul 12, 2023
2 parents d009787 + 62b37db commit 0d7a262
Show file tree
Hide file tree
Showing 11 changed files with 10,150 additions and 550 deletions.
2 changes: 1 addition & 1 deletion dist/SpringRoll-Container-umd.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/SpringRoll-Container-umd.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions karma.conf.bs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const [umd] = require('./rollup.config');
require('dotenv').config();
// const [umd] = require('./rollup.config.mjs');
import { umd } from './rollup.config.mjs';
// require('dotenv').config();
module.exports = function(config) {
config.set({
customLaunchers: {
Expand Down
3 changes: 2 additions & 1 deletion karma.conf.e2e.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const [umd] = require('./rollup.config');
// const [umd] = require('./rollup.config.mjs');
import { umd } from './rollup.config.mjs';
module.exports = function(config) {
config.set({
frameworks: ['mocha', 'chai'],
Expand Down
20 changes: 15 additions & 5 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
const [umd] = require('./rollup.config');

module.exports = function(config) {
config.set({
frameworks: ['mocha', 'chai'],
frameworks: ['mocha','chai', 'webpack'],
plugins: [
'karma-webpack',
'karma-mocha',
'karma-chai',
'karma-chrome-launcher',
'karma-firefox-launcher'
],
files: [{ pattern: 'src/index.spec.js', watched: true }],
preprocessors: { 'src/**/*.js': ['babel', 'rollup'] },
rollupPreprocessor: umd,
preprocessors: { 'src/**/*.js': ['webpack'] },
reporters: ['progress'],
port: 9876, // karma web server port
colors: true,
logLevel: config.LOG_INFO,
browsers: ['ChromeHeadless', 'FirefoxHeadless'],
autoWatch: true,
concurrency: Infinity
concurrency: Infinity,
webpack: {
// karma watches the test entry points
stats: 'errors-only'
},
});
};
Loading

0 comments on commit 0d7a262

Please sign in to comment.