Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-06 17:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure build command csp cannot be combined with others like underscore.

Browse Source 
Former-commit-id: 97b6bd973323e086f1b6fdf3e40a7732804e2669
This commit is contained in:
John-David Dalton
2013-07-22 07:16:04 -07:00
parent 769ff84a65
commit 2c772d0f4c
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -168,7 +168,7 @@ lodash settings="{interpolate:/\{\{([\s\S]+?)\}\}/g}"
lodash moduleId="underscore" lodash moduleId="underscore"
``` ```
All arguments, except `legacy` with `mobile`, `modern`, or `underscore`, may be combined.<br> All arguments, except `backbone`, `csp`, `legacy`, `mobile`, `modern`, and `underscore`, may be combined.<br>
Unless specified by `-o` or `--output`, all files created are saved to the current working directory. Unless specified by `-o` or `--output`, all files created are saved to the current working directory.
The following options are also supported: The following options are also supported:

4
build.js
View File

@@ -1150,7 +1150,7 @@
' (e.g. `lodash settings="{interpolate:/{{([\\s\\S]+?)}}/g}"`)', ' (e.g. `lodash settings="{interpolate:/{{([\\s\\S]+?)}}/g}"`)',
' lodash moduleId=... The AMD module ID of Lo-Dash, which defaults to “lodash”, used by precompiled templates', ' lodash moduleId=... The AMD module ID of Lo-Dash, which defaults to “lodash”, used by precompiled templates',
'', '',
' All arguments, except `backbone`, `legacy`, `mobile`, `modern`, and `underscore`, may be combined.', ' All arguments, except `backbone`, `csp`, `legacy`, `mobile`, `modern`, and `underscore`, may be combined.',
' Unless specified by `-o` or `--output`, all files created are saved to the current working directory.', ' Unless specified by `-o` or `--output`, all files created are saved to the current working directory.',
'', '',
' Options:', ' Options:',
@@ -2650,7 +2650,7 @@
warnings.push('Invalid argument' + (invalidArgs.length > 1 ? 's' : '') + ' passed: ' + invalidArgs.join(', ')); warnings.push('Invalid argument' + (invalidArgs.length > 1 ? 's' : '') + ' passed: ' + invalidArgs.join(', '));
} }
// report invalid command combinations // report invalid command combinations
invalidArgs = _.intersection(options, ['backbone', 'legacy', 'mobile', 'modern', 'underscore']); invalidArgs = _.intersection(options, ['backbone', 'csp', 'legacy', 'mobile', 'modern', 'underscore']);
if (isTemplate) { if (isTemplate) {
invalidArgs.push('template'); invalidArgs.push('template');

3
test/test-build.js
View File

@@ -505,6 +505,7 @@
}); });
commands = [ commands = [
'csp backbone',
'mobile underscore', 'mobile underscore',
'modern template=./*.jst' 'modern template=./*.jst'
]; ];
@@ -1646,7 +1647,7 @@
}) })
); );
var reNonCombinable = /\b(?:backbone|legacy|mobile|modern|underscore)\b/; var reNonCombinable = /\b(?:backbone|csp|legacy|mobile|modern|underscore)\b/;
commands.forEach(function(origCommand) { commands.forEach(function(origCommand) {
_.each(['', 'mobile', 'modern', 'underscore'], function(otherCommand) { _.each(['', 'mobile', 'modern', 'underscore'], function(otherCommand) {