Commit 95c4c812 authored by Sascha Herzinger's avatar Sascha Herzinger
Browse files

#21

parent 8cf03d03
......@@ -8,11 +8,11 @@
"safari >= 11"
]
},
"modules": "commonjs"
"modules": false
}]
],
"plugins": [
"@babel/plugin-transform-runtime",
"@babel/plugin-proposal-object-rest-spread"
]
}
\ No newline at end of file
}
[bumpversion]
current_version = 1.2.1
current_version = 1.2.2
commit = True
tag = True
[bumpversion:file:package.json]
parse = '"version": "(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)",$'
parse = '(("version": ")|("main": "\./lib/fractal-)|("module": "\./lib/fractal-))(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?:\.min\.js)|)"'
src/
test/
node_modules/
.idea
.eslintrc
.babelrc
.gitignore
.gitlab-ci.yml
.bumpversion.cfg
karma.conf.js
webpack.config.js
{
"name": "fractalis",
"version": "1.1.0",
"version": "1.2.2-test-1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......@@ -672,7 +672,6 @@
"version": "7.0.0-beta.46",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.46.tgz",
"integrity": "sha512-/3a3USMKk54BEHhDgY8rtxtaQOs4bp4aQwo6SDtdwmrXmgSgEusWuXNX5oIs/nwzmTD9o8wz2EyAjA+uHDMmJA==",
"dev": true,
"requires": {
"core-js": "^2.5.3",
"regenerator-runtime": "^0.11.1"
......@@ -3235,8 +3234,7 @@
"core-js": {
"version": "2.5.3",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
"integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=",
"dev": true
"integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4="
},
"core-util-is": {
"version": "1.0.2",
......@@ -5220,6 +5218,25 @@
"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
"dev": true
},
"fractalis": {
"version": "1.2.2-test-1",
"resolved": "https://registry.npmjs.org/fractalis/-/fractalis-1.2.2-test-1.tgz",
"integrity": "sha512-0IV+c+zWasPVgYGh9K+FrPMuyFI8YUeekcvsgjj6OEPVp5VYSSRa1v4rATCidVdXlsRsHwV44EeVpDmF+r2u9A==",
"requires": {
"@babel/runtime": "7.0.0-beta.46",
"axios": "0.16.1",
"d3": "4.13.0",
"deep-freeze-strict": "1.1.1",
"html2canvas": "1.0.0-alpha.12",
"lodash": "4.17.5",
"resize-observer-polyfill": "1.5.0",
"tippy.js": "2.2.2",
"uuid": "3.2.1",
"vue": "2.5.13",
"vue-async-computed": "3.3.1",
"vuex": "3.0.1"
}
},
"fragment-cache": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
......@@ -17156,8 +17173,7 @@
"regenerator-runtime": {
"version": "0.11.1",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
"dev": true
"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
},
"regenerator-transform": {
"version": "0.12.3",
......
{
"name": "fractalis",
"description": "The front-end component of the Fractalis visual analytics project.",
"version": "1.2.1",
"version": "1.2.2",
"author": "Sascha Herzinger <sascha.herzinger@uni.lu>",
"license": "Apache-2.0",
"bugs": {
......@@ -13,11 +13,13 @@
"url": "https://git-r3lab.uni.lu/Fractalis/fractal.js.git"
},
"scripts": {
"build": "./node_modules/webpack/bin/webpack.js --config webpack.config.js --mode production",
"devserver": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --config webpack.config.js --mode development",
"test": "./node_modules/karma/bin/karma start karma.conf.js"
"build": "webpack --config webpack.config.js --mode production",
"prepublishOnly": "npm run-script build",
"devserver": "webpack-dev-server --config webpack.config.js --mode development",
"test": "karma start karma.conf.js"
},
"main": "src/main.js",
"main": "./lib/fractal-1.2.2.min.js",
"module": "./lib/fractal-1.2.2.min.js",
"dependencies": {
"axios": "0.16.1",
"d3": "4.13.0",
......@@ -29,14 +31,14 @@
"uuid": "3.2.1",
"vue": "2.5.13",
"vue-async-computed": "3.3.1",
"vuex": "3.0.1"
"vuex": "3.0.1",
"@babel/runtime": "7.0.0-beta.46"
},
"devDependencies": {
"@babel/core": "7.0.0-beta.46",
"@babel/plugin-proposal-object-rest-spread": "7.0.0-beta.46",
"@babel/plugin-transform-runtime": "7.0.0-beta.46",
"@babel/preset-env": "7.0.0-beta.46",
"@babel/runtime": "7.0.0-beta.46",
"babel-loader": "8.0.0-beta.2",
"css-loader": "1.0.0",
"devbridge-autocomplete": "1.4.7",
......
......@@ -3,38 +3,13 @@ const path = require('path')
const mode = require('yargs').argv.mode
const VERSION = require('./package.json').version
let plugins = [
new webpack.HotModuleReplacementPlugin()
]
let filename = ''
const library = 'fractal'
if (mode === 'production') {
filename = `${library}-${VERSION}.min.js`
} else {
filename = `${library}.js`
}
module.exports = {
entry: [
path.resolve(__dirname, 'src/main.js')
],
devtool: '#source-map',
devServer: {
host: '0.0.0.0',
port: '8080',
hot: true,
inline: true,
publicPath: 'http://127.0.0.1:8080/',
headers: { 'Access-Control-Allow-Origin': '*' }
},
plugins: plugins,
entry: './src/main.js',
output: {
path: path.resolve(__dirname, 'lib'),
library: library,
library: 'fractal',
libraryTarget: 'var',
filename: filename,
publicPath: 'http://localhost:8080/',
filename: mode === 'production' ? `fractal-${VERSION}.min.js` : `fractal.js`,
hotUpdateChunkFilename: 'hot/hot-update.js',
hotUpdateMainFilename: 'hot/hot-update.json'
},
......@@ -67,5 +42,21 @@ module.exports = {
'vue$': 'vue/dist/vue.esm.js',
'assets': path.resolve(__dirname, 'src/assets')
}
}
},
performance: {
hints: false
},
devtool: '#source-map',
context: __dirname,
target: 'web',
devServer: {
host: '0.0.0.0',
port: '8080',
hot: true,
inline: true,
headers: { 'Access-Control-Allow-Origin': '*' }
},
plugins: [
new webpack.HotModuleReplacementPlugin()
]
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment