diff options
Diffstat (limited to '')
| -rw-r--r-- | package.json | 3 | ||||
| -rw-r--r-- | public/js/history.js | 2 | ||||
| -rw-r--r-- | public/js/index.js | 1 | ||||
| -rw-r--r-- | webpack.config.js | 125 |
4 files changed, 72 insertions, 59 deletions
diff --git a/package.json b/package.json index 3c7304ed..5fa71df9 100644 --- a/package.json +++ b/package.json @@ -121,8 +121,11 @@ "bower-webpack-plugin": "^0.1.9", "css-loader": "^0.25.0", "extract-text-webpack-plugin": "^1.0.1", + "file-loader": "^0.9.0", "imports-loader": "^0.6.5", "json-loader": "^0.5.4", + "style-loader": "^0.13.1", + "url-loader": "^0.5.7", "webpack": "^1.13.2" } } diff --git a/public/js/history.js b/public/js/history.js index fbf71db7..23c7bebd 100644 --- a/public/js/history.js +++ b/public/js/history.js @@ -378,5 +378,5 @@ function parseToHistory(list, notehistory, callback) { } module.exports = { - writeHistory: writeHistory + writeHistory: writeHistory } diff --git a/public/js/index.js b/public/js/index.js index d84d0a8d..08f64d46 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -13,6 +13,7 @@ require('../vendor/showup/showup'); /* bootstrap */ require('bootstrap'); +require('bootstrap/dist/css/bootstrap.css'); /* code mirror plugins */ require('codemirror/keymap/vim'); diff --git a/webpack.config.js b/webpack.config.js index af001444..26eeed58 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,67 +3,76 @@ var path = require('path'); var ExtractTextPlugin = require("extract-text-webpack-plugin"); module.exports = { - plugins: [ - new webpack.ProvidePlugin({ - '_': 'lodash', - jquery: "jquery", - jQuery: "jquery", - $: "jquery", - "window.jQuery": "jquery", - Visibility: "visibilityjs", - Cookies: "js-cookie", - CodeMirror: "codemirror", - emojify: "emojify.js", - ot: "ot", - io: "socket.io-client", - LZString: "lz-string", - key: "keymaster" - }), - new webpack.DefinePlugin({ - "require.specified": "require.resolve" - }) - ], + plugins: [ + new webpack.ProvidePlugin({ + '_': 'lodash', + jquery: "jquery", + jQuery: "jquery", + $: "jquery", + "window.jQuery": "jquery", + Visibility: "visibilityjs", + Cookies: "js-cookie", + CodeMirror: "codemirror", + emojify: "emojify.js", + ot: "ot", + io: "socket.io-client", + LZString: "lz-string", + key: "keymaster" + }), + new webpack.DefinePlugin({ + "require.specified": "require.resolve" + }) + ], - entry: { - app: path.join(__dirname, 'public/js/app.js') - }, + entry: { + app: path.join(__dirname, 'public/js/app.js') + }, - output: { - path: path.join(__dirname, 'public/build/js'), - filename: '[name].js' - }, + output: { + path: path.join(__dirname, 'public/build/js'), + filename: '[name].js' + }, - resolve: { - root: [ - path.resolve(__dirname, 'src'), - path.resolve(__dirname, 'node_modules') - ], - extensions: ["", ".js"], - alias: { - 'jquery-ui': 'jquery-ui/ui/widgets' - } - }, + resolve: { + root: [ + path.resolve(__dirname, 'src'), + path.resolve(__dirname, 'node_modules') + ], + extensions: ["", ".js"], + alias: { + 'jquery-ui': 'jquery-ui/ui/widgets' + } + }, - module: { - loaders: [{ - test: /\.json$/, - loader: 'json-loader' - }, { - test: /\.css$/, - loader: ExtractTextPlugin.extract({ - fallbackLoader: "style-loader", - loader: "css-loader" - }) - }, { - test: /\.scss$/, - loaders: ['style', 'css', 'sass'] - }, { - test: require.resolve("js-sequence-diagrams"), - loader: "imports?Raphael=raphael" - }] - }, + module: { + loaders: [{ + test: /\.json$/, + loader: 'json-loader' + }, { + test: /\.css$/, + loader: 'style-loader!css-loader' + }, , { + test: /\.scss$/, + loaders: ['style', 'css', 'sass'] + }, { + test: require.resolve("js-sequence-diagrams"), + loader: "imports?Raphael=raphael" + }, { + test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, + loader: "file" + }, { + test: /\.(woff|woff2)$/, + loader: "url?prefix=font/&limit=5000" + }, { + test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, + loader: "url?limit=10000&mimetype=application/octet-stream" + }, { + test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, + loader: "url?limit=10000&mimetype=image/svg+xml" + }] + }, - node: { - fs: "empty" - } + node: { + fs: "empty" + } }; |