couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject fauxton commit: updated refs/heads/master to 75b0b11
Date Thu, 14 Jan 2016 08:35:28 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master fa6a30e30 -> 75b0b11da


fix production build

- prepend and append additional dependencies

PR: #603
PR-URL: https://github.com/apache/couchdb-fauxton/pull/603
Reviewed-By: Benjamin Keen <ben.keen@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/75b0b11d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/75b0b11d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/75b0b11d

Branch: refs/heads/master
Commit: 75b0b11da3fe63c0cdef223311072c72d5660b90
Parents: fa6a30e
Author: Robert Kowalski <robertkowalski@apache.org>
Authored: Wed Jan 13 15:33:08 2016 +0100
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Thu Jan 14 09:37:09 2016 +0100

----------------------------------------------------------------------
 Gruntfile.js | 4 ++--
 package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/75b0b11d/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index b42a8e5..8ecf193 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -144,8 +144,8 @@ module.exports = function (grunt) {
     // index.html.
     concat: {
       requirejs: {
-        src: ["assets/js/libs/require.js", 'dist/tmp-out/templates.js', 'dist/tmp-out/require.js'],
-        dest: 'dist/tmp-out/require.js'
+        src: ['assets/js/libs/require.js', 'dist/tmp-out/templates.js', 'dist/tmp-out/require-max.js'],
+        dest: 'dist/tmp-out/require-max-concat.js'
       },
 
       test_config_js: {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/75b0b11d/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index c63b5d6..5cdc7d9 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "build:less:debug": "mkdirp ./dist/debug/dashboard.assets/css && node ./build-helper/less.js
dist/debug/dashboard.assets/css/index.css",
     "build:less:release": "mkdirp ./dist/tmp-out && node ./build-helper/less.js dist/tmp-out/index-max.css",
     "build:css-compress": "mkdirp ./dist/release/dashboard.assets/css/ && cleancss
--skip-rebase -o dist/tmp-out/index.css dist/tmp-out/index-max.css",
-    "build:uglify": "mkdirp ./dist/release/dashboard.assets/js/ && uglifyjs --mangle
--compress=warnings=false --screw-ie8 -o dist/tmp-out/require.js dist/tmp-out/require.js",
+    "build:uglify": "mkdirp ./dist/release/dashboard.assets/js/ && uglifyjs --mangle
--compress=warnings=false --screw-ie8 -o dist/tmp-out/require.js dist/tmp-out/require-max-concat.js",
     "build:requirejs:production": "mkdirp ./dist/tmp-out && r.js -o out=dist/tmp-out/require-max.js
baseUrl=app mainConfigFile=app/config.js name=config optimize=none wrap=false findNestedDependencies=true",
     "test": "grunt test",
     "couchdebug": "grunt couchdebug",


Mime
View raw message