Browse Source

Make build system great again, yet again

Artur Paikin 9 years ago
parent
commit
d3cb24582a
4 changed files with 6 additions and 7 deletions
  1. 1 1
      bin/build-umd
  2. 3 3
      package.json
  3. 2 0
      website/_config.yml
  4. 0 3
      website/build-examples.js

+ 1 - 1
bin/build-umd

@@ -13,7 +13,7 @@ SRC="src/index.js"
 OUT="${OUT:-uppy.js}"
 OUTDIR="dist"
 
-FLAGS="-t ejsify -t babelify --standalone Uppy"
+FLAGS="-t [ babelify ] --standalone Uppy"
 
 mkdir -p "${OUTDIR}"
 

+ 3 - 3
package.json

@@ -29,9 +29,9 @@
     "web:clean": "cd website && ./node_modules/.bin/hexo clean",
     "web:deploy": "npm run web:install && npm run web:disc && npm run docs && npm run web:build && ./bin/web-deploy",
     "web:disc": "npm run build:umd:fullpath && discify dist/uppy-fp.js --output website/src/_disc.html && echo '---\nlayout: false\n---\n' |cat - website/src/_disc.html > website/src/disc.html && rm website/src/_disc.html",
-    "web:fast": "cd website && node build-examples.js && ./node_modules/.bin/hexo server --debug",
-    "web:install": "cd website && rm -rf node_modules/hexo-renderer-uppyexamples && npm install",
-    "web:preview": "cd website && ./node_modules/.bin/hexo server --debug",
+    "web:fast": "cd website && parallelshell 'node build-examples.js watch' './node_modules/.bin/hexo server --debug'",
+    "web:install": "cd website && npm install",
+    "web:preview": "cd website && parallelshell 'node build-examples.js watch' './node_modules/.bin/hexo server --debug'",
     "web:update:frontpage:code:sample": "cd website && ./node_modules/.bin/hexo generate && cp -f public/frontpage-code-sample.html ./themes/uppy/layout/partials/frontpage-code-sample.html",
     "web": "npm run web:install && npm run web:clean && npm run web:build && npm run web:preview"
   },

+ 2 - 0
website/_config.yml

@@ -141,3 +141,5 @@ browsersync:
 skip_render:
   - '*.js'
   - '**/*.js'
+  - '*.es6'
+  - '**/*.es6'

+ 0 - 3
website/build-examples.js

@@ -27,8 +27,6 @@ var path = require('path')
 var mkdirp = require('mkdirp')
 var notifier = require('node-notifier')
 var babelify = require('babelify')
-// var hbsfy = require('hbsfy')
-var ejsify = require('ejsify')
 var browserify = require('browserify')
 var watchify = require('watchify')
 
@@ -76,7 +74,6 @@ glob(srcPattern, function (err, files) {
       .require(uppyRoot + '/src/index.js', { expose: 'uppy' })
       .require(uppyRoot + '/src/core/index.js', { expose: 'uppy/core' })
       .require(uppyRoot + '/src/plugins/index.js', { expose: 'uppy/plugins' })
-      .transform(ejsify)
       .transform(babelify)
 
     // Listeners for changes, errors, and completion.