From e4274f535355e54c5aa7674b06e9984509736167 Mon Sep 17 00:00:00 2001 From: Ovidiu Viorel Iepure Date: Fri, 23 Sep 2016 07:59:59 -0700 Subject: [PATCH] Remove platform blacklists Summary: File platform identifiers (`fileName..js`) are no longer part of the blacklist regular expression. This allows the upcoming `jest-haste-map` to include all files for all platforms, therefore enabling Packager to build bundles for different platforms using the same `HasteMap`(jest-haste-map) instance. Reviewed By: davidaurelio Differential Revision: D3907508 fbshipit-source-id: d7d7f3bd93287a634a1ef0590a736d021be2aaa5 --- blacklist.js | 26 +------------------------- rn-cli.config.js | 13 +++++++++---- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/blacklist.js b/blacklist.js index 3b222145..d9a357d6 100644 --- a/blacklist.js +++ b/blacklist.js @@ -23,29 +23,6 @@ var sharedBlacklist = [ 'Libraries/Relay/relay/tools/relayUnstableBatchedUpdates.js', ]; -var platformBlacklists = { - web: [ - '.ios.js', - '.android.js', - '.windows.js' - ], - ios: [ - '.web.js', - '.android.js', - '.windows.js', - ], - android: [ - '.web.js', - '.ios.js', - '.windows.js' - ], - windows: [ - '.web.js', - '.ios.js', - '.android.js' - ], -}; - function escapeRegExp(pattern) { if (Object.prototype.toString.call(pattern) === '[object RegExp]') { return pattern.source.replace(/\//g, path.sep); @@ -58,10 +35,9 @@ function escapeRegExp(pattern) { } } -function blacklist(platform, additionalBlacklist) { +function blacklist(additionalBlacklist) { return new RegExp('(' + (additionalBlacklist || []).concat(sharedBlacklist) - .concat(platformBlacklists[platform] || []) .map(escapeRegExp) .join('|') + ')$' diff --git a/rn-cli.config.js b/rn-cli.config.js index 72a785ef..c7741dfb 100644 --- a/rn-cli.config.js +++ b/rn-cli.config.js @@ -1,6 +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. + * * React Native CLI configuration file */ 'use strict'; @@ -21,8 +26,8 @@ module.exports = { return []; }, - getBlacklistRE(platform) { - return blacklist(platform); + getBlacklistRE() { + return blacklist(); }, _getRoots() {