Merge pull request #1436 from adumesny/develop

attempt at let user bring own jquery libs

Author: adumesny

karma.conf.js

@@ -2,9 +2,19 @@
 
 module.exports = function(config) {
   config.set({
+
+    // see https://www.npmjs.com/package/karma-typescript
     karmaTypescriptConfig: {
       compilerOptions: {
         lib: ['dom', 'es6'],
+      },
+      bundlerOptions: {
+        resolve: {
+          alias: {
+            'jquery': './src/jq/jquery.js',
+            'jquery-ui': './src/jq/jquery-ui.js',
+          }
+        }
       }
     },
 

src/gridstack.ts

@@ -18,7 +18,6 @@ export * from './gridstack-engine';
 export * from './gridstack-dd';
 
 // TEMPORARY import the jquery-ui drag&drop since we don't have alternative yet and don't expect users to create their own yet
-import './jq/gridstack-dd-jqueryui';
 export * from './jq/gridstack-dd-jqueryui';
 
 export type GridStackElement = string | HTMLElement | GridItemHTMLElement;

src/jq/gridstack-dd-jqueryui.ts

@@ -10,11 +10,13 @@ import { GridStack, GridStackElement } from '../gridstack';
 import { GridStackDD, DDOpts, DDKey, DDDropOpt, DDCallback, DDValue } from '../gridstack-dd';
 import { GridItemHTMLElement, DDDragInOpt } from '../types';
 
-// export all jq symbols see https://stackoverflow.com/questions/35345760/importing-jqueryui-with-typescript-and-requirejs
+// export jq symbols see
+// https://stackoverflow.com/questions/35345760/importing-jqueryui-with-typescript-and-requirejs
+// https://stackoverflow.com/questions/33998262/jquery-ui-and-webpack-how-to-manage-it-into-module
 // TODO: let user bring their own jq or jq-ui version
-import * as $ from './jquery';
+import * as $ from './jquery'; // compile this in... having issues TS/ES6 app would include instead
 export { $ };
-export * from './jquery-ui';
+import './jquery-ui';
 
 /**
  * legacy Jquery-ui based drag'n'drop plugin.

src/jq/jquery-ui.js

@@ -10,7 +10,7 @@
 
     // AMD. Register as an anonymous module.
     define([ "jquery" ], factory );
-  } else */{
+  } else */ {
 
     // Browser globals
     factory( jQuery );

src/jq/jquery.js

@@ -10861,8 +10861,8 @@ jQuery.noConflict = function( deep ) {
 // Expose jQuery and $ identifiers, even in AMD
 // (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
 // and CommonJS for browser emulators (#13566)
-//if ( !noGlobal ) { [alain] noGlobal=true when using webpack/TS, yet we compile this in, not AMD load, so always expose
-	window.jQuery = window.$ = jQuery;
+//if ( !noGlobal ) { [alain] noGlobal=true when using runing karma test cases, not sure how to run otherwise...
+  window.jQuery = window.$ = jQuery;
 //}
 
 

webpack.config.js

@@ -22,8 +22,8 @@ module.exports = {
   resolve: {
     extensions: [ '.ts', '.js' ],
     alias: {
-      'jquery': './src/jq/jquery.js',
-      'jquery-ui': './src/jq/jquery-ui.js',
+      'jquery': '/src/jq/jquery.js',
+      'jquery-ui': '/src/jq/jquery-ui.js',
     }
   },
   output: {