Fix svg2png in tests, update node deps

main
DaAwesomeP 8 years ago
parent 32f99b0641
commit 8b196cc2e5

@ -1,6 +1,7 @@
language: node_js language: node_js
node_js: node_js:
- "4" - "4"
- "node"
sudo: false sudo: false
before_install: before_install:
- export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR - export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR

@ -42,7 +42,7 @@ do
dest="$WAPPALYZER_ROOT/src/icons/converted/$(basename "$svg").png" dest="$WAPPALYZER_ROOT/src/icons/converted/$(basename "$svg").png"
if [[ ! -f "$dest" ]]; then if [[ ! -f "$dest" ]]; then
svg2png "$svg" --width=32 --height=32 --output "$dest" || true node $WAPPALYZER_NODE_PATH/node_modules/svg2png/bin/svg2png-cli "$svg" --width=32 --height=32 --output "$dest" || true
fi fi
done done

@ -39,7 +39,6 @@ RUN su wappalyzer -c "mkdir $WAPPALYZER_NODE_PATH"
ADD node/package.json $WAPPALYZER_NODE_PATH/package.json ADD node/package.json $WAPPALYZER_NODE_PATH/package.json
RUN npm i -g npm svg2png --prefix=/usr/local
RUN ln -s -f /usr/local/bin/npm /usr/bin/npm RUN ln -s -f /usr/local/bin/npm /usr/bin/npm
RUN su wappalyzer -c "cd $WAPPALYZER_NODE_PATH && npm i" RUN su wappalyzer -c "cd $WAPPALYZER_NODE_PATH && npm i"

@ -12,13 +12,14 @@
"test": "./bin/wappalyzer build" "test": "./bin/wappalyzer build"
}, },
"devDependencies": { "devDependencies": {
"file-type": "3.4.*", "file-type": "3.8.*",
"is-svg": "1.1.*", "is-svg": "2.0.*",
"read-chunk": "1.0.*", "read-chunk": "2.0.*",
"jsonlint": "*", "jsonlint": "*",
"jpm": "*", "jpm": "*",
"imagemin-cli": "*", "imagemin-cli": "*",
"phantomjs-prebuilt": "*", "phantomjs-prebuilt": "*",
"svg2png": "*",
"svgo": "*" "svgo": "*"
}, },
"engines": { "engines": {

Loading…
Cancel
Save