Merge pull request #1079 from adumesny/develop

Alain Dumesny · web-flow · commit 10715f21756b · 2019-11-27T16:26:49.000-08:00
removed jquery-ui/* requirements from AMD packing
diff --git a/.eslintignore b/.eslintignore
@@ -2,4 +2,3 @@ dist/*.js
 demo/*
 spec/*
 src/jquery-ui.js
-src/jquery-ui.min.js
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -40,7 +40,6 @@ module.exports = function(grunt) {
           'dist/gridstack.jQueryUI.js': ['src/gridstack.jQueryUI.js'],
           'dist/gridstack-poly.js': ['src/gridstack-poly.js'],
           'dist/jquery-ui.js': ['src/jquery-ui.js'],
-          'dist/jquery-ui.min.js': ['src/jquery-ui.min.js'],
         }
       }
     },
@@ -58,6 +57,7 @@ module.exports = function(grunt) {
           'dist/gridstack.min.js': ['src/gridstack.js'],
           'dist/gridstack.jQueryUI.min.js': ['src/gridstack.jQueryUI.js'],
           'dist/gridstack-poly.min.js': ['src/gridstack-poly.js'],
+          'dist/jquery-ui.min.js': ['src/jquery-ui.js'],
           'dist/gridstack.all.js': ['src/gridstack-poly.js', 'src/gridstack.js', 'src/jquery-ui.js', 'src/gridstack.jQueryUI.js']
         }
       }
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "0.5.4-dev",
+  "version": "0.5.5",
   "homepage": "https://github.com/gridstack/gridstack.js",
   "authors": [
     "Pavel Reznikov <pashka.reznikov@gmail.com>",
diff --git a/demo/advance.html b/demo/advance.html
@@ -13,7 +13,7 @@
   <script type="module" src="https://unpkg.com/ionicons@4.5.10-0/dist/ionicons/ionicons.esm.js"></script>
   <script nomodule="" src="https://unpkg.com/ionicons@4.5.10-0/dist/ionicons/ionicons.js"></script>
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-  <script src="../src/jquery-ui.min.js"></script>
+  <script src="../dist/jquery-ui.min.js"></script>
   <script src="../src/gridstack.js"></script>
   <script src="../src/gridstack.jQueryUI.js"></script>
 
diff --git a/demo/anijs.html b/demo/anijs.html
@@ -10,9 +10,12 @@
   <link rel="stylesheet" href="demo.css"/>
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-  <script src="../src/jquery-ui.min.js"></script>
+  <!--
+  <script src="../dist/jquery-ui.min.js"></script>
   <script src="../src/gridstack.js"></script>
   <script src="../src/gridstack.jQueryUI.js"></script>
+  -->
+  <script src="../dist/gridstack.all.js"></script>
 </head>
 <body>
   <div class="container-fluid">
diff --git a/demo/demo.css b/demo/demo.css
@@ -1,5 +1,7 @@
+/* required file for gridstack to work */
 @import "../dist/gridstack.css";
 
