Skip to content

Commit d3a722e

Browse files
committed
Adjust urls in builds for something.js files to be relative to the dirBaseUrl, and make sure the foo.js sample layer in the order test is properly constructed.
1 parent b3e5180 commit d3a722e

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

build/jslib/requirePatch.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,11 @@
118118
evalSource = false,
119119
contents, pluginContents, pluginBuilderMatch, builderName;
120120

121+
//Adjust the URL if it was not transformed to use baseUrl.
122+
if (require.jsExtRegExp.test(moduleName)) {
123+
url = context.config.dirBaseUrl + url;
124+
}
125+
121126
context.loaded[moduleName] = false;
122127
context.scriptCount += 1;
123128

tests/order/foo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
//Just a test file to to use in order build process.
2-
require(["require", "order!one", "order!two", "order!three"]);
2+
define(["require", "order!one.js", "order!two", "order!three.js"]);

0 commit comments

Comments
 (0)