Merge branch 'master' of git.noarch.de:hardi/opt-cc into feature/statistic-charts

pull/2/head
Florian Hartwich 2017-07-29 16:50:42 +02:00
commit 85b192ad39
4 changed files with 13 additions and 5 deletions

View File

@ -8,4 +8,5 @@ for i in "${FILES[@]}"
do do
echo "minify ${i} ..." echo "minify ${i} ..."
$(npm bin)/uglifyjs public/${i}.bundle.js ${OPTIONS} -o public/${i}.bundle.js $(npm bin)/uglifyjs public/${i}.bundle.js ${OPTIONS} -o public/${i}.bundle.js
rm -f public/${i}.bundle.js.map
done done

12
package-lock.json generated
View File

@ -128,7 +128,8 @@
"commander": { "commander": {
"version": "2.6.0", "version": "2.6.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
"integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=" "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=",
"dev": true
}, },
"concurrently": { "concurrently": {
"version": "3.5.0", "version": "3.5.0",
@ -631,8 +632,15 @@
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.26.tgz", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.26.tgz",
"integrity": "sha512-+D/BjzuvT1oRMSkH0fuF3M/BCvDxDywmZasd1UTPPHsdsHZqJEAZSvrojgFlS7lrM3ZZWq5h7Bb5i96X1TbOJw==", "integrity": "sha512-+D/BjzuvT1oRMSkH0fuF3M/BCvDxDywmZasd1UTPPHsdsHZqJEAZSvrojgFlS7lrM3ZZWq5h7Bb5i96X1TbOJw==",
"requires": { "requires": {
"commander": "2.6.0", "commander": "2.11.0",
"source-map": "0.5.6" "source-map": "0.5.6"
},
"dependencies": {
"commander": {
"version": "2.11.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
"integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
}
} }
}, },
"uuid": { "uuid": {

View File

@ -1,6 +1,6 @@
{ {
"name": "opt-cc", "name": "opt-cc",
"version": "1.1.2", "version": "1.1.3",
"license": "MIT", "license": "MIT",
"private": true, "private": true,
"scripts": { "scripts": {

View File

@ -51,7 +51,6 @@
"protractor": "~5.1.1", "protractor": "~5.1.1",
"protractor-jasmine2-screenshot-reporter": "^0.3.2", "protractor-jasmine2-screenshot-reporter": "^0.3.2",
"ts-node": "1.2.1", "ts-node": "1.2.1",
"tslint": "^4.3.0", "tslint": "^4.3.0"
"typescript": "^2.3.2"
} }
} }