Skip to content
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.

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

Introduce overrides for main #68

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,24 @@
"name": "debowerify-test",
"verision": "0.0.0",
"dependencies": {
"js-base64": "~2.1.2"
"js-base64": "~2.1.2",
"test-package-d": "./test/fixtures/test-package-d",
"test-package-e": "./test/fixtures/test-package-e"
},
"devDependencies": {
"base62": "~0.4.0",
"test-package-a": "./test/fixtures/test-package-a",
"test-package-c": "./test/fixtures/test-package-c"
},
"overrides": {
"test-package-d": {
"main": "main.js"
},
"test-package-e": {
"main": {
"production": "main.min.js",
"development": "main.js"
}
}
}
}
9 changes: 9 additions & 0 deletions bower_components/test-package-d/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "test-package-d",
"main": [
"./unknownfile.js"
],
"_source": "/Users/lincoln/Work/Checkouts/debowerify/test/fixtures/test-package-d",
"_target": "*",
"_originalSource": "./test/fixtures/test-package-d"
}
6 changes: 6 additions & 0 deletions bower_components/test-package-d/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "test-package-d",
"main": [
"./unknownfile.js"
]
}
1 change: 1 addition & 0 deletions bower_components/test-package-d/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loaded = true;
10 changes: 10 additions & 0 deletions bower_components/test-package-e/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "test-package-e",
"main": [
"./main.js",
"./main.min.js"
],
"_source": "/Users/lincoln/Work/Checkouts/debowerify/test/fixtures/test-package-e",
"_target": "*",
"_originalSource": "./test/fixtures/test-package-e"
}
7 changes: 7 additions & 0 deletions bower_components/test-package-e/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "test-package-e",
"main": [
"./main.js",
"./main.min.js"
]
}
1 change: 1 addition & 0 deletions bower_components/test-package-e/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
notMinified = true;
1 change: 1 addition & 0 deletions bower_components/test-package-e/main.min.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
minified = true;
6 changes: 4 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,10 @@ module.exports = function (file, options) {
var requiredFilePaths = moduleSubPath;

if (!requiredFilePaths){
if (pkgMeta && pkgMeta.main) {
requiredFilePaths = Array.isArray(pkgMeta.main) ? pkgMeta.main.filter(function (file) { return /\.js$/.test(file); }) : [ pkgMeta.main ];
var pkg = (bowerModules.pkgMeta.overrides[moduleName] || {}).main || pkgMeta.main;
if (pkgMeta && pkg) {
pkg = pkg[process.env.NODE_ENV] || pkg;
requiredFilePaths = Array.isArray(pkg) ? pkg.filter(function (file) { return /\.js$/.test(file); }) : [ pkg ];
} else {
// if 'main' wasn't specified by this component, let's try
// guessing that the main file is moduleName.js
Expand Down
1 change: 1 addition & 0 deletions public/overrides.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('test-package-d')
1 change: 1 addition & 0 deletions public/overrides2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('test-package-e')
6 changes: 6 additions & 0 deletions test/fixtures/test-package-d/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "test-package-d",
"main": [
"./unknownfile.js"
]
}
1 change: 1 addition & 0 deletions test/fixtures/test-package-d/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loaded = true;
7 changes: 7 additions & 0 deletions test/fixtures/test-package-e/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "test-package-e",
"main": [
"./main.js",
"./main.min.js"
]
}
1 change: 1 addition & 0 deletions test/fixtures/test-package-e/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
notMinified = true;
1 change: 1 addition & 0 deletions test/fixtures/test-package-e/main.min.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
minified = true;
29 changes: 28 additions & 1 deletion test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe('debowerify', function() {
});
});

it.only('should be able to debowerify a module with multiple main entries', function(done) {
it('should be able to debowerify a module with multiple main entries', function(done) {
var b = browserify();
b.add(path.join(__dirname, '..', 'public', 'multiple_main_entries.js'));
b.transform(debowerify);
Expand All @@ -85,4 +85,31 @@ describe('debowerify', function() {
});
});

it('should be able to debowerify a module with a broken `main` section with overrides', function(done) {
var b = browserify();
b.add(path.join(__dirname, '..', 'public', 'overrides.js'));
b.transform(debowerify);
b.bundle(function (err, src) {
if (err) return done(err);
var sandbox = { loaded: false };
vm.runInNewContext(src, sandbox);
expect(sandbox.loaded).to.equal(true);
done();
});
});

it('should be able to use NODE_ENV to choose which file to debowerify', function(done) {
process.env.NODE_ENV = 'production'
var b = browserify();
b.add(path.join(__dirname, '..', 'public', 'overrides2.js'));
b.transform(debowerify);
b.bundle(function (err, src) {
if (err) return done(err);
var sandbox = { minified: null, notMinified: null };
vm.runInNewContext(src, sandbox);
expect(sandbox.minified).to.equal(true);
expect(sandbox.notMinified).to.equal(null);
done();
});
});
});