Parcourir la source

Small build fixes.

Renée Kooi il y a 6 ans
Parent
commit
2c67c89b8d
4 fichiers modifiés avec 7 ajouts et 5 suppressions
  1. 2 1
      bin/build-css.js
  2. 2 1
      bin/build-lib.js
  3. 1 1
      bin/gzip.js
  4. 2 2
      package.json

+ 2 - 1
bin/build-css.js

@@ -51,7 +51,8 @@ async function compileCSS () {
     })
 
     const outdir = path.join(path.dirname(file), '../dist')
-    const outfile = path.join(outdir, 'style.css')
+    // Save the `uppy` package's CSS as `uppy.css`, the rest as `style.css`.
+    const outfile = path.join(outdir, outdir.includes('packages/uppy/') ? 'uppy.css' : 'style.css')
     await mkdirp(outdir)
     await writeFile(outfile, postcssResult.css)
     console.info(

+ 2 - 1
bin/build-lib.js

@@ -1,3 +1,4 @@
+const chalk = require('chalk')
 const babel = require('babel-core')
 const { promisify } = require('util')
 const glob = promisify(require('glob'))
@@ -24,7 +25,7 @@ async function buildLib () {
       writeFile(libFile, code),
       writeFile(libFile + '.map', JSON.stringify(map))
     ])
-    console.log(libFile)
+    console.log(chalk.green('Compiled lib:'), chalk.magenta(libFile))
   }
 }
 

+ 1 - 1
bin/gzip.js

@@ -25,7 +25,7 @@ function gzip (file) {
 
 function gzipDist () {
   return new Promise(function (resolve) {
-    glob('./{,packages/uppy/}dist/**/*.*(css|js)', function (err, files) {
+    glob('./packages/uppy/dist/**/*.*(css|js)', function (err, files) {
       if (err) console.log(err)
       var gzipPromises = []
       files.forEach(function (file) {

+ 2 - 2
package.json

@@ -159,7 +159,7 @@
     "watch:js": "onchange 'packages/{@uppy/,}*/src/**/*.js' --initial --verbose -- npm run build:bundle",
     "watch": "npm-run-all --parallel watch:js watch:css",
     "watch:fast": "npm-run-all --parallel watch:css web:preview",
-    "watch:example:browsersync": "browser-sync start --server examples/bundled-example --port 3452 --serveStatic \"packages/uppy/dist, dist\" --files \"examples/bundled-example/bundle.js, dist/uppy.min.css\"",
+    "watch:example:browsersync": "browser-sync start --server examples/bundled-example --port 3452 --serveStatic packages/uppy/dist --files \"examples/bundled-example/bundle.js, packages/uppy/dist/uppy.min.css\"",
     "watch:example:js": "cd examples/bundled-example && npm run watch",
     "watch:example": "npm-run-all --parallel watch:example:js watch:css watch:example:browsersync",
     "dev": "npm-run-all --parallel watch:example:js watch:css watch:example:browsersync",
@@ -169,7 +169,7 @@
     "web:generated-docs": "cd website && node node_modules/documentation/bin/documentation.js readme ../src/index.js --readme-file=src/docs/api.md --section 'Uppy Core & Plugins' -q --github -c doc-order.json",
     "web:disc": "node ./bin/disc.js",
     "web:install": "cd website && npm install",
-    "web:bundle:update:watch": "onchange 'dist/**/*.css' 'packages/dist/**/*.js' --initial --verbose -- node website/update.js",
+    "web:bundle:update:watch": "onchange 'packages/uppy/dist/**/*.css' 'packages/uppy/dist/**/*.js' --initial --verbose -- node website/update.js",
     "web:examples:watch": "cd website && node build-examples.js watch",
     "web:serve": "cd website && ./node_modules/.bin/hexo server",
     "web:preview": "npm-run-all --parallel web:examples:watch web:bundle:update:watch web:serve",