Skip to content
This repository was archived by the owner on Oct 5, 2020. It is now read-only.

Commit f2072d6

Browse files
committed
Found some last minute bugs
1 parent 103a3b0 commit f2072d6

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

app/templates/_gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ node_modules
22
bower_components
33
coverage
44
ui/fonts
5-
ui/styles/*.css
65
deploy/local.properties
76
local.json
87
/dist

app/templates/gulpfile.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ function init(env, done) {
556556
var marklogicAdminUser = properties['ml.user'] || localMlAdminUser || 'admin';
557557
var appName = properties['ml.app-name'] || localAppName;
558558
var appUserName = properties['ml.default-user'] || localMlAppUser;
559-
var appUserPass = properties['ml.appuser-password'] || localMlAppPass;
559+
var appUserPass = unescape(properties['ml.appuser-password']) || localMlAppPass;
560560
var appPort = localMlHttpPort || properties['ml.app-port'] || 8040;
561561
var xccPort = localMlXccPort || properties['ml.xcc-port'] || 8041;
562562

@@ -663,6 +663,10 @@ function init(env, done) {
663663
});
664664
}
665665
}
666+
// bypass Roxy bug that causes special XML chars to get escaped as entities
667+
function unescape(s) {
668+
return s.replace('&apos;', '\'').replace('&quot;', '"').replace('&lt;', '<').replace('&gt;', '>').replace('&amp;', '&').replace('{{', '{').replace('}}', '}');
669+
}
666670

667671
/**
668672
* Inject files in a sorted sequence at a specified inject label

app/templates/node-server/node-app.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ console.log('PORT=' + port);
2828
console.log('NODE_ENV=' + environment);
2929

3030
switch (environment){
31-
case 'build':
31+
case 'prod':
32+
case 'dev':
3233
console.log('** BUILD **');
3334
app.use(express.static('./dist/'));
3435
// Any invalid calls for templateUrls are under app/* and should return 404

app/templates/node-server/utils/options.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ var config = require('../../gulp.config')();
77
module.exports = function(){
88

99
var environment = process.env.NODE_ENV;
10-
var envJson = getEnvOptions(environment === 'build' ? 'prod' : 'local');
10+
environment = environment === 'build' ? 'prod' : environment;
11+
12+
var envJson = getEnvOptions(environment);
1113

1214
var options = {
1315
env: environment,

0 commit comments

Comments
 (0)