Skip to content

Commit 1114d81

Browse files
committed
Fixes requirejs/requirejs#1463, allow wrap.start/endFile to be arrays on command line
1 parent 4119fdd commit 1114d81

File tree

6 files changed

+26
-1
lines changed

6 files changed

+26
-1
lines changed

build/jslib/build.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,9 @@ define(function (require) {
855855
"insertRequire": true,
856856
"stubModules": true,
857857
"deps": true,
858-
"mainConfigFile": true
858+
"mainConfigFile": true,
859+
"wrap.startFile": true,
860+
"wrap.endFile": true
859861
};
860862

861863
for (i = 0; i < ary.length; i++) {

build/tests/builds.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,25 @@ define(['build', 'env!env/file', 'env', 'lang'], function (build, file, env, lan
146146
);
147147
doh.run();
148148

149+
doh.register("buildOneJsFileWrappedArray",
150+
[
151+
function buildOneJsFileWrappedArray(t) {
152+
build(["name=one", "include=dimple", "out=builds/outSingleWrapArray.js",
153+
"baseUrl=../../../requirejs/tests", "optimize=none",
154+
"wrap.startFile=support/wrap/pre1.js,support/wrap/pre2.js",
155+
"wrap.endFile=support/wrap/post1.js,support/wrap/post2.js"]);
156+
157+
t.is(nol("//pre1.js//pre2.js" + oneResult + "//post1.js//post2.js"),
158+
nol(c("builds/outSingleWrapArray.js")));
159+
160+
//Reset require internal state for the contexts so future
161+
//builds in these tests will work correctly.
162+
require._buildReset();
163+
}
164+
]
165+
);
166+
doh.run();
167+
149168
doh.register("buildOneJsFileWrappedTrue",
150169
[
151170
function buildOneJsFile(t) {

build/tests/support/wrap/post1.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
//post1.js

build/tests/support/wrap/post2.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
//post2.js

build/tests/support/wrap/pre1.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
//pre1.js

build/tests/support/wrap/pre2.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
//pre2.js

0 commit comments

Comments
 (0)