switch from babel-preset-es2015 to babel-preset-env (#115)

* switch from babel-preset-es2015 to babel-preset-env addresses #112 and #113 * minor letter casing the way it is preffered on Google Analytics Website * Run prettier after merge * removing contributors section in favor of separate PR * chnage babel config on README to single quote
reactjs · Oct 31, 2017 · a42989c · a42989c
1 parent eb465db
commit a42989c
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Next
+* switch from babel-preset-es2015 to babel-preset-env
+
 # v0.10.4 (2017-10-13)
 
 * Fixed bug preventing the use of arrays for the Express views setting

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ option | values | default
 `doctype` | any string that can be used as [a doctype](http://en.wikipedia.org/wiki/Document_type_declaration), this will be prepended to your document | `"<!DOCTYPE html>"`
 `beautify` | `true`: beautify markup before outputting (note, this can affect rendering due to additional whitespace) | `false`
 `transformViews` | `true`: use `babel` to apply JSX, ESNext transforms to views.<br>**Note:** if already using `babel-register` in your project, you should set this to `false` | `true`
-`babel` | any object containing valid Babel options<br>**Note:** does not merge with defaults | `{presets: ['react', 'es2015']}`
+`babel` | any object containing valid Babel options<br>**Note:** does not merge with defaults | `{presets: ['react', [ 'env', {'targets': {'node': 'current'}}]]}`
 
 The defaults are sane, but just in case you want to change something, here's how it would look:
 
@@ -46,7 +46,7 @@ app.engine('jsx', require('express-react-views').createEngine(options));
 
 ### Views
 
-Under the hood, [Babel][babel] is used to compile your views into ES5 friendly code, using the [react][babel-preset-react] and [es2015][babel-preset-es2015] presets by default. Only the files in your `views` directory (i.e. `app.set('views', __dirname + '/views')`) will be compiled.
+Under the hood, [Babel][babel] is used to compile your views to code compatible with your current node version, using the [react][babel-preset-react] and [env][babel-preset-env] presets by default. Only the files in your `views` directory (i.e. `app.set('views', __dirname + '/views')`) will be compiled.
 
 Your views should be node modules that export a React component. Let's assume you have this file in `views/index.jsx`:
 
@@ -149,18 +149,19 @@ All "locals" are exposed to your view in `this.props`. These should work identic
 
 ```js
 <script dangerouslySetInnerHTML={{__html: `
-  // google analytics
+  // Google Analytics
   // is a common use
 `}} />
 ```
 
 * It's not possible to specify a doctype in JSX. You can override the default HTML5 doctype in the options.
 
+
 [express]: http://expressjs.com/
 [react]: http://facebook.github.io/react/
 [jade]: http://jade-lang.com/
 [ejs]: http://embeddedjs.com/
 [hbs]: https://github.com/barc/express-hbs
 [babel]: https://babeljs.io/
 [babel-preset-react]: https://babeljs.io/docs/plugins/preset-react/
-[babel-preset-es2015]: https://babeljs.io/docs/plugins/preset-es2015/
+[babel-preset-env]: https://babeljs.io/docs/plugins/preset-env/
diff --git a/examples/dynamic/.babelrc b/examples/dynamic/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    "react",
+    "env"
+  ]
+}
diff --git a/examples/dynamic/package.json b/examples/dynamic/package.json
@@ -6,10 +6,10 @@
   "private": true,
   "scripts": {
     "start":
-      "browserify -t [ babelify --presets [ es2015 react ] --standalone main views/main.js -o public/main.js ] && node app.js"
+      "browserify -t babelify views/main.js --standalone main -o public/main.js  && node app.js"
   },
   "dependencies": {
-    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-env": "^1.6.0",
     "babel-preset-react": "^6.24.1",
     "babelify": "^7.3.0",
     "browserify": "^14.3.0",

diff --git a/index.js b/index.js
@@ -18,7 +18,17 @@ var DEFAULT_OPTIONS = {
   beautify: false,
   transformViews: true,
   babel: {
-    presets: ['react', 'es2015'],
+    presets: [
+      'react',
+      [
+        'env',
+        {
+          targets: {
+            node: 'current',
+          },
+        },
+      ],
+    ],
   },
 };
 

diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "react-dom": "^0.14.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-env": "^1.6.0",
     "babel-preset-react": "^6.24.1",
     "babel-register": "^6.26.0",
     "js-beautify": "^1.7.3",