Closes requirejs#142, './mod' not resolved to 'mod' when at top level

timmywil · Nov 19, 2011 · a71b5af · a71b5af
1 parent 129dbdd
commit a71b5af
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 0 deletions.
diff --git a/require.js b/require.js
@@ -268,6 +268,10 @@ var requirejs, require, define;
                     if (pkgConfig && name === pkgName + '/' + pkgConfig.main) {
                         name = pkgName;
                     }
+                } else if (name.indexOf("./") === 0) {
+                    // No baseName, so this is ID is resolved relative
+                    // to baseUrl, pull off the leading dot.
+                    name = name.substring(2);
                 }
             }
             return name;

diff --git a/tests/all-server.js b/tests/all-server.js
@@ -41,6 +41,7 @@ load('doh/_' + env + 'Runner.js');
 load("simple-tests.js");
 load("circular-tests.js");
 load("relative/relative-tests.js");
+load("relative/relativeBaseUrl-tests.js");
 load("exports/exports-tests.js");
 load("exports/moduleAndExports-tests.js");
 load("anon/anon-tests.js");

diff --git a/tests/relative/relativeBaseUrl-tests.js b/tests/relative/relativeBaseUrl-tests.js
@@ -0,0 +1,24 @@
+//Use a property on require so if the test runs in node, it is visible.
+//Remove it when done with the test.
+require.relativeBaseUrlCounter = 0;
+
+require({
+        baseUrl: require.isBrowser ? "./" : "./relative/"
+    },
+    ["./top", "top"],
+    function(top1, top2) {
+        doh.register(
+            "relativeBaseUrl",
+            [
+                function relativeBaseUrl(t){
+                    t.is(top1.id, top2.id);
+                    t.is(1, require.relativeBaseUrlCounter);
+
+                    delete require.relativeBaseUrlCounter;
+                }
+            ]
+        );
+
+        doh.run();
+    }
+);
diff --git a/tests/relative/relativeBaseUrl.html b/tests/relative/relativeBaseUrl.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>require.js: Relative Module Names at baseUrl Test</title>
+    <script type="text/javascript" src="../../require.js"></script>
+    <script type="text/javascript" src="../doh/runner.js"></script>
+    <script type="text/javascript" src="../doh/_browserRunner.js"></script>
+    <script type="text/javascript" src="relativeBaseUrl-tests.js"></script>
+</head>
+<body>
+    <h1>require.js: Relative Module Names at baseUrl Test</h1>
+    <p>Check console for messages</p>
+</body>
+</html>
diff --git a/tests/relative/top.js b/tests/relative/top.js
@@ -0,0 +1,7 @@
+
+define(function () {
+    require.relativeBaseUrlCounter += 1;
+    return {
+        id: require.relativeBaseUrlCounter
+    };
+});