From 6bc2bfce7d059083674d76e9b99bbfce0fc48a04 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Tue, 31 Mar 2015 02:34:32 +1100
Subject: [PATCH] rename runtimeES3 transformer to es3.runtime

---
 packages/build-runtime.js                                     | 2 +-
 src/babel/transformation/transformers/aliases.json            | 3 ++-
 .../transformers/{other/runtime-es3.js => es3/runtime.js}     | 0
 src/babel/transformation/transformers/index.js                | 2 +-
 .../aliases-array-is-array/actual.js                          | 0
 .../aliases-array-is-array/expected.js                        | 0
 test/core/fixtures/transformation/es3.runtime/options.json    | 4 ++++
 test/core/fixtures/transformation/runtime-es3/options.json    | 4 ----
 8 files changed, 8 insertions(+), 7 deletions(-)
 rename src/babel/transformation/transformers/{other/runtime-es3.js => es3/runtime.js} (100%)
 rename test/core/fixtures/transformation/{runtime-es3 => es3.runtime}/aliases-array-is-array/actual.js (100%)
 rename test/core/fixtures/transformation/{runtime-es3 => es3.runtime}/aliases-array-is-array/expected.js (100%)
 create mode 100644 test/core/fixtures/transformation/es3.runtime/options.json
 delete mode 100644 test/core/fixtures/transformation/runtime-es3/options.json

diff --git a/packages/build-runtime.js b/packages/build-runtime.js
index 1533e5bf9b..1f0f07e893 100644
--- a/packages/build-runtime.js
+++ b/packages/build-runtime.js
@@ -40,7 +40,7 @@ function writeRootFile(filename, content) {
 }
 
 function doVersion(version) {
-  var transformer = "runtime" + version.toUpperCase();
+  var transformer = version + ".runtime";
 
   function writeFile(filename, content) {
     return writeRootFile(version + "/" + filename, content);
diff --git a/src/babel/transformation/transformers/aliases.json b/src/babel/transformation/transformers/aliases.json
index 4cec66af73..9c87372347 100644
--- a/src/babel/transformation/transformers/aliases.json
+++ b/src/babel/transformation/transformers/aliases.json
@@ -1,4 +1,5 @@
 {
   "useStrict": "strict",
-  "runtimeES5": "runtime"
+  "es5.runtime": "runtime",
+  "es6.runtime": "runtime"
 }
diff --git a/src/babel/transformation/transformers/other/runtime-es3.js b/src/babel/transformation/transformers/es3/runtime.js
similarity index 100%
rename from src/babel/transformation/transformers/other/runtime-es3.js
rename to src/babel/transformation/transformers/es3/runtime.js
diff --git a/src/babel/transformation/transformers/index.js b/src/babel/transformation/transformers/index.js
index b942489aab..b1a46f56f8 100644
--- a/src/babel/transformation/transformers/index.js
+++ b/src/babel/transformation/transformers/index.js
@@ -83,7 +83,7 @@ export default {
   // needs to be after `regenerator` due to needing `regeneratorRuntime` references
   // needs to be after `es6.forOf` due to needing `Symbol.iterator` references
   // needs to be before `es6.modules` due to dynamic imports
-  runtimeES3:                             require("./other/runtime-es3"),
+  "es3.runtime":                          require("./es3/runtime"),
   runtime:                                require("./other/runtime"),
 
   // needs to be before `_blockHoist` due to function hoisting etc
diff --git a/test/core/fixtures/transformation/runtime-es3/aliases-array-is-array/actual.js b/test/core/fixtures/transformation/es3.runtime/aliases-array-is-array/actual.js
similarity index 100%
rename from test/core/fixtures/transformation/runtime-es3/aliases-array-is-array/actual.js
rename to test/core/fixtures/transformation/es3.runtime/aliases-array-is-array/actual.js
diff --git a/test/core/fixtures/transformation/runtime-es3/aliases-array-is-array/expected.js b/test/core/fixtures/transformation/es3.runtime/aliases-array-is-array/expected.js
similarity index 100%
rename from test/core/fixtures/transformation/runtime-es3/aliases-array-is-array/expected.js
rename to test/core/fixtures/transformation/es3.runtime/aliases-array-is-array/expected.js
diff --git a/test/core/fixtures/transformation/es3.runtime/options.json b/test/core/fixtures/transformation/es3.runtime/options.json
new file mode 100644
index 0000000000..6b5bc2daf9
--- /dev/null
+++ b/test/core/fixtures/transformation/es3.runtime/options.json
@@ -0,0 +1,4 @@
+{
+  "optional": ["es3.runtime"],
+  "stage": 0
+}
diff --git a/test/core/fixtures/transformation/runtime-es3/options.json b/test/core/fixtures/transformation/runtime-es3/options.json
deleted file mode 100644
index 48f3dce3ce..0000000000
--- a/test/core/fixtures/transformation/runtime-es3/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "optional": ["runtimeES3"],
-  "stage": 0
-}