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

Allowing user to supply paths for jquery and can. #36

Merged
merged 4 commits into from
Apr 13, 2015
Merged

Allowing user to supply paths for jquery and can. #36

merged 4 commits into from
Apr 13, 2015

Conversation

ccummings
Copy link
Contributor

This enables can-compile to work offline if the paths are local.

The new resolveScripts utility determines the correct version of jQuery and what view engines to include for a given version of CanJS.

This still needs tests. The PR is mostly to see the proposed changes as a diff and solicit feedback.

This enables can-compile to work offline if the paths local.
The new resolveScripts utility uses a version mapping to determine the
correct version of jQuery and what view engines to include for a given version
of CanJS.
@@ -38,7 +40,7 @@ module.exports = function(files, configuration, callback, log) {
}
var list = results.map(function(compiled) {
var options = compiled[1];
var method = configuration.version.indexOf('2.1') === 0 ? 'preloadStringRenderer' : 'preload';
var method = semver.satisfies(configuration.version, '>=2.1.x') ? 'preloadStringRenderer' : 'preload';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 I just realized that the old one would break with 2.2

daffl added a commit that referenced this pull request Apr 13, 2015
Allowing user to supply paths for jquery and can.
@daffl daffl merged commit 39140b4 into canjs:master Apr 13, 2015
@daffl
Copy link
Contributor

daffl commented Apr 13, 2015

I think this will solve #35, too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants