Harmonization with IVIS

This commit is contained in:
Tomas Bures 2019-01-04 21:31:01 +01:00
parent 428fb9db7b
commit 397f85dac4
41 changed files with 8587 additions and 10940 deletions

File diff suppressed because it is too large Load diff

View file

@ -10,23 +10,22 @@
"author": "Tomas Bures",
"license": "MIT",
"devDependencies": {
"babel-cli": "^6.24.1",
"babel-core": "^6",
"babel-loader": "^7.1.1",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-function-bind": "^6.22.0",
"babel-preset-env": "^1.6.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-1": "^6.24.1",
"css-loader": "^0.28.5",
"file-loader": "^0.11.2",
"i18next-conv": "^3.0.3",
"imports-loader": "^0.7.1",
"node-sass": "^4.5.3",
"sass-loader": "^6.0.6",
"style-loader": "^0.18.2",
"@babel/cli": "^7.2.3",
"@babel/core": "^7.2.2",
"@babel/plugin-proposal-class-properties": "^7.2.3",
"@babel/plugin-proposal-decorators": "^7.2.3",
"@babel/plugin-proposal-function-bind": "^7.2.0",
"@babel/preset-env": "^7.2.3",
"@babel/preset-react": "^7.0.0",
"babel-loader": "^8.0.4",
"css-loader": "^2.1.0",
"file-loader": "^3.0.1",
"node-sass": "^4.11.0",
"sass-loader": "^7.1.0",
"style-loader": "^0.23.1",
"url-loader": "^1.1.2",
"webpack": "^3.5.5"
"webpack": "^4.28.3",
"webpack-cli": "^3.2.0"
},
"optionalDependencies": {},
"dependencies": {}

View file

@ -3,7 +3,7 @@ const path = require('path');
const webpackConf = require('../ivis-core/client/webpack.config');
webpackConf.resolve.modules = ['node_modules', '../ivis-core/client/node_modules', './src/bimlib'];
webpackConf.resolve.modules = ['node_modules', '../ivis-core/client/node_modules'];
webpackConf.entry = {
'index-trusted': ['babel-polyfill', './src/root-trusted.js'],
'index-sandbox': ['babel-polyfill', '../ivis-core/client/src/root-sandbox.js']

File diff suppressed because it is too large Load diff

View file

@ -7,14 +7,14 @@
"author": "Tomas Bures",
"license": "MIT",
"engines": {
"node": ">=7.1.0"
"node": ">=10.0.0"
},
"devDependencies": {},
"optionalDependencies": {},
"dependencies": {
"axios": "^0.16.2",
"axios": "^0.18.0",
"js-yaml": "^3.12.0",
"knex": "^0.13.0",
"knex": "^0.16.3",
"moment": "^2.18.1",
"moment-timezone": "^0.5.21",
"mysql2": "^1.3.5",

View file

@ -42,11 +42,11 @@
}
},
"axios": {
"version": "0.16.2",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.16.2.tgz",
"integrity": "sha1-uk+S8XFn37q0CYN4VFS5rBScPG0=",
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz",
"integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=",
"requires": {
"follow-redirects": "^1.2.3",
"follow-redirects": "^1.3.0",
"is-buffer": "^1.1.5"
}
},
@ -259,9 +259,9 @@
}
},
"follow-redirects": {
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz",
"integrity": "sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ==",
"requires": {
"debug": "=3.1.0"
}

View file

@ -7,12 +7,12 @@
"author": "Tomas Bures",
"license": "MIT",
"engines": {
"node": ">=7.1.0"
"node": ">=10.0.0"
},
"devDependencies": {},
"optionalDependencies": {},
"dependencies": {
"axios": "^0.16.2",
"axios": "^0.18.0",
"express": "^4.15.2",
"handlebars": "^4.0.11",
"hbs": "^4.0.1"