run js before css

pull/1436/head
Min RK 10 years ago
parent 4c7f5972e1
commit 2ced11ff9c

@ -26,7 +26,7 @@ before_install:
- nvm install 5.6
- nvm use 5.6
- npm upgrade -g npm
- npm install
- npm install && npm run bower
- 'if [[ $GROUP == js* ]]; then npm install -g casperjs@1.1.0-beta5; fi'
- git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels

@ -12,7 +12,7 @@
"lint": "eslint --quiet notebook/",
"bower": "bower install --allow-root --config.interactive=false",
"build:watch": "concurrent \"npm run build:css:watch\" \"npm run build:js:watch\"",
"build": "npm run build:css && npm run build:js",
"build": "npm run build:js && npm run build:css",
"build:css": "concurrent 'npm run build:css:ipython' 'npm run build:css:style'",
"build:css:ipython": "lessc --source-map --include-path=notebook/static notebook/static/style/ipython.less notebook/static/style/ipython.min.css",
"build:css:style": "lessc --source-map --include-path=notebook/static notebook/static/style/style.less notebook/static/style/style.min.css",

@ -530,8 +530,8 @@ def css_js_prerelease(command, strict=False):
return
try:
self.distribution.run_command('css')
self.distribution.run_command('js')
self.distribution.run_command('css')
except Exception as e:
# refresh missing
missing = [ t for t in targets if not os.path.exists(t) ]

Loading…
Cancel
Save