FIX: refacto massive dependencies updates including d3js V5 * without merge regression

parent aa4c00b1
Pipeline #46115 failed with stages
in 4 minutes and 50 seconds
### v0.17.5
*👤 [1000i100](mailto:git@1000i100.fr) ⏰ 2018-04-05 10:36*
FIX: refacto massive dependencies updates including d3js V5 * without merge regression
*👤 [1000i100](mailto:git@1000i100.fr) ⏰ 2018-04-05 10:02*
# Conflicts:
......
{
"name": "mycelia-front-app",
"version": "0.17.4",
"version": "0.17.5",
"description": "Visualisation de graph sociaux",
"bin": {
"mycelia-front-srv": "srv/index.js"
......@@ -12,7 +12,7 @@
"postcommit": "node .config/autoVersionAfter.js",
"build": "npm run build.copyBase && npm run build.requirejs && npm run build.minifyjs && npm run build.stylus && npm run build.index.html && npm run build.npmPackage.json",
"build.copyBase": "mkdir -p generated.build/staticApp/ && cp -r allData generated.build/ && cp -r no-ie generated.build/ && cp -r staticApp/default generated.build/staticApp/ && cp README.md generated.build/ && cp cacheServiceWorker.js generated.build/",
"build.requirejs": "r_js -o name=main out=generated.all.js baseUrl=staticApp/ include=requireLib paths.requireLib=../node_modules/requirejs/require paths.js-yaml=../node_modules/js-yaml/dist/js-yaml paths.d3=../node_modules/d3/build/d3 paths.mathjs=../node_modules/mathjs/dist/math paths.marked=../node_modules/marked/lib/marked",
"build.requirejs": "r_js -o name=main out=generated.all.js baseUrl=staticApp/ include=requireLib paths.requireLib=../node_modules/requirejs/require paths.js-yaml=../node_modules/js-yaml/dist/js-yaml paths.d3=../node_modules/d3/dist/d3 paths.mathjs=../node_modules/mathjs/dist/math paths.marked=../node_modules/marked/lib/marked",
"build.minifyjs": "uglifyjs -c -m -o generated.build/staticApp/mycelia-front-app.full.static.min.js -- generated.all.js",
"build.stylus": "stylus --compress staticApp/default/theme/style.styl --out generated.build/staticApp/default/theme/style.css",
"build.index.html": "sed -e \"s/data-main=\\\"staticApp\\/main\\\" src=\\\"node_modules\\/requirejs\\/require.js\\\"/src=\\\"staticApp\\/mycelia-front-app.full.static.min.js\\\"/g\" index.html > generated.build/index.html",
......@@ -32,7 +32,7 @@
"data-viz",
"d3",
"d3.js",
"d3.v4",
"d3.v5",
"graph",
"mind-map"
],
......@@ -43,31 +43,31 @@
},
"homepage": "https://mycelia.tools/",
"dependencies": {
"d3": "^4.10.2",
"js-yaml": "^3.10.0",
"marked": "^0.3.6",
"mathjs": "^3.16.3",
"d3": "^5.0.0",
"js-yaml": "^3.11.0",
"marked": "^0.3.19",
"mathjs": "^4.0.1",
"requirejs": "^2.3.5"
},
"devDependencies": {
"es6-plato": "^1.0.14",
"eslint": "^3.19.0",
"es6-plato": "^1.0.17",
"eslint": "^4.19.1",
"husky": "^0.14.3",
"jasmine": "^2.8.0",
"jasmine-core": "^2.8.0",
"karma": "^1.7.1",
"jasmine": "^3.1.0",
"jasmine-core": "^3.1.0",
"karma": "^2.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.1",
"karma-coveralls": "^1.1.2",
"karma-firefox-launcher": "^1.0.1",
"karma-firefox-launcher": "^1.1.0",
"karma-jasmine": "^1.1.1",
"karma-longest-reporter": "^1.1.0",
"karma-min-reporter": "^0.1.0",
"karma-requirejs": "^1.1.0",
"node-static": "^0.7.10",
"opn": "^5.1.0",
"simple-git": "^1.77.0",
"opn": "^5.3.0",
"simple-git": "^1.92.0",
"stylus": "^0.54.5",
"uglify-es": "^3.1.2"
"uglify-es": "^3.3.9"
}
}
\ No newline at end of file
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