Skip to content

Commit

Permalink
git subrepo pull --branch=master ui
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "ui"
  merged:   "266410f"
upstream:
  origin:   "git@github.com:crowdfavorite/wp-capsule-ui.git"
  branch:   "master"
  commit:   "266410f"
git-subrepo:
  version:  "0.4.0"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "74339e8"
  • Loading branch information
cristirusu committed Mar 12, 2018
1 parent 0a41b65 commit b2d0a88
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions ui/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = git@github.com:crowdfavorite/wp-capsule-ui.git
branch = master
commit = 4a1c31e4ed58f5c201c0ab4b6a3b86ae030c0107
parent = b896aca68aba14b4b06f5c90a5acf47ce42ce190
commit = 266410fdd6d76ac207cbd0d806c036b34282ec95
parent = 0a41b65c7f1d7d2d73795c7659fd590a2c7c34ac
method = merge
cmdver = 0.4.0
4 changes: 2 additions & 2 deletions ui/Cakefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
###

requirejs = require 'requirejs'
{minify} = require 'uglify-js'
uglifyjs = require 'uglify-js'
fs = require 'fs'
temp = require 'temp'

Expand Down Expand Up @@ -116,7 +116,7 @@ concatAppJS = (outfile = './assets/js/optimized.js') ->
console.log "concatenating #{jsfile} - #{stats.size} bytes"
fs.appendFileSync(outfile, fs.readFileSync(jsfile))
else
min = minify(jsfile, uglifyOptions).code
min = uglifyjs.minify(fs.readFileSync(jsfile, 'utf8')).code
console.log "minifying #{jsfile} - #{stats.size} bytes became #{min.length} bytes"
fs.appendFileSync(outfile, min)
min = null
Expand Down
16 changes: 8 additions & 8 deletions ui/assets/js/optimized.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b2d0a88

Please sign in to comment.