Skip to content

Bugfix/require module regexp #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
daviskoh wants to merge 9 commits into from
Closed

Bugfix/require module regexp #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5addc1f
update HasteDependencyResolver specs to account for varying require a…
daviskoh Mar 27, 2015
6a99076
update REL_REQUIRE_STMT to use same regex as requireRe
daviskoh Mar 27, 2015
50ca504
Update HasteDependencyResolver Tests w/ Better Cases
daviskoh Mar 27, 2015
e1b3c47
strip whitespace from codeMatch of require
daviskoh Mar 27, 2015
3095255
remove unnecessary whitespace before var REL_REQUIRE_STMT dec
daviskoh Mar 27, 2015
8f036d9
adjust regex to account for small amounts of whitespace in require ca…
daviskoh Mar 28, 2015
0fb934f
change requireRe to match REL_REQUIRE_STMT in DependencyResolver/inde…
daviskoh Mar 28, 2015
002955e
use correct arg in replace method call
daviskoh Mar 28, 2015
4ac2381
Move REQUIRE_RE to separate regex.js file
daviskoh Mar 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...t-packager/src/DependencyResolver/haste/DependencyGraph/__tests__/DependencyGraph-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jest
.dontMock('path')
.dontMock('absolute-path')
.dontMock('../docblock')
.dontMock('../regex')
.setMock('../../../ModuleDescriptor', function(data) {return data;});

describe('DependencyGraph', function() {
Expand Down
5 changes: 3 additions & 2 deletions packager/react-packager/src/DependencyResolver/haste/DependencyGraph/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ var ModuleDescriptor = require('../../ModuleDescriptor');
var q = require('q');
var fs = require('fs');
var docblock = require('./docblock');
var REQUIRE_RE = require('./regex').REQUIRE_RE;
var path = require('path');
var isAbsolutePath = require('absolute-path');
var debug = require('debug')('DependecyGraph');
Expand Down Expand Up @@ -600,7 +601,7 @@ DependecyGraph.prototype._processAssetChange = function(eventType, file) {
/**
* Extract all required modules from a `code` string.
*/
var requireRe = /\brequire\s*\(\s*[\'"]([^"\']+)["\']\s*\)/g;

var blockCommentRe = /\/\*(.|\n)*?\*\//g;
var lineCommentRe = /\/\/.+(\n|$)/g;
function extractRequires(code) {
Expand All @@ -609,7 +610,7 @@ function extractRequires(code) {
code
.replace(blockCommentRe, '')
.replace(lineCommentRe, '')
.replace(requireRe, function(match, dep) {
.replace(REQUIRE_RE, function(match, _, dep) {
deps.push(dep);
});

Expand Down
14 changes: 14 additions & 0 deletions packager/react-packager/src/DependencyResolver/haste/DependencyGraph/regex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/**
* 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';

var REQUIRE_RE = /\brequire\s*?\(\s*?([\'"])([^"\']+)\1\s*?\)/g;

exports.REQUIRE_RE = REQUIRE_RE;
11 changes: 8 additions & 3 deletions ...ger/react-packager/src/DependencyResolver/haste/__tests__/HasteDependencyResolver-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

jest.dontMock('../')
.dontMock('q')
.dontMock('../DependencyGraph/regex')
.setMock('../../ModuleDescriptor', function(data) {return data;});

var q = require('q');
Expand Down Expand Up @@ -226,11 +227,13 @@ describe('HasteDependencyResolver', function() {
});

var depGraph = depResolver._depGraph;
var dependencies = ['x', 'y', 'z'];
var dependencies = ['x', 'y', 'z', 'a', 'b'];
var code = [
'require("x")',
'require("y")',
'require("z")',
'require( "z" )',
'require( "a")',
'require("b" )',
].join('\n');

depGraph.resolveDependency.mockImpl(function(fromModule, toModuleName) {
Expand All @@ -255,7 +258,9 @@ describe('HasteDependencyResolver', function() {
' require, requireDynamic, requireLazy, module, exports) {' +
' require(\'changed\')',
'require(\'y\')',
'require("z")});',
'require("z")',
'require("a")',
'require("b")});',
].join('\n'));
});
});
Expand Down
6 changes: 3 additions & 3 deletions packager/react-packager/src/DependencyResolver/haste/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
var path = require('path');
var FileWatcher = require('../../FileWatcher');
var DependencyGraph = require('./DependencyGraph');
var REQUIRE_RE = require('./DependencyGraph/regex').REQUIRE_RE;
var ModuleDescriptor = require('../ModuleDescriptor');
var declareOpts = require('../../lib/declareOpts');

Expand All @@ -25,7 +26,6 @@ var DEFINE_MODULE_CODE = [
].join('');

var DEFINE_MODULE_REPLACE_RE = /_moduleName_|_code_|_deps_/g;
var REL_REQUIRE_STMT = /require\(['"]([\.\/0-9A-Z_$\-]*)['"]\)/gi;

var validateOpts = declareOpts({
projectRoots: {
Expand Down Expand Up @@ -146,12 +146,12 @@ HasteDependencyResolver.prototype.wrapModule = function(module, code) {
}

var relativizedCode =
code.replace(REL_REQUIRE_STMT, function(codeMatch, depName) {
code.replace(REQUIRE_RE, function(codeMatch, _, depName) {
var depId = resolvedDeps[depName];
if (depId != null) {
return 'require(\'' + depId + '\')';
} else {
return codeMatch;
return codeMatch.replace(/\s+/g, '');
}
});

Expand Down