From 693dd3567b6648fdccfd602702192bb22f405e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Thu, 1 Oct 2015 14:29:07 -0700 Subject: [PATCH] Update to fbjs@0.3 As far as we're concerned, the only difference is that we moved some files from React to fbjs. --- package.json | 2 +- packages/react/package.json | 2 +- .../deprecated/__tests__/joinClasses-test.js | 50 ------------------- src/isomorphic/deprecated/joinClasses.js | 39 --------------- .../utils/__tests__/memoizeStringOnly-test.js | 30 ----------- src/shared/utils/memoizeStringOnly.js | 31 ------------ 6 files changed, 2 insertions(+), 152 deletions(-) delete mode 100644 src/isomorphic/deprecated/__tests__/joinClasses-test.js delete mode 100644 src/isomorphic/deprecated/joinClasses.js delete mode 100644 src/shared/utils/__tests__/memoizeStringOnly-test.js delete mode 100644 src/shared/utils/memoizeStringOnly.js diff --git a/package.json b/package.json index 1cf55fb991..841d38090d 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "eslint": "^1.5.1", "eslint-plugin-react": "^3.4.2", "eslint-plugin-react-internal": "file:eslint-rules", - "fbjs": "^0.2.0", + "fbjs": "^0.3.1", "fbjs-scripts": "^0.2.0", "grunt": "^0.4.5", "grunt-cli": "^0.1.13", diff --git a/packages/react/package.json b/packages/react/package.json index d607dffa6b..3f99de875e 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "envify": "^3.0.0", - "fbjs": "^0.2.0" + "fbjs": "^0.3.1" }, "browserify": { "transform": [ diff --git a/src/isomorphic/deprecated/__tests__/joinClasses-test.js b/src/isomorphic/deprecated/__tests__/joinClasses-test.js deleted file mode 100644 index 0adb374475..0000000000 --- a/src/isomorphic/deprecated/__tests__/joinClasses-test.js +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Copyright 2013-2015, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - * - * @emails react-core - */ - -'use strict'; - -require('mock-modules').dontMock('joinClasses'); - -var joinClasses = require('joinClasses'); - -describe('joinClasses', function() { - - it('should return a single className', function() { - expect(joinClasses('aaa')).toEqual('aaa'); - }); - - it('should join two classes together', function() { - var aaa = 'aaa'; - var bbb = 'bbb'; - expect(joinClasses(aaa, bbb)).toEqual('aaa bbb'); - }); - - it('should join many classes together', function() { - var aaa = 'aaa'; - var bbb = 'bbb'; - var ccc = 'ccc'; - var ddd = 'ddd'; - var eee = 'eee'; - expect(joinClasses(aaa, bbb, ccc, ddd, eee)).toEqual('aaa bbb ccc ddd eee'); - }); - - it('should omit undefined and empty classes', function() { - var aaa = 'aaa'; - var bbb; - var ccc = null; - var ddd = ''; - var eee = 'eee'; - expect(joinClasses(bbb)).toEqual(''); - expect(joinClasses(bbb, bbb, bbb)).toEqual(''); - expect(joinClasses(aaa, bbb, ccc, ddd, eee)).toEqual('aaa eee'); - }); - -}); diff --git a/src/isomorphic/deprecated/joinClasses.js b/src/isomorphic/deprecated/joinClasses.js deleted file mode 100644 index 3545f0cbe5..0000000000 --- a/src/isomorphic/deprecated/joinClasses.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright 2013-2015, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - * - * @providesModule joinClasses - * @typechecks static-only - */ - -'use strict'; - -/** - * Combines multiple className strings into one. - * http://jsperf.com/joinclasses-args-vs-array - * - * @param {...?string} className - * @return {string} - */ -function joinClasses(className/*, ... */) { - if (!className) { - className = ''; - } - var nextClass; - var argLength = arguments.length; - if (argLength > 1) { - for (var ii = 1; ii < argLength; ii++) { - nextClass = arguments[ii]; - if (nextClass) { - className = (className ? className + ' ' : '') + nextClass; - } - } - } - return className; -} - -module.exports = joinClasses; diff --git a/src/shared/utils/__tests__/memoizeStringOnly-test.js b/src/shared/utils/__tests__/memoizeStringOnly-test.js deleted file mode 100644 index de1c62d7ad..0000000000 --- a/src/shared/utils/__tests__/memoizeStringOnly-test.js +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright 2013-2015, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - * - * @emails react-core - */ - -'use strict'; - -describe('memoizeStringOnly', function() { - var memoizeStringOnly; - - beforeEach(function() { - require('mock-modules').dumpCache(); - memoizeStringOnly = require('memoizeStringOnly'); - }); - - it('should be transparent to callers', function() { - var callback = function(string) { - return string; - }; - var memoized = memoizeStringOnly(callback); - - expect(memoized('foo'), callback('foo')); - }); -}); diff --git a/src/shared/utils/memoizeStringOnly.js b/src/shared/utils/memoizeStringOnly.js deleted file mode 100644 index 0efaa3170a..0000000000 --- a/src/shared/utils/memoizeStringOnly.js +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright 2013-2015, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - * - * @providesModule memoizeStringOnly - * @typechecks static-only - */ - -'use strict'; - -/** - * Memoizes the return value of a function that accepts one string argument. - * - * @param {function} callback - * @return {function} - */ -function memoizeStringOnly(callback) { - var cache = {}; - return function(string) { - if (!cache.hasOwnProperty(string)) { - cache[string] = callback.call(this, string); - } - return cache[string]; - }; -} - -module.exports = memoizeStringOnly;