From 02b7410ece050a6bf61df5ac3dcb4bb75883444b Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 29 Jun 2015 14:22:12 -0400 Subject: [PATCH] remove eliteDependencies & magic path detection behavior --- lib/detect-dependencies.js | 38 +- lib/inject-dependencies.js | 8 +- test/fixture/bower.json | 1 - test/fixture/bower_after_uninstall.json | 1 - .../bower_components/modernizr/bower.json | 13 - .../bower_components/modernizr/modernizr.js | 1393 ----------------- .../bower_packages_without_dependencies.json | 2 +- test/fixture/bower_with_main.json | 1 - test/fixture/bower_with_main_glob.json | 1 - test/fixture/bowerrc/bower.json | 5 +- .../bowerrc/custom/modernizr/bower.json | 13 - .../bowerrc/custom/modernizr/modernizr.js | 1393 ----------------- test/fixture/haml/index-actual.haml | 2 - .../haml/index-after-uninstall-actual.haml | 2 - .../haml/index-after-uninstall-expected.haml | 3 +- .../haml/index-custom-format-actual.haml | 2 - .../haml/index-custom-format-expected.haml | 3 +- .../haml/index-excluded-files-expected.haml | 1 - test/fixture/haml/index-expected.haml | 3 +- .../fixture/haml/index-second-run-actual.haml | 3 +- .../haml/index-second-run-expected.haml | 3 +- .../html/deep/nested/index-actual.html | 2 - .../html/deep/nested/index-expected.html | 3 +- test/fixture/html/index-actual.html | 2 - .../html/index-after-uninstall-actual.html | 2 - .../index-after-uninstall-all-actual.html | 3 - .../html/index-after-uninstall-expected.html | 3 +- .../html/index-custom-format-expected.html | 1 - .../html/index-cwd-include-self-actual.html | 1 - .../html/index-cwd-include-self-expected.html | 2 +- .../index-detect-quotation-marks-actual.html | 3 +- ...index-detect-quotation-marks-expected.html | 4 +- .../html/index-excluded-files-expected.html | 1 - test/fixture/html/index-expected.html | 3 +- .../html/index-include-self-actual.html | 2 - .../html/index-include-self-expected.html | 3 +- .../html/index-include-self-glob-actual.html | 2 - .../index-include-self-glob-expected.html | 3 +- .../index-override-dependencies-actual.html | 2 - .../index-override-dependencies-expected.html | 2 - .../fixture/html/index-second-run-actual.html | 3 +- .../html/index-second-run-expected.html | 3 +- ...-with-custom-bower-directory-expected.html | 1 - ...with-custom-replace-function-expected.html | 1 - .../index-with-dev-dependencies-actual.html | 2 - .../index-with-dev-dependencies-expected.html | 2 - test/fixture/jade/index-actual.jade | 2 - .../jade/index-after-uninstall-actual.jade | 2 - .../jade/index-after-uninstall-expected.jade | 3 +- .../jade/index-custom-format-actual.jade | 2 - .../jade/index-custom-format-expected.jade | 3 +- .../jade/index-excluded-files-expected.jade | 1 - test/fixture/jade/index-expected.jade | 3 +- .../fixture/jade/index-second-run-actual.jade | 3 +- .../jade/index-second-run-expected.jade | 3 +- .../index-unbuffered-comments-actual.jade | 2 - .../index-unbuffered-comments-expected.jade | 3 +- test/fixture/js/index-expected.js | 1 - .../fixture/less/index-second-run-actual.less | 3 +- .../less/index-second-run-expected.less | 3 +- test/fixture/sass/index-actual.sass | 2 - test/fixture/sass/index-expected.sass | 3 +- .../fixture/sass/index-second-run-actual.sass | 3 +- .../sass/index-second-run-expected.sass | 3 +- test/fixture/scss/index-actual.scss | 2 - test/fixture/scss/index-expected.scss | 3 +- .../fixture/scss/index-second-run-actual.scss | 3 +- .../scss/index-second-run-expected.scss | 3 +- test/fixture/slim/index-actual.slim | 2 - .../slim/index-after-uninstall-actual.slim | 2 - .../slim/index-after-uninstall-expected.slim | 3 +- .../slim/index-custom-format-actual.slim | 2 - .../slim/index-custom-format-expected.slim | 3 +- .../slim/index-excluded-files-expected.slim | 1 - test/fixture/slim/index-expected.slim | 3 +- .../fixture/slim/index-second-run-actual.slim | 3 +- .../slim/index-second-run-expected.slim | 3 +- .../fixture/styl/index-second-run-actual.styl | 3 +- .../styl/index-second-run-expected.styl | 3 +- .../unrecognized/index-actual.unrecognized | 2 - .../unrecognized/index-expected.unrecognized | 3 +- test/fixture/yml/index-actual.yml | 2 - .../yml/index-custom-format-actual.yml | 2 - .../yml/index-custom-format-expected.yml | 3 +- .../yml/index-excluded-files-expected.yml | 1 - test/fixture/yml/index-expected.yml | 3 +- test/fixture/yml/index-second-run-actual.yml | 3 +- .../fixture/yml/index-second-run-expected.yml | 3 +- test/wiredup_test.js | 2 +- 89 files changed, 52 insertions(+), 3003 deletions(-) delete mode 100644 test/fixture/bower_components/modernizr/bower.json delete mode 100644 test/fixture/bower_components/modernizr/modernizr.js delete mode 100644 test/fixture/bowerrc/custom/modernizr/bower.json delete mode 100644 test/fixture/bowerrc/custom/modernizr/modernizr.js diff --git a/lib/detect-dependencies.js b/lib/detect-dependencies.js index 25aed1c..7ee3464 100644 --- a/lib/detect-dependencies.js +++ b/lib/detect-dependencies.js @@ -272,17 +272,6 @@ function mergeSort(items) { } -/** - * Some dependencies which we know should always come first. - */ -var eliteDependencies = [ - 'es5-shim', - 'jquery', - 'zepto', - 'modernizr' -]; - - /** * Sort the dependencies in the order we can best determine they're needed. * @@ -291,29 +280,14 @@ var eliteDependencies = [ * @return {array} the sorted items of 'path/to/main/files.ext' sorted by type */ function prioritizeDependencies(config, fileType) { - var eliteDependenciesCaught = []; - - var dependencies = mergeSort( - $._.toArray(config.get('global-dependencies').get()). - filter(function (dependency) { - return $._.contains(dependency.type, fileType); - }). - filter(function (dependency) { - if ($._.contains(eliteDependencies, dependency.name)) { - eliteDependenciesCaught.push(dependency.main); - } else { - return true; - } - }) - ).map($.propprop('main')); + var globalDependencies = $._.toArray(config.get('global-dependencies').get()); - eliteDependenciesCaught. - forEach(function (dependency) { - dependencies.unshift(dependency); - }); + var dependencies = globalDependencies.filter(function (dependency) { + return $._.contains(dependency.type, fileType); + }); - return $._ - (dependencies). + return $._(mergeSort(dependencies)). + map($.propprop('main')). flatten(). value(). filter(function (main) { diff --git a/lib/inject-dependencies.js b/lib/inject-dependencies.js index 017d855..536679f 100644 --- a/lib/inject-dependencies.js +++ b/lib/inject-dependencies.js @@ -7,7 +7,6 @@ var $ = { var config; var fileTypes; -var filesCaught = []; var globalDependenciesSorted; var ignorePath; @@ -22,7 +21,6 @@ function injectDependencies(globalConfig) { config = globalConfig; var stream = config.get('stream'); - filesCaught = []; globalDependenciesSorted = config.get('global-dependencies-sorted'); ignorePath = config.get('ignore-path'); fileTypes = config.get('file-types'); @@ -62,9 +60,8 @@ function replaceIncludes(file, fileType, returnType) { (string.substr(0, offset) + string.substr(offset + match.length)). replace(oldScripts, ''). replace(fileType.block, ''). - replace(fileType.detect[blockType], function (match, reference) { + replace(fileType.detect[blockType], function (match) { quoteMark = match.match(/['"]/) && match.match(/['"]/)[0]; - filesCaught.push(reference.replace(/['"\s]/g, '')); }); if (!quoteMark) { @@ -83,9 +80,6 @@ function replaceIncludes(file, fileType, returnType) { $.path.basename(filePath) ).replace(/\\/g, '/').replace(ignorePath, ''); }). - filter(function (filePath) { - return filesCaught.indexOf(filePath) === -1; - }). forEach(function (filePath) { if (typeof fileType.replace[blockType] === 'function') { newFileContents += spacing + fileType.replace[blockType](filePath); diff --git a/test/fixture/bower.json b/test/fixture/bower.json index 57d492a..7d55527 100644 --- a/test/fixture/bower.json +++ b/test/fixture/bower.json @@ -2,7 +2,6 @@ "name": "wiredep-test", "version": "0.0.0", "dependencies": { - "modernizr": "2.6.2", "codecode": "0.0.3", "bootstrap": "3.0.0", "modular-scale": "2.0.3", diff --git a/test/fixture/bower_after_uninstall.json b/test/fixture/bower_after_uninstall.json index ec60d3e..37be146 100644 --- a/test/fixture/bower_after_uninstall.json +++ b/test/fixture/bower_after_uninstall.json @@ -2,7 +2,6 @@ "name": "wiredep-test", "version": "0.0.0", "dependencies": { - "modernizr": "~2.6.2", "bootstrap": "~3.0.0" } } diff --git a/test/fixture/bower_components/modernizr/bower.json b/test/fixture/bower_components/modernizr/bower.json deleted file mode 100644 index a1156e2..0000000 --- a/test/fixture/bower_components/modernizr/bower.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "modernizr", - "version": "2.6.2", - "_release": "2.6.2", - "_resolution": { - "type": "version", - "tag": "v2.6.2", - "commit": "ca45d02757b83367d8455d477e3cbc42dfdee035" - }, - "_source": "git://github.com/Modernizr/Modernizr.git", - "_target": "~2.6.2", - "_direct": true -} \ No newline at end of file diff --git a/test/fixture/bower_components/modernizr/modernizr.js b/test/fixture/bower_components/modernizr/modernizr.js deleted file mode 100644 index 56a0022..0000000 --- a/test/fixture/bower_components/modernizr/modernizr.js +++ /dev/null @@ -1,1393 +0,0 @@ -/*! - * Modernizr v2.6.2 - * www.modernizr.com - * - * Copyright (c) Faruk Ates, Paul Irish, Alex Sexton - * Available under the BSD and MIT licenses: www.modernizr.com/license/ - */ - -/* - * Modernizr tests which native CSS3 and HTML5 features are available in - * the current UA and makes the results available to you in two ways: - * as properties on a global Modernizr object, and as classes on the - * element. This information allows you to progressively enhance - * your pages with a granular level of control over the experience. - * - * Modernizr has an optional (not included) conditional resource loader - * called Modernizr.load(), based on Yepnope.js (yepnopejs.com). - * To get a build that includes Modernizr.load(), as well as choosing - * which tests to include, go to www.modernizr.com/download/ - * - * Authors Faruk Ates, Paul Irish, Alex Sexton - * Contributors Ryan Seddon, Ben Alman - */ - -window.Modernizr = (function( window, document, undefined ) { - - var version = '2.6.2', - - Modernizr = {}, - - /*>>cssclasses*/ - // option for enabling the HTML classes to be added - enableClasses = true, - /*>>cssclasses*/ - - docElement = document.documentElement, - - /** - * Create our "modernizr" element that we do most feature tests on. - */ - mod = 'modernizr', - modElem = document.createElement(mod), - mStyle = modElem.style, - - /** - * Create the input element for various Web Forms feature tests. - */ - inputElem /*>>inputelem*/ = document.createElement('input') /*>>inputelem*/ , - - /*>>smile*/ - smile = ':)', - /*>>smile*/ - - toString = {}.toString, - - // TODO :: make the prefixes more granular - /*>>prefixes*/ - // List of property values to set for css tests. See ticket #21 - prefixes = ' -webkit- -moz- -o- -ms- '.split(' '), - /*>>prefixes*/ - - /*>>domprefixes*/ - // Following spec is to expose vendor-specific style properties as: - // elem.style.WebkitBorderRadius - // and the following would be incorrect: - // elem.style.webkitBorderRadius - - // Webkit ghosts their properties in lowercase but Opera & Moz do not. - // Microsoft uses a lowercase `ms` instead of the correct `Ms` in IE8+ - // erik.eae.net/archives/2008/03/10/21.48.10/ - - // More here: github.com/Modernizr/Modernizr/issues/issue/21 - omPrefixes = 'Webkit Moz O ms', - - cssomPrefixes = omPrefixes.split(' '), - - domPrefixes = omPrefixes.toLowerCase().split(' '), - /*>>domprefixes*/ - - /*>>ns*/ - ns = {'svg': 'http://www.w3.org/2000/svg'}, - /*>>ns*/ - - tests = {}, - inputs = {}, - attrs = {}, - - classes = [], - - slice = classes.slice, - - featureName, // used in testing loop - - - /*>>teststyles*/ - // Inject element with style element and some CSS rules - injectElementWithStyles = function( rule, callback, nodes, testnames ) { - - var style, ret, node, docOverflow, - div = document.createElement('div'), - // After page load injecting a fake body doesn't work so check if body exists - body = document.body, - // IE6 and 7 won't return offsetWidth or offsetHeight unless it's in the body element, so we fake it. - fakeBody = body || document.createElement('body'); - - if ( parseInt(nodes, 10) ) { - // In order not to give false positives we create a node for each test - // This also allows the method to scale for unspecified uses - while ( nodes-- ) { - node = document.createElement('div'); - node.id = testnames ? testnames[nodes] : mod + (nodes + 1); - div.appendChild(node); - } - } - - // '].join(''); - div.id = mod; - // IE6 will false positive on some tests due to the style element inside the test div somehow interfering offsetHeight, so insert it into body or fakebody. - // Opera will act all quirky when injecting elements in documentElement when page is served as xml, needs fakebody too. #270 - (body ? div : fakeBody).innerHTML += style; - fakeBody.appendChild(div); - if ( !body ) { - //avoid crashing IE8, if background image is used - fakeBody.style.background = ''; - //Safari 5.13/5.1.4 OSX stops loading if ::-webkit-scrollbar is used and scrollbars are visible - fakeBody.style.overflow = 'hidden'; - docOverflow = docElement.style.overflow; - docElement.style.overflow = 'hidden'; - docElement.appendChild(fakeBody); - } - - ret = callback(div, rule); - // If this is done after page load we don't want to remove the body so check if body exists - if ( !body ) { - fakeBody.parentNode.removeChild(fakeBody); - docElement.style.overflow = docOverflow; - } else { - div.parentNode.removeChild(div); - } - - return !!ret; - - }, - /*>>teststyles*/ - - /*>>mq*/ - // adapted from matchMedia polyfill - // by Scott Jehl and Paul Irish - // gist.github.com/786768 - testMediaQuery = function( mq ) { - - var matchMedia = window.matchMedia || window.msMatchMedia; - if ( matchMedia ) { - return matchMedia(mq).matches; - } - - var bool; - - injectElementWithStyles('@media ' + mq + ' { #' + mod + ' { position: absolute; } }', function( node ) { - bool = (window.getComputedStyle ? - getComputedStyle(node, null) : - node.currentStyle)['position'] == 'absolute'; - }); - - return bool; - - }, - /*>>mq*/ - - - /*>>hasevent*/ - // - // isEventSupported determines if a given element supports the given event - // kangax.github.com/iseventsupported/ - // - // The following results are known incorrects: - // Modernizr.hasEvent("webkitTransitionEnd", elem) // false negative - // Modernizr.hasEvent("textInput") // in Webkit. github.com/Modernizr/Modernizr/issues/333 - // ... - isEventSupported = (function() { - - var TAGNAMES = { - 'select': 'input', 'change': 'input', - 'submit': 'form', 'reset': 'form', - 'error': 'img', 'load': 'img', 'abort': 'img' - }; - - function isEventSupported( eventName, element ) { - - element = element || document.createElement(TAGNAMES[eventName] || 'div'); - eventName = 'on' + eventName; - - // When using `setAttribute`, IE skips "unload", WebKit skips "unload" and "resize", whereas `in` "catches" those - var isSupported = eventName in element; - - if ( !isSupported ) { - // If it has no `setAttribute` (i.e. doesn't implement Node interface), try generic element - if ( !element.setAttribute ) { - element = document.createElement('div'); - } - if ( element.setAttribute && element.removeAttribute ) { - element.setAttribute(eventName, ''); - isSupported = is(element[eventName], 'function'); - - // If property was created, "remove it" (by setting value to `undefined`) - if ( !is(element[eventName], 'undefined') ) { - element[eventName] = undefined; - } - element.removeAttribute(eventName); - } - } - - element = null; - return isSupported; - } - return isEventSupported; - })(), - /*>>hasevent*/ - - // TODO :: Add flag for hasownprop ? didn't last time - - // hasOwnProperty shim by kangax needed for Safari 2.0 support - _hasOwnProperty = ({}).hasOwnProperty, hasOwnProp; - - if ( !is(_hasOwnProperty, 'undefined') && !is(_hasOwnProperty.call, 'undefined') ) { - hasOwnProp = function (object, property) { - return _hasOwnProperty.call(object, property); - }; - } - else { - hasOwnProp = function (object, property) { /* yes, this can give false positives/negatives, but most of the time we don't care about those */ - return ((property in object) && is(object.constructor.prototype[property], 'undefined')); - }; - } - - // Adapted from ES5-shim https://github.com/kriskowal/es5-shim/blob/master/es5-shim.js - // es5.github.com/#x15.3.4.5 - - if (!Function.prototype.bind) { - Function.prototype.bind = function bind(that) { - - var target = this; - - if (typeof target != "function") { - throw new TypeError(); - } - - var args = slice.call(arguments, 1), - bound = function () { - - if (this instanceof bound) { - - var F = function(){}; - F.prototype = target.prototype; - var self = new F(); - - var result = target.apply( - self, - args.concat(slice.call(arguments)) - ); - if (Object(result) === result) { - return result; - } - return self; - - } else { - - return target.apply( - that, - args.concat(slice.call(arguments)) - ); - - } - - }; - - return bound; - }; - } - - /** - * setCss applies given styles to the Modernizr DOM node. - */ - function setCss( str ) { - mStyle.cssText = str; - } - - /** - * setCssAll extrapolates all vendor-specific css strings. - */ - function setCssAll( str1, str2 ) { - return setCss(prefixes.join(str1 + ';') + ( str2 || '' )); - } - - /** - * is returns a boolean for if typeof obj is exactly type. - */ - function is( obj, type ) { - return typeof obj === type; - } - - /** - * contains returns a boolean for if substr is found within str. - */ - function contains( str, substr ) { - return !!~('' + str).indexOf(substr); - } - - /*>>testprop*/ - - // testProps is a generic CSS / DOM property test. - - // In testing support for a given CSS property, it's legit to test: - // `elem.style[styleName] !== undefined` - // If the property is supported it will return an empty string, - // if unsupported it will return undefined. - - // We'll take advantage of this quick test and skip setting a style - // on our modernizr element, but instead just testing undefined vs - // empty string. - - // Because the testing of the CSS property names (with "-", as - // opposed to the camelCase DOM properties) is non-portable and - // non-standard but works in WebKit and IE (but not Gecko or Opera), - // we explicitly reject properties with dashes so that authors - // developing in WebKit or IE first don't end up with - // browser-specific content by accident. - - function testProps( props, prefixed ) { - for ( var i in props ) { - var prop = props[i]; - if ( !contains(prop, "-") && mStyle[prop] !== undefined ) { - return prefixed == 'pfx' ? prop : true; - } - } - return false; - } - /*>>testprop*/ - - // TODO :: add testDOMProps - /** - * testDOMProps is a generic DOM property test; if a browser supports - * a certain property, it won't return undefined for it. - */ - function testDOMProps( props, obj, elem ) { - for ( var i in props ) { - var item = obj[props[i]]; - if ( item !== undefined) { - - // return the property name as a string - if (elem === false) return props[i]; - - // let's bind a function - if (is(item, 'function')){ - // default to autobind unless override - return item.bind(elem || obj); - } - - // return the unbound function or obj or value - return item; - } - } - return false; - } - - /*>>testallprops*/ - /** - * testPropsAll tests a list of DOM properties we want to check against. - * We specify literally ALL possible (known and/or likely) properties on - * the element including the non-vendor prefixed one, for forward- - * compatibility. - */ - function testPropsAll( prop, prefixed, elem ) { - - var ucProp = prop.charAt(0).toUpperCase() + prop.slice(1), - props = (prop + ' ' + cssomPrefixes.join(ucProp + ' ') + ucProp).split(' '); - - // did they call .prefixed('boxSizing') or are we just testing a prop? - if(is(prefixed, "string") || is(prefixed, "undefined")) { - return testProps(props, prefixed); - - // otherwise, they called .prefixed('requestAnimationFrame', window[, elem]) - } else { - props = (prop + ' ' + (domPrefixes).join(ucProp + ' ') + ucProp).split(' '); - return testDOMProps(props, prefixed, elem); - } - } - /*>>testallprops*/ - - - /** - * Tests - * ----- - */ - - // The *new* flexbox - // dev.w3.org/csswg/css3-flexbox - - tests['flexbox'] = function() { - return testPropsAll('flexWrap'); - }; - - // The *old* flexbox - // www.w3.org/TR/2009/WD-css3-flexbox-20090723/ - - tests['flexboxlegacy'] = function() { - return testPropsAll('boxDirection'); - }; - - // On the S60 and BB Storm, getContext exists, but always returns undefined - // so we actually have to call getContext() to verify - // github.com/Modernizr/Modernizr/issues/issue/97/ - - tests['canvas'] = function() { - var elem = document.createElement('canvas'); - return !!(elem.getContext && elem.getContext('2d')); - }; - - tests['canvastext'] = function() { - return !!(Modernizr['canvas'] && is(document.createElement('canvas').getContext('2d').fillText, 'function')); - }; - - // webk.it/70117 is tracking a legit WebGL feature detect proposal - - // We do a soft detect which may false positive in order to avoid - // an expensive context creation: bugzil.la/732441 - - tests['webgl'] = function() { - return !!window.WebGLRenderingContext; - }; - - /* - * The Modernizr.touch test only indicates if the browser supports - * touch events, which does not necessarily reflect a touchscreen - * device, as evidenced by tablets running Windows 7 or, alas, - * the Palm Pre / WebOS (touch) phones. - * - * Additionally, Chrome (desktop) used to lie about its support on this, - * but that has since been rectified: crbug.com/36415 - * - * We also test for Firefox 4 Multitouch Support. - * - * For more info, see: modernizr.github.com/Modernizr/touch.html - */ - - tests['touch'] = function() { - var bool; - - if(('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch) { - bool = true; - } else { - injectElementWithStyles(['@media (',prefixes.join('touch-enabled),('),mod,')','{#modernizr{top:9px;position:absolute}}'].join(''), function( node ) { - bool = node.offsetTop === 9; - }); - } - - return bool; - }; - - - // geolocation is often considered a trivial feature detect... - // Turns out, it's quite tricky to get right: - // - // Using !!navigator.geolocation does two things we don't want. It: - // 1. Leaks memory in IE9: github.com/Modernizr/Modernizr/issues/513 - // 2. Disables page caching in WebKit: webk.it/43956 - // - // Meanwhile, in Firefox < 8, an about:config setting could expose - // a false positive that would throw an exception: bugzil.la/688158 - - tests['geolocation'] = function() { - return 'geolocation' in navigator; - }; - - - tests['postmessage'] = function() { - return !!window.postMessage; - }; - - - // Chrome incognito mode used to throw an exception when using openDatabase - // It doesn't anymore. - tests['websqldatabase'] = function() { - return !!window.openDatabase; - }; - - // Vendors had inconsistent prefixing with the experimental Indexed DB: - // - Webkit's implementation is accessible through webkitIndexedDB - // - Firefox shipped moz_indexedDB before FF4b9, but since then has been mozIndexedDB - // For speed, we don't test the legacy (and beta-only) indexedDB - tests['indexedDB'] = function() { - return !!testPropsAll("indexedDB", window); - }; - - // documentMode logic from YUI to filter out IE8 Compat Mode - // which false positives. - tests['hashchange'] = function() { - return isEventSupported('hashchange', window) && (document.documentMode === undefined || document.documentMode > 7); - }; - - // Per 1.6: - // This used to be Modernizr.historymanagement but the longer - // name has been deprecated in favor of a shorter and property-matching one. - // The old API is still available in 1.6, but as of 2.0 will throw a warning, - // and in the first release thereafter disappear entirely. - tests['history'] = function() { - return !!(window.history && history.pushState); - }; - - tests['draganddrop'] = function() { - var div = document.createElement('div'); - return ('draggable' in div) || ('ondragstart' in div && 'ondrop' in div); - }; - - // FF3.6 was EOL'ed on 4/24/12, but the ESR version of FF10 - // will be supported until FF19 (2/12/13), at which time, ESR becomes FF17. - // FF10 still uses prefixes, so check for it until then. - // for more ESR info, see: mozilla.org/en-US/firefox/organizations/faq/ - tests['websockets'] = function() { - return 'WebSocket' in window || 'MozWebSocket' in window; - }; - - - // css-tricks.com/rgba-browser-support/ - tests['rgba'] = function() { - // Set an rgba() color and check the returned value - - setCss('background-color:rgba(150,255,150,.5)'); - - return contains(mStyle.backgroundColor, 'rgba'); - }; - - tests['hsla'] = function() { - // Same as rgba(), in fact, browsers re-map hsla() to rgba() internally, - // except IE9 who retains it as hsla - - setCss('background-color:hsla(120,40%,100%,.5)'); - - return contains(mStyle.backgroundColor, 'rgba') || contains(mStyle.backgroundColor, 'hsla'); - }; - - tests['multiplebgs'] = function() { - // Setting multiple images AND a color on the background shorthand property - // and then querying the style.background property value for the number of - // occurrences of "url(" is a reliable method for detecting ACTUAL support for this! - - setCss('background:url(https://),url(https://),red url(https://)'); - - // If the UA supports multiple backgrounds, there should be three occurrences - // of the string "url(" in the return value for elemStyle.background - - return (/(url\s*\(.*?){3}/).test(mStyle.background); - }; - - - - // this will false positive in Opera Mini - // github.com/Modernizr/Modernizr/issues/396 - - tests['backgroundsize'] = function() { - return testPropsAll('backgroundSize'); - }; - - tests['borderimage'] = function() { - return testPropsAll('borderImage'); - }; - - - // Super comprehensive table about all the unique implementations of - // border-radius: muddledramblings.com/table-of-css3-border-radius-compliance - - tests['borderradius'] = function() { - return testPropsAll('borderRadius'); - }; - - // WebOS unfortunately false positives on this test. - tests['boxshadow'] = function() { - return testPropsAll('boxShadow'); - }; - - // FF3.0 will false positive on this test - tests['textshadow'] = function() { - return document.createElement('div').style.textShadow === ''; - }; - - - tests['opacity'] = function() { - // Browsers that actually have CSS Opacity implemented have done so - // according to spec, which means their return values are within the - // range of [0.0,1.0] - including the leading zero. - - setCssAll('opacity:.55'); - - // The non-literal . in this regex is intentional: - // German Chrome returns this value as 0,55 - // github.com/Modernizr/Modernizr/issues/#issue/59/comment/516632 - return (/^0.55$/).test(mStyle.opacity); - }; - - - // Note, Android < 4 will pass this test, but can only animate - // a single property at a time - // daneden.me/2011/12/putting-up-with-androids-bullshit/ - tests['cssanimations'] = function() { - return testPropsAll('animationName'); - }; - - - tests['csscolumns'] = function() { - return testPropsAll('columnCount'); - }; - - - tests['cssgradients'] = function() { - /** - * For CSS Gradients syntax, please see: - * webkit.org/blog/175/introducing-css-gradients/ - * developer.mozilla.org/en/CSS/-moz-linear-gradient - * developer.mozilla.org/en/CSS/-moz-radial-gradient - * dev.w3.org/csswg/css3-images/#gradients- - */ - - var str1 = 'background-image:', - str2 = 'gradient(linear,left top,right bottom,from(#9f9),to(white));', - str3 = 'linear-gradient(left top,#9f9, white);'; - - setCss( - // legacy webkit syntax (FIXME: remove when syntax not in use anymore) - (str1 + '-webkit- '.split(' ').join(str2 + str1) + - // standard syntax // trailing 'background-image:' - prefixes.join(str3 + str1)).slice(0, -str1.length) - ); - - return contains(mStyle.backgroundImage, 'gradient'); - }; - - - tests['cssreflections'] = function() { - return testPropsAll('boxReflect'); - }; - - - tests['csstransforms'] = function() { - return !!testPropsAll('transform'); - }; - - - tests['csstransforms3d'] = function() { - - var ret = !!testPropsAll('perspective'); - - // Webkit's 3D transforms are passed off to the browser's own graphics renderer. - // It works fine in Safari on Leopard and Snow Leopard, but not in Chrome in - // some conditions. As a result, Webkit typically recognizes the syntax but - // will sometimes throw a false positive, thus we must do a more thorough check: - if ( ret && 'webkitPerspective' in docElement.style ) { - - // Webkit allows this media query to succeed only if the feature is enabled. - // `@media (transform-3d),(-webkit-transform-3d){ ... }` - injectElementWithStyles('@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}', function( node, rule ) { - ret = node.offsetLeft === 9 && node.offsetHeight === 3; - }); - } - return ret; - }; - - - tests['csstransitions'] = function() { - return testPropsAll('transition'); - }; - - - /*>>fontface*/ - // @font-face detection routine by Diego Perini - // javascript.nwbox.com/CSSSupport/ - - // false positives: - // WebOS github.com/Modernizr/Modernizr/issues/342 - // WP7 github.com/Modernizr/Modernizr/issues/538 - tests['fontface'] = function() { - var bool; - - injectElementWithStyles('@font-face {font-family:"font";src:url("https://")}', function( node, rule ) { - var style = document.getElementById('smodernizr'), - sheet = style.sheet || style.styleSheet, - cssText = sheet ? (sheet.cssRules && sheet.cssRules[0] ? sheet.cssRules[0].cssText : sheet.cssText || '') : ''; - - bool = /src/i.test(cssText) && cssText.indexOf(rule.split(' ')[0]) === 0; - }); - - return bool; - }; - /*>>fontface*/ - - // CSS generated content detection - tests['generatedcontent'] = function() { - var bool; - - injectElementWithStyles(['#',mod,'{font:0/0 a}#',mod,':after{content:"',smile,'";visibility:hidden;font:3px/1 a}'].join(''), function( node ) { - bool = node.offsetHeight >= 3; - }); - - return bool; - }; - - - - // These tests evaluate support of the video/audio elements, as well as - // testing what types of content they support. - // - // We're using the Boolean constructor here, so that we can extend the value - // e.g. Modernizr.video // true - // Modernizr.video.ogg // 'probably' - // - // Codec values from : github.com/NielsLeenheer/html5test/blob/9106a8/index.html#L845 - // thx to NielsLeenheer and zcorpan - - // Note: in some older browsers, "no" was a return value instead of empty string. - // It was live in FF3.5.0 and 3.5.1, but fixed in 3.5.2 - // It was also live in Safari 4.0.0 - 4.0.4, but fixed in 4.0.5 - - tests['video'] = function() { - var elem = document.createElement('video'), - bool = false; - - // IE9 Running on Windows Server SKU can cause an exception to be thrown, bug #224 - try { - if ( bool = !!elem.canPlayType ) { - bool = new Boolean(bool); - bool.ogg = elem.canPlayType('video/ogg; codecs="theora"') .replace(/^no$/,''); - - // Without QuickTime, this value will be `undefined`. github.com/Modernizr/Modernizr/issues/546 - bool.h264 = elem.canPlayType('video/mp4; codecs="avc1.42E01E"') .replace(/^no$/,''); - - bool.webm = elem.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,''); - } - - } catch(e) { } - - return bool; - }; - - tests['audio'] = function() { - var elem = document.createElement('audio'), - bool = false; - - try { - if ( bool = !!elem.canPlayType ) { - bool = new Boolean(bool); - bool.ogg = elem.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,''); - bool.mp3 = elem.canPlayType('audio/mpeg;') .replace(/^no$/,''); - - // Mimetypes accepted: - // developer.mozilla.org/En/Media_formats_supported_by_the_audio_and_video_elements - // bit.ly/iphoneoscodecs - bool.wav = elem.canPlayType('audio/wav; codecs="1"') .replace(/^no$/,''); - bool.m4a = ( elem.canPlayType('audio/x-m4a;') || - elem.canPlayType('audio/aac;')) .replace(/^no$/,''); - } - } catch(e) { } - - return bool; - }; - - - // In FF4, if disabled, window.localStorage should === null. - - // Normally, we could not test that directly and need to do a - // `('localStorage' in window) && ` test first because otherwise Firefox will - // throw bugzil.la/365772 if cookies are disabled - - // Also in iOS5 Private Browsing mode, attempting to use localStorage.setItem - // will throw the exception: - // QUOTA_EXCEEDED_ERRROR DOM Exception 22. - // Peculiarly, getItem and removeItem calls do not throw. - - // Because we are forced to try/catch this, we'll go aggressive. - - // Just FWIW: IE8 Compat mode supports these features completely: - // www.quirksmode.org/dom/html5.html - // But IE8 doesn't support either with local files - - tests['localstorage'] = function() { - try { - localStorage.setItem(mod, mod); - localStorage.removeItem(mod); - return true; - } catch(e) { - return false; - } - }; - - tests['sessionstorage'] = function() { - try { - sessionStorage.setItem(mod, mod); - sessionStorage.removeItem(mod); - return true; - } catch(e) { - return false; - } - }; - - - tests['webworkers'] = function() { - return !!window.Worker; - }; - - - tests['applicationcache'] = function() { - return !!window.applicationCache; - }; - - - // Thanks to Erik Dahlstrom - tests['svg'] = function() { - return !!document.createElementNS && !!document.createElementNS(ns.svg, 'svg').createSVGRect; - }; - - // specifically for SVG inline in HTML, not within XHTML - // test page: paulirish.com/demo/inline-svg - tests['inlinesvg'] = function() { - var div = document.createElement('div'); - div.innerHTML = ''; - return (div.firstChild && div.firstChild.namespaceURI) == ns.svg; - }; - - // SVG SMIL animation - tests['smil'] = function() { - return !!document.createElementNS && /SVGAnimate/.test(toString.call(document.createElementNS(ns.svg, 'animate'))); - }; - - // This test is only for clip paths in SVG proper, not clip paths on HTML content - // demo: srufaculty.sru.edu/david.dailey/svg/newstuff/clipPath4.svg - - // However read the comments to dig into applying SVG clippaths to HTML content here: - // github.com/Modernizr/Modernizr/issues/213#issuecomment-1149491 - tests['svgclippaths'] = function() { - return !!document.createElementNS && /SVGClipPath/.test(toString.call(document.createElementNS(ns.svg, 'clipPath'))); - }; - - /*>>webforms*/ - // input features and input types go directly onto the ret object, bypassing the tests loop. - // Hold this guy to execute in a moment. - function webforms() { - /*>>input*/ - // Run through HTML5's new input attributes to see if the UA understands any. - // We're using f which is the element created early on - // Mike Taylr has created a comprehensive resource for testing these attributes - // when applied to all input types: - // miketaylr.com/code/input-type-attr.html - // spec: www.whatwg.org/specs/web-apps/current-work/multipage/the-input-element.html#input-type-attr-summary - - // Only input placeholder is tested while textarea's placeholder is not. - // Currently Safari 4 and Opera 11 have support only for the input placeholder - // Both tests are available in feature-detects/forms-placeholder.js - Modernizr['input'] = (function( props ) { - for ( var i = 0, len = props.length; i < len; i++ ) { - attrs[ props[i] ] = !!(props[i] in inputElem); - } - if (attrs.list){ - // safari false positive's on datalist: webk.it/74252 - // see also github.com/Modernizr/Modernizr/issues/146 - attrs.list = !!(document.createElement('datalist') && window.HTMLDataListElement); - } - return attrs; - })('autocomplete autofocus list placeholder max min multiple pattern required step'.split(' ')); - /*>>input*/ - - /*>>inputtypes*/ - // Run through HTML5's new input types to see if the UA understands any. - // This is put behind the tests runloop because it doesn't return a - // true/false like all the other tests; instead, it returns an object - // containing each input type with its corresponding true/false value - - // Big thanks to @miketaylr for the html5 forms expertise. miketaylr.com/ - Modernizr['inputtypes'] = (function(props) { - - for ( var i = 0, bool, inputElemType, defaultView, len = props.length; i < len; i++ ) { - - inputElem.setAttribute('type', inputElemType = props[i]); - bool = inputElem.type !== 'text'; - - // We first check to see if the type we give it sticks.. - // If the type does, we feed it a textual value, which shouldn't be valid. - // If the value doesn't stick, we know there's input sanitization which infers a custom UI - if ( bool ) { - - inputElem.value = smile; - inputElem.style.cssText = 'position:absolute;visibility:hidden;'; - - if ( /^range$/.test(inputElemType) && inputElem.style.WebkitAppearance !== undefined ) { - - docElement.appendChild(inputElem); - defaultView = document.defaultView; - - // Safari 2-4 allows the smiley as a value, despite making a slider - bool = defaultView.getComputedStyle && - defaultView.getComputedStyle(inputElem, null).WebkitAppearance !== 'textfield' && - // Mobile android web browser has false positive, so must - // check the height to see if the widget is actually there. - (inputElem.offsetHeight !== 0); - - docElement.removeChild(inputElem); - - } else if ( /^(search|tel)$/.test(inputElemType) ){ - // Spec doesn't define any special parsing or detectable UI - // behaviors so we pass these through as true - - // Interestingly, opera fails the earlier test, so it doesn't - // even make it here. - - } else if ( /^(url|email)$/.test(inputElemType) ) { - // Real url and email support comes with prebaked validation. - bool = inputElem.checkValidity && inputElem.checkValidity() === false; - - } else { - // If the upgraded input compontent rejects the :) text, we got a winner - bool = inputElem.value != smile; - } - } - - inputs[ props[i] ] = !!bool; - } - return inputs; - })('search tel url email datetime date month week time datetime-local number range color'.split(' ')); - /*>>inputtypes*/ - } - /*>>webforms*/ - - - // End of test definitions - // ----------------------- - - - - // Run through all tests and detect their support in the current UA. - // todo: hypothetically we could be doing an array of tests and use a basic loop here. - for ( var feature in tests ) { - if ( hasOwnProp(tests, feature) ) { - // run the test, throw the return value into the Modernizr, - // then based on that boolean, define an appropriate className - // and push it into an array of classes we'll join later. - featureName = feature.toLowerCase(); - Modernizr[featureName] = tests[feature](); - - classes.push((Modernizr[featureName] ? '' : 'no-') + featureName); - } - } - - /*>>webforms*/ - // input tests need to run. - Modernizr.input || webforms(); - /*>>webforms*/ - - - /** - * addTest allows the user to define their own feature tests - * the result will be added onto the Modernizr object, - * as well as an appropriate className set on the html element - * - * @param feature - String naming the feature - * @param test - Function returning true if feature is supported, false if not - */ - Modernizr.addTest = function ( feature, test ) { - if ( typeof feature == 'object' ) { - for ( var key in feature ) { - if ( hasOwnProp( feature, key ) ) { - Modernizr.addTest( key, feature[ key ] ); - } - } - } else { - - feature = feature.toLowerCase(); - - if ( Modernizr[feature] !== undefined ) { - // we're going to quit if you're trying to overwrite an existing test - // if we were to allow it, we'd do this: - // var re = new RegExp("\\b(no-)?" + feature + "\\b"); - // docElement.className = docElement.className.replace( re, '' ); - // but, no rly, stuff 'em. - return Modernizr; - } - - test = typeof test == 'function' ? test() : test; - - if (typeof enableClasses !== "undefined" && enableClasses) { - docElement.className += ' ' + (test ? '' : 'no-') + feature; - } - Modernizr[feature] = test; - - } - - return Modernizr; // allow chaining. - }; - - - // Reset modElem.cssText to nothing to reduce memory footprint. - setCss(''); - modElem = inputElem = null; - - /*>>shiv*/ - /*! HTML5 Shiv v3.6.1 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */ - ;(function(window, document) { - /*jshint evil:true */ - /** Preset options */ - var options = window.html5 || {}; - - /** Used to skip problem elements */ - var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i; - - /** Not all elements can be cloned in IE **/ - var saveClones = /^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i; - - /** Detect whether the browser supports default html5 styles */ - var supportsHtml5Styles; - - /** Name of the expando, to work with multiple documents or to re-shiv one document */ - var expando = '_html5shiv'; - - /** The id for the the documents expando */ - var expanID = 0; - - /** Cached data for each document */ - var expandoData = {}; - - /** Detect whether the browser supports unknown elements */ - var supportsUnknownElements; - - (function() { - try { - var a = document.createElement('a'); - a.innerHTML = ''; - //if the hidden property is implemented we can assume, that the browser supports basic HTML5 Styles - supportsHtml5Styles = ('hidden' in a); - - supportsUnknownElements = a.childNodes.length == 1 || (function() { - // assign a false positive if unable to shiv - (document.createElement)('a'); - var frag = document.createDocumentFragment(); - return ( - typeof frag.cloneNode == 'undefined' || - typeof frag.createDocumentFragment == 'undefined' || - typeof frag.createElement == 'undefined' - ); - }()); - } catch(e) { - supportsHtml5Styles = true; - supportsUnknownElements = true; - } - - }()); - - /*--------------------------------------------------------------------------*/ - - /** - * Creates a style sheet with the given CSS text and adds it to the document. - * @private - * @param {Document} ownerDocument The document. - * @param {String} cssText The CSS text. - * @returns {StyleSheet} The style element. - */ - function addStyleSheet(ownerDocument, cssText) { - var p = ownerDocument.createElement('p'), - parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement; - - p.innerHTML = 'x'; - return parent.insertBefore(p.lastChild, parent.firstChild); - } - - /** - * Returns the value of `html5.elements` as an array. - * @private - * @returns {Array} An array of shived element node names. - */ - function getElements() { - var elements = html5.elements; - return typeof elements == 'string' ? elements.split(' ') : elements; - } - - /** - * Returns the data associated to the given document - * @private - * @param {Document} ownerDocument The document. - * @returns {Object} An object of data. - */ - function getExpandoData(ownerDocument) { - var data = expandoData[ownerDocument[expando]]; - if (!data) { - data = {}; - expanID++; - ownerDocument[expando] = expanID; - expandoData[expanID] = data; - } - return data; - } - - /** - * returns a shived element for the given nodeName and document - * @memberOf html5 - * @param {String} nodeName name of the element - * @param {Document} ownerDocument The context document. - * @returns {Object} The shived element. - */ - function createElement(nodeName, ownerDocument, data){ - if (!ownerDocument) { - ownerDocument = document; - } - if(supportsUnknownElements){ - return ownerDocument.createElement(nodeName); - } - if (!data) { - data = getExpandoData(ownerDocument); - } - var node; - - if (data.cache[nodeName]) { - node = data.cache[nodeName].cloneNode(); - } else if (saveClones.test(nodeName)) { - node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode(); - } else { - node = data.createElem(nodeName); - } - - // Avoid adding some elements to fragments in IE < 9 because - // * Attributes like `name` or `type` cannot be set/changed once an element - // is inserted into a document/fragment - // * Link elements with `src` attributes that are inaccessible, as with - // a 403 response, will cause the tab/window to crash - // * Script elements appended to fragments will execute when their `src` - // or `text` property is set - return node.canHaveChildren && !reSkip.test(nodeName) ? data.frag.appendChild(node) : node; - } - - /** - * returns a shived DocumentFragment for the given document - * @memberOf html5 - * @param {Document} ownerDocument The context document. - * @returns {Object} The shived DocumentFragment. - */ - function createDocumentFragment(ownerDocument, data){ - if (!ownerDocument) { - ownerDocument = document; - } - if(supportsUnknownElements){ - return ownerDocument.createDocumentFragment(); - } - data = data || getExpandoData(ownerDocument); - var clone = data.frag.cloneNode(), - i = 0, - elems = getElements(), - l = elems.length; - for(;i>shiv*/ - - // Assign private properties to the return object with prefix - Modernizr._version = version; - - // expose these for the plugin API. Look in the source for how to join() them against your input - /*>>prefixes*/ - Modernizr._prefixes = prefixes; - /*>>prefixes*/ - /*>>domprefixes*/ - Modernizr._domPrefixes = domPrefixes; - Modernizr._cssomPrefixes = cssomPrefixes; - /*>>domprefixes*/ - - /*>>mq*/ - // Modernizr.mq tests a given media query, live against the current state of the window - // A few important notes: - // * If a browser does not support media queries at all (eg. oldIE) the mq() will always return false - // * A max-width or orientation query will be evaluated against the current state, which may change later. - // * You must specify values. Eg. If you are testing support for the min-width media query use: - // Modernizr.mq('(min-width:0)') - // usage: - // Modernizr.mq('only screen and (max-width:768)') - Modernizr.mq = testMediaQuery; - /*>>mq*/ - - /*>>hasevent*/ - // Modernizr.hasEvent() detects support for a given event, with an optional element to test on - // Modernizr.hasEvent('gesturestart', elem) - Modernizr.hasEvent = isEventSupported; - /*>>hasevent*/ - - /*>>testprop*/ - // Modernizr.testProp() investigates whether a given style property is recognized - // Note that the property names must be provided in the camelCase variant. - // Modernizr.testProp('pointerEvents') - Modernizr.testProp = function(prop){ - return testProps([prop]); - }; - /*>>testprop*/ - - /*>>testallprops*/ - // Modernizr.testAllProps() investigates whether a given style property, - // or any of its vendor-prefixed variants, is recognized - // Note that the property names must be provided in the camelCase variant. - // Modernizr.testAllProps('boxSizing') - Modernizr.testAllProps = testPropsAll; - /*>>testallprops*/ - - - /*>>teststyles*/ - // Modernizr.testStyles() allows you to add custom styles to the document and test an element afterwards - // Modernizr.testStyles('#modernizr { position:absolute }', function(elem, rule){ ... }) - Modernizr.testStyles = injectElementWithStyles; - /*>>teststyles*/ - - - /*>>prefixed*/ - // Modernizr.prefixed() returns the prefixed or nonprefixed property name variant of your input - // Modernizr.prefixed('boxSizing') // 'MozBoxSizing' - - // Properties must be passed as dom-style camelcase, rather than `box-sizing` hypentated style. - // Return values will also be the camelCase variant, if you need to translate that to hypenated style use: - // - // str.replace(/([A-Z])/g, function(str,m1){ return '-' + m1.toLowerCase(); }).replace(/^ms-/,'-ms-'); - - // If you're trying to ascertain which transition end event to bind to, you might do something like... - // - // var transEndEventNames = { - // 'WebkitTransition' : 'webkitTransitionEnd', - // 'MozTransition' : 'transitionend', - // 'OTransition' : 'oTransitionEnd', - // 'msTransition' : 'MSTransitionEnd', - // 'transition' : 'transitionend' - // }, - // transEndEventName = transEndEventNames[ Modernizr.prefixed('transition') ]; - - Modernizr.prefixed = function(prop, obj, elem){ - if(!obj) { - return testPropsAll(prop, 'pfx'); - } else { - // Testing DOM property e.g. Modernizr.prefixed('requestAnimationFrame', window) // 'mozRequestAnimationFrame' - return testPropsAll(prop, obj, elem); - } - }; - /*>>prefixed*/ - - - /*>>cssclasses*/ - // Remove "no-js" class from element, if it exists: - docElement.className = docElement.className.replace(/(^|\s)no-js(\s|$)/, '$1$2') + - - // Add the new classes to the element. - (enableClasses ? ' js ' + classes.join(' ') : ''); - /*>>cssclasses*/ - - return Modernizr; - -})(this, this.document); diff --git a/test/fixture/bower_packages_without_dependencies.json b/test/fixture/bower_packages_without_dependencies.json index 418bc5f..b7e7fdf 100644 --- a/test/fixture/bower_packages_without_dependencies.json +++ b/test/fixture/bower_packages_without_dependencies.json @@ -7,7 +7,7 @@ "overrides": { "fake-package-without-dependencies": { "dependencies": { - "codecode": "0.0.3" + "codecode": "0.0.3" } } } diff --git a/test/fixture/bower_with_main.json b/test/fixture/bower_with_main.json index 6a72c29..9b2907f 100644 --- a/test/fixture/bower_with_main.json +++ b/test/fixture/bower_with_main.json @@ -6,7 +6,6 @@ "sample-main.css" ], "dependencies": { - "modernizr": "2.6.2", "codecode": "0.0.3", "bootstrap": "3.0.0", "modular-scale": "2.0.3", diff --git a/test/fixture/bower_with_main_glob.json b/test/fixture/bower_with_main_glob.json index 44acb2e..6dfde3f 100644 --- a/test/fixture/bower_with_main_glob.json +++ b/test/fixture/bower_with_main_glob.json @@ -3,7 +3,6 @@ "version": "0.0.0", "main": ["sample-*"], "dependencies": { - "modernizr": "2.6.2", "codecode": "0.0.3", "bootstrap": "3.0.0", "modular-scale": "2.0.3", diff --git a/test/fixture/bowerrc/bower.json b/test/fixture/bowerrc/bower.json index 767b954..46b9ee4 100644 --- a/test/fixture/bowerrc/bower.json +++ b/test/fixture/bowerrc/bower.json @@ -1,7 +1,4 @@ { "name": "wiredep-test", - "version": "0.0.0", - "dependencies": { - "modernizr": "2.6.2" - } + "version": "0.0.0" } diff --git a/test/fixture/bowerrc/custom/modernizr/bower.json b/test/fixture/bowerrc/custom/modernizr/bower.json deleted file mode 100644 index a1156e2..0000000 --- a/test/fixture/bowerrc/custom/modernizr/bower.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "modernizr", - "version": "2.6.2", - "_release": "2.6.2", - "_resolution": { - "type": "version", - "tag": "v2.6.2", - "commit": "ca45d02757b83367d8455d477e3cbc42dfdee035" - }, - "_source": "git://github.com/Modernizr/Modernizr.git", - "_target": "~2.6.2", - "_direct": true -} \ No newline at end of file diff --git a/test/fixture/bowerrc/custom/modernizr/modernizr.js b/test/fixture/bowerrc/custom/modernizr/modernizr.js deleted file mode 100644 index 56a0022..0000000 --- a/test/fixture/bowerrc/custom/modernizr/modernizr.js +++ /dev/null @@ -1,1393 +0,0 @@ -/*! - * Modernizr v2.6.2 - * www.modernizr.com - * - * Copyright (c) Faruk Ates, Paul Irish, Alex Sexton - * Available under the BSD and MIT licenses: www.modernizr.com/license/ - */ - -/* - * Modernizr tests which native CSS3 and HTML5 features are available in - * the current UA and makes the results available to you in two ways: - * as properties on a global Modernizr object, and as classes on the - * element. This information allows you to progressively enhance - * your pages with a granular level of control over the experience. - * - * Modernizr has an optional (not included) conditional resource loader - * called Modernizr.load(), based on Yepnope.js (yepnopejs.com). - * To get a build that includes Modernizr.load(), as well as choosing - * which tests to include, go to www.modernizr.com/download/ - * - * Authors Faruk Ates, Paul Irish, Alex Sexton - * Contributors Ryan Seddon, Ben Alman - */ - -window.Modernizr = (function( window, document, undefined ) { - - var version = '2.6.2', - - Modernizr = {}, - - /*>>cssclasses*/ - // option for enabling the HTML classes to be added - enableClasses = true, - /*>>cssclasses*/ - - docElement = document.documentElement, - - /** - * Create our "modernizr" element that we do most feature tests on. - */ - mod = 'modernizr', - modElem = document.createElement(mod), - mStyle = modElem.style, - - /** - * Create the input element for various Web Forms feature tests. - */ - inputElem /*>>inputelem*/ = document.createElement('input') /*>>inputelem*/ , - - /*>>smile*/ - smile = ':)', - /*>>smile*/ - - toString = {}.toString, - - // TODO :: make the prefixes more granular - /*>>prefixes*/ - // List of property values to set for css tests. See ticket #21 - prefixes = ' -webkit- -moz- -o- -ms- '.split(' '), - /*>>prefixes*/ - - /*>>domprefixes*/ - // Following spec is to expose vendor-specific style properties as: - // elem.style.WebkitBorderRadius - // and the following would be incorrect: - // elem.style.webkitBorderRadius - - // Webkit ghosts their properties in lowercase but Opera & Moz do not. - // Microsoft uses a lowercase `ms` instead of the correct `Ms` in IE8+ - // erik.eae.net/archives/2008/03/10/21.48.10/ - - // More here: github.com/Modernizr/Modernizr/issues/issue/21 - omPrefixes = 'Webkit Moz O ms', - - cssomPrefixes = omPrefixes.split(' '), - - domPrefixes = omPrefixes.toLowerCase().split(' '), - /*>>domprefixes*/ - - /*>>ns*/ - ns = {'svg': 'http://www.w3.org/2000/svg'}, - /*>>ns*/ - - tests = {}, - inputs = {}, - attrs = {}, - - classes = [], - - slice = classes.slice, - - featureName, // used in testing loop - - - /*>>teststyles*/ - // Inject element with style element and some CSS rules - injectElementWithStyles = function( rule, callback, nodes, testnames ) { - - var style, ret, node, docOverflow, - div = document.createElement('div'), - // After page load injecting a fake body doesn't work so check if body exists - body = document.body, - // IE6 and 7 won't return offsetWidth or offsetHeight unless it's in the body element, so we fake it. - fakeBody = body || document.createElement('body'); - - if ( parseInt(nodes, 10) ) { - // In order not to give false positives we create a node for each test - // This also allows the method to scale for unspecified uses - while ( nodes-- ) { - node = document.createElement('div'); - node.id = testnames ? testnames[nodes] : mod + (nodes + 1); - div.appendChild(node); - } - } - - // '].join(''); - div.id = mod; - // IE6 will false positive on some tests due to the style element inside the test div somehow interfering offsetHeight, so insert it into body or fakebody. - // Opera will act all quirky when injecting elements in documentElement when page is served as xml, needs fakebody too. #270 - (body ? div : fakeBody).innerHTML += style; - fakeBody.appendChild(div); - if ( !body ) { - //avoid crashing IE8, if background image is used - fakeBody.style.background = ''; - //Safari 5.13/5.1.4 OSX stops loading if ::-webkit-scrollbar is used and scrollbars are visible - fakeBody.style.overflow = 'hidden'; - docOverflow = docElement.style.overflow; - docElement.style.overflow = 'hidden'; - docElement.appendChild(fakeBody); - } - - ret = callback(div, rule); - // If this is done after page load we don't want to remove the body so check if body exists - if ( !body ) { - fakeBody.parentNode.removeChild(fakeBody); - docElement.style.overflow = docOverflow; - } else { - div.parentNode.removeChild(div); - } - - return !!ret; - - }, - /*>>teststyles*/ - - /*>>mq*/ - // adapted from matchMedia polyfill - // by Scott Jehl and Paul Irish - // gist.github.com/786768 - testMediaQuery = function( mq ) { - - var matchMedia = window.matchMedia || window.msMatchMedia; - if ( matchMedia ) { - return matchMedia(mq).matches; - } - - var bool; - - injectElementWithStyles('@media ' + mq + ' { #' + mod + ' { position: absolute; } }', function( node ) { - bool = (window.getComputedStyle ? - getComputedStyle(node, null) : - node.currentStyle)['position'] == 'absolute'; - }); - - return bool; - - }, - /*>>mq*/ - - - /*>>hasevent*/ - // - // isEventSupported determines if a given element supports the given event - // kangax.github.com/iseventsupported/ - // - // The following results are known incorrects: - // Modernizr.hasEvent("webkitTransitionEnd", elem) // false negative - // Modernizr.hasEvent("textInput") // in Webkit. github.com/Modernizr/Modernizr/issues/333 - // ... - isEventSupported = (function() { - - var TAGNAMES = { - 'select': 'input', 'change': 'input', - 'submit': 'form', 'reset': 'form', - 'error': 'img', 'load': 'img', 'abort': 'img' - }; - - function isEventSupported( eventName, element ) { - - element = element || document.createElement(TAGNAMES[eventName] || 'div'); - eventName = 'on' + eventName; - - // When using `setAttribute`, IE skips "unload", WebKit skips "unload" and "resize", whereas `in` "catches" those - var isSupported = eventName in element; - - if ( !isSupported ) { - // If it has no `setAttribute` (i.e. doesn't implement Node interface), try generic element - if ( !element.setAttribute ) { - element = document.createElement('div'); - } - if ( element.setAttribute && element.removeAttribute ) { - element.setAttribute(eventName, ''); - isSupported = is(element[eventName], 'function'); - - // If property was created, "remove it" (by setting value to `undefined`) - if ( !is(element[eventName], 'undefined') ) { - element[eventName] = undefined; - } - element.removeAttribute(eventName); - } - } - - element = null; - return isSupported; - } - return isEventSupported; - })(), - /*>>hasevent*/ - - // TODO :: Add flag for hasownprop ? didn't last time - - // hasOwnProperty shim by kangax needed for Safari 2.0 support - _hasOwnProperty = ({}).hasOwnProperty, hasOwnProp; - - if ( !is(_hasOwnProperty, 'undefined') && !is(_hasOwnProperty.call, 'undefined') ) { - hasOwnProp = function (object, property) { - return _hasOwnProperty.call(object, property); - }; - } - else { - hasOwnProp = function (object, property) { /* yes, this can give false positives/negatives, but most of the time we don't care about those */ - return ((property in object) && is(object.constructor.prototype[property], 'undefined')); - }; - } - - // Adapted from ES5-shim https://github.com/kriskowal/es5-shim/blob/master/es5-shim.js - // es5.github.com/#x15.3.4.5 - - if (!Function.prototype.bind) { - Function.prototype.bind = function bind(that) { - - var target = this; - - if (typeof target != "function") { - throw new TypeError(); - } - - var args = slice.call(arguments, 1), - bound = function () { - - if (this instanceof bound) { - - var F = function(){}; - F.prototype = target.prototype; - var self = new F(); - - var result = target.apply( - self, - args.concat(slice.call(arguments)) - ); - if (Object(result) === result) { - return result; - } - return self; - - } else { - - return target.apply( - that, - args.concat(slice.call(arguments)) - ); - - } - - }; - - return bound; - }; - } - - /** - * setCss applies given styles to the Modernizr DOM node. - */ - function setCss( str ) { - mStyle.cssText = str; - } - - /** - * setCssAll extrapolates all vendor-specific css strings. - */ - function setCssAll( str1, str2 ) { - return setCss(prefixes.join(str1 + ';') + ( str2 || '' )); - } - - /** - * is returns a boolean for if typeof obj is exactly type. - */ - function is( obj, type ) { - return typeof obj === type; - } - - /** - * contains returns a boolean for if substr is found within str. - */ - function contains( str, substr ) { - return !!~('' + str).indexOf(substr); - } - - /*>>testprop*/ - - // testProps is a generic CSS / DOM property test. - - // In testing support for a given CSS property, it's legit to test: - // `elem.style[styleName] !== undefined` - // If the property is supported it will return an empty string, - // if unsupported it will return undefined. - - // We'll take advantage of this quick test and skip setting a style - // on our modernizr element, but instead just testing undefined vs - // empty string. - - // Because the testing of the CSS property names (with "-", as - // opposed to the camelCase DOM properties) is non-portable and - // non-standard but works in WebKit and IE (but not Gecko or Opera), - // we explicitly reject properties with dashes so that authors - // developing in WebKit or IE first don't end up with - // browser-specific content by accident. - - function testProps( props, prefixed ) { - for ( var i in props ) { - var prop = props[i]; - if ( !contains(prop, "-") && mStyle[prop] !== undefined ) { - return prefixed == 'pfx' ? prop : true; - } - } - return false; - } - /*>>testprop*/ - - // TODO :: add testDOMProps - /** - * testDOMProps is a generic DOM property test; if a browser supports - * a certain property, it won't return undefined for it. - */ - function testDOMProps( props, obj, elem ) { - for ( var i in props ) { - var item = obj[props[i]]; - if ( item !== undefined) { - - // return the property name as a string - if (elem === false) return props[i]; - - // let's bind a function - if (is(item, 'function')){ - // default to autobind unless override - return item.bind(elem || obj); - } - - // return the unbound function or obj or value - return item; - } - } - return false; - } - - /*>>testallprops*/ - /** - * testPropsAll tests a list of DOM properties we want to check against. - * We specify literally ALL possible (known and/or likely) properties on - * the element including the non-vendor prefixed one, for forward- - * compatibility. - */ - function testPropsAll( prop, prefixed, elem ) { - - var ucProp = prop.charAt(0).toUpperCase() + prop.slice(1), - props = (prop + ' ' + cssomPrefixes.join(ucProp + ' ') + ucProp).split(' '); - - // did they call .prefixed('boxSizing') or are we just testing a prop? - if(is(prefixed, "string") || is(prefixed, "undefined")) { - return testProps(props, prefixed); - - // otherwise, they called .prefixed('requestAnimationFrame', window[, elem]) - } else { - props = (prop + ' ' + (domPrefixes).join(ucProp + ' ') + ucProp).split(' '); - return testDOMProps(props, prefixed, elem); - } - } - /*>>testallprops*/ - - - /** - * Tests - * ----- - */ - - // The *new* flexbox - // dev.w3.org/csswg/css3-flexbox - - tests['flexbox'] = function() { - return testPropsAll('flexWrap'); - }; - - // The *old* flexbox - // www.w3.org/TR/2009/WD-css3-flexbox-20090723/ - - tests['flexboxlegacy'] = function() { - return testPropsAll('boxDirection'); - }; - - // On the S60 and BB Storm, getContext exists, but always returns undefined - // so we actually have to call getContext() to verify - // github.com/Modernizr/Modernizr/issues/issue/97/ - - tests['canvas'] = function() { - var elem = document.createElement('canvas'); - return !!(elem.getContext && elem.getContext('2d')); - }; - - tests['canvastext'] = function() { - return !!(Modernizr['canvas'] && is(document.createElement('canvas').getContext('2d').fillText, 'function')); - }; - - // webk.it/70117 is tracking a legit WebGL feature detect proposal - - // We do a soft detect which may false positive in order to avoid - // an expensive context creation: bugzil.la/732441 - - tests['webgl'] = function() { - return !!window.WebGLRenderingContext; - }; - - /* - * The Modernizr.touch test only indicates if the browser supports - * touch events, which does not necessarily reflect a touchscreen - * device, as evidenced by tablets running Windows 7 or, alas, - * the Palm Pre / WebOS (touch) phones. - * - * Additionally, Chrome (desktop) used to lie about its support on this, - * but that has since been rectified: crbug.com/36415 - * - * We also test for Firefox 4 Multitouch Support. - * - * For more info, see: modernizr.github.com/Modernizr/touch.html - */ - - tests['touch'] = function() { - var bool; - - if(('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch) { - bool = true; - } else { - injectElementWithStyles(['@media (',prefixes.join('touch-enabled),('),mod,')','{#modernizr{top:9px;position:absolute}}'].join(''), function( node ) { - bool = node.offsetTop === 9; - }); - } - - return bool; - }; - - - // geolocation is often considered a trivial feature detect... - // Turns out, it's quite tricky to get right: - // - // Using !!navigator.geolocation does two things we don't want. It: - // 1. Leaks memory in IE9: github.com/Modernizr/Modernizr/issues/513 - // 2. Disables page caching in WebKit: webk.it/43956 - // - // Meanwhile, in Firefox < 8, an about:config setting could expose - // a false positive that would throw an exception: bugzil.la/688158 - - tests['geolocation'] = function() { - return 'geolocation' in navigator; - }; - - - tests['postmessage'] = function() { - return !!window.postMessage; - }; - - - // Chrome incognito mode used to throw an exception when using openDatabase - // It doesn't anymore. - tests['websqldatabase'] = function() { - return !!window.openDatabase; - }; - - // Vendors had inconsistent prefixing with the experimental Indexed DB: - // - Webkit's implementation is accessible through webkitIndexedDB - // - Firefox shipped moz_indexedDB before FF4b9, but since then has been mozIndexedDB - // For speed, we don't test the legacy (and beta-only) indexedDB - tests['indexedDB'] = function() { - return !!testPropsAll("indexedDB", window); - }; - - // documentMode logic from YUI to filter out IE8 Compat Mode - // which false positives. - tests['hashchange'] = function() { - return isEventSupported('hashchange', window) && (document.documentMode === undefined || document.documentMode > 7); - }; - - // Per 1.6: - // This used to be Modernizr.historymanagement but the longer - // name has been deprecated in favor of a shorter and property-matching one. - // The old API is still available in 1.6, but as of 2.0 will throw a warning, - // and in the first release thereafter disappear entirely. - tests['history'] = function() { - return !!(window.history && history.pushState); - }; - - tests['draganddrop'] = function() { - var div = document.createElement('div'); - return ('draggable' in div) || ('ondragstart' in div && 'ondrop' in div); - }; - - // FF3.6 was EOL'ed on 4/24/12, but the ESR version of FF10 - // will be supported until FF19 (2/12/13), at which time, ESR becomes FF17. - // FF10 still uses prefixes, so check for it until then. - // for more ESR info, see: mozilla.org/en-US/firefox/organizations/faq/ - tests['websockets'] = function() { - return 'WebSocket' in window || 'MozWebSocket' in window; - }; - - - // css-tricks.com/rgba-browser-support/ - tests['rgba'] = function() { - // Set an rgba() color and check the returned value - - setCss('background-color:rgba(150,255,150,.5)'); - - return contains(mStyle.backgroundColor, 'rgba'); - }; - - tests['hsla'] = function() { - // Same as rgba(), in fact, browsers re-map hsla() to rgba() internally, - // except IE9 who retains it as hsla - - setCss('background-color:hsla(120,40%,100%,.5)'); - - return contains(mStyle.backgroundColor, 'rgba') || contains(mStyle.backgroundColor, 'hsla'); - }; - - tests['multiplebgs'] = function() { - // Setting multiple images AND a color on the background shorthand property - // and then querying the style.background property value for the number of - // occurrences of "url(" is a reliable method for detecting ACTUAL support for this! - - setCss('background:url(https://),url(https://),red url(https://)'); - - // If the UA supports multiple backgrounds, there should be three occurrences - // of the string "url(" in the return value for elemStyle.background - - return (/(url\s*\(.*?){3}/).test(mStyle.background); - }; - - - - // this will false positive in Opera Mini - // github.com/Modernizr/Modernizr/issues/396 - - tests['backgroundsize'] = function() { - return testPropsAll('backgroundSize'); - }; - - tests['borderimage'] = function() { - return testPropsAll('borderImage'); - }; - - - // Super comprehensive table about all the unique implementations of - // border-radius: muddledramblings.com/table-of-css3-border-radius-compliance - - tests['borderradius'] = function() { - return testPropsAll('borderRadius'); - }; - - // WebOS unfortunately false positives on this test. - tests['boxshadow'] = function() { - return testPropsAll('boxShadow'); - }; - - // FF3.0 will false positive on this test - tests['textshadow'] = function() { - return document.createElement('div').style.textShadow === ''; - }; - - - tests['opacity'] = function() { - // Browsers that actually have CSS Opacity implemented have done so - // according to spec, which means their return values are within the - // range of [0.0,1.0] - including the leading zero. - - setCssAll('opacity:.55'); - - // The non-literal . in this regex is intentional: - // German Chrome returns this value as 0,55 - // github.com/Modernizr/Modernizr/issues/#issue/59/comment/516632 - return (/^0.55$/).test(mStyle.opacity); - }; - - - // Note, Android < 4 will pass this test, but can only animate - // a single property at a time - // daneden.me/2011/12/putting-up-with-androids-bullshit/ - tests['cssanimations'] = function() { - return testPropsAll('animationName'); - }; - - - tests['csscolumns'] = function() { - return testPropsAll('columnCount'); - }; - - - tests['cssgradients'] = function() { - /** - * For CSS Gradients syntax, please see: - * webkit.org/blog/175/introducing-css-gradients/ - * developer.mozilla.org/en/CSS/-moz-linear-gradient - * developer.mozilla.org/en/CSS/-moz-radial-gradient - * dev.w3.org/csswg/css3-images/#gradients- - */ - - var str1 = 'background-image:', - str2 = 'gradient(linear,left top,right bottom,from(#9f9),to(white));', - str3 = 'linear-gradient(left top,#9f9, white);'; - - setCss( - // legacy webkit syntax (FIXME: remove when syntax not in use anymore) - (str1 + '-webkit- '.split(' ').join(str2 + str1) + - // standard syntax // trailing 'background-image:' - prefixes.join(str3 + str1)).slice(0, -str1.length) - ); - - return contains(mStyle.backgroundImage, 'gradient'); - }; - - - tests['cssreflections'] = function() { - return testPropsAll('boxReflect'); - }; - - - tests['csstransforms'] = function() { - return !!testPropsAll('transform'); - }; - - - tests['csstransforms3d'] = function() { - - var ret = !!testPropsAll('perspective'); - - // Webkit's 3D transforms are passed off to the browser's own graphics renderer. - // It works fine in Safari on Leopard and Snow Leopard, but not in Chrome in - // some conditions. As a result, Webkit typically recognizes the syntax but - // will sometimes throw a false positive, thus we must do a more thorough check: - if ( ret && 'webkitPerspective' in docElement.style ) { - - // Webkit allows this media query to succeed only if the feature is enabled. - // `@media (transform-3d),(-webkit-transform-3d){ ... }` - injectElementWithStyles('@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}', function( node, rule ) { - ret = node.offsetLeft === 9 && node.offsetHeight === 3; - }); - } - return ret; - }; - - - tests['csstransitions'] = function() { - return testPropsAll('transition'); - }; - - - /*>>fontface*/ - // @font-face detection routine by Diego Perini - // javascript.nwbox.com/CSSSupport/ - - // false positives: - // WebOS github.com/Modernizr/Modernizr/issues/342 - // WP7 github.com/Modernizr/Modernizr/issues/538 - tests['fontface'] = function() { - var bool; - - injectElementWithStyles('@font-face {font-family:"font";src:url("https://")}', function( node, rule ) { - var style = document.getElementById('smodernizr'), - sheet = style.sheet || style.styleSheet, - cssText = sheet ? (sheet.cssRules && sheet.cssRules[0] ? sheet.cssRules[0].cssText : sheet.cssText || '') : ''; - - bool = /src/i.test(cssText) && cssText.indexOf(rule.split(' ')[0]) === 0; - }); - - return bool; - }; - /*>>fontface*/ - - // CSS generated content detection - tests['generatedcontent'] = function() { - var bool; - - injectElementWithStyles(['#',mod,'{font:0/0 a}#',mod,':after{content:"',smile,'";visibility:hidden;font:3px/1 a}'].join(''), function( node ) { - bool = node.offsetHeight >= 3; - }); - - return bool; - }; - - - - // These tests evaluate support of the video/audio elements, as well as - // testing what types of content they support. - // - // We're using the Boolean constructor here, so that we can extend the value - // e.g. Modernizr.video // true - // Modernizr.video.ogg // 'probably' - // - // Codec values from : github.com/NielsLeenheer/html5test/blob/9106a8/index.html#L845 - // thx to NielsLeenheer and zcorpan - - // Note: in some older browsers, "no" was a return value instead of empty string. - // It was live in FF3.5.0 and 3.5.1, but fixed in 3.5.2 - // It was also live in Safari 4.0.0 - 4.0.4, but fixed in 4.0.5 - - tests['video'] = function() { - var elem = document.createElement('video'), - bool = false; - - // IE9 Running on Windows Server SKU can cause an exception to be thrown, bug #224 - try { - if ( bool = !!elem.canPlayType ) { - bool = new Boolean(bool); - bool.ogg = elem.canPlayType('video/ogg; codecs="theora"') .replace(/^no$/,''); - - // Without QuickTime, this value will be `undefined`. github.com/Modernizr/Modernizr/issues/546 - bool.h264 = elem.canPlayType('video/mp4; codecs="avc1.42E01E"') .replace(/^no$/,''); - - bool.webm = elem.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,''); - } - - } catch(e) { } - - return bool; - }; - - tests['audio'] = function() { - var elem = document.createElement('audio'), - bool = false; - - try { - if ( bool = !!elem.canPlayType ) { - bool = new Boolean(bool); - bool.ogg = elem.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,''); - bool.mp3 = elem.canPlayType('audio/mpeg;') .replace(/^no$/,''); - - // Mimetypes accepted: - // developer.mozilla.org/En/Media_formats_supported_by_the_audio_and_video_elements - // bit.ly/iphoneoscodecs - bool.wav = elem.canPlayType('audio/wav; codecs="1"') .replace(/^no$/,''); - bool.m4a = ( elem.canPlayType('audio/x-m4a;') || - elem.canPlayType('audio/aac;')) .replace(/^no$/,''); - } - } catch(e) { } - - return bool; - }; - - - // In FF4, if disabled, window.localStorage should === null. - - // Normally, we could not test that directly and need to do a - // `('localStorage' in window) && ` test first because otherwise Firefox will - // throw bugzil.la/365772 if cookies are disabled - - // Also in iOS5 Private Browsing mode, attempting to use localStorage.setItem - // will throw the exception: - // QUOTA_EXCEEDED_ERRROR DOM Exception 22. - // Peculiarly, getItem and removeItem calls do not throw. - - // Because we are forced to try/catch this, we'll go aggressive. - - // Just FWIW: IE8 Compat mode supports these features completely: - // www.quirksmode.org/dom/html5.html - // But IE8 doesn't support either with local files - - tests['localstorage'] = function() { - try { - localStorage.setItem(mod, mod); - localStorage.removeItem(mod); - return true; - } catch(e) { - return false; - } - }; - - tests['sessionstorage'] = function() { - try { - sessionStorage.setItem(mod, mod); - sessionStorage.removeItem(mod); - return true; - } catch(e) { - return false; - } - }; - - - tests['webworkers'] = function() { - return !!window.Worker; - }; - - - tests['applicationcache'] = function() { - return !!window.applicationCache; - }; - - - // Thanks to Erik Dahlstrom - tests['svg'] = function() { - return !!document.createElementNS && !!document.createElementNS(ns.svg, 'svg').createSVGRect; - }; - - // specifically for SVG inline in HTML, not within XHTML - // test page: paulirish.com/demo/inline-svg - tests['inlinesvg'] = function() { - var div = document.createElement('div'); - div.innerHTML = ''; - return (div.firstChild && div.firstChild.namespaceURI) == ns.svg; - }; - - // SVG SMIL animation - tests['smil'] = function() { - return !!document.createElementNS && /SVGAnimate/.test(toString.call(document.createElementNS(ns.svg, 'animate'))); - }; - - // This test is only for clip paths in SVG proper, not clip paths on HTML content - // demo: srufaculty.sru.edu/david.dailey/svg/newstuff/clipPath4.svg - - // However read the comments to dig into applying SVG clippaths to HTML content here: - // github.com/Modernizr/Modernizr/issues/213#issuecomment-1149491 - tests['svgclippaths'] = function() { - return !!document.createElementNS && /SVGClipPath/.test(toString.call(document.createElementNS(ns.svg, 'clipPath'))); - }; - - /*>>webforms*/ - // input features and input types go directly onto the ret object, bypassing the tests loop. - // Hold this guy to execute in a moment. - function webforms() { - /*>>input*/ - // Run through HTML5's new input attributes to see if the UA understands any. - // We're using f which is the element created early on - // Mike Taylr has created a comprehensive resource for testing these attributes - // when applied to all input types: - // miketaylr.com/code/input-type-attr.html - // spec: www.whatwg.org/specs/web-apps/current-work/multipage/the-input-element.html#input-type-attr-summary - - // Only input placeholder is tested while textarea's placeholder is not. - // Currently Safari 4 and Opera 11 have support only for the input placeholder - // Both tests are available in feature-detects/forms-placeholder.js - Modernizr['input'] = (function( props ) { - for ( var i = 0, len = props.length; i < len; i++ ) { - attrs[ props[i] ] = !!(props[i] in inputElem); - } - if (attrs.list){ - // safari false positive's on datalist: webk.it/74252 - // see also github.com/Modernizr/Modernizr/issues/146 - attrs.list = !!(document.createElement('datalist') && window.HTMLDataListElement); - } - return attrs; - })('autocomplete autofocus list placeholder max min multiple pattern required step'.split(' ')); - /*>>input*/ - - /*>>inputtypes*/ - // Run through HTML5's new input types to see if the UA understands any. - // This is put behind the tests runloop because it doesn't return a - // true/false like all the other tests; instead, it returns an object - // containing each input type with its corresponding true/false value - - // Big thanks to @miketaylr for the html5 forms expertise. miketaylr.com/ - Modernizr['inputtypes'] = (function(props) { - - for ( var i = 0, bool, inputElemType, defaultView, len = props.length; i < len; i++ ) { - - inputElem.setAttribute('type', inputElemType = props[i]); - bool = inputElem.type !== 'text'; - - // We first check to see if the type we give it sticks.. - // If the type does, we feed it a textual value, which shouldn't be valid. - // If the value doesn't stick, we know there's input sanitization which infers a custom UI - if ( bool ) { - - inputElem.value = smile; - inputElem.style.cssText = 'position:absolute;visibility:hidden;'; - - if ( /^range$/.test(inputElemType) && inputElem.style.WebkitAppearance !== undefined ) { - - docElement.appendChild(inputElem); - defaultView = document.defaultView; - - // Safari 2-4 allows the smiley as a value, despite making a slider - bool = defaultView.getComputedStyle && - defaultView.getComputedStyle(inputElem, null).WebkitAppearance !== 'textfield' && - // Mobile android web browser has false positive, so must - // check the height to see if the widget is actually there. - (inputElem.offsetHeight !== 0); - - docElement.removeChild(inputElem); - - } else if ( /^(search|tel)$/.test(inputElemType) ){ - // Spec doesn't define any special parsing or detectable UI - // behaviors so we pass these through as true - - // Interestingly, opera fails the earlier test, so it doesn't - // even make it here. - - } else if ( /^(url|email)$/.test(inputElemType) ) { - // Real url and email support comes with prebaked validation. - bool = inputElem.checkValidity && inputElem.checkValidity() === false; - - } else { - // If the upgraded input compontent rejects the :) text, we got a winner - bool = inputElem.value != smile; - } - } - - inputs[ props[i] ] = !!bool; - } - return inputs; - })('search tel url email datetime date month week time datetime-local number range color'.split(' ')); - /*>>inputtypes*/ - } - /*>>webforms*/ - - - // End of test definitions - // ----------------------- - - - - // Run through all tests and detect their support in the current UA. - // todo: hypothetically we could be doing an array of tests and use a basic loop here. - for ( var feature in tests ) { - if ( hasOwnProp(tests, feature) ) { - // run the test, throw the return value into the Modernizr, - // then based on that boolean, define an appropriate className - // and push it into an array of classes we'll join later. - featureName = feature.toLowerCase(); - Modernizr[featureName] = tests[feature](); - - classes.push((Modernizr[featureName] ? '' : 'no-') + featureName); - } - } - - /*>>webforms*/ - // input tests need to run. - Modernizr.input || webforms(); - /*>>webforms*/ - - - /** - * addTest allows the user to define their own feature tests - * the result will be added onto the Modernizr object, - * as well as an appropriate className set on the html element - * - * @param feature - String naming the feature - * @param test - Function returning true if feature is supported, false if not - */ - Modernizr.addTest = function ( feature, test ) { - if ( typeof feature == 'object' ) { - for ( var key in feature ) { - if ( hasOwnProp( feature, key ) ) { - Modernizr.addTest( key, feature[ key ] ); - } - } - } else { - - feature = feature.toLowerCase(); - - if ( Modernizr[feature] !== undefined ) { - // we're going to quit if you're trying to overwrite an existing test - // if we were to allow it, we'd do this: - // var re = new RegExp("\\b(no-)?" + feature + "\\b"); - // docElement.className = docElement.className.replace( re, '' ); - // but, no rly, stuff 'em. - return Modernizr; - } - - test = typeof test == 'function' ? test() : test; - - if (typeof enableClasses !== "undefined" && enableClasses) { - docElement.className += ' ' + (test ? '' : 'no-') + feature; - } - Modernizr[feature] = test; - - } - - return Modernizr; // allow chaining. - }; - - - // Reset modElem.cssText to nothing to reduce memory footprint. - setCss(''); - modElem = inputElem = null; - - /*>>shiv*/ - /*! HTML5 Shiv v3.6.1 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */ - ;(function(window, document) { - /*jshint evil:true */ - /** Preset options */ - var options = window.html5 || {}; - - /** Used to skip problem elements */ - var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i; - - /** Not all elements can be cloned in IE **/ - var saveClones = /^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i; - - /** Detect whether the browser supports default html5 styles */ - var supportsHtml5Styles; - - /** Name of the expando, to work with multiple documents or to re-shiv one document */ - var expando = '_html5shiv'; - - /** The id for the the documents expando */ - var expanID = 0; - - /** Cached data for each document */ - var expandoData = {}; - - /** Detect whether the browser supports unknown elements */ - var supportsUnknownElements; - - (function() { - try { - var a = document.createElement('a'); - a.innerHTML = ''; - //if the hidden property is implemented we can assume, that the browser supports basic HTML5 Styles - supportsHtml5Styles = ('hidden' in a); - - supportsUnknownElements = a.childNodes.length == 1 || (function() { - // assign a false positive if unable to shiv - (document.createElement)('a'); - var frag = document.createDocumentFragment(); - return ( - typeof frag.cloneNode == 'undefined' || - typeof frag.createDocumentFragment == 'undefined' || - typeof frag.createElement == 'undefined' - ); - }()); - } catch(e) { - supportsHtml5Styles = true; - supportsUnknownElements = true; - } - - }()); - - /*--------------------------------------------------------------------------*/ - - /** - * Creates a style sheet with the given CSS text and adds it to the document. - * @private - * @param {Document} ownerDocument The document. - * @param {String} cssText The CSS text. - * @returns {StyleSheet} The style element. - */ - function addStyleSheet(ownerDocument, cssText) { - var p = ownerDocument.createElement('p'), - parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement; - - p.innerHTML = 'x'; - return parent.insertBefore(p.lastChild, parent.firstChild); - } - - /** - * Returns the value of `html5.elements` as an array. - * @private - * @returns {Array} An array of shived element node names. - */ - function getElements() { - var elements = html5.elements; - return typeof elements == 'string' ? elements.split(' ') : elements; - } - - /** - * Returns the data associated to the given document - * @private - * @param {Document} ownerDocument The document. - * @returns {Object} An object of data. - */ - function getExpandoData(ownerDocument) { - var data = expandoData[ownerDocument[expando]]; - if (!data) { - data = {}; - expanID++; - ownerDocument[expando] = expanID; - expandoData[expanID] = data; - } - return data; - } - - /** - * returns a shived element for the given nodeName and document - * @memberOf html5 - * @param {String} nodeName name of the element - * @param {Document} ownerDocument The context document. - * @returns {Object} The shived element. - */ - function createElement(nodeName, ownerDocument, data){ - if (!ownerDocument) { - ownerDocument = document; - } - if(supportsUnknownElements){ - return ownerDocument.createElement(nodeName); - } - if (!data) { - data = getExpandoData(ownerDocument); - } - var node; - - if (data.cache[nodeName]) { - node = data.cache[nodeName].cloneNode(); - } else if (saveClones.test(nodeName)) { - node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode(); - } else { - node = data.createElem(nodeName); - } - - // Avoid adding some elements to fragments in IE < 9 because - // * Attributes like `name` or `type` cannot be set/changed once an element - // is inserted into a document/fragment - // * Link elements with `src` attributes that are inaccessible, as with - // a 403 response, will cause the tab/window to crash - // * Script elements appended to fragments will execute when their `src` - // or `text` property is set - return node.canHaveChildren && !reSkip.test(nodeName) ? data.frag.appendChild(node) : node; - } - - /** - * returns a shived DocumentFragment for the given document - * @memberOf html5 - * @param {Document} ownerDocument The context document. - * @returns {Object} The shived DocumentFragment. - */ - function createDocumentFragment(ownerDocument, data){ - if (!ownerDocument) { - ownerDocument = document; - } - if(supportsUnknownElements){ - return ownerDocument.createDocumentFragment(); - } - data = data || getExpandoData(ownerDocument); - var clone = data.frag.cloneNode(), - i = 0, - elems = getElements(), - l = elems.length; - for(;i>shiv*/ - - // Assign private properties to the return object with prefix - Modernizr._version = version; - - // expose these for the plugin API. Look in the source for how to join() them against your input - /*>>prefixes*/ - Modernizr._prefixes = prefixes; - /*>>prefixes*/ - /*>>domprefixes*/ - Modernizr._domPrefixes = domPrefixes; - Modernizr._cssomPrefixes = cssomPrefixes; - /*>>domprefixes*/ - - /*>>mq*/ - // Modernizr.mq tests a given media query, live against the current state of the window - // A few important notes: - // * If a browser does not support media queries at all (eg. oldIE) the mq() will always return false - // * A max-width or orientation query will be evaluated against the current state, which may change later. - // * You must specify values. Eg. If you are testing support for the min-width media query use: - // Modernizr.mq('(min-width:0)') - // usage: - // Modernizr.mq('only screen and (max-width:768)') - Modernizr.mq = testMediaQuery; - /*>>mq*/ - - /*>>hasevent*/ - // Modernizr.hasEvent() detects support for a given event, with an optional element to test on - // Modernizr.hasEvent('gesturestart', elem) - Modernizr.hasEvent = isEventSupported; - /*>>hasevent*/ - - /*>>testprop*/ - // Modernizr.testProp() investigates whether a given style property is recognized - // Note that the property names must be provided in the camelCase variant. - // Modernizr.testProp('pointerEvents') - Modernizr.testProp = function(prop){ - return testProps([prop]); - }; - /*>>testprop*/ - - /*>>testallprops*/ - // Modernizr.testAllProps() investigates whether a given style property, - // or any of its vendor-prefixed variants, is recognized - // Note that the property names must be provided in the camelCase variant. - // Modernizr.testAllProps('boxSizing') - Modernizr.testAllProps = testPropsAll; - /*>>testallprops*/ - - - /*>>teststyles*/ - // Modernizr.testStyles() allows you to add custom styles to the document and test an element afterwards - // Modernizr.testStyles('#modernizr { position:absolute }', function(elem, rule){ ... }) - Modernizr.testStyles = injectElementWithStyles; - /*>>teststyles*/ - - - /*>>prefixed*/ - // Modernizr.prefixed() returns the prefixed or nonprefixed property name variant of your input - // Modernizr.prefixed('boxSizing') // 'MozBoxSizing' - - // Properties must be passed as dom-style camelcase, rather than `box-sizing` hypentated style. - // Return values will also be the camelCase variant, if you need to translate that to hypenated style use: - // - // str.replace(/([A-Z])/g, function(str,m1){ return '-' + m1.toLowerCase(); }).replace(/^ms-/,'-ms-'); - - // If you're trying to ascertain which transition end event to bind to, you might do something like... - // - // var transEndEventNames = { - // 'WebkitTransition' : 'webkitTransitionEnd', - // 'MozTransition' : 'transitionend', - // 'OTransition' : 'oTransitionEnd', - // 'msTransition' : 'MSTransitionEnd', - // 'transition' : 'transitionend' - // }, - // transEndEventName = transEndEventNames[ Modernizr.prefixed('transition') ]; - - Modernizr.prefixed = function(prop, obj, elem){ - if(!obj) { - return testPropsAll(prop, 'pfx'); - } else { - // Testing DOM property e.g. Modernizr.prefixed('requestAnimationFrame', window) // 'mozRequestAnimationFrame' - return testPropsAll(prop, obj, elem); - } - }; - /*>>prefixed*/ - - - /*>>cssclasses*/ - // Remove "no-js" class from element, if it exists: - docElement.className = docElement.className.replace(/(^|\s)no-js(\s|$)/, '$1$2') + - - // Add the new classes to the element. - (enableClasses ? ' js ' + classes.join(' ') : ''); - /*>>cssclasses*/ - - return Modernizr; - -})(this, this.document); diff --git a/test/fixture/haml/index-actual.haml b/test/fixture/haml/index-actual.haml index dbd1971..ea10300 100644 --- a/test/fixture/haml/index-actual.haml +++ b/test/fixture/haml/index-actual.haml @@ -3,8 +3,6 @@ %head %meta{charset:'utf-8'} %title test. - %script{src:'../bower_components/modernizr/modernizr.js'} - %link{rel:'stylesheet', href:'../bower_components/bootstrap/dist/css/bootstrap.css'} -# bower:css -# endbower %body diff --git a/test/fixture/haml/index-after-uninstall-actual.haml b/test/fixture/haml/index-after-uninstall-actual.haml index dbd1971..ea10300 100644 --- a/test/fixture/haml/index-after-uninstall-actual.haml +++ b/test/fixture/haml/index-after-uninstall-actual.haml @@ -3,8 +3,6 @@ %head %meta{charset:'utf-8'} %title test. - %script{src:'../bower_components/modernizr/modernizr.js'} - %link{rel:'stylesheet', href:'../bower_components/bootstrap/dist/css/bootstrap.css'} -# bower:css -# endbower %body diff --git a/test/fixture/haml/index-after-uninstall-expected.haml b/test/fixture/haml/index-after-uninstall-expected.haml index bdfec8e..0c89160 100644 --- a/test/fixture/haml/index-after-uninstall-expected.haml +++ b/test/fixture/haml/index-after-uninstall-expected.haml @@ -3,9 +3,8 @@ %head %meta{charset:'utf-8'} %title test. - %script{src:'../bower_components/modernizr/modernizr.js'} - %link{rel:'stylesheet', href:'../bower_components/bootstrap/dist/css/bootstrap.css'} -# bower:css + %link{rel:'stylesheet', href:'../bower_components/bootstrap/dist/css/bootstrap.css'} -# endbower %body -# bower:js diff --git a/test/fixture/haml/index-custom-format-actual.haml b/test/fixture/haml/index-custom-format-actual.haml index dbd1971..ea10300 100644 --- a/test/fixture/haml/index-custom-format-actual.haml +++ b/test/fixture/haml/index-custom-format-actual.haml @@ -3,8 +3,6 @@ %head %meta{charset:'utf-8'} %title test. - %script{src:'../bower_components/modernizr/modernizr.js'} - %link{rel:'stylesheet', href:'../bower_components/bootstrap/dist/css/bootstrap.css'} -# bower:css -# endbower %body diff --git a/test/fixture/haml/index-custom-format-expected.haml b/test/fixture/haml/index-custom-format-expected.haml index 8373800..5d9c4a9 100644 --- a/test/fixture/haml/index-custom-format-expected.haml +++ b/test/fixture/haml/index-custom-format-expected.haml @@ -3,10 +3,9 @@ %head %meta{charset:'utf-8'} %title test. - %script{src:'../bower_components/modernizr/modernizr.js'} - %link{rel:'stylesheet', href:'../bower_components/bootstrap/dist/css/bootstrap.css'} -# bower:css %link{href:'../bower_components/codecode/dist/codecode.css', rel:'stylesheet'} + %link{href:'../bower_components/bootstrap/dist/css/bootstrap.css', rel:'stylesheet'} -# endbower %body -# bower:js diff --git a/test/fixture/haml/index-excluded-files-expected.haml b/test/fixture/haml/index-excluded-files-expected.haml index d787b3f..47caca5 100644 --- a/test/fixture/haml/index-excluded-files-expected.haml +++ b/test/fixture/haml/index-excluded-files-expected.haml @@ -9,5 +9,4 @@ %body -# bower:js %script{src:'../bower_components/jquery/jquery.js'} - %script{src:'../bower_components/modernizr/modernizr.js'} -# endbower diff --git a/test/fixture/haml/index-expected.haml b/test/fixture/haml/index-expected.haml index f42edb9..b8b8cbb 100644 --- a/test/fixture/haml/index-expected.haml +++ b/test/fixture/haml/index-expected.haml @@ -3,10 +3,9 @@ %head %meta{charset:'utf-8'} %title test. - %script{src:'../bower_components/modernizr/modernizr.js'} - %link{rel:'stylesheet', href:'../bower_components/bootstrap/dist/css/bootstrap.css'} -# bower:css %link{rel:'stylesheet', href:'../bower_components/codecode/dist/codecode.css'} + %link{rel:'stylesheet', href:'../bower_components/bootstrap/dist/css/bootstrap.css'} -# endbower %body -# bower:js diff --git a/test/fixture/haml/index-second-run-actual.haml b/test/fixture/haml/index-second-run-actual.haml index f42edb9..b8b8cbb 100644 --- a/test/fixture/haml/index-second-run-actual.haml +++ b/test/fixture/haml/index-second-run-actual.haml @@ -3,10 +3,9 @@ %head %meta{charset:'utf-8'} %title test. - %script{src:'../bower_components/modernizr/modernizr.js'} - %link{rel:'stylesheet', href:'../bower_components/bootstrap/dist/css/bootstrap.css'} -# bower:css %link{rel:'stylesheet', href:'../bower_components/codecode/dist/codecode.css'} + %link{rel:'stylesheet', href:'../bower_components/bootstrap/dist/css/bootstrap.css'} -# endbower %body -# bower:js diff --git a/test/fixture/haml/index-second-run-expected.haml b/test/fixture/haml/index-second-run-expected.haml index f42edb9..b8b8cbb 100644 --- a/test/fixture/haml/index-second-run-expected.haml +++ b/test/fixture/haml/index-second-run-expected.haml @@ -3,10 +3,9 @@ %head %meta{charset:'utf-8'} %title test. - %script{src:'../bower_components/modernizr/modernizr.js'} - %link{rel:'stylesheet', href:'../bower_components/bootstrap/dist/css/bootstrap.css'} -# bower:css %link{rel:'stylesheet', href:'../bower_components/codecode/dist/codecode.css'} + %link{rel:'stylesheet', href:'../bower_components/bootstrap/dist/css/bootstrap.css'} -# endbower %body -# bower:js diff --git a/test/fixture/html/deep/nested/index-actual.html b/test/fixture/html/deep/nested/index-actual.html index ac2e02f..d5d1c66 100644 --- a/test/fixture/html/deep/nested/index-actual.html +++ b/test/fixture/html/deep/nested/index-actual.html @@ -3,8 +3,6 @@ test. - - diff --git a/test/fixture/html/deep/nested/index-expected.html b/test/fixture/html/deep/nested/index-expected.html index 943df7f..3d8b52a 100644 --- a/test/fixture/html/deep/nested/index-expected.html +++ b/test/fixture/html/deep/nested/index-expected.html @@ -3,10 +3,9 @@ test. - - + diff --git a/test/fixture/html/index-actual.html b/test/fixture/html/index-actual.html index 55424fb..d5d1c66 100644 --- a/test/fixture/html/index-actual.html +++ b/test/fixture/html/index-actual.html @@ -3,8 +3,6 @@ test. - - diff --git a/test/fixture/html/index-after-uninstall-actual.html b/test/fixture/html/index-after-uninstall-actual.html index 55424fb..d5d1c66 100644 --- a/test/fixture/html/index-after-uninstall-actual.html +++ b/test/fixture/html/index-after-uninstall-actual.html @@ -3,8 +3,6 @@ test. - - diff --git a/test/fixture/html/index-after-uninstall-all-actual.html b/test/fixture/html/index-after-uninstall-all-actual.html index bd3ac26..d5d1c66 100644 --- a/test/fixture/html/index-after-uninstall-all-actual.html +++ b/test/fixture/html/index-after-uninstall-all-actual.html @@ -4,14 +4,11 @@ test. - - - diff --git a/test/fixture/html/index-after-uninstall-expected.html b/test/fixture/html/index-after-uninstall-expected.html index 5a783fa..bd3ac26 100644 --- a/test/fixture/html/index-after-uninstall-expected.html +++ b/test/fixture/html/index-after-uninstall-expected.html @@ -3,9 +3,8 @@ test. - - + diff --git a/test/fixture/html/index-custom-format-expected.html b/test/fixture/html/index-custom-format-expected.html index c436840..a565afe 100644 --- a/test/fixture/html/index-custom-format-expected.html +++ b/test/fixture/html/index-custom-format-expected.html @@ -12,7 +12,6 @@ - diff --git a/test/fixture/html/index-cwd-include-self-actual.html b/test/fixture/html/index-cwd-include-self-actual.html index fe7ae29..d5d1c66 100644 --- a/test/fixture/html/index-cwd-include-self-actual.html +++ b/test/fixture/html/index-cwd-include-self-actual.html @@ -3,7 +3,6 @@ test. - diff --git a/test/fixture/html/index-cwd-include-self-expected.html b/test/fixture/html/index-cwd-include-self-expected.html index aeca4de..2469796 100644 --- a/test/fixture/html/index-cwd-include-self-expected.html +++ b/test/fixture/html/index-cwd-include-self-expected.html @@ -3,8 +3,8 @@ test. - + diff --git a/test/fixture/html/index-detect-quotation-marks-actual.html b/test/fixture/html/index-detect-quotation-marks-actual.html index 6c84d8e..ed8c1fe 100644 --- a/test/fixture/html/index-detect-quotation-marks-actual.html +++ b/test/fixture/html/index-detect-quotation-marks-actual.html @@ -3,13 +3,12 @@ test. - - + diff --git a/test/fixture/html/index-detect-quotation-marks-expected.html b/test/fixture/html/index-detect-quotation-marks-expected.html index 3c03594..6e6aa81 100644 --- a/test/fixture/html/index-detect-quotation-marks-expected.html +++ b/test/fixture/html/index-detect-quotation-marks-expected.html @@ -3,14 +3,14 @@ test. - - + + diff --git a/test/fixture/html/index-excluded-files-expected.html b/test/fixture/html/index-excluded-files-expected.html index b918a32..8df5344 100644 --- a/test/fixture/html/index-excluded-files-expected.html +++ b/test/fixture/html/index-excluded-files-expected.html @@ -11,7 +11,6 @@ - diff --git a/test/fixture/html/index-expected.html b/test/fixture/html/index-expected.html index 48518ce..99d999a 100644 --- a/test/fixture/html/index-expected.html +++ b/test/fixture/html/index-expected.html @@ -3,10 +3,9 @@ test. - - + diff --git a/test/fixture/html/index-include-self-actual.html b/test/fixture/html/index-include-self-actual.html index 55424fb..d5d1c66 100644 --- a/test/fixture/html/index-include-self-actual.html +++ b/test/fixture/html/index-include-self-actual.html @@ -3,8 +3,6 @@ test. - - diff --git a/test/fixture/html/index-include-self-expected.html b/test/fixture/html/index-include-self-expected.html index b571d23..445aa26 100644 --- a/test/fixture/html/index-include-self-expected.html +++ b/test/fixture/html/index-include-self-expected.html @@ -3,10 +3,9 @@ test. - - + diff --git a/test/fixture/html/index-include-self-glob-actual.html b/test/fixture/html/index-include-self-glob-actual.html index 55424fb..d5d1c66 100644 --- a/test/fixture/html/index-include-self-glob-actual.html +++ b/test/fixture/html/index-include-self-glob-actual.html @@ -3,8 +3,6 @@ test. - - diff --git a/test/fixture/html/index-include-self-glob-expected.html b/test/fixture/html/index-include-self-glob-expected.html index b571d23..445aa26 100644 --- a/test/fixture/html/index-include-self-glob-expected.html +++ b/test/fixture/html/index-include-self-glob-expected.html @@ -3,10 +3,9 @@ test. - - + diff --git a/test/fixture/html/index-override-dependencies-actual.html b/test/fixture/html/index-override-dependencies-actual.html index 4c5c9d7..1418075 100644 --- a/test/fixture/html/index-override-dependencies-actual.html +++ b/test/fixture/html/index-override-dependencies-actual.html @@ -3,8 +3,6 @@ test. - - diff --git a/test/fixture/html/index-override-dependencies-expected.html b/test/fixture/html/index-override-dependencies-expected.html index 49c9f4a..9f2bf1e 100644 --- a/test/fixture/html/index-override-dependencies-expected.html +++ b/test/fixture/html/index-override-dependencies-expected.html @@ -3,8 +3,6 @@ test. - - diff --git a/test/fixture/html/index-second-run-actual.html b/test/fixture/html/index-second-run-actual.html index 48518ce..99d999a 100644 --- a/test/fixture/html/index-second-run-actual.html +++ b/test/fixture/html/index-second-run-actual.html @@ -3,10 +3,9 @@ test. - - + diff --git a/test/fixture/html/index-second-run-expected.html b/test/fixture/html/index-second-run-expected.html index 48518ce..99d999a 100644 --- a/test/fixture/html/index-second-run-expected.html +++ b/test/fixture/html/index-second-run-expected.html @@ -3,10 +3,9 @@ test. - - + diff --git a/test/fixture/html/index-with-custom-bower-directory-expected.html b/test/fixture/html/index-with-custom-bower-directory-expected.html index 9a21f96..d5d1c66 100644 --- a/test/fixture/html/index-with-custom-bower-directory-expected.html +++ b/test/fixture/html/index-with-custom-bower-directory-expected.html @@ -9,7 +9,6 @@ - diff --git a/test/fixture/html/index-with-custom-replace-function-expected.html b/test/fixture/html/index-with-custom-replace-function-expected.html index be090e1..0fbc043 100644 --- a/test/fixture/html/index-with-custom-replace-function-expected.html +++ b/test/fixture/html/index-with-custom-replace-function-expected.html @@ -12,7 +12,6 @@ - diff --git a/test/fixture/html/index-with-dev-dependencies-actual.html b/test/fixture/html/index-with-dev-dependencies-actual.html index 55424fb..d5d1c66 100644 --- a/test/fixture/html/index-with-dev-dependencies-actual.html +++ b/test/fixture/html/index-with-dev-dependencies-actual.html @@ -3,8 +3,6 @@ test. - - diff --git a/test/fixture/html/index-with-dev-dependencies-expected.html b/test/fixture/html/index-with-dev-dependencies-expected.html index 090255b..effa125 100644 --- a/test/fixture/html/index-with-dev-dependencies-expected.html +++ b/test/fixture/html/index-with-dev-dependencies-expected.html @@ -3,8 +3,6 @@ test. - - diff --git a/test/fixture/jade/index-actual.jade b/test/fixture/jade/index-actual.jade index 77b3835..b9ffccd 100644 --- a/test/fixture/jade/index-actual.jade +++ b/test/fixture/jade/index-actual.jade @@ -3,8 +3,6 @@ html(lang='en') head meta(charset='utf-8') title test. - script(src='../bower_components/modernizr/modernizr.js') - link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') // bower:css // endbower body diff --git a/test/fixture/jade/index-after-uninstall-actual.jade b/test/fixture/jade/index-after-uninstall-actual.jade index 77b3835..b9ffccd 100644 --- a/test/fixture/jade/index-after-uninstall-actual.jade +++ b/test/fixture/jade/index-after-uninstall-actual.jade @@ -3,8 +3,6 @@ html(lang='en') head meta(charset='utf-8') title test. - script(src='../bower_components/modernizr/modernizr.js') - link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') // bower:css // endbower body diff --git a/test/fixture/jade/index-after-uninstall-expected.jade b/test/fixture/jade/index-after-uninstall-expected.jade index e234a0f..f240ab7 100644 --- a/test/fixture/jade/index-after-uninstall-expected.jade +++ b/test/fixture/jade/index-after-uninstall-expected.jade @@ -3,9 +3,8 @@ html(lang='en') head meta(charset='utf-8') title test. - script(src='../bower_components/modernizr/modernizr.js') - link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') // bower:css + link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') // endbower body // bower:js diff --git a/test/fixture/jade/index-custom-format-actual.jade b/test/fixture/jade/index-custom-format-actual.jade index 77b3835..b9ffccd 100644 --- a/test/fixture/jade/index-custom-format-actual.jade +++ b/test/fixture/jade/index-custom-format-actual.jade @@ -3,8 +3,6 @@ html(lang='en') head meta(charset='utf-8') title test. - script(src='../bower_components/modernizr/modernizr.js') - link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') // bower:css // endbower body diff --git a/test/fixture/jade/index-custom-format-expected.jade b/test/fixture/jade/index-custom-format-expected.jade index a2407bc..63e10fb 100644 --- a/test/fixture/jade/index-custom-format-expected.jade +++ b/test/fixture/jade/index-custom-format-expected.jade @@ -3,10 +3,9 @@ html(lang='en') head meta(charset='utf-8') title test. - script(src='../bower_components/modernizr/modernizr.js') - link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') // bower:css link(href='../bower_components/codecode/dist/codecode.css', rel='stylesheet') + link(href='../bower_components/bootstrap/dist/css/bootstrap.css', rel='stylesheet') // endbower body // bower:js diff --git a/test/fixture/jade/index-excluded-files-expected.jade b/test/fixture/jade/index-excluded-files-expected.jade index f988347..2216ab8 100644 --- a/test/fixture/jade/index-excluded-files-expected.jade +++ b/test/fixture/jade/index-excluded-files-expected.jade @@ -9,5 +9,4 @@ head body // bower:js script(src='../bower_components/jquery/jquery.js') - script(src='../bower_components/modernizr/modernizr.js') // endbower diff --git a/test/fixture/jade/index-expected.jade b/test/fixture/jade/index-expected.jade index 31f173f..e00b924 100644 --- a/test/fixture/jade/index-expected.jade +++ b/test/fixture/jade/index-expected.jade @@ -3,10 +3,9 @@ html(lang='en') head meta(charset='utf-8') title test. - script(src='../bower_components/modernizr/modernizr.js') - link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') // bower:css link(rel='stylesheet', href='../bower_components/codecode/dist/codecode.css') + link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') // endbower body // bower:js diff --git a/test/fixture/jade/index-second-run-actual.jade b/test/fixture/jade/index-second-run-actual.jade index 31f173f..e00b924 100644 --- a/test/fixture/jade/index-second-run-actual.jade +++ b/test/fixture/jade/index-second-run-actual.jade @@ -3,10 +3,9 @@ html(lang='en') head meta(charset='utf-8') title test. - script(src='../bower_components/modernizr/modernizr.js') - link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') // bower:css link(rel='stylesheet', href='../bower_components/codecode/dist/codecode.css') + link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') // endbower body // bower:js diff --git a/test/fixture/jade/index-second-run-expected.jade b/test/fixture/jade/index-second-run-expected.jade index 31f173f..e00b924 100644 --- a/test/fixture/jade/index-second-run-expected.jade +++ b/test/fixture/jade/index-second-run-expected.jade @@ -3,10 +3,9 @@ html(lang='en') head meta(charset='utf-8') title test. - script(src='../bower_components/modernizr/modernizr.js') - link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') // bower:css link(rel='stylesheet', href='../bower_components/codecode/dist/codecode.css') + link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') // endbower body // bower:js diff --git a/test/fixture/jade/index-unbuffered-comments-actual.jade b/test/fixture/jade/index-unbuffered-comments-actual.jade index a4153d1..b4da780 100644 --- a/test/fixture/jade/index-unbuffered-comments-actual.jade +++ b/test/fixture/jade/index-unbuffered-comments-actual.jade @@ -3,8 +3,6 @@ html(lang='en') head meta(charset='utf-8') title test. - script(src='../bower_components/modernizr/modernizr.js') - link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') //- bower:css //- endbower body diff --git a/test/fixture/jade/index-unbuffered-comments-expected.jade b/test/fixture/jade/index-unbuffered-comments-expected.jade index ccc06df..24d82d4 100644 --- a/test/fixture/jade/index-unbuffered-comments-expected.jade +++ b/test/fixture/jade/index-unbuffered-comments-expected.jade @@ -3,10 +3,9 @@ html(lang='en') head meta(charset='utf-8') title test. - script(src='../bower_components/modernizr/modernizr.js') - link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') //- bower:css link(rel='stylesheet', href='../bower_components/codecode/dist/codecode.css') + link(rel='stylesheet', href='../bower_components/bootstrap/dist/css/bootstrap.css') //- endbower body //- bower:js diff --git a/test/fixture/js/index-expected.js b/test/fixture/js/index-expected.js index 6cb44b1..81bce19 100644 --- a/test/fixture/js/index-expected.js +++ b/test/fixture/js/index-expected.js @@ -4,7 +4,6 @@ module.exports = function(config){ // These are the most important... // bower:js "../bower_components/jquery/jquery.js", - "../bower_components/modernizr/modernizr.js", "../bower_components/codecode/dist/codecode.js", "../bower_components/bootstrap/dist/js/bootstrap.js", // endbower diff --git a/test/fixture/less/index-second-run-actual.less b/test/fixture/less/index-second-run-actual.less index ce90d63..55b8b4f 100644 --- a/test/fixture/less/index-second-run-actual.less +++ b/test/fixture/less/index-second-run-actual.less @@ -1,7 +1,6 @@ -@import "../bower_components/bootstrap/dist/css/bootstrap.css"; - // bower:css @import "../bower_components/codecode/dist/codecode.css"; +@import "../bower_components/bootstrap/dist/css/bootstrap.css"; // endbower // bower:less diff --git a/test/fixture/less/index-second-run-expected.less b/test/fixture/less/index-second-run-expected.less index ce90d63..55b8b4f 100644 --- a/test/fixture/less/index-second-run-expected.less +++ b/test/fixture/less/index-second-run-expected.less @@ -1,7 +1,6 @@ -@import "../bower_components/bootstrap/dist/css/bootstrap.css"; - // bower:css @import "../bower_components/codecode/dist/codecode.css"; +@import "../bower_components/bootstrap/dist/css/bootstrap.css"; // endbower // bower:less diff --git a/test/fixture/sass/index-actual.sass b/test/fixture/sass/index-actual.sass index 988593d..46ea10b 100644 --- a/test/fixture/sass/index-actual.sass +++ b/test/fixture/sass/index-actual.sass @@ -1,5 +1,3 @@ -@import ../bower_components/bootstrap/dist/css/bootstrap.css - // bower:css // endbower diff --git a/test/fixture/sass/index-expected.sass b/test/fixture/sass/index-expected.sass index 23406bf..bcbe75c 100644 --- a/test/fixture/sass/index-expected.sass +++ b/test/fixture/sass/index-expected.sass @@ -1,7 +1,6 @@ -@import ../bower_components/bootstrap/dist/css/bootstrap.css - // bower:css @import ../bower_components/codecode/dist/codecode.css +@import ../bower_components/bootstrap/dist/css/bootstrap.css // endbower // bower:sass diff --git a/test/fixture/sass/index-second-run-actual.sass b/test/fixture/sass/index-second-run-actual.sass index 23406bf..bcbe75c 100644 --- a/test/fixture/sass/index-second-run-actual.sass +++ b/test/fixture/sass/index-second-run-actual.sass @@ -1,7 +1,6 @@ -@import ../bower_components/bootstrap/dist/css/bootstrap.css - // bower:css @import ../bower_components/codecode/dist/codecode.css +@import ../bower_components/bootstrap/dist/css/bootstrap.css // endbower // bower:sass diff --git a/test/fixture/sass/index-second-run-expected.sass b/test/fixture/sass/index-second-run-expected.sass index 23406bf..bcbe75c 100644 --- a/test/fixture/sass/index-second-run-expected.sass +++ b/test/fixture/sass/index-second-run-expected.sass @@ -1,7 +1,6 @@ -@import ../bower_components/bootstrap/dist/css/bootstrap.css - // bower:css @import ../bower_components/codecode/dist/codecode.css +@import ../bower_components/bootstrap/dist/css/bootstrap.css // endbower // bower:sass diff --git a/test/fixture/scss/index-actual.scss b/test/fixture/scss/index-actual.scss index 1464b00..46ea10b 100644 --- a/test/fixture/scss/index-actual.scss +++ b/test/fixture/scss/index-actual.scss @@ -1,5 +1,3 @@ -@import "../bower_components/bootstrap/dist/css/bootstrap.css"; - // bower:css // endbower diff --git a/test/fixture/scss/index-expected.scss b/test/fixture/scss/index-expected.scss index efea6ca..8dc92d1 100644 --- a/test/fixture/scss/index-expected.scss +++ b/test/fixture/scss/index-expected.scss @@ -1,7 +1,6 @@ -@import "../bower_components/bootstrap/dist/css/bootstrap.css"; - // bower:css @import "../bower_components/codecode/dist/codecode.css"; +@import "../bower_components/bootstrap/dist/css/bootstrap.css"; // endbower // bower:sass diff --git a/test/fixture/scss/index-second-run-actual.scss b/test/fixture/scss/index-second-run-actual.scss index efea6ca..8dc92d1 100644 --- a/test/fixture/scss/index-second-run-actual.scss +++ b/test/fixture/scss/index-second-run-actual.scss @@ -1,7 +1,6 @@ -@import "../bower_components/bootstrap/dist/css/bootstrap.css"; - // bower:css @import "../bower_components/codecode/dist/codecode.css"; +@import "../bower_components/bootstrap/dist/css/bootstrap.css"; // endbower // bower:sass diff --git a/test/fixture/scss/index-second-run-expected.scss b/test/fixture/scss/index-second-run-expected.scss index efea6ca..8dc92d1 100644 --- a/test/fixture/scss/index-second-run-expected.scss +++ b/test/fixture/scss/index-second-run-expected.scss @@ -1,7 +1,6 @@ -@import "../bower_components/bootstrap/dist/css/bootstrap.css"; - // bower:css @import "../bower_components/codecode/dist/codecode.css"; +@import "../bower_components/bootstrap/dist/css/bootstrap.css"; // endbower // bower:sass diff --git a/test/fixture/slim/index-actual.slim b/test/fixture/slim/index-actual.slim index 610045c..c9d6de6 100644 --- a/test/fixture/slim/index-actual.slim +++ b/test/fixture/slim/index-actual.slim @@ -2,8 +2,6 @@ doctype html head meta charset='utf-8' title test - script src='../bower_components/modernizr/modernizr.js' - link rel='stylesheet' href='../bower_components/bootstrap/dist/css/bootstrap.css' /! bower:css /! endbower body diff --git a/test/fixture/slim/index-after-uninstall-actual.slim b/test/fixture/slim/index-after-uninstall-actual.slim index 610045c..c9d6de6 100644 --- a/test/fixture/slim/index-after-uninstall-actual.slim +++ b/test/fixture/slim/index-after-uninstall-actual.slim @@ -2,8 +2,6 @@ doctype html head meta charset='utf-8' title test - script src='../bower_components/modernizr/modernizr.js' - link rel='stylesheet' href='../bower_components/bootstrap/dist/css/bootstrap.css' /! bower:css /! endbower body diff --git a/test/fixture/slim/index-after-uninstall-expected.slim b/test/fixture/slim/index-after-uninstall-expected.slim index 8a0b82b..e12b113 100644 --- a/test/fixture/slim/index-after-uninstall-expected.slim +++ b/test/fixture/slim/index-after-uninstall-expected.slim @@ -2,9 +2,8 @@ doctype html head meta charset='utf-8' title test - script src='../bower_components/modernizr/modernizr.js' - link rel='stylesheet' href='../bower_components/bootstrap/dist/css/bootstrap.css' /! bower:css + link rel='stylesheet' href='../bower_components/bootstrap/dist/css/bootstrap.css' /! endbower body / bower:js diff --git a/test/fixture/slim/index-custom-format-actual.slim b/test/fixture/slim/index-custom-format-actual.slim index 0e401bf..f6574c1 100644 --- a/test/fixture/slim/index-custom-format-actual.slim +++ b/test/fixture/slim/index-custom-format-actual.slim @@ -2,8 +2,6 @@ doctype html head meta charset='utf-8' title test - script src='../bower_components/modernizr/modernizr.js' - link rel='stylesheet' href='../bower_components/bootstrap/dist/css/bootstrap.css' /! bower:css /! endbower body diff --git a/test/fixture/slim/index-custom-format-expected.slim b/test/fixture/slim/index-custom-format-expected.slim index c51e636..03e4675 100644 --- a/test/fixture/slim/index-custom-format-expected.slim +++ b/test/fixture/slim/index-custom-format-expected.slim @@ -2,10 +2,9 @@ doctype html head meta charset='utf-8' title test - script src='../bower_components/modernizr/modernizr.js' - link rel='stylesheet' href='../bower_components/bootstrap/dist/css/bootstrap.css' /! bower:css link href='../bower_components/codecode/dist/codecode.css' rel='stylesheet' + link href='../bower_components/bootstrap/dist/css/bootstrap.css' rel='stylesheet' /! endbower body /! bower:js diff --git a/test/fixture/slim/index-excluded-files-expected.slim b/test/fixture/slim/index-excluded-files-expected.slim index e980913..c58599d 100644 --- a/test/fixture/slim/index-excluded-files-expected.slim +++ b/test/fixture/slim/index-excluded-files-expected.slim @@ -8,5 +8,4 @@ head body /! bower:js script src='../bower_components/jquery/jquery.js' - script src='../bower_components/modernizr/modernizr.js' /! endbower diff --git a/test/fixture/slim/index-expected.slim b/test/fixture/slim/index-expected.slim index 8f1ea18..0432de3 100644 --- a/test/fixture/slim/index-expected.slim +++ b/test/fixture/slim/index-expected.slim @@ -2,10 +2,9 @@ doctype html head meta charset='utf-8' title test - script src='../bower_components/modernizr/modernizr.js' - link rel='stylesheet' href='../bower_components/bootstrap/dist/css/bootstrap.css' /! bower:css link rel='stylesheet' href='../bower_components/codecode/dist/codecode.css' + link rel='stylesheet' href='../bower_components/bootstrap/dist/css/bootstrap.css' /! endbower body / bower:js diff --git a/test/fixture/slim/index-second-run-actual.slim b/test/fixture/slim/index-second-run-actual.slim index 1c53796..42cee1d 100644 --- a/test/fixture/slim/index-second-run-actual.slim +++ b/test/fixture/slim/index-second-run-actual.slim @@ -2,10 +2,9 @@ doctype html head meta charset='utf-8' title test - script src='../bower_components/modernizr/modernizr.js' - link rel='stylesheet' href='../bower_components/bootstrap/dist/css/bootstrap.css' /! bower:css link rel='stylesheet' href='../bower_components/codecode/dist/codecode.css' + link rel='stylesheet' href='../bower_components/bootstrap/dist/css/bootstrap.css' /! endbower body /! bower:js diff --git a/test/fixture/slim/index-second-run-expected.slim b/test/fixture/slim/index-second-run-expected.slim index 1c53796..42cee1d 100644 --- a/test/fixture/slim/index-second-run-expected.slim +++ b/test/fixture/slim/index-second-run-expected.slim @@ -2,10 +2,9 @@ doctype html head meta charset='utf-8' title test - script src='../bower_components/modernizr/modernizr.js' - link rel='stylesheet' href='../bower_components/bootstrap/dist/css/bootstrap.css' /! bower:css link rel='stylesheet' href='../bower_components/codecode/dist/codecode.css' + link rel='stylesheet' href='../bower_components/bootstrap/dist/css/bootstrap.css' /! endbower body /! bower:js diff --git a/test/fixture/styl/index-second-run-actual.styl b/test/fixture/styl/index-second-run-actual.styl index 2e59b6f..3d73ecb 100644 --- a/test/fixture/styl/index-second-run-actual.styl +++ b/test/fixture/styl/index-second-run-actual.styl @@ -1,7 +1,6 @@ -@import "../bower_components/bootstrap/dist/css/bootstrap.css" - // bower:css @import "../bower_components/codecode/dist/codecode.css" +@import "../bower_components/bootstrap/dist/css/bootstrap.css" // endbower // bower:styl diff --git a/test/fixture/styl/index-second-run-expected.styl b/test/fixture/styl/index-second-run-expected.styl index 2e59b6f..3d73ecb 100644 --- a/test/fixture/styl/index-second-run-expected.styl +++ b/test/fixture/styl/index-second-run-expected.styl @@ -1,7 +1,6 @@ -@import "../bower_components/bootstrap/dist/css/bootstrap.css" - // bower:css @import "../bower_components/codecode/dist/codecode.css" +@import "../bower_components/bootstrap/dist/css/bootstrap.css" // endbower // bower:styl diff --git a/test/fixture/unrecognized/index-actual.unrecognized b/test/fixture/unrecognized/index-actual.unrecognized index 55424fb..d5d1c66 100644 --- a/test/fixture/unrecognized/index-actual.unrecognized +++ b/test/fixture/unrecognized/index-actual.unrecognized @@ -3,8 +3,6 @@ test. - - diff --git a/test/fixture/unrecognized/index-expected.unrecognized b/test/fixture/unrecognized/index-expected.unrecognized index 48518ce..99d999a 100644 --- a/test/fixture/unrecognized/index-expected.unrecognized +++ b/test/fixture/unrecognized/index-expected.unrecognized @@ -3,10 +3,9 @@ test. - - + diff --git a/test/fixture/yml/index-actual.yml b/test/fixture/yml/index-actual.yml index 9ae7adb..d699550 100644 --- a/test/fixture/yml/index-actual.yml +++ b/test/fixture/yml/index-actual.yml @@ -1,9 +1,7 @@ src_css_files: - - ../bower_components/bootstrap/dist/css/bootstrap.css # bower:css # endbower src_js_files: - - ../bower_components/modernizr/modernizr.js # bower:js # endbower diff --git a/test/fixture/yml/index-custom-format-actual.yml b/test/fixture/yml/index-custom-format-actual.yml index 9d88080..d699550 100644 --- a/test/fixture/yml/index-custom-format-actual.yml +++ b/test/fixture/yml/index-custom-format-actual.yml @@ -1,9 +1,7 @@ src_css_files: - - "../bower_components/bootstrap/dist/css/bootstrap.css" # bower:css # endbower src_js_files: - - "../bower_components/modernizr/modernizr.js" # bower:js # endbower diff --git a/test/fixture/yml/index-custom-format-expected.yml b/test/fixture/yml/index-custom-format-expected.yml index 9d14aec..d5647ad 100644 --- a/test/fixture/yml/index-custom-format-expected.yml +++ b/test/fixture/yml/index-custom-format-expected.yml @@ -1,11 +1,10 @@ src_css_files: - - "../bower_components/bootstrap/dist/css/bootstrap.css" # bower:css - "../bower_components/codecode/dist/codecode.css" #css + - "../bower_components/bootstrap/dist/css/bootstrap.css" #css # endbower src_js_files: - - "../bower_components/modernizr/modernizr.js" # bower:js - "../bower_components/jquery/jquery.js" - "../bower_components/codecode/dist/codecode.js" diff --git a/test/fixture/yml/index-excluded-files-expected.yml b/test/fixture/yml/index-excluded-files-expected.yml index 48d32ea..055b6bc 100644 --- a/test/fixture/yml/index-excluded-files-expected.yml +++ b/test/fixture/yml/index-excluded-files-expected.yml @@ -6,5 +6,4 @@ src_css_files: src_js_files: # bower:js - ../bower_components/jquery/jquery.js - - ../bower_components/modernizr/modernizr.js # endbower diff --git a/test/fixture/yml/index-expected.yml b/test/fixture/yml/index-expected.yml index 303adc6..988ef41 100644 --- a/test/fixture/yml/index-expected.yml +++ b/test/fixture/yml/index-expected.yml @@ -1,11 +1,10 @@ src_css_files: - - ../bower_components/bootstrap/dist/css/bootstrap.css # bower:css - ../bower_components/codecode/dist/codecode.css + - ../bower_components/bootstrap/dist/css/bootstrap.css # endbower src_js_files: - - ../bower_components/modernizr/modernizr.js # bower:js - ../bower_components/jquery/jquery.js - ../bower_components/codecode/dist/codecode.js diff --git a/test/fixture/yml/index-second-run-actual.yml b/test/fixture/yml/index-second-run-actual.yml index 303adc6..988ef41 100644 --- a/test/fixture/yml/index-second-run-actual.yml +++ b/test/fixture/yml/index-second-run-actual.yml @@ -1,11 +1,10 @@ src_css_files: - - ../bower_components/bootstrap/dist/css/bootstrap.css # bower:css - ../bower_components/codecode/dist/codecode.css + - ../bower_components/bootstrap/dist/css/bootstrap.css # endbower src_js_files: - - ../bower_components/modernizr/modernizr.js # bower:js - ../bower_components/jquery/jquery.js - ../bower_components/codecode/dist/codecode.js diff --git a/test/fixture/yml/index-second-run-expected.yml b/test/fixture/yml/index-second-run-expected.yml index 303adc6..988ef41 100644 --- a/test/fixture/yml/index-second-run-expected.yml +++ b/test/fixture/yml/index-second-run-expected.yml @@ -1,11 +1,10 @@ src_css_files: - - ../bower_components/bootstrap/dist/css/bootstrap.css # bower:css - ../bower_components/codecode/dist/codecode.css + - ../bower_components/bootstrap/dist/css/bootstrap.css # endbower src_js_files: - - ../bower_components/modernizr/modernizr.js # bower:js - ../bower_components/jquery/jquery.js - ../bower_components/codecode/dist/codecode.js diff --git a/test/wiredup_test.js b/test/wiredup_test.js index 34926c6..2db28c9 100644 --- a/test/wiredup_test.js +++ b/test/wiredup_test.js @@ -298,7 +298,7 @@ describe('wiredep', function () { it('should send injected file data', function(done) { var injected = 0; - var paths = ['bootstrap.css', 'codecode.css', 'bootstrap.js', 'codecode.js', 'modernizr.js', 'jquery.js']; + var paths = ['bootstrap.css', 'codecode.css', 'bootstrap.js', 'codecode.js', 'jquery.js']; wiredep({ src: filePath,