Skip to content
This repository was archived by the owner on Jan 13, 2022. It is now read-only.

[packager] breaking test and fix for combination of "browser" and "react-native" fields #61

Merged
davidaurelio merged 2 commits into from
Apr 12, 2016
Merged

[packager] breaking test and fix for combination of "browser" and "react-native" fields #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e12c913
breaking test for combination of browser and react-native package.jso…
mvayngrib Mar 25, 2016
f2b7041
fix for combination of browser and react-native package.json fields
mvayngrib Mar 25, 2016
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
24 changes: 21 additions & 3 deletions src/Package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,27 @@ class Package {
}

function getReplacements(pkg) {
return pkg['react-native'] == null
? pkg.browser
: pkg['react-native'];
let rn = pkg['react-native'];
let browser = pkg.browser;
if (rn == null) {
return browser;
}

if (browser == null) {
return rn;
}

if (typeof rn === 'string') {
rn = { [pkg.main]: rn };
}

if (typeof browser === 'string') {
browser = { [pkg.main]: browser };
}

// merge with "browser" as default,
// "react-native" as override
return { ...browser, ...rn };
}

module.exports = Package;
137 changes: 137 additions & 0 deletions src/__tests__/DependencyGraph-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2201,6 +2201,143 @@ describe('DependencyGraph', function() {
]);
});
});

pit('should merge browser mapping with react-native mapping', function() {
var root = '/root';
fs.__setMockFilesystem({
'root': {
'index.js': [
'/**',
' * @providesModule index',
' */',
'require("aPackage")',
].join('\n'),
'aPackage': {
'package.json': JSON.stringify({
name: 'aPackage',
'react-native': {
// should see this:
'node-package-a': 'rn-package-a',
// should see this:
'node-package-c': 'rn-package-d',
},
'browser': {
// should see this:
'node-package-b': 'rn-package-b',
// should NOT see this:
'node-package-c': 'rn-package-c',
},
}),
'index.js': 'require("node-package-a"); require("node-package-b"); require("node-package-c");',
'node_modules': {
'node-package-a': {
'package.json': JSON.stringify({
'name': 'node-package-a',
}),
'index.js': 'some node code',
},
'node-package-b': {
'package.json': JSON.stringify({
'name': 'node-package-b',
}),
'index.js': 'some node code',
},
'node-package-c': {
'package.json': JSON.stringify({
'name': 'node-package-c',
}),
'index.js': 'some node code',
},
'node-package-d': {
'package.json': JSON.stringify({
'name': 'node-package-d',
}),
'index.js': 'some node code',
},
'rn-package-a': {
'package.json': JSON.stringify({
'name': 'rn-package-a',
}),
'index.js': 'some rn code',
},
'rn-package-b': {
'package.json': JSON.stringify({
'name': 'rn-package-b',
}),
'index.js': 'some rn code',
},
'rn-package-c': {
'package.json': JSON.stringify({
'name': 'rn-package-c',
}),
'index.js': 'some rn code',
},
'rn-package-d': {
'package.json': JSON.stringify({
'name': 'rn-package-d',
}),
'index.js': 'some rn code',
},
},
},
},
});

var dgraph = new DependencyGraph({
...defaults,
roots: [root],
});
return getOrderedDependenciesAsJSON(dgraph, '/root/index.js').then(function(deps) {
expect(deps)
.toEqual([
{ id: 'index',
path: '/root/index.js',
dependencies: ['aPackage'],
isAsset: false,
isAsset_DEPRECATED: false,
isJSON: false,
isPolyfill: false,
resolution: undefined,
},
{ id: 'aPackage/index.js',
path: '/root/aPackage/index.js',
dependencies: ['node-package-a', 'node-package-b', 'node-package-c'],
isAsset: false,
isAsset_DEPRECATED: false,
isJSON: false,
isPolyfill: false,
resolution: undefined,
},
{ id: 'rn-package-a/index.js',
path: '/root/aPackage/node_modules/rn-package-a/index.js',
dependencies: [],
isAsset: false,
isAsset_DEPRECATED: false,
isJSON: false,
isPolyfill: false,
resolution: undefined,
},
{ id: 'rn-package-b/index.js',
path: '/root/aPackage/node_modules/rn-package-b/index.js',
dependencies: [],
isAsset: false,
isAsset_DEPRECATED: false,
isJSON: false,
isPolyfill: false,
resolution: undefined,
},
{ id: 'rn-package-d/index.js',
path: '/root/aPackage/node_modules/rn-package-d/index.js',
dependencies: [],
isAsset: false,
isAsset_DEPRECATED: false,
isJSON: false,
isPolyfill: false,
resolution: undefined,
},
]);
});
});
});

describe('get sync dependencies (win32)', function() {
Expand Down