summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2018-05-30 18:05:23 +0200
committerRyan Dahl <ry@tinyclouds.org>2018-05-30 18:26:03 +0200
commit4f00218d6d2bd6169b08e6c83cff52852e621985 (patch)
tree060fee0423694c714800990a79ad3997899f3848
parente401d9e21bd3803d7d329ed8b7c831127f12832f (diff)
Remove extension hack in ResolveModule.
-rw-r--r--os.go5
-rw-r--r--os_test.go7
-rw-r--r--testing/testing.ts2
-rw-r--r--testing/util_test.ts6
4 files changed, 7 insertions, 13 deletions
diff --git a/os.go b/os.go
index 877fa24ca..23d09fc88 100644
--- a/os.go
+++ b/os.go
@@ -76,11 +76,6 @@ func ResolveModule(moduleSpecifier string, containingFile string) (
containingFile = SrcFileToUrl(containingFile)
moduleSpecifier = SrcFileToUrl(moduleSpecifier)
- // Hack: If there is no extension, just add .ts
- if path.Ext(moduleSpecifier) == "" {
- moduleSpecifier = moduleSpecifier + ".ts"
- }
-
logDebug("os.go ResolveModule after moduleSpecifier %s containingFile %s",
moduleSpecifier, containingFile)
diff --git a/os_test.go b/os_test.go
index e04f8c820..d1ffd3e29 100644
--- a/os_test.go
+++ b/os_test.go
@@ -72,9 +72,8 @@ func TestResolveModule4(t *testing.T) {
path.Join(SrcDir, "unpkg.com/liltest@0.0.5/index.ts"))
}
-func TestResolveModule5(t *testing.T) {
+func TestResolveModuleExtensionsAintSpecial(t *testing.T) {
createDirs()
- // Files in SrcDir should resolve to URLs.
moduleName, filename, err := ResolveModule(
"./util",
path.Join(SrcDir, "unpkg.com/liltest@0.0.5/index.ts"))
@@ -82,7 +81,7 @@ func TestResolveModule5(t *testing.T) {
t.Fatalf(err.Error())
}
AssertEqual(t, moduleName,
- "http://unpkg.com/liltest@0.0.5/util.ts")
+ "http://unpkg.com/liltest@0.0.5/util")
AssertEqual(t, filename,
- path.Join(SrcDir, "unpkg.com/liltest@0.0.5/util.ts"))
+ path.Join(SrcDir, "unpkg.com/liltest@0.0.5/util"))
}
diff --git a/testing/testing.ts b/testing/testing.ts
index 969c15704..4d7cd9c6c 100644
--- a/testing/testing.ts
+++ b/testing/testing.ts
@@ -13,7 +13,7 @@
limitations under the License.
*/
-export { assert, assertEqual, equal } from "./util";
+export { assert, assertEqual, equal } from "./util.ts";
export type TestFunction = () => void | Promise<void>;
diff --git a/testing/util_test.ts b/testing/util_test.ts
index 44f61f9c4..34bd97e0f 100644
--- a/testing/util_test.ts
+++ b/testing/util_test.ts
@@ -13,9 +13,9 @@
limitations under the License.
*/
-import { test } from "./index";
-import { assert } from "./util";
-import * as util from "./util";
+import { test } from "./index.ts";
+import { assert } from "./util.ts";
+import * as util from "./util.ts";
test(async function util_equal() {
assert(util.equal("world", "world"));