* feat: v5 BREAKING CHANGE: Mergely is no longer a jQuery plugin. BREAKING CHANGE: Removed `options.autoresize` BREAKING CHANGE: Removed `options.editor_width` BREAKING CHANGE: Removed `options.editor_height` BREAKING CHANGE: Removed `options.fadein` BREAKING CHANGE: Removed `options.fgcolor` BREAKING CHANGE: Removed `options.resize` BREAKING CHANGE: Removed `options.width` BREAKING CHANGE: Removed `options.height` BREAKING CHANGE: Removed `options.loaded` callback BREAKING CHANGE: Removed `options.resized` callback BREAKING CHANGE: Removed styles `.mergely-resizer`, `.mergely-full-screen-0`, and `.mergely-full-screen-8` BREAKING CHANGE: Changed default for `options.change_timeout` changed from `150` to `50`. BREAKING CHANGE: No longer automatically scrolls to first change. feat: CodeMirror is now an explicit dependency. feat: No longer necessary to separately require codemirror/addon/search/searchcursor feat: No longer necessary to separately require codemirror/addon/selection/mark-selection feat: `mergely.js` is now unminimized, and added new minimized version `mergely.min.js` feat: Gutter click now scrolls to any line feat: Mergely now emits `resize` event on resize feat: The UI is now non-blocking as diff now runs in background feat: Added support to provide `options.lhs` and `options.rhs` as strings feat: #16 added titles to editor.mergely.com fix: #165 block of changes at end of file are now distinguishable fix: #140 fixed performance issue with large files fix: Fixed issue where canvas markup was not rendered when `viewport` enabled fix: Fixed timing issue where swap sides may not work as expected. fix: Fixed issue where unmarkup did not emit an updated event. fix: Fixed documentation issue where `merge` incorrectly stated: from the specified `side` to the opposite side. fix: Fixed performance issue scrolling fix: Fixed issue where initial render scrolled to first change, showing it at the bottom (as opposed to middle as expected) fix: Fixed issue where line-diffs failed to diff non-alphanumeric characters * chore: tweaked no-start/end styles * feat: dark mode * chore: updated examples * chore(ci): updated webpack * chore(ci): alpha, beta, next branches * chore(ci): test * chore(ci): package-lock.json * chore(ci): ignore alpha, beta, next on branch * fix: fixes firefox scroll-linked effect issue * fix: fixes firefox scroll-linked effect issue * chore: fix css * chore: debug
80 lines
1.5 KiB
JavaScript
80 lines
1.5 KiB
JavaScript
const path = require('path')
|
|
const HtmlWebpackPlugin = require('html-webpack-plugin');
|
|
|
|
module.exports = {
|
|
mode: 'development',
|
|
|
|
module: {
|
|
rules: [{
|
|
test: /worker/,
|
|
loader: 'worker-loader',
|
|
options: { inline: 'no-fallback' }
|
|
}, {
|
|
include: [
|
|
path.resolve(__dirname, 'src'),
|
|
path.resolve(__dirname, 'examples')
|
|
],
|
|
test: /\.js$/
|
|
}, {
|
|
test: /\.css$/,
|
|
use: [{
|
|
loader: 'style-loader'
|
|
}, {
|
|
loader: 'css-loader'
|
|
}]
|
|
}]
|
|
},
|
|
|
|
resolve: {
|
|
extensions: ['.js'],
|
|
alias: {
|
|
CodeMirror: path.join(__dirname, 'node_modules', 'codemirror')
|
|
}
|
|
},
|
|
|
|
plugins: [
|
|
new HtmlWebpackPlugin({
|
|
template: path.join(__dirname, 'examples', 'app.html'),
|
|
filename: 'app.html',
|
|
inject: true,
|
|
chunks: [ 'app' ],
|
|
}),
|
|
new HtmlWebpackPlugin({
|
|
template: path.join(__dirname, 'examples', 'app-styles.html'),
|
|
filename: 'app-styles.html',
|
|
inject: true,
|
|
chunks: [ 'styles' ],
|
|
}),
|
|
{
|
|
apply: (compiler) => {
|
|
compiler.hooks.entryOption.tap('MyPlugin', (context, entry) => {
|
|
console.log('-'.repeat(78));
|
|
console.log('Applications:');
|
|
console.log('http://localhost:8080/app.html');
|
|
console.log('http://localhost:8080/app-styles.html');
|
|
console.log('-'.repeat(78));
|
|
});
|
|
}
|
|
}
|
|
],
|
|
|
|
entry: {
|
|
app: [
|
|
'./examples/app.js',
|
|
'./src/mergely'
|
|
],
|
|
styles: [
|
|
'./examples/app-styles.js',
|
|
'./src/mergely'
|
|
]
|
|
},
|
|
|
|
output: {
|
|
filename: '[name].mergely.js'
|
|
},
|
|
|
|
optimization: {
|
|
chunkIds: 'named'
|
|
}
|
|
}
|