+/* Optional styles for demos */
 .btn-primary {
   color: #fff;
   background-color: #007bff;
diff --git a/demo/float.html b/demo/float.html
@@ -9,7 +9,7 @@
   <link rel="stylesheet" href="demo.css"/>
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-  <script src="../src/jquery-ui.min.js"></script>
+  <script src="../dist/jquery-ui.min.js"></script>
   <script src="../src/gridstack.js"></script>
   <script src="../src/gridstack.jQueryUI.js"></script>
   </style>
diff --git a/demo/knockout.html b/demo/knockout.html
@@ -10,7 +10,7 @@
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.5.0/knockout-debug.js"></script>
-  <script src="../src/jquery-ui.min.js"></script>
+  <script src="../dist/jquery-ui.min.js"></script>
   <script src="../src/gridstack.js"></script>
   <script src="../src/gridstack.jQueryUI.js"></script>
 </head>
diff --git a/demo/knockout2.html b/demo/knockout2.html
@@ -10,7 +10,7 @@
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.5.0/knockout-min.js"></script>
-  <script src="../src/jquery-ui.min.js"></script>
+  <script src="../dist/jquery-ui.min.js"></script>
   <script src="../src/gridstack.js"></script>
   <script src="../src/gridstack.jQueryUI.js"></script>
 </head>
diff --git a/demo/nested.html b/demo/nested.html
@@ -9,7 +9,7 @@
   <link rel="stylesheet" href="demo.css"/>
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-  <script src="../src/jquery-ui.min.js"></script>
+  <script src="../dist/jquery-ui.min.js"></script>
   <script src="../src/gridstack.js"></script>
   <script src="../src/gridstack.jQueryUI.js"></script>
 
diff --git a/demo/responsive.html b/demo/responsive.html
@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../dist/gridstack-extra.css"/>
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-  <script src="../src/jquery-ui.min.js"></script>
+  <script src="../dist/jquery-ui.min.js"></script>
   <script src="../src/gridstack.js"></script>
   <script src="../src/gridstack.jQueryUI.js"></script>
 </head>
diff --git a/demo/right-to-left(rtl).html b/demo/right-to-left(rtl).html
@@ -15,7 +15,7 @@
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.5.0/knockout-min.js"></script>
-  <script src="../src/jquery-ui.min.js"></script>
+  <script src="../dist/jquery-ui.min.js"></script>
   <script src="../src/gridstack.js"></script>
   <script src="../src/gridstack.jQueryUI.js"></script>
 </head>
diff --git a/demo/serialization.html b/demo/serialization.html
@@ -9,7 +9,7 @@
   <link rel="stylesheet" href="demo.css"/>
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-  <script src="../src/jquery-ui.min.js"></script>
+  <script src="../dist/jquery-ui.min.js"></script>
   <script src="../src/gridstack.js"></script>
   <script src="../src/gridstack.jQueryUI.js"></script>
 </head>
diff --git a/demo/two.html b/demo/two.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" href="../dist/gridstack-extra.css"/>
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-  <script src="../src/jquery-ui.min.js"></script>
+  <script src="../dist/jquery-ui.min.js"></script>
   <script src="../src/gridstack.js"></script>
   <script src="../src/gridstack.jQueryUI.js"></script>
 
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -5,7 +5,7 @@ Change log
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
 
-- [v0.5.4-dev (upcoming changes)](#v054-dev-upcoming-changes)
+- [v0.5.5 (2019-11-27)](#v055-2019-11-27)
 - [v0.5.4 (2019-11-26)](#v054-2019-11-26)
 - [v0.5.3 (2019-11-20)](#v053-2019-11-20)
 - [v0.5.2 (2019-11-13)](#v052-2019-11-13)
@@ -24,10 +24,11 @@ Change log
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-## v0.5.4-dev (upcoming changes)
+## v0.5.5 (2019-11-27)
 
 - min files include rev number/license [#1075](https://github.com/gridstack/gridstack.js/pull/1075)
-- npm package fix to exclude more temporary content
+- npm package fix to exclude more temporary content [#1078](https://github.com/gridstack/gridstack.js/pull/1078)
+- removed `jquery-ui/*` requirements from AMD packing in `gridstack.jQueryUI.js` as it was causing App compile missing errors now that we include a subset of jquery-ui
 
 ## v0.5.4 (2019-11-26)
 
diff --git a/karma.conf.js b/karma.conf.js
@@ -18,7 +18,7 @@ module.exports = function(config) {
       'node_modules/jquery/dist/jquery.min.js',
       'node_modules/core-js/client/shim.min.js',
       'src/gridstack.js',
-      'src/jquery-ui.min.js',
+      'dist/jquery-ui.min.js',
       'src/gridstack.jQueryUI.js',
       'spec/*-spec.js',
       // 'spec/e2e/*-spec.js' issues with ReferenceError: `browser` & `element` is not defined
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "0.5.4-dev",
+  "version": "0.5.5",
   "description": "gridstack.js is a jQuery plugin for widget layout",
   "main": "dist/gridstack.js",
   "repository": {
diff --git a/spec/e2e/html/1017-items-no-x-y-for-autoPosition.html b/spec/e2e/html/1017-items-no-x-y-for-autoPosition.html
@@ -13,7 +13,7 @@
   <link rel="stylesheet" href="../../../demo/demo.css"/>
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-  <script src="../../../src/jquery-ui.min.js"></script>
+  <script src="../../../dist/jquery-ui.min.js"></script>
   <script src="../../../src/gridstack.js"></script>
   <script src="../../../src/gridstack.jQueryUI.js"></script>
 
diff --git a/spec/e2e/html/810-many-columns.html b/spec/e2e/html/810-many-columns.html
@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="810-many-columns.css"/>
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-  <script src="../../../src/jquery-ui.min.js"></script>
+  <script src="../../../dist/jquery-ui.min.js"></script>
   <script src="../../../src/gridstack.js"></script>
   <script src="../../../src/gridstack.jQueryUI.js"></script>
 </head>
diff --git a/spec/e2e/html/column.html b/spec/e2e/html/column.html
@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../../../dist/gridstack-extra.css"/>
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-  <script src="../../../src/jquery-ui.min.js"></script>
+  <script src="../../../dist/jquery-ui.min.js"></script>
   <script src="../../../src/gridstack.js"></script>
   <script src="../../../src/gridstack.jQueryUI.js"></script>
 </head>
diff --git a/spec/e2e/html/gridstack-with-height.html b/spec/e2e/html/gridstack-with-height.html
@@ -9,7 +9,7 @@
   <link rel="stylesheet" href="../../../demo/demo.css"/>
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-  <script src="../../../src/jquery-ui.min.js"></script>
+  <script src="../../../dist/jquery-ui.min.js"></script>
   <script src="../../../dist/gridstack.js"></script>
   <script src="../../../dist/gridstack.jQueryUI.js"></script>
 </head>
diff --git a/src/gridstack-poly.js b/src/gridstack-poly.js
@@ -1,4 +1,4 @@
-/** gridstack.js 0.5.4-dev - IE and older browsers Polyfills for this library @preserve*/
+/** gridstack.js 0.5.5 - IE and older browsers Polyfills for this library @preserve*/
 /**
  * https://gridstackjs.com/
  * (c) 2019 Alain Dumesny
diff --git a/src/gridstack.d.ts b/src/gridstack.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Gridstack 0.5.4-dev
+// Type definitions for Gridstack 0.5.5
 // Project: https://gridstackjs.com/
 // Definitions by: Pascal Senn <https://github.com/PascalSenn>
 //                 Ricky Blankenaufulland <https://github.com/ZoolWay>
diff --git a/src/gridstack.jQueryUI.js b/src/gridstack.jQueryUI.js
@@ -1,17 +1,12 @@
-/** gridstack.js 0.5.4-dev - JQuery UI Drag&Drop plugin @preserve */
+/** gridstack.js 0.5.5 - JQuery UI Drag&Drop plugin @preserve */
 /**
  * https://gridstackjs.com/
  * (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
  * gridstack.js may be freely distributed under the MIT license.
 */
 (function(factory) {
   if (typeof define === 'function' && define.amd) {
-    define(['jquery', 'gridstack', 'exports', 'jquery-ui/data', 'jquery-ui/disable-selection',
-      'jquery-ui/focusable', 'jquery-ui/form', 'jquery-ui/ie', 'jquery-ui/keycode', 'jquery-ui/labels',
-      'jquery-ui/jquery-1-7', 'jquery-ui/plugin', 'jquery-ui/safe-active-element', 'jquery-ui/safe-blur',
-      'jquery-ui/scroll-parent', 'jquery-ui/tabbable', 'jquery-ui/unique-id', 'jquery-ui/version',
-      'jquery-ui/widget', 'jquery-ui/widgets/mouse', 'jquery-ui/widgets/draggable',
-      'jquery-ui/widgets/droppable', 'jquery-ui/widgets/resizable'], factory);
+    define(['jquery', 'gridstack', 'exports'], factory);
   } else if (typeof exports !== 'undefined') {
     try { jQuery = require('jquery'); } catch (e) {}
     try { gridstack = require('gridstack'); } catch (e) {}
diff --git a/src/gridstack.js b/src/gridstack.js
@@ -1,5 +1,5 @@
 /**
- * gridstack.js 0.5.4-dev
+ * gridstack.js 0.5.5
  * https://gridstackjs.com/
  * (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
  * gridstack.js may be freely distributed under the MIT license.
diff --git a/src/gridstack.scss b/src/gridstack.scss
@@ -1,5 +1,5 @@
 /*!
- * required gridstack CSS for default column size
+ * required gridstack CSS for default 12 column size
  * https://gridstackjs.com/
  * (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
  * gridstack.js may be freely distributed under the MIT license.
diff --git a/src/jquery-ui.min.js b/src/jquery-ui.min.js

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ module.exports = function(grunt) {`
`40`	`40`	`'dist/gridstack.jQueryUI.js': ['src/gridstack.jQueryUI.js'],`
`41`	`41`	`'dist/gridstack-poly.js': ['src/gridstack-poly.js'],`
`42`	`42`	`'dist/jquery-ui.js': ['src/jquery-ui.js'],`
`43`		`- 'dist/jquery-ui.min.js': ['src/jquery-ui.min.js'],`
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`	`},`
`@@ -58,6 +57,7 @@ module.exports = function(grunt) {`
`58`	`57`	`'dist/gridstack.min.js': ['src/gridstack.js'],`
`59`	`58`	`'dist/gridstack.jQueryUI.min.js': ['src/gridstack.jQueryUI.js'],`
`60`	`59`	`'dist/gridstack-poly.min.js': ['src/gridstack-poly.js'],`
	`60`	`+ 'dist/jquery-ui.min.js': ['src/jquery-ui.js'],`
`61`	`61`	`'dist/gridstack.all.js': ['src/gridstack-poly.js', 'src/gridstack.js', 'src/jquery-ui.js', 'src/gridstack.jQueryUI.js']`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gridstack",`
`3`		`- "version": "0.5.4-dev",`
	`3`	`+ "version": "0.5.5",`
`4`	`4`	`"homepage": "https://github.com/gridstack/gridstack.js",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Pavel Reznikov <pashka.reznikov@gmail.com>",`