From 477360b8c95320b90cd6314022e761bc495182d0 Mon Sep 17 00:00:00 2001 From: Amjad Masad Date: Tue, 16 Jun 2015 12:04:22 -0700 Subject: [PATCH] [react-packager] Make it safe to include files without a newline at the end Summary: @public Fixes #1431 Fixes #1005 Files with no newlines and a comment at the end of the file would've caused a syntax error in the bundle: ```js __d('module', function() { hi(); // wow }) ``` This fixes the issue by inserting a new lines before `})`. Test Plan: * ./runJestTests.sh * ./runJestTests.sh PackagerIntegration * open app to the playground app * add an error * observe that the redbox has the correct lines --- .../haste/__tests__/HasteDependencyResolver-test.js | 3 ++- packager/react-packager/src/DependencyResolver/haste/index.js | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packager/react-packager/src/DependencyResolver/haste/__tests__/HasteDependencyResolver-test.js b/packager/react-packager/src/DependencyResolver/haste/__tests__/HasteDependencyResolver-test.js index 9bc8b8b95c..0d1296ba16 100644 --- a/packager/react-packager/src/DependencyResolver/haste/__tests__/HasteDependencyResolver-test.js +++ b/packager/react-packager/src/DependencyResolver/haste/__tests__/HasteDependencyResolver-test.js @@ -600,7 +600,8 @@ describe('HasteDependencyResolver', function() { 'require("Y")', 'require( \'z\' )', 'require( "a")', - 'require("b" )});', + 'require("b" )', + '});', ].join('\n')); }); }); diff --git a/packager/react-packager/src/DependencyResolver/haste/index.js b/packager/react-packager/src/DependencyResolver/haste/index.js index da68785eac..aaa79c95b9 100644 --- a/packager/react-packager/src/DependencyResolver/haste/index.js +++ b/packager/react-packager/src/DependencyResolver/haste/index.js @@ -20,8 +20,7 @@ var DEFINE_MODULE_CODE = [ '_deps_,', 'function(global, require, requireDynamic, requireLazy, module, exports) {', ' _code_', - '}', - ');', + '\n});', ].join(''); var DEFINE_MODULE_REPLACE_RE = /_moduleName_|_code_|_deps_/g;