status-im
/
metro
mirror of https://github.com/status-im/metro.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix packager asset requests on windows 

Summary:
6554ad5983ae85212684a09869e2ea2e0b743dd3 broke assets on windows, this fixes it and add a test to avoid regressions.

Ideally we'd run all the Dependency graph tests on both posix and win32 filesystems but that would probably require doing some sort of factory function to create the tests because I don't think we want to duplicate every test (file is big enough already :)). So for now I just copied that one test and changed the paths manually.

**Test plan**
Run the new test without the fix -> fails
Run the new test with the fix -> succeeds
Closes https://github.com/facebook/react-native/pull/11254

Differential Revision: D4265157

Pulled By: cpojer

fbshipit-source-id: 511470276bd950c2943e94c2dce6840df0fe6d69
This commit is contained in:
Janic Duplessis 2016-12-02 04:43:53 -08:00 committed by Facebook Github Bot
parent 336376e018
commit a1f4dac064
2 changed files with 81 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
react-packager/src/node-haste/DependencyGraph/ResolutionRequest.js vendored
View File

@ -381,7 +381,7 @@ class ResolutionRequest {
_loadAsFile(potentialModulePath, fromModule, toModule) {
return Promise.resolve().then(() => {
if (this._helpers.isAssetFile(potentialModulePath)) {
const dirname = path.dirname(potentialModulePath);
let dirname = path.dirname(potentialModulePath);
if (!this._dirExists(dirname)) {
throw new UnableToResolveError(
fromModule,
@ -398,6 +398,11 @@ class ResolutionRequest {
}
pattern += '\\.' + type;
// Escape backslashes in the path to be able to use it in the regex
if (path.sep === '\\') {
dirname = dirname.replace(/\\/g, '\\\\');
}
// We arbitrarly grab the first one, because scale selection
// will happen somewhere
const [assetFile] = this._hasteFS.matchFiles(

75
react-packager/src/node-haste/__tests__/DependencyGraph-test.js vendored
View File

@ -2562,6 +2562,81 @@ describe('DependencyGraph', function() {
]);
});
});
it('should get dependencies with assets and resolution', function() {
const root = 'C:\\root';
setMockFileSystem({
'root': {
'index.js': [
'/**',
' * @providesModule index',
' */',
'require("./imgs/a.png");',
'require("./imgs/b.png");',
'require("./imgs/c.png");',
].join('\n'),
'imgs': {
'a@1.5x.png': '',
'b@.7x.png': '',
'c.png': '',
'c@2x.png': '',
},
'package.json': JSON.stringify({
name: 'rootPackage',
}),
},
});
var dgraph = new DependencyGraph({
...defaults,
roots: [root],
});
return getOrderedDependenciesAsJSON(dgraph, 'C:\\root\\index.js').then(function(deps) {
expect(deps)
.toEqual([
{
id: 'index',
path: 'C:\\root\\index.js',
dependencies: [
'./imgs/a.png',
'./imgs/b.png',
'./imgs/c.png',
],
isAsset: false,
isJSON: false,
isPolyfill: false,
resolution: undefined,
},
{
id: 'rootPackage/imgs/a.png',
path: 'C:\\root\\imgs\\a@1.5x.png',
resolution: 1.5,
dependencies: [],
isAsset: true,
isJSON: false,
isPolyfill: false,
},
{
id: 'rootPackage/imgs/b.png',
path: 'C:\\root\\imgs\\b@.7x.png',
resolution: 0.7,
dependencies: [],
isAsset: true,
isJSON: false,
isPolyfill: false,
},
{
id: 'rootPackage/imgs/c.png',
path: 'C:\\root\\imgs\\c.png',
resolution: 1,
dependencies: [],
isAsset: true,
isJSON: false,
isPolyfill: false,
},
]);
});
});
});
describe('node_modules (posix)', function() {