udpate configFile and set default sourceType to script

babel · May 1, 2018 · 6063ec6 · 6063ec6
1 parent ce74217
commit 6063ec6
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 17 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -1,8 +1,8 @@
 /**
  * Reason for Filename to be babel.config.js
  *
- * https://github.com/facebook/jest/issues/6053#issuecomment-383632515
  * https://github.com/babel/babel/pull/7784
+ * https://github.com/facebook/jest/issues/6053#issuecomment-383632515
  */
 
 module.exports = {

diff --git a/packages/babel-minify/src/index.js b/packages/babel-minify/src/index.js
@@ -11,6 +11,7 @@ module.exports = function babelMinify(
     minified = true,
     inputSourceMap,
     sourceMaps = false,
+    sourceType = "script",
 
     // to override the default babelCore used
     babel = babelCore,
@@ -21,10 +22,12 @@ module.exports = function babelMinify(
 ) {
   return babel.transformSync(input, {
     babelrc: false,
+    configFile: false,
     presets: [[minifyPreset, options]],
     comments: false,
     inputSourceMap,
     sourceMaps,
-    minified
+    minified,
+    sourceType
   });
 };
diff --git a/packages/babel-plugin-minify-dead-code-elimination/__tests__/dead-code-elimination-test.js b/packages/babel-plugin-minify-dead-code-elimination/__tests__/dead-code-elimination-test.js
@@ -7,8 +7,9 @@ const simplify = require("../../babel-plugin-minify-simplify/src/index");
 const thePlugin = require("test-transform")(deadcode);
 
 function transformWithSimplify(code) {
-  return babel.transform(code, {
-    plugins: [deadcode, simplify]
+  return babel.transformSync(code, {
+    plugins: [deadcode, simplify],
+    sourceType: "script"
   }).code;
 }
 

diff --git a/...ages/babel-plugin-minify-mangle-names/__tests__/fixtures/with-block-scoping-2/expected.js b/...ages/babel-plugin-minify-mangle-names/__tests__/fixtures/with-block-scoping-2/expected.js
@@ -1,5 +1,3 @@
-"use strict";
-
 // #issue55, #issue57
 (function () {
   (function () {

diff --git a/packages/babel-plugin-minify-type-constructors/__tests__/type-constructors-test.js b/packages/babel-plugin-minify-type-constructors/__tests__/type-constructors-test.js
@@ -27,8 +27,9 @@ describe("type-constructors-plugin", () => {
       `
       );
       expect(
-        babel.transform(source, {
-          plugins: [[plugin, { [names[i]]: false }]]
+        babel.transformSync(source, {
+          plugins: [[plugin, { [names[i]]: false }]],
+          sourceType: "script"
         }).code
       ).toBe(source);
     }

diff --git a/packages/gulp-babel-minify/__tests__/gulp-babili-test.js b/packages/gulp-babel-minify/__tests__/gulp-babili-test.js
@@ -72,10 +72,10 @@ describe("gulp-babel-minify", () => {
       const babel = Object.assign({}, babelCore);
 
       let usedTransform = false;
-      Object.defineProperty(babel, "transform", {
+      Object.defineProperty(babel, "transformSync", {
         get() {
           usedTransform = true;
-          return babelCore.transform;
+          return babelCore.transformSync;
         }
       });
 

diff --git a/packages/gulp-babel-minify/src/index.js b/packages/gulp-babel-minify/src/index.js
@@ -13,7 +13,8 @@ function gulpBabelMinify(
   {
     babel = babelCore,
     minifyPreset = babelPresetMinify,
-    comments = /preserve|licen(s|c)e/
+    comments = /preserve|licen(s|c)e/,
+    sourceType = "script"
   } = {}
 ) {
   return through2.obj(function(file, enc, callback) {
@@ -35,6 +36,8 @@ function gulpBabelMinify(
       babelrc: false,
       ast: false,
 
+      sourceType,
+
       /* preset */
       presets: [[minifyPreset, minifyOpts]],
 
@@ -73,7 +76,7 @@ function transform({ babel, input, babelOpts }) {
   try {
     return {
       success: true,
-      result: babel.transform(input, babelOpts)
+      result: babel.transformSync(input, babelOpts)
     };
   } catch (e) {
     return {

diff --git a/utils/test-runner/src/index.js b/utils/test-runner/src/index.js
@@ -58,9 +58,16 @@ function testRunner(dir) {
           options = JSON.parse(await fs.readFile(optionsFile));
         }
 
-        let babelOpts = {};
+        let babelOpts = {
+          // set the default sourcetype to be script
+          sourceType: "script"
+        };
+
         if (await fs.isFile(babelOptionsFile)) {
-          babelOpts = JSON.parse(await fs.readFile(babelOptionsFile));
+          Object.assign(
+            babelOpts,
+            JSON.parse(await fs.readFile(babelOptionsFile))
+          );
         }
 
         const currentPlugin = pathJoin(pkgDir, "src/index.js");
@@ -71,7 +78,10 @@ function testRunner(dir) {
           babelOpts.plugins = [[currentPlugin, options]];
         }
 
-        const actualTransformed = babel.transform(actual, babelOpts).code;
+        // don't consider the project's babel.config.js
+        babelOpts.configFile = false;
+
+        const actualTransformed = babel.transformSync(actual, babelOpts).code;
 
         if (!(await fs.isFile(expectedFile))) {
           await fs.writeFile(expectedFile, actualTransformed);

diff --git a/utils/test-transform/src/test-transform.js b/utils/test-transform/src/test-transform.js
@@ -3,7 +3,7 @@ const babel = require("@babel/core");
 const unpad = require("unpad");
 
 function _transform(source, options) {
-  return babel.transform(unpad(source), options).code.trim();
+  return babel.transformSync(unpad(source), options).code.trim();
 }
 
 function makeTester(
@@ -15,19 +15,23 @@ function makeTester(
   if (!Array.isArray(plugins)) {
     plugins = [plugins];
   }
+
   const thePlugin = (name, source, expected = source, babelOpts) => {
     if (typeof expected === "object") {
       babelOpts = expected;
       expected = source;
     }
+
     const { stack } = new Error();
     const options = Object.assign(
-      { plugins, sourceType: "script" },
+      { plugins, sourceType: "script", configFile: false },
       opts,
       babelOpts
     );
+
     test(name, () => {
       const transformed = transform(source, options);
+
       try {
         check({
           transformed,
@@ -42,14 +46,21 @@ function makeTester(
       }
     });
   };
+
   thePlugin.skip = name => test.skip(name);
+
   if (excludeKeys.indexOf("inEachLine") === -1) {
     thePlugin.inEachLine = makeTester(
       plugins,
       opts,
       {
         test,
         transform(source, options) {
+          options.configFile = false;
+          options.sourceType = hop(options, "sourceType")
+            ? options.sourceType
+            : "script";
+
           return unpad(source)
             .split("\n")
             .map(line => _transform(line, options))
@@ -60,6 +71,7 @@ function makeTester(
       excludeKeys.concat("inEachLine")
     );
   }
+
   if (excludeKeys.indexOf("only") === -1) {
     thePlugin.only = makeTester(
       plugins,
@@ -72,6 +84,7 @@ function makeTester(
       excludeKeys.concat("only")
     );
   }
+
   return thePlugin;
 }
 
@@ -89,3 +102,7 @@ exports.snapshot = (plugins, opts) =>
       expect({ _source: source, expected: transformed }).toMatchSnapshot();
     }
   });
+
+function hop(o, key) {
+  return Object.prototype.hasOwnProperty.call(o, key);
+}