Move getPlatformExtension and getAssetDataFromName into `Dependen…

…cyResolver` Reviewed By: martinbigio Differential Revision: D2619690 fb-gh-sync-id: 04ca68a1fa2dc7b77a49c38ea1515d7afbdee603
yudong22 · Nov 9, 2015 · 34f8a6e · 34f8a6e
1 parent 145a72d
commit 34f8a6e
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 10 deletions.
diff --git a/packager/react-packager/src/AssetServer/__tests__/AssetServer-test.js b/packager/react-packager/src/AssetServer/__tests__/AssetServer-test.js
@@ -1,8 +1,8 @@
 'use strict';
 
 jest
-  .dontMock('../../lib/getPlatformExtension')
-  .dontMock('../../lib/getAssetDataFromName')
+  .dontMock('../../DependencyResolver/lib/getPlatformExtension')
+  .dontMock('../../DependencyResolver/lib/getAssetDataFromName')
   .dontMock('../');
 
 jest

diff --git a/packager/react-packager/src/AssetServer/index.js b/packager/react-packager/src/AssetServer/index.js
@@ -13,7 +13,7 @@ const Promise = require('promise');
 const crypto = require('crypto');
 const declareOpts = require('../lib/declareOpts');
 const fs = require('fs');
-const getAssetDataFromName = require('../lib/getAssetDataFromName');
+const getAssetDataFromName = require('../DependencyResolver/lib/getAssetDataFromName');
 const path = require('path');
 
 const stat = Promise.denodeify(fs.stat);

diff --git a/packager/react-packager/src/DependencyResolver/AssetModule.js b/packager/react-packager/src/DependencyResolver/AssetModule.js
@@ -2,7 +2,7 @@
 
 const Module = require('./Module');
 const Promise = require('promise');
-const getAssetDataFromName = require('../lib/getAssetDataFromName');
+const getAssetDataFromName = require('./lib/getAssetDataFromName');
 
 class AssetModule extends Module {
   constructor(...args) {

diff --git a/packager/react-packager/src/DependencyResolver/AssetModule_DEPRECATED.js b/packager/react-packager/src/DependencyResolver/AssetModule_DEPRECATED.js
@@ -2,7 +2,7 @@
 
 const Module = require('./Module');
 const Promise = require('promise');
-const getAssetDataFromName = require('../lib/getAssetDataFromName');
+const getAssetDataFromName = require('./lib/getAssetDataFromName');
 
 class AssetModule_DEPRECATED extends Module {
   constructor(...args) {

diff --git a/packager/react-packager/src/DependencyResolver/DependencyGraph/HasteMap.js b/packager/react-packager/src/DependencyResolver/DependencyGraph/HasteMap.js
@@ -9,7 +9,7 @@
 'use strict';
 
 const path = require('path');
-const getPlatformExtension = require('../../lib/getPlatformExtension');
+const getPlatformExtension = require('../lib/getPlatformExtension');
 const Promise = require('promise');
 
 const GENERIC_PLATFORM = 'generic';

diff --git a/packager/react-packager/src/DependencyResolver/DependencyGraph/ResolutionRequest.js b/packager/react-packager/src/DependencyResolver/DependencyGraph/ResolutionRequest.js
@@ -12,7 +12,7 @@ const debug = require('debug')('ReactNativePackager:DependencyGraph');
 const util = require('util');
 const path = require('path');
 const isAbsolutePath = require('absolute-path');
-const getAssetDataFromName = require('../../lib/getAssetDataFromName');
+const getAssetDataFromName = require('../lib/getAssetDataFromName');
 const Promise = require('promise');
 
 class ResolutionRequest {

diff --git a/packager/react-packager/src/DependencyResolver/DependencyGraph/index.js b/packager/react-packager/src/DependencyResolver/DependencyGraph/index.js
@@ -13,7 +13,7 @@ const ModuleCache = require('../ModuleCache');
 const Promise = require('promise');
 const crawl = require('../crawlers');
 const declareOpts = require('../../lib/declareOpts');
-const getPontentialPlatformExt = require('../../lib/getPlatformExtension');
+const getPlatformExtension = require('../lib/getPlatformExtension');
 const isAbsolutePath = require('absolute-path');
 const path = require('path');
 const util = require('util');
@@ -173,7 +173,7 @@ class DependencyGraph {
 
   _getRequestPlatform(entryPath, platform) {
     if (platform == null) {
-      platform = getPontentialPlatformExt(entryPath);
+      platform = getPlatformExtension(entryPath);
       if (platform == null || this._opts.platforms.indexOf(platform) === -1) {
         platform = null;
       }

diff --git a/...ib/__tests__/getAssetDataFromName-test.js → ...ib/__tests__/getAssetDataFromName-test.js b/...ib/__tests__/getAssetDataFromName-test.js → ...ib/__tests__/getAssetDataFromName-test.js
diff --git a/...__tests__/getPotentialPlatformExt-test.js → ...ib/__tests__/getPlatformExtension-test.js b/...__tests__/getPotentialPlatformExt-test.js → ...ib/__tests__/getPlatformExtension-test.js
diff --git a/...-packager/src/lib/getAssetDataFromName.js → ...dencyResolver/lib/getAssetDataFromName.js b/...-packager/src/lib/getAssetDataFromName.js → ...dencyResolver/lib/getAssetDataFromName.js
diff --git a/...-packager/src/lib/getPlatformExtension.js → ...dencyResolver/lib/getPlatformExtension.js b/...-packager/src/lib/getPlatformExtension.js → ...dencyResolver/lib/getPlatformExtension.js
diff --git a/packager/react-packager/src/Server/index.js b/packager/react-packager/src/Server/index.js
@@ -11,7 +11,7 @@
 const Activity = require('../Activity');
 const AssetServer = require('../AssetServer');
 const FileWatcher = require('../FileWatcher');
-const getPlatformExtension = require('../lib/getPlatformExtension');
+const getPlatformExtension = require('../DependencyResolver/lib/getPlatformExtension');
 const Bundler = require('../Bundler');
 const Promise = require('promise');