🐞 Fix AMD file paths. Fixes #1088

Same issue as metafizzy/packery#372 👷 build v3.0.1 ⬆️ update ev-emitter v1.0.3, fizzy-ui-utils v2.0.2
metafizzy · Jun 8, 2016 · 98ba374 · 98ba374
1 parent 812c3f8
commit 98ba374
Show file tree

Hide file tree

Showing 7 changed files with 313 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ See [isotope.metafizzy.co](http://isotope.metafizzy.co) for complete docs and de
 
 ### CDN
 
-Link directly to [Isotope files on cdnjs](https://cdnjs.com/libraries/jquery.isotope).
+Link directly to Isotope files on [npmcdn](https://npmcdn.com).
 
 ``` html
 <script src="https://npmcdn.com/isotope-layout@3.0/dist/isotope.pkgd.min.js"></script>

diff --git a/dist/isotope.pkgd.js b/dist/isotope.pkgd.js
@@ -1,5 +1,5 @@
 /*!
- * Isotope PACKAGED v3.0.0
+ * Isotope PACKAGED v3.0.1
  *
  * Licensed GPLv3 for open source use
  * or Isotope Commercial License for commercial use
@@ -154,7 +154,7 @@ return jQueryBridget;
 }));
 
 /**
- * EvEmitter v1.0.2
+ * EvEmitter v1.0.3
  * Lil' event emitter
  * MIT License
  */
@@ -163,7 +163,7 @@ return jQueryBridget;
 
 ( function( global, factory ) {
   // universal module definition
-  /* jshint strict: false */ /* globals define, module */
+  /* jshint strict: false */ /* globals define, module, window */
   if ( typeof define == 'function' && define.amd ) {
     // AMD - RequireJS
     define( 'ev-emitter/ev-emitter',factory );
@@ -175,7 +175,7 @@ return jQueryBridget;
     global.EvEmitter = factory();
   }
 
-}( this, function() {
+}( typeof window != 'undefined' ? window : this, function() {
 
 
 
@@ -528,7 +528,7 @@ return getSize;
 }));
 
 /**
- * Fizzy UI utils v2.0.1
+ * Fizzy UI utils v2.0.2
  * MIT license
  */
 
@@ -699,7 +699,8 @@ utils.debounceMethod = function( _class, methodName, threshold ) {
 // ----- docReady ----- //
 
 utils.docReady = function( callback ) {
-  if ( document.readyState == 'complete' ) {
+  var readyState = document.readyState;
+  if ( readyState == 'complete' || readyState == 'interactive' ) {
     callback();
   } else {
     document.addEventListener( 'DOMContentLoaded', callback );
@@ -2266,7 +2267,7 @@ return Outlayer;
   /* jshint strict: false */ /*globals define, module, require */
   if ( typeof define == 'function' && define.amd ) {
     // AMD
-    define( 'isotope/item',[
+    define( 'isotope/js/item',[
         'outlayer/outlayer'
       ],
       factory );
@@ -2344,7 +2345,7 @@ return Item;
   /* jshint strict: false */ /*globals define, module, require */
   if ( typeof define == 'function' && define.amd ) {
     // AMD
-    define( 'isotope/layout-mode',[
+    define( 'isotope/js/layout-mode',[
         'get-size/get-size',
         'outlayer/outlayer'
       ],
@@ -2710,7 +2711,7 @@ return Item;
   /* jshint strict: false */ /*globals define, module, require */
   if ( typeof define == 'function' && define.amd ) {
     // AMD
-    define( 'isotope/layout-modes/masonry',[
+    define( 'isotope/js/layout-modes/masonry',[
         '../layout-mode',
         'masonry/masonry'
       ],
@@ -2783,7 +2784,7 @@ return Item;
   /* jshint strict: false */ /*globals define, module, require */
   if ( typeof define == 'function' && define.amd ) {
     // AMD
-    define( 'isotope/layout-modes/fit-rows',[
+    define( 'isotope/js/layout-modes/fit-rows',[
         '../layout-mode'
       ],
       factory );
@@ -2852,7 +2853,7 @@ return FitRows;
   /* jshint strict: false */ /*globals define, module, require */
   if ( typeof define == 'function' && define.amd ) {
     // AMD
-    define( 'isotope/layout-modes/vertical',[
+    define( 'isotope/js/layout-modes/vertical',[
         '../layout-mode'
       ],
       factory );
@@ -2899,7 +2900,7 @@ return Vertical;
 }));
 
 /*!
- * Isotope v3.0.0
+ * Isotope v3.0.1
  *
  * Licensed GPLv3 for open source use
  * or Isotope Commercial License for commercial use
@@ -2918,12 +2919,12 @@ return Vertical;
         'get-size/get-size',
         'desandro-matches-selector/matches-selector',
         'fizzy-ui-utils/utils',
-        './item',
-        './layout-mode',
+        'isotope/js/item',
+        'isotope/js/layout-mode',
         // include default layout modes
-        './layout-modes/masonry',
-        './layout-modes/fit-rows',
-        './layout-modes/vertical'
+        'isotope/js/layout-modes/masonry',
+        'isotope/js/layout-modes/fit-rows',
+        'isotope/js/layout-modes/vertical'
       ],
       function( Outlayer, getSize, matchesSelector, utils, Item, LayoutMode ) {
         return factory( window, Outlayer, getSize, matchesSelector, utils, Item, LayoutMode );
@@ -2936,12 +2937,12 @@ return Vertical;
       require('get-size'),
       require('desandro-matches-selector'),
       require('fizzy-ui-utils'),
-      require('./item'),
-      require('./layout-mode'),
+      require('isotope/js/item'),
+      require('isotope/js/layout-mode'),
       // include default layout modes
-      require('./layout-modes/masonry'),
-      require('./layout-modes/fit-rows'),
-      require('./layout-modes/vertical')
+      require('isotope/js/layout-modes/masonry'),
+      require('isotope/js/layout-modes/fit-rows'),
+      require('isotope/js/layout-modes/vertical')
     );
   } else {
     // browser global

diff --git a/dist/isotope.pkgd.min.js b/dist/isotope.pkgd.min.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -56,6 +56,7 @@ function addBanner( str ) {
 var rjsOptimize = require('gulp-requirejs-optimize');
 
 gulp.task( 'requirejs', function() {
+  var definitionRE = /define\(\s*'isotope\/isotope'(.|\n)+\],/;
   var banner = getBanner();
   // HACK src is not needed
   // should refactor rjsOptimize to produce src
@@ -72,8 +73,14 @@ gulp.task( 'requirejs', function() {
         jquery: 'empty:'
       }
     }) )
-    // remove named module
-    .pipe( replace( "'isotope/isotope',", '' ) )
+    // munge AMD definition
+    .pipe( replace( definitionRE, function( definition ) {
+      // remove named module
+      return definition.replace( "'isotope/isotope',", '' )
+        // use explicit file paths, './item' -> 'isotope/js/item'
+        .replace( /'.\//g, "'isotope/js/" );
+    }) )
+    .pipe( replace( "define( 'isotope/", "define( 'isotope/js/" ) )
     // add banner
     .pipe( addBanner( banner ) )
     .pipe( rename('isotope.pkgd.js') )

diff --git a/js/isotope.js b/js/isotope.js
@@ -1,5 +1,5 @@
 /*!
- * Isotope v3.0.0
+ * Isotope v3.0.1
  *
  * Licensed GPLv3 for open source use
  * or Isotope Commercial License for commercial use

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "isotope-layout",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Filter and sort magical layouts",
   "main": "js/isotope.js",
   "dependencies": {