Skip to content

Commit

Permalink
Upgrade fbjs preset
Browse files Browse the repository at this point in the history
Summary:
This removes a bunch of overlapping dependencies now that we do
everything you need in the fbjs preset.

This is pending the actual release of v2 of the preset, which hasn't happened yet - I wanted to try this and see what the outcome would be. Luckily nothing really needed to be done :)

Here's the diff of `lib/`: https://gist.github.com/zpao/79879855ac21d12094087a754daa7fa4. Overwhelmingly the difference is that have the function name transform on now. Otherwise there are a couple ordering differences with the helpers and then L1620 (not sure what's happening there)

It looks like you weren't actually making use of anything that was in stage-1, and es2015 wasn't even used, so got rid of those.
Closes #1139

Differential Revision: D3357595

Pulled By: steveluscher

fbshipit-source-id: e4f29c56e98da0870cdb0339a6ae1f938c2431ee
  • Loading branch information
zpao authored and Facebook Github Bot 9 committed May 27, 2016
1 parent f754557 commit 1ae9c3e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@
"babel-eslint": "^6.0.4",
"babel-plugin-transform-runtime": "^6.8.0",
"babel-polyfill": "^6.8.0",
"babel-preset-es2015": "^6.6.0",
"babel-preset-fbjs": "^1.0.0",
"babel-preset-react": "^6.5.0",
"babel-preset-stage-1": "^6.5.0",
"babel-preset-fbjs": "^2.0.0-alpha.1",
"del": "^1.2.0",
"eslint": "^2.9.0",
"eslint-plugin-react": "^5.0.1",
Expand All @@ -60,7 +57,7 @@
"gulp-header": "^1.7.1",
"gulp-util": "^3.0.7",
"jest": "^12.1.1",
"object-assign": "^3.0.0",
"object-assign": "^4.1.0",
"react": "^0.14.0",
"react-dom": "^0.14.0",
"run-sequence": "^1.1.2",
Expand Down Expand Up @@ -96,6 +93,7 @@
"<rootDir>/node_modules/fbjs/node_modules/core-js/",
"<rootDir>/node_modules/fbjs/node_modules/promise/",
"<rootDir>/node_modules/fbjs/lib/(?!(ErrorUtils.js$|fetch.js$|fetchWithRetries.js$))",
"<rootDir>/node_modules/object-assign/",
"<rootDir>/node_modules/react/",
"<rootDir>/node_modules/react-dom/",
"<rootDir>/node_modules/react-static-container/"
Expand Down
2 changes: 0 additions & 2 deletions scripts/getBabelOptions.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ module.exports = function(options) {
return {
plugins: options.plugins,
presets: [
'stage-1',
'react',
require('babel-preset-fbjs/configure')({
autoImport: true,
inlineRequires: true,
Expand Down

0 comments on commit 1ae9c3e

Please sign in to comment.