From 1b5254a3ca592bc8093dad6b506c6477702df499 Mon Sep 17 00:00:00 2001 From: James Ide Date: Wed, 13 Jan 2016 19:16:58 -0800 Subject: [PATCH] Revert "Enable JSX files extension" This reverts commit 888749220dac26382412f2c38ac5f9205cc842e5. --- .../src/DependencyResolver/DependencyGraph/ResolutionRequest.js | 2 -- .../src/DependencyResolver/DependencyGraph/index.js | 2 +- packager/react-packager/src/Server/index.js | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packager/react-packager/src/DependencyResolver/DependencyGraph/ResolutionRequest.js b/packager/react-packager/src/DependencyResolver/DependencyGraph/ResolutionRequest.js index 50a590256bb1..18992e920522 100644 --- a/packager/react-packager/src/DependencyResolver/DependencyGraph/ResolutionRequest.js +++ b/packager/react-packager/src/DependencyResolver/DependencyGraph/ResolutionRequest.js @@ -350,8 +350,6 @@ class ResolutionRequest { file = potentialModulePath + '.native.js'; } else if (this._fastfs.fileExists(potentialModulePath + '.js')) { file = potentialModulePath + '.js'; - } else if (this._fastfs.fileExists(potentialModulePath + '.jsx')) { - file = potentialModulePath + '.jsx'; } else if (this._fastfs.fileExists(potentialModulePath + '.json')) { file = potentialModulePath + '.json'; } else { diff --git a/packager/react-packager/src/DependencyResolver/DependencyGraph/index.js b/packager/react-packager/src/DependencyResolver/DependencyGraph/index.js index 1278d2ce8544..1192159b308d 100644 --- a/packager/react-packager/src/DependencyResolver/DependencyGraph/index.js +++ b/packager/react-packager/src/DependencyResolver/DependencyGraph/index.js @@ -55,7 +55,7 @@ class DependencyGraph { platforms: platforms || [], preferNativePlatform: preferNativePlatform || false, cache, - extensions: extensions || ['js', 'jsx', 'json'], + extensions: extensions || ['js', 'json'], mocksPattern, extractRequires, shouldThrowOnUnresolvedErrors, diff --git a/packager/react-packager/src/Server/index.js b/packager/react-packager/src/Server/index.js index 63432090570c..fe7294bbcc8c 100644 --- a/packager/react-packager/src/Server/index.js +++ b/packager/react-packager/src/Server/index.js @@ -151,7 +151,6 @@ class Server { dir: dir, globs: [ '**/*.js', - '**/*.jsx', '**/*.json', ].concat(assetGlobs), };