Skip to content

Add support for package interface #49

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

Open
egeste wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for package interface #49

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
e437fa7
Add support for package interface
egeste Dec 27, 2013
236ff93
Append / to module prefix
egeste Feb 10, 2014
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
6 changes: 4 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
node_modules
npm-debug.log
*.iml
.idea
.grunt

/node_modules
/npm-debug.log
/_SpecRunner.html
38 changes: 33 additions & 5 deletions src/template-jasmine-requirejs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ function resolvePath(filepath) {
return path.resolve(filepath);
}

function resolvePackageRoot(baseUrl, pkg) {
var root = baseUrl + path.sep;
if (pkg.location) {
root += pkg.location + path.sep;
}
root += pkg.main ? pkg.main : 'main';
return path.normalize(root);
}

function moveRequireJs(grunt, task, versionOrPath) {
var pathToRequireJS,
versionReg = /^(\d\.?)*$/;
Expand Down Expand Up @@ -94,10 +103,29 @@ exports.process = function(grunt, task, context) {
}

// Remove baseUrl and .js from src files
var baseUrl = (context.options.requireConfig && context.options.requireConfig.baseUrl || '/');
context.scripts.src.forEach(function(script, i){
script = script.replace(new RegExp('^' + baseUrl + "/?"),"");
context.scripts.src[i] = script.replace(/\.js$/,"");
var module = false;
var baseUrl = path.normalize(context.options.requireConfig && context.options.requireConfig.baseUrl || path.sep);

var packages = context.options.requireConfig.packages || [];
packages.forEach(function (pkg) {
var root = resolvePackageRoot(baseUrl, pkg);
var rootPath = path.dirname(root);
if (rootPath === baseUrl) {
module = pkg;
}
});

var prefix = module ? (module.name + '/') : '';
var main = module ? resolvePackageRoot(baseUrl, module) : false;
context.scripts.src.forEach(function(script, i) {
script = path.normalize(script);
script = script.replace(/\.js$/,"");
if (script === main) {
script = module.name;
} else {
script = script.replace(new RegExp('^' + baseUrl + path.sep + "?"), prefix);
}
context.scripts.src[i] = script;
});

// Prepend loaderPlugins to the appropriate files
Expand All @@ -111,7 +139,7 @@ exports.process = function(grunt, task, context) {
});
}

moveRequireJs(grunt, task, version);
moveRequireJs(grunt, task, version);

context.serializeRequireConfig = function(requireConfig) {
var funcCounter = 0;
Expand Down