Merge pull request #518 from wyuenho/babel7-fixes

Fix #515 Add required option to decorator plugin
Galooshi · Sep 10, 2018 · 7e7e4d2 · 7e7e4d2
2 parents 655df38 + 8b99a41
commit 7e7e4d2
Show file tree

Hide file tree

Showing 6 changed files with 7,980 additions and 19 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,7 +1,10 @@
 {
-  "presets": ["@babel/preset-react", "@babel/preset-env"],
+  "presets": [
+    "@babel/preset-react",
+    "@babel/preset-env",
+    "@babel/preset-flow"
+  ],
   "plugins": [
-    "add-module-exports",
     "@babel/plugin-transform-flow-strip-types",
     "@babel/plugin-proposal-class-properties"
   ]

diff --git a/bin/importjs.js b/bin/importjs.js
@@ -1,4 +1,6 @@
 #!/usr/bin/env node
 
 // eslint-disable-next-line import/no-unresolved
-require('../build/importjs.js')(process.argv);
+const importjs = require('../build/importjs.js').default;
+
+importjs(process.argv);
diff --git a/bin/importjsd.js b/bin/importjsd.js
@@ -3,4 +3,6 @@
 // The `importjsd` command is deprecated and will be removed in a future
 // version. `importjs` should be used instead.
 // eslint-disable-next-line import/no-unresolved
-require('../build/importjs.js')(process.argv);
+const importjs = require('../build/importjs.js').default;
+
+importjs(process.argv);
diff --git a/lib/parse.js b/lib/parse.js
@@ -11,7 +11,7 @@ function getParserPlugins(absolutePathToFile: string): Array<string | [string, O
     'jsx',
     'doExpressions',
     'objectRestSpread',
-    'decorators',
+    'decorators-legacy',
     'classProperties',
     'classPrivateProperties',
     'classPrivateMethods',