Skip to content

Commit

Permalink
Upgrade to fbjs, fbjs-scripts @ 0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
zpao committed Sep 1, 2015
1 parent dc4f011 commit 52b4c9e
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 50 deletions.
4 changes: 2 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ var babel = require('gulp-babel');
var flatten = require('gulp-flatten');
var del = require('del');

var babelPluginDEV = require('fbjs/scripts/babel/dev-expression');
var babelPluginModules = require('fbjs/scripts/babel/rewrite-modules');
var babelPluginDEV = require('fbjs-scripts/babel/dev-expression');
var babelPluginModules = require('fbjs-scripts/babel/rewrite-modules');

var paths = {
react: {
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"eslint": "^1.1.0",
"eslint-plugin-react": "^3.2.1",
"eslint-plugin-react-internal": "file:eslint-rules",
"fbjs": "0.1.0-alpha.4",
"fbjs": "^0.2.0",
"fbjs-scripts": "^0.2.0",
"grunt": "^0.4.5",
"grunt-cli": "^0.1.13",
"grunt-compare-size": "^0.4.0",
Expand All @@ -32,7 +33,6 @@
"optimist": "^0.6.1",
"platform": "^1.1.0",
"run-sequence": "^1.1.0",
"semver": "^5.0.1",
"through2": "^2.0.0",
"tmp": "~0.0.18",
"typescript": "~1.4.0",
Expand All @@ -50,7 +50,7 @@
"build": "grunt build",
"linc": "git diff --name-only --diff-filter=ACMRTUB `git merge-base HEAD master` | grep '\\.js$' | xargs eslint --",
"lint": "grunt lint",
"postinstall": "node scripts/check-dev-engines.js",
"postinstall": "node node_modules/fbjs-scripts/node/check-dev-engines.js package.json",
"test": "NODE_ENV=test jest"
},
"jest": {
Expand Down
1 change: 0 additions & 1 deletion packages/react-dom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
},
"homepage": "https://github.com/facebook/react/tree/master/npm-react-dom",
"dependencies": {
"fbjs": "0.1.0-alpha.4",
"react": "^0.14.0-beta3"
}
}
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"envify": "^3.0.0",
"fbjs": "0.1.0-alpha.4"
"fbjs": "^0.2.0"
},
"browserify": {
"transform": [
Expand Down
41 changes: 0 additions & 41 deletions scripts/check-dev-engines.js

This file was deleted.

4 changes: 2 additions & 2 deletions scripts/jest/preprocessor.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ var ts = tsPreprocessor(defaultLibraries);
// This assumes the module map has been built. This might not be safe.
// We should consider consuming this from a built fbjs module from npm.
var moduleMap = require('fbjs/module-map');
var babelPluginDEV = require('fbjs/scripts/babel/dev-expression');
var babelPluginModules = require('fbjs/scripts/babel/rewrite-modules');
var babelPluginDEV = require('fbjs-scripts/babel/dev-expression');
var babelPluginModules = require('fbjs-scripts/babel/rewrite-modules');

module.exports = {
process: function(src, filePath) {
Expand Down

0 comments on commit 52b4c9e

Please sign in to comment.