Working AMD Strip. Fishy heuristic, but it works for every test so far.

Modernizr · Nov 8, 2012 · 788487b · 788487b
1 parent 9fe0ea1
commit 788487b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/app.build.js b/app.build.js
@@ -19,13 +19,12 @@
       //Remove AMD ceremony for use without require.js or almond.js
       contents = contents.replace(/define\(.*?\{/, '');
 
-      if ( contents.match(/return.*[^return]*$/) ) {
+      contents = contents.replace(/\}\);\s*?$/,'');
+
+      if ( !contents.match(/Modernizr\.addTest\(/) && !contents.match(/Modernizr\.addAsyncTest\(/) ) {
         //remove last return statement and trailing })
         contents = contents.replace(/return.*[^return]*$/,'');
       }
-      else {
-        contents = contents.replace(/\}\);\s*?$/,'');
-      }
     }
     else if ((/require\([^\{]*?\{/).test(contents)) {
       contents = contents.replace(/require[^\{]+\{/, '');

diff --git a/src/addTest.js b/src/addTest.js
@@ -11,7 +11,7 @@ define(['ModernizrProto', 'Modernizr', 'docElement', 'hasOwnProp'], function( Mo
     if ( typeof feature == 'object' ) {
       for ( var key in feature ) {
         if ( hasOwnProp( feature, key ) ) {
-          Modernizr.addTest( key, feature[ key ] );
+          addTest( key, feature[ key ] );
         }
       }
     } else {

diff --git a/src/modernizr-init.js b/src/modernizr-init.js
@@ -165,6 +165,4 @@ require([
 
   // Leak Modernizr namespace
   window.Modernizr = Modernizr;
-
-  console.dir(window.Modernizr);
 });
diff --git a/stripdefine.js b/stripdefine.js
@@ -2,5 +2,5 @@ var fs = require('fs');
 
 var mod = fs.readFileSync(__dirname + '/dist/modernizr-build.js', 'utf8');
 
-mod = mod.replace('define("modernizr-init", function(){});', '');
+mod = mod.replace('define("modernizr-init",[], function(){});', '');
 fs.writeFileSync(__dirname + '/dist/modernizr-build.js', ";(function(window, document, undefined){\n" + mod + "\n})(this, document);", 'utf8');