diff --git a/blacklist.js b/blacklist.js index 850a8724..b5ba4185 100644 --- a/blacklist.js +++ b/blacklist.js @@ -1,5 +1,10 @@ /** - * Copyright 2004-present Facebook. All Rights Reserved. + * Copyright (c) 2015-present, 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. */ 'use strict'; @@ -8,7 +13,6 @@ var sharedBlacklist = [ __dirname, 'website', - 'node_modules/parse/node_modules/xmlhttprequest/lib/XMLHttpRequest.js', 'node_modules/react-tools/src/utils/ImmutableObject.js', 'node_modules/react-tools/src/core/ReactInstanceHandles.js', 'node_modules/react-tools/src/event/EventPropagators.js' diff --git a/debugger.html b/debugger.html index f7cabc5f..38e9e6cd 100644 --- a/debugger.html +++ b/debugger.html @@ -1,4 +1,13 @@ + + diff --git a/launchChromeDevTools.applescript b/launchChromeDevTools.applescript index 4384b3ae..1fe6f4b0 100755 --- a/launchChromeDevTools.applescript +++ b/launchChromeDevTools.applescript @@ -1,5 +1,11 @@ #!/usr/bin/env osascript +-- Copyright (c) 2015-present, 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. on run argv set theURL to item 1 of argv diff --git a/launchEditor.js b/launchEditor.js index 93db9bfc..cf89ed4f 100644 --- a/launchEditor.js +++ b/launchEditor.js @@ -1,5 +1,10 @@ /** - * Copyright 2004-present Facebook. All Rights Reserved. + * Copyright (c) 2015-present, 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. */ 'use strict'; diff --git a/launchPackager.command b/launchPackager.command index dc56d7ff..eb777493 100755 --- a/launchPackager.command +++ b/launchPackager.command @@ -1,5 +1,12 @@ #!/bin/bash +# Copyright (c) 2015-present, 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. + # Set terminal title echo -en "\033]0;React Packager\a" clear diff --git a/packager.js b/packager.js index 7214aaaf..12ef9ddd 100644 --- a/packager.js +++ b/packager.js @@ -1,5 +1,10 @@ /** - * Copyright 2004-present Facebook. All Rights Reserved. + * Copyright (c) 2015-present, 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. */ 'use strict'; diff --git a/packager.sh b/packager.sh index 98e42184..969ca1b2 100755 --- a/packager.sh +++ b/packager.sh @@ -1,5 +1,12 @@ #!/bin/bash +# Copyright (c) 2015-present, 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. + ulimit -n 4096 THIS_DIR=$(dirname "$0") diff --git a/parseCommandLine.js b/parseCommandLine.js index 5240d37d..65061e3f 100644 --- a/parseCommandLine.js +++ b/parseCommandLine.js @@ -1,5 +1,10 @@ /** - * Copyright 2004-present Facebook. All Rights Reserved. + * Copyright (c) 2015-present, 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. * * Wrapper on-top of `optimist` in order to properly support boolean flags * and have a slightly less akward API. diff --git a/react-packager/__mocks__/debug.js b/react-packager/__mocks__/debug.js index d35fffd4..41955326 100644 --- a/react-packager/__mocks__/debug.js +++ b/react-packager/__mocks__/debug.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; module.exports = function() { diff --git a/react-packager/__mocks__/net.js b/react-packager/__mocks__/net.js index 661fb196..43f51828 100644 --- a/react-packager/__mocks__/net.js +++ b/react-packager/__mocks__/net.js @@ -1,3 +1,12 @@ +/** + * Copyright (c) 2015-present, 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. + */ + var EventEmitter = require('events').EventEmitter; var servers = {}; exports.createServer = function(listener) { diff --git a/react-packager/example_project/bar.js b/react-packager/example_project/bar.js index cc56ce6e..6653bdf7 100644 --- a/react-packager/example_project/bar.js +++ b/react-packager/example_project/bar.js @@ -1,5 +1,12 @@ /** + * Copyright (c) 2015-present, 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 bar */ - module.exports = setInterval; \ No newline at end of file + module.exports = setInterval; diff --git a/react-packager/example_project/foo/foo.js b/react-packager/example_project/foo/foo.js index c45d9aba..fe3c8cd1 100644 --- a/react-packager/example_project/foo/foo.js +++ b/react-packager/example_project/foo/foo.js @@ -1,4 +1,11 @@ /** + * Copyright (c) 2015-present, 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 foo */ diff --git a/react-packager/example_project/index.js b/react-packager/example_project/index.js index 2943d187..d63b5193 100644 --- a/react-packager/example_project/index.js +++ b/react-packager/example_project/index.js @@ -1,6 +1,12 @@ /** + * Copyright (c) 2015-present, 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 index - * @jsx React.DOM */ require('main'); diff --git a/react-packager/example_project/js/Channel.js b/react-packager/example_project/js/Channel.js index d3cbae1c..6cbfce6f 100644 --- a/react-packager/example_project/js/Channel.js +++ b/react-packager/example_project/js/Channel.js @@ -1,4 +1,11 @@ /** + * Copyright (c) 2015-present, 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 Channel */ diff --git a/react-packager/example_project/js/XHR.js b/react-packager/example_project/js/XHR.js index d9e0563f..bede8ca5 100644 --- a/react-packager/example_project/js/XHR.js +++ b/react-packager/example_project/js/XHR.js @@ -1,4 +1,11 @@ /** + * Copyright (c) 2015-present, 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 XHR */ diff --git a/react-packager/example_project/js/code.js b/react-packager/example_project/js/code.js index 70067859..f99a90c9 100644 --- a/react-packager/example_project/js/code.js +++ b/react-packager/example_project/js/code.js @@ -1,4 +1,11 @@ /** + * Copyright (c) 2015-present, 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 code */ var XHR = require('XHR'); diff --git a/react-packager/example_project/js/main.js b/react-packager/example_project/js/main.js index 58847092..405d015e 100644 --- a/react-packager/example_project/js/main.js +++ b/react-packager/example_project/js/main.js @@ -1,4 +1,11 @@ /** + * Copyright (c) 2015-present, 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 main */ var Channel = require('Channel'); diff --git a/react-packager/example_project/public/css/index.css b/react-packager/example_project/public/css/index.css index 7d36bf2c..651f3326 100644 --- a/react-packager/example_project/public/css/index.css +++ b/react-packager/example_project/public/css/index.css @@ -1,3 +1,13 @@ +/** + * Copyright (c) 2015-present, 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. + */ + + html { font-family: sans-serif; } diff --git a/react-packager/example_project/public/index.html b/react-packager/example_project/public/index.html index b19685d5..e0e2ce7f 100644 --- a/react-packager/example_project/public/index.html +++ b/react-packager/example_project/public/index.html @@ -1,4 +1,12 @@ + diff --git a/react-packager/index.js b/react-packager/index.js index 65ae88d8..3a70659c 100644 --- a/react-packager/index.js +++ b/react-packager/index.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var Activity = require('./src/Activity'); diff --git a/react-packager/src/Activity/__tests__/Activity-test.js b/react-packager/src/Activity/__tests__/Activity-test.js index 7fe31614..c854aa33 100644 --- a/react-packager/src/Activity/__tests__/Activity-test.js +++ b/react-packager/src/Activity/__tests__/Activity-test.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; jest.autoMockOff(); diff --git a/react-packager/src/Activity/index.js b/react-packager/src/Activity/index.js index 611ccb0b..05285d0f 100644 --- a/react-packager/src/Activity/index.js +++ b/react-packager/src/Activity/index.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var COLLECTION_PERIOD = 1000; diff --git a/react-packager/src/DependencyResolver/ModuleDescriptor.js b/react-packager/src/DependencyResolver/ModuleDescriptor.js index df29e57c..1388a610 100644 --- a/react-packager/src/DependencyResolver/ModuleDescriptor.js +++ b/react-packager/src/DependencyResolver/ModuleDescriptor.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; function ModuleDescriptor(fields) { diff --git a/react-packager/src/DependencyResolver/haste/DependencyGraph/__mocks__/fs.js b/react-packager/src/DependencyResolver/haste/DependencyGraph/__mocks__/fs.js index de3622d9..3ebee183 100644 --- a/react-packager/src/DependencyResolver/haste/DependencyGraph/__mocks__/fs.js +++ b/react-packager/src/DependencyResolver/haste/DependencyGraph/__mocks__/fs.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var fs = jest.genMockFromModule('fs'); diff --git a/react-packager/src/DependencyResolver/haste/DependencyGraph/__tests__/DependencyGraph-test.js b/react-packager/src/DependencyResolver/haste/DependencyGraph/__tests__/DependencyGraph-test.js index 6dee93ec..bbdb0641 100644 --- a/react-packager/src/DependencyResolver/haste/DependencyGraph/__tests__/DependencyGraph-test.js +++ b/react-packager/src/DependencyResolver/haste/DependencyGraph/__tests__/DependencyGraph-test.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; jest diff --git a/react-packager/src/DependencyResolver/haste/DependencyGraph/docblock.js b/react-packager/src/DependencyResolver/haste/DependencyGraph/docblock.js index c2b6ac98..131f09d1 100644 --- a/react-packager/src/DependencyResolver/haste/DependencyGraph/docblock.js +++ b/react-packager/src/DependencyResolver/haste/DependencyGraph/docblock.js @@ -1,17 +1,10 @@ /** - * Copyright 2013 Facebook, Inc. + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * 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. */ 'use strict'; diff --git a/react-packager/src/DependencyResolver/haste/DependencyGraph/index.js b/react-packager/src/DependencyResolver/haste/DependencyGraph/index.js index 918b1e06..14139159 100644 --- a/react-packager/src/DependencyResolver/haste/DependencyGraph/index.js +++ b/react-packager/src/DependencyResolver/haste/DependencyGraph/index.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var ModuleDescriptor = require('../../ModuleDescriptor'); @@ -296,35 +304,50 @@ DependecyGraph.prototype._findAndProcessPackage = function(files, root) { } if (packagePath != null) { - return readFile(packagePath, 'utf8') - .then(function(content) { - var packageJson; - try { - packageJson = JSON.parse(content); - } catch (e) { - debug('WARNING: malformed package.json: ', packagePath); - return q(); - } - - if (packageJson.name == null) { - debug( - 'WARNING: package.json `%s` is missing a name field', - packagePath - ); - return q(); - } - - packageJson._root = root; - self._packageByRoot[root] = packageJson; - self._packagesById[packageJson.name] = packageJson; - - return packageJson; - }); + return this._processPackage(packagePath); } else { return q(); } }; +DependecyGraph.prototype._processPackage = function(packagePath) { + var packageRoot = path.dirname(packagePath); + var self = this; + return readFile(packagePath, 'utf8') + .then(function(content) { + var packageJson; + try { + packageJson = JSON.parse(content); + } catch (e) { + debug('WARNING: malformed package.json: ', packagePath); + return q(); + } + + if (packageJson.name == null) { + debug( + 'WARNING: package.json `%s` is missing a name field', + packagePath + ); + return q(); + } + + packageJson._root = packageRoot; + self._addPackageToIndices(packageJson); + + return packageJson; + }); +}; + +DependecyGraph.prototype._addPackageToIndices = function(packageJson) { + this._packageByRoot[packageJson._root] = packageJson; + this._packagesById[packageJson.name] = packageJson; +}; + +DependecyGraph.prototype._removePackageFromIndices = function(packageJson) { + delete this._packageByRoot[packageJson._root]; + delete this._packagesById[packageJson.name]; +}; + /** * Parse a module and update indices. */ @@ -436,16 +459,27 @@ DependecyGraph.prototype._processFileChange = function(eventType, filePath, root this._debugUpdateEvents.push({event: eventType, path: filePath}); + var isPackage = path.basename(filePath) === 'package.json'; if (eventType === 'delete') { - var module = this._graph[absPath]; - if (module == null) { - return; - } + if (isPackage) { + var packageJson = this._packageByRoot[path.dirname(absPath)]; + if (packageJson) { + this._removePackageFromIndices(packageJson); + } + } else { + var module = this._graph[absPath]; + if (module == null) { + return; + } - this._deleteModule(module); + this._deleteModule(module); + } } else if (!(stat && stat.isDirectory())) { var self = this; this._loading = this._loading.then(function() { + if (isPackage) { + return self._processPackage(absPath); + } return self._processModule(absPath); }); } diff --git a/react-packager/src/DependencyResolver/haste/__tests__/HasteDependencyResolver-test.js b/react-packager/src/DependencyResolver/haste/__tests__/HasteDependencyResolver-test.js index b25fd821..90ae5888 100644 --- a/react-packager/src/DependencyResolver/haste/__tests__/HasteDependencyResolver-test.js +++ b/react-packager/src/DependencyResolver/haste/__tests__/HasteDependencyResolver-test.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; jest.dontMock('../') diff --git a/react-packager/src/DependencyResolver/haste/index.js b/react-packager/src/DependencyResolver/haste/index.js index fdc779ed..2edb3b52 100644 --- a/react-packager/src/DependencyResolver/haste/index.js +++ b/react-packager/src/DependencyResolver/haste/index.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var path = require('path'); diff --git a/react-packager/src/DependencyResolver/haste/polyfills/console.js b/react-packager/src/DependencyResolver/haste/polyfills/console.js index 1b2604e3..91fb970f 100644 --- a/react-packager/src/DependencyResolver/haste/polyfills/console.js +++ b/react-packager/src/DependencyResolver/haste/polyfills/console.js @@ -1,17 +1,10 @@ /** - * Copyright 2013 Facebook, Inc. + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * 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. * * This pipes all of our console logging functions to native logging so that * JavaScript errors in required modules show up in Xcode via NSLog. diff --git a/react-packager/src/DependencyResolver/haste/polyfills/error-guard.js b/react-packager/src/DependencyResolver/haste/polyfills/error-guard.js index 745d650e..3816617f 100644 --- a/react-packager/src/DependencyResolver/haste/polyfills/error-guard.js +++ b/react-packager/src/DependencyResolver/haste/polyfills/error-guard.js @@ -1,5 +1,11 @@ - /** + * Copyright (c) 2015-present, 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. + * * The particular require runtime that we are using looks for a global * `ErrorUtils` object and if it exists, then it requires modules with the * error handler specified via ErrorUtils.setGlobalHandler by calling the diff --git a/react-packager/src/DependencyResolver/haste/polyfills/polyfills.js b/react-packager/src/DependencyResolver/haste/polyfills/polyfills.js index 75f74279..84bf2d3d 100644 --- a/react-packager/src/DependencyResolver/haste/polyfills/polyfills.js +++ b/react-packager/src/DependencyResolver/haste/polyfills/polyfills.js @@ -1,17 +1,10 @@ /** - * Copyright 2013 Facebook, Inc. + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * 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. * * This pipes all of our console logging functions to native logging so that * JavaScript errors in required modules show up in Xcode via NSLog. diff --git a/react-packager/src/DependencyResolver/index.js b/react-packager/src/DependencyResolver/index.js index f42ecb8a..ca80ab0b 100644 --- a/react-packager/src/DependencyResolver/index.js +++ b/react-packager/src/DependencyResolver/index.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var HasteDependencyResolver = require('./haste'); diff --git a/react-packager/src/DependencyResolver/node/index.js b/react-packager/src/DependencyResolver/node/index.js index da03cc7e..46c93c2f 100644 --- a/react-packager/src/DependencyResolver/node/index.js +++ b/react-packager/src/DependencyResolver/node/index.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var Promise = require('q').Promise; diff --git a/react-packager/src/FileWatcher/__mocks__/sane.js b/react-packager/src/FileWatcher/__mocks__/sane.js index 20dda2a2..9823a930 100644 --- a/react-packager/src/FileWatcher/__mocks__/sane.js +++ b/react-packager/src/FileWatcher/__mocks__/sane.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; module.exports = { diff --git a/react-packager/src/FileWatcher/__tests__/FileWatcher-test.js b/react-packager/src/FileWatcher/__tests__/FileWatcher-test.js index 11b9f4a3..213033c5 100644 --- a/react-packager/src/FileWatcher/__tests__/FileWatcher-test.js +++ b/react-packager/src/FileWatcher/__tests__/FileWatcher-test.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; jest diff --git a/react-packager/src/FileWatcher/index.js b/react-packager/src/FileWatcher/index.js index f2721d8c..c1633683 100644 --- a/react-packager/src/FileWatcher/index.js +++ b/react-packager/src/FileWatcher/index.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var EventEmitter = require('events').EventEmitter; @@ -56,7 +64,7 @@ function createWatcher(root) { } return detectingWatcherClass.then(function(Watcher) { - var watcher = new Watcher(root, {glob: '**/*.js'}); + var watcher = new Watcher(root, {glob: ['**/*.js', '**/package.json']}); return new Promise(function(resolve, reject) { var rejectTimeout = setTimeout(function() { diff --git a/react-packager/src/JSTransformer/Cache.js b/react-packager/src/JSTransformer/Cache.js index bad0dadb..363be7b9 100644 --- a/react-packager/src/JSTransformer/Cache.js +++ b/react-packager/src/JSTransformer/Cache.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var _ = require('underscore'); diff --git a/react-packager/src/JSTransformer/__mocks__/q.js b/react-packager/src/JSTransformer/__mocks__/q.js index 3d4d21f1..7ee0beac 100644 --- a/react-packager/src/JSTransformer/__mocks__/q.js +++ b/react-packager/src/JSTransformer/__mocks__/q.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; // Bug with Jest because we're going to the node_modules that is a sibling diff --git a/react-packager/src/JSTransformer/__mocks__/underscore.js b/react-packager/src/JSTransformer/__mocks__/underscore.js index a985ab20..45754e1a 100644 --- a/react-packager/src/JSTransformer/__mocks__/underscore.js +++ b/react-packager/src/JSTransformer/__mocks__/underscore.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; // Bug with Jest because we're going to the node_modules that is a sibling diff --git a/react-packager/src/JSTransformer/__mocks__/worker.js b/react-packager/src/JSTransformer/__mocks__/worker.js index 04a24e8d..e36b27e4 100644 --- a/react-packager/src/JSTransformer/__mocks__/worker.js +++ b/react-packager/src/JSTransformer/__mocks__/worker.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; module.exports = function (data, callback) { diff --git a/react-packager/src/JSTransformer/__tests__/Cache-test.js b/react-packager/src/JSTransformer/__tests__/Cache-test.js index f5b55f05..6af1ff94 100644 --- a/react-packager/src/JSTransformer/__tests__/Cache-test.js +++ b/react-packager/src/JSTransformer/__tests__/Cache-test.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; jest diff --git a/react-packager/src/JSTransformer/__tests__/Transformer-test.js b/react-packager/src/JSTransformer/__tests__/Transformer-test.js index 36d81d8f..72845a2e 100644 --- a/react-packager/src/JSTransformer/__tests__/Transformer-test.js +++ b/react-packager/src/JSTransformer/__tests__/Transformer-test.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; jest diff --git a/react-packager/src/JSTransformer/index.js b/react-packager/src/JSTransformer/index.js index 00e49d5d..c7f7bb7f 100644 --- a/react-packager/src/JSTransformer/index.js +++ b/react-packager/src/JSTransformer/index.js @@ -1,4 +1,11 @@ - +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var fs = require('fs'); diff --git a/react-packager/src/JSTransformer/worker.js b/react-packager/src/JSTransformer/worker.js index 26f789e4..b6b4f363 100644 --- a/react-packager/src/JSTransformer/worker.js +++ b/react-packager/src/JSTransformer/worker.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var transformer = require('./transformer'); diff --git a/react-packager/src/Packager/Package.js b/react-packager/src/Packager/Package.js index 5d9b201c..99edbbe0 100644 --- a/react-packager/src/Packager/Package.js +++ b/react-packager/src/Packager/Package.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var _ = require('underscore'); diff --git a/react-packager/src/Packager/__tests__/Package-test.js b/react-packager/src/Packager/__tests__/Package-test.js index 41630fc4..ee94437d 100644 --- a/react-packager/src/Packager/__tests__/Package-test.js +++ b/react-packager/src/Packager/__tests__/Package-test.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; jest.autoMockOff(); diff --git a/react-packager/src/Packager/__tests__/Packager-test.js b/react-packager/src/Packager/__tests__/Packager-test.js index 498faea3..bed6fac3 100644 --- a/react-packager/src/Packager/__tests__/Packager-test.js +++ b/react-packager/src/Packager/__tests__/Packager-test.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; jest diff --git a/react-packager/src/Packager/index.js b/react-packager/src/Packager/index.js index c21889b4..ac7bd2e2 100644 --- a/react-packager/src/Packager/index.js +++ b/react-packager/src/Packager/index.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var assert = require('assert'); diff --git a/react-packager/src/Server/__tests__/Server-test.js b/react-packager/src/Server/__tests__/Server-test.js index f4905806..8e638311 100644 --- a/react-packager/src/Server/__tests__/Server-test.js +++ b/react-packager/src/Server/__tests__/Server-test.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; jest.setMock('worker-farm', function() { return function() {}; }) diff --git a/react-packager/src/Server/index.js b/react-packager/src/Server/index.js index 3043903d..cc4f0bdf 100644 --- a/react-packager/src/Server/index.js +++ b/react-packager/src/Server/index.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; var url = require('url'); @@ -67,7 +75,7 @@ function Server(options) { this._debouncedFileChangeHandler = _.debounce(function(filePath) { self._rebuildPackages(filePath); self._informChangeWatchers(); - }, 50, true); + }, 50); } Server.prototype._onFileChange = function(type, filepath, root) { diff --git a/react-packager/src/lib/__mocks__/declareOpts.js b/react-packager/src/lib/__mocks__/declareOpts.js index 1afe4e29..7b54b27d 100644 --- a/react-packager/src/lib/__mocks__/declareOpts.js +++ b/react-packager/src/lib/__mocks__/declareOpts.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; module.exports = function(declared) { diff --git a/react-packager/src/lib/__tests__/declareOpts-test.js b/react-packager/src/lib/__tests__/declareOpts-test.js index 66ae174f..cb9a35dd 100644 --- a/react-packager/src/lib/__tests__/declareOpts-test.js +++ b/react-packager/src/lib/__tests__/declareOpts-test.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2015-present, 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. + */ 'use strict'; jest.autoMockOff(); diff --git a/react-packager/src/lib/declareOpts.js b/react-packager/src/lib/declareOpts.js index 3b80da51..c20ae6d1 100644 --- a/react-packager/src/lib/declareOpts.js +++ b/react-packager/src/lib/declareOpts.js @@ -1,4 +1,11 @@ /** + * Copyright (c) 2015-present, 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. + * * Declares, validates and defaults options. * var validate = declareOpts({ * foo: { diff --git a/transformer.js b/transformer.js index acb586d7..31cb8d31 100644 --- a/transformer.js +++ b/transformer.js @@ -1,5 +1,10 @@ /** - * Copyright 2004-present Facebook. All Rights Reserved. + * Copyright (c) 2015-present, 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. * * Note: This is a fork of the fb-specific transform.js */ diff --git a/webSocketProxy.js b/webSocketProxy.js index dada059a..8223bbf2 100644 --- a/webSocketProxy.js +++ b/webSocketProxy.js @@ -1,7 +1,11 @@ /** - * Copyright 2004-present Facebook. All Rights Reserved. + * Copyright (c) 2015-present, 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. */ - 'use strict'; var WebSocketServer = require('ws').Server;