diff --git a/packages/babel-core/src/transformation/file/index.js b/packages/babel-core/src/transformation/file/index.js index 88d5be5e84..3eddf03235 100644 --- a/packages/babel-core/src/transformation/file/index.js +++ b/packages/babel-core/src/transformation/file/index.js @@ -3,7 +3,6 @@ import getHelper from "babel-helpers"; import * as metadataVisitor from "./metadata"; import convertSourceMap from "convert-source-map"; -import OptionManager from "./options/option-manager"; import PluginPass from "../plugin-pass"; import { NodePath, Hub, Scope } from "babel-traverse"; import sourceMap from "source-map"; @@ -42,8 +41,6 @@ export default class File extends Store { constructor(opts: Object = {}) { super(); - opts = new OptionManager().init(opts); - let passes = []; if (opts.plugins) passes.push(opts.plugins); diff --git a/packages/babel-core/src/transformation/pipeline.js b/packages/babel-core/src/transformation/pipeline.js index c50ac6fc99..367e1efede 100644 --- a/packages/babel-core/src/transformation/pipeline.js +++ b/packages/babel-core/src/transformation/pipeline.js @@ -4,6 +4,7 @@ import fs from "fs"; import normalizeAst from "../helpers/normalize-ast"; import Plugin from "./plugin"; import File from "./file"; +import OptionManager from "./file/options/option-manager"; export function analyse(code: string, opts: Object = {}, visitor?: Object): ?BabelFileMetadata { opts.code = false; @@ -15,6 +16,8 @@ export function analyse(code: string, opts: Object = {}, visitor?: Object): ?Bab } export function transform(code: string, opts?: Object): BabelFileResult { + opts = new OptionManager().init(opts); + const file = new File(opts); return file.wrap(code, function () { file.addCode(code); @@ -24,6 +27,8 @@ export function transform(code: string, opts?: Object): BabelFileResult { } export function transformFromAst(ast: Object, code: string, opts: Object): BabelFileResult { + opts = new OptionManager().init(opts); + ast = normalizeAst(ast); const file = new File(opts); @@ -41,6 +46,7 @@ export function transformFile(filename: string, opts?: Object, callback: Functio } opts.filename = filename; + opts = new OptionManager().init(opts); fs.readFile(filename, function (err, code) { let result; @@ -68,6 +74,7 @@ export function transformFile(filename: string, opts?: Object, callback: Functio export function transformFileSync(filename: string, opts?: Object = {}): string { opts.filename = filename; + opts = new OptionManager().init(opts); const code = fs.readFileSync(filename, "utf8"); const file = new File(opts);