diff --git a/.gitignore b/.gitignore index bb631a0971..b89c0e745f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,10 @@ tmp/ log.txt *.log +## Build +/dist +montage.min.js + ## jsdoc /doc diff --git a/.jshintignore b/.jshintignore index f3bb5771d4..fdadfade24 100644 --- a/.jshintignore +++ b/.jshintignore @@ -3,3 +3,6 @@ **/test/spec/** **/report/** **/tools/** +montage.min.js +montage2.js +webpack.config.js \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b6c851687e..7c5abfa824 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,19 @@ language: node_js node_js: - "4" -# - "8" + - "6" + - "8" + - "10" script: npm run $COMMAND env: - COMMAND=lint + - COMMAND=build - COMMAND=test - COMMAND=test:karma-travis #- COMMAND=integration MONTAGE_VERSION=. MOP_VERSION=0.13 #- COMMAND=integration MONTAGE_VERSION=. MOP_VERSION=latest - - COMMAND=integration MONTAGE_VERSION=. MOP_VERSION="#master" + - COMMAND=integration MONTAGE_VERSION=. MOP_VERSION="#commonjs" before_install: - - "npm set legacy-bundling=true" - export CHROME_BIN=chromium-browser - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start diff --git a/composer/press-composer.info/sample/index.html b/composer/press-composer.info/sample/index.html index 300157f913..d27881b1b8 100644 --- a/composer/press-composer.info/sample/index.html +++ b/composer/press-composer.info/sample/index.html @@ -4,7 +4,7 @@