diff --git a/package.json b/package.json index 4fd58d5..71fbb4b 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,9 @@ "description": "JavaScript SDK for Veriff identity verification", "main": "lib/veriff.js", "scripts": { - "build": "webpack", + "build": "webpack --config webpack/prod.config.js", "dev": "webpack --progress --colors --watch --config webpack/prod.config.js", - "test": "./node_modules/karma/bin/karma start ./scripts/karma.conf.js --config webpack/prod.config.js" + "test": "./node_modules/karma/bin/karma start ./scripts/karma.conf.js" }, "author": "Ilia Aphtsiauri (https://github.com/iaptsiauri)", "keywords": [ diff --git a/scripts/karma.conf.js b/scripts/karma.conf.js index 92b9d70..71832ef 100644 --- a/scripts/karma.conf.js +++ b/scripts/karma.conf.js @@ -1,4 +1,4 @@ -const baseConfig = require('../webpack/base.config'); +const baseConfig = require('../webpack/test.config'); module.exports = function (config) { diff --git a/webpack/base.config.js b/webpack/base.config.js index abec63a..c052496 100644 --- a/webpack/base.config.js +++ b/webpack/base.config.js @@ -44,8 +44,7 @@ module.exports = { module: { loaders: [ { test: /(\.js)$/, loader: 'babel-loader', exclude: /node_modules/ }, - { test: /(\.js)$/, loader: 'eslint-loader', exclude: /node_modules/ }, - { test: /\.css$/, loader: 'style-loader!css-loader', exclude: /node_modules/ } + { test: /(\.js)$/, loader: 'eslint-loader', exclude: /node_modules/ } ] }, resolve: { diff --git a/webpack/prod.config.js b/webpack/prod.config.js index 229a899..3bc22f5 100644 --- a/webpack/prod.config.js +++ b/webpack/prod.config.js @@ -3,41 +3,43 @@ const merge = require('webpack-merge'); const baseConfig = require('./base.config.js'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); -const config = merge(baseConfig, { - entry: `${__dirname}/src/index.js`, - devtool: 'source-map', - module: { - loaders: [ - { test: /\.css$/, +const umdConfig = merge(baseConfig, { + entry: `${__dirname}/../src/index.js`, + devtool: 'source-map', + module: { + loaders: [{ + test: /\.css$/, use: ExtractTextPlugin.extract({ - fallback: "style-loader", - use: "css-loader" + fallback: "style-loader", + use: "css-loader" }) - } - ] - }, - plugins: [ - new ExtractTextPlugin("styles.css") - ] + }] + }, + plugins: [ + new ExtractTextPlugin("styles.css") + ], + output: { + path: `${__dirname}/../dist`, + filename: 'veriff.min.js', + library: libraryName, + libraryTarget: 'umd', + umdNamedDefine: true + } }); -const umdConfig = Object.assign({}, config, { - output: { - path: `${__dirname}/dist`, - filename: 'veriff.min.js', - library: libraryName, - libraryTarget: 'umd', - umdNamedDefine: true - } +const npmConfig = merge(baseConfig, { + entry: `${__dirname}/../src/index.js`, + devtool: 'source-map', + module: { + loaders: [ + { test: /\.css$/, loader: 'style-loader!css-loader', exclude: /node_modules/ } + ] + }, + output: { + path: `${__dirname}/../lib`, + filename: 'veriff.js', + libraryTarget: 'commonjs2' + } }); -const npmConfig = Object.assign({}, config, { - output: { - path: `${__dirname}/lib`, - filename: 'veriff.js', - libraryTarget: 'commonjs2' - } -}); - - -module.exports = [ umdConfig, npmConfig ]; +module.exports = [umdConfig, npmConfig]; \ No newline at end of file diff --git a/webpack/test.config.js b/webpack/test.config.js new file mode 100644 index 0000000..99bdb53 --- /dev/null +++ b/webpack/test.config.js @@ -0,0 +1,10 @@ +const merge = require('webpack-merge'); +const baseConfig = require('./base.config.js'); + +module.exports = merge(baseConfig, { + module: { + loaders: [ + { test: /\.css$/, loader: 'style-loader!css-loader', exclude: /node_modules/ } + ] + } +}); \ No newline at end of file