diff --git a/.eslintrc b/.eslintrc index f05efed9..58ef8ed6 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,5 +1,6 @@ { "rules": { - "extra-arrow-initializer": 0 + "extra-arrow-initializer": 0, + "no-console-disallow": 0 } } diff --git a/defaultAssetExts.js b/defaultAssetExts.js deleted file mode 100644 index 0d53ace6..00000000 --- a/defaultAssetExts.js +++ /dev/null @@ -1,16 +0,0 @@ -/** - * 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 = [ - 'bmp', 'gif', 'jpg', 'jpeg', 'png', 'psd', 'svg', 'webp', // Image formats - 'm4v', 'mov', 'mp4', 'mpeg', 'mpg', 'webm', // Video formats - 'aac', 'aiff', 'caf', 'm4a', 'mp3', 'wav', // Audio formats - 'html', 'pdf', // Document formats -]; diff --git a/defaults.js b/defaults.js new file mode 100644 index 00000000..2841558a --- /dev/null +++ b/defaults.js @@ -0,0 +1,49 @@ +/** + * 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. + * + * @flow + */ +'use strict'; + +exports.assetExts = [ + 'bmp', 'gif', 'jpg', 'jpeg', 'png', 'psd', 'svg', 'webp', // Image formats + 'm4v', 'mov', 'mp4', 'mpeg', 'mpg', 'webm', // Video formats + 'aac', 'aiff', 'caf', 'm4a', 'mp3', 'wav', // Audio formats + 'html', 'pdf', // Document formats +]; + +exports.moduleSystem = require.resolve('./react-packager/src/Resolver/polyfills/require.js'); + +exports.platforms = ['ios', 'android', 'windows', 'web']; + +exports.polyfills = [ + require.resolve('./react-packager/src/Resolver/polyfills/polyfills.js'), + require.resolve('./react-packager/src/Resolver/polyfills/console.js'), + require.resolve('./react-packager/src/Resolver/polyfills/error-guard.js'), + require.resolve('./react-packager/src/Resolver/polyfills/Number.es6.js'), + require.resolve('./react-packager/src/Resolver/polyfills/String.prototype.es6.js'), + require.resolve('./react-packager/src/Resolver/polyfills/Array.prototype.es6.js'), + require.resolve('./react-packager/src/Resolver/polyfills/Array.es6.js'), + require.resolve('./react-packager/src/Resolver/polyfills/Object.es7.js'), + require.resolve('./react-packager/src/Resolver/polyfills/babelHelpers.js'), +]; + +exports.providesModuleNodeModules = [ + 'react-native', + 'react-native-windows', + // Parse requires AsyncStorage. They will + // change that to require('react-native') which + // should work after this release and we can + // remove it from here. + 'parse', +]; + +exports.runBeforeMainModule = [ + // Ensures essential globals are available and are patched correctly. + 'InitializeCore', +]; diff --git a/react-packager/src/Resolver/__tests__/Resolver-test.js b/react-packager/src/Resolver/__tests__/Resolver-test.js index c6166548..17a6de6e 100644 --- a/react-packager/src/Resolver/__tests__/Resolver-test.js +++ b/react-packager/src/Resolver/__tests__/Resolver-test.js @@ -9,9 +9,10 @@ 'use strict'; jest.unmock('../'); +jest.unmock('../../../../defaults'); jest.mock('path'); - +const {join: pathJoin} = require.requireActual('path'); const DependencyGraph = jest.fn(); jest.setMock('../../node-haste', DependencyGraph); let Module; @@ -219,7 +220,11 @@ describe('Resolver', function() { 'polyfills/Object.es7.js', ], }, - ]); + ].map(({id, file, dependencies}) => ({ + id: pathJoin(__dirname, '..', id), + file: pathJoin(__dirname, '..', file), + dependencies: dependencies.map((d => pathJoin(__dirname, '..', d))), + }))); }); }); @@ -295,7 +300,7 @@ describe('Resolver', function() { 'polyfills/Array.es6.js', 'polyfills/Object.es7.js', 'polyfills/babelHelpers.js', - ] + ].map(d => pathJoin(__dirname, '..', d)) }, ]); }); diff --git a/react-packager/src/Resolver/index.js b/react-packager/src/Resolver/index.js index cefecd59..6f4fb98b 100644 --- a/react-packager/src/Resolver/index.js +++ b/react-packager/src/Resolver/index.js @@ -9,11 +9,12 @@ 'use strict'; -const path = require('path'); const Activity = require('../Activity'); const DependencyGraph = require('../node-haste'); + const declareOpts = require('../lib/declareOpts'); -const Promise = require('promise'); +const defaults = require('../../../defaults'); +const pathJoin = require('path').join; const validateOpts = declareOpts({ projectRoots: { @@ -74,7 +75,7 @@ const getDependenciesValidateOpts = declareOpts({ }, unbundle: { type: 'boolean', - default: false + default: false, }, recursive: { type: 'boolean', @@ -96,16 +97,8 @@ class Resolver { return filepath.indexOf('__tests__') !== -1 || (opts.blacklistRE && opts.blacklistRE.test(filepath)); }, - providesModuleNodeModules: [ - 'react-native', - 'react-native-windows', - // Parse requires AsyncStorage. They will - // change that to require('react-native') which - // should work after this release and we can - // remove it from here. - 'parse', - ], - platforms: ['ios', 'android', 'windows', 'web'], + providesModuleNodeModules: defaults.providesModuleNodeModules, + platforms: defaults.platforms, preferNativePlatform: true, fileWatcher: opts.fileWatcher, cache: opts.cache, @@ -160,14 +153,14 @@ class Resolver { const opts = getDependenciesValidateOpts(options); const prelude = opts.dev - ? path.join(__dirname, 'polyfills/prelude_dev.js') - : path.join(__dirname, 'polyfills/prelude.js'); + ? pathJoin(__dirname, 'polyfills/prelude_dev.js') + : pathJoin(__dirname, 'polyfills/prelude.js'); - const moduleSystem = path.join(__dirname, 'polyfills/require.js'); + const moduleSystem = defaults.moduleSystem; return [ prelude, - moduleSystem + moduleSystem, ].map(moduleName => this._depGraph.createPolyfill({ file: moduleName, id: moduleName, @@ -176,17 +169,7 @@ class Resolver { } _getPolyfillDependencies() { - const polyfillModuleNames = [ - path.join(__dirname, 'polyfills/polyfills.js'), - path.join(__dirname, 'polyfills/console.js'), - path.join(__dirname, 'polyfills/error-guard.js'), - path.join(__dirname, 'polyfills/Number.es6.js'), - path.join(__dirname, 'polyfills/String.prototype.es6.js'), - path.join(__dirname, 'polyfills/Array.prototype.es6.js'), - path.join(__dirname, 'polyfills/Array.es6.js'), - path.join(__dirname, 'polyfills/Object.es7.js'), - path.join(__dirname, 'polyfills/babelHelpers.js'), - ].concat(this._polyfillModuleNames); + const polyfillModuleNames = defaults.polyfills.concat(this._polyfillModuleNames); return polyfillModuleNames.map( (polyfillModuleName, idx) => this._depGraph.createPolyfill({ @@ -242,7 +225,7 @@ class Resolver { code, meta = {}, dev = true, - minify = false + minify = false, }) { if (module.isJSON()) { code = `module.exports = ${code}`; diff --git a/react-packager/src/Server/index.js b/react-packager/src/Server/index.js index 3778289e..d5da01dd 100644 --- a/react-packager/src/Server/index.js +++ b/react-packager/src/Server/index.js @@ -19,7 +19,7 @@ const Promise = require('promise'); const SourceMapConsumer = require('source-map').SourceMapConsumer; const declareOpts = require('../lib/declareOpts'); -const defaultAssetExts = require('../../../defaultAssetExts'); +const defaults = require('../../../defaults'); const mime = require('mime-types'); const path = require('path'); const url = require('url'); @@ -81,7 +81,7 @@ const validateOpts = declareOpts({ }, assetExts: { type: 'array', - default: defaultAssetExts, + default: defaults.assetExts, }, transformTimeoutInterval: { type: 'number', @@ -128,10 +128,7 @@ const bundleOpts = declareOpts({ }, runBeforeMainModule: { type: 'array', - default: [ - // Ensures essential globals are available and are patched correctly. - 'InitializeCore' - ], + default: defaults.runBeforeMainModule, }, unbundle: { type: 'boolean', @@ -147,7 +144,7 @@ const bundleOpts = declareOpts({ }, isolateModuleIDs: { type: 'boolean', - default: false + default: false, }, resolutionResponse: { type: 'object', @@ -487,7 +484,7 @@ class Server { 'Accept-Ranges': 'bytes', 'Content-Length': chunksize, 'Content-Range': `bytes ${dataStart}-${dataEnd}/${data.length}`, - 'Content-Type': mime.lookup(path.basename(assetPath[1])) + 'Content-Type': mime.lookup(path.basename(assetPath[1])), }); return data.slice(dataStart, dataEnd + 1); @@ -585,7 +582,7 @@ class Server { ...options, resolutionResponse: response.copy({ dependencies: changedModules, - }) + }), }).then(updateBundle => { const oldModules = bundle.getModules(); const newModules = updateBundle.getModules();