Merge pull request #1352 from adumesny/develop

typescript ->develop merge

Author: adumesny

.eslintignore

@@ -1,5 +1,4 @@
-dist/*.js
+dist/*
 demo/*
 spec/*
-src/jquery.js
-src/jquery-ui.js
+src/jq/*.js

.eslintrc.js

@@ -0,0 +1,23 @@
+module.exports = {
+  parser: '@typescript-eslint/parser',
+  env: {
+    browser: true,
+    commonjs: true,
+    es6: true,
+    node: true
+  },
+  extends: [
+    'plugin:@typescript-eslint/recommended'
+  ],
+  parserOptions: {
+    ecmaVersion: 2020,
+    sourceType: 'module'
+  },
+  rules: {
+    'indent': ['error', 2],
+    'max-len': ['error', 180],
+    'no-trailing-spaces': 'error',
+    'prefer-const': 0,
+    '@typescript-eslint/explicit-function-return-type': 0
+  }
+};

.eslintrc.json

@@ -19,6 +19,8 @@ PULL_REQUEST_TEMPLATE.md
 freelancer
 karma.conf.js
 protractor.conf.js
+tsconfig.json
+webpack.config.js
 
 ## From .gitignore:
 *.log

.npmignore

@@ -10,8 +10,8 @@
     "dragstop",
     "dropover",
     "droppable",
+    "gridster",
     "gsresize",
-    "gsresizestop",
     "jqueryui",
     "resizestart"
   ]

.vscode/settings.json

@@ -1,4 +1,3 @@
-/*eslint-disable camelcase */
 module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-sass');
   grunt.loadNpmTasks('grunt-contrib-cssmin');
@@ -16,7 +15,7 @@ module.exports = function(grunt) {
     sass: {
       options: {
         implementation: sass,
-			  sourceMap: true
+			  sourceMap: false
       },
       dist: {
         files: {
@@ -25,10 +24,10 @@ module.exports = function(grunt) {
         }
       }
     },
-
     cssmin: {
       dist: {
         options: {
+          sourceMap: false,
           keepSpecialComments: '*'
         },
         files: {
@@ -37,50 +36,47 @@ module.exports = function(grunt) {
         }
       }
     },
-
     copy: {
       dist: {
         files: {
-          'dist/gridstack.js': ['src/gridstack.js'],
-          'dist/gridstack.d.ts': ['src/gridstack.d.ts'],
-          'dist/gridstack.jQueryUI.js': ['src/gridstack.jQueryUI.js'],
           'dist/gridstack-poly.js': ['src/gridstack-poly.js'],
-          'dist/jquery.js': ['src/jquery.js'],
-          'dist/jquery-ui.js': ['src/jquery-ui.js'],
+          //'dist/jq/jquery.js': ['src/jq/jquery.js'],
+          //'dist/jq/jquery-ui.js': ['src/jq/jquery-ui.js'],
           'dist/src/gridstack.scss': ['src/gridstack.scss'],
           'dist/src/gridstack-extra.scss': ['src/gridstack-extra.scss'],
         }
       }
     },
-
     uglify: {
       options: {
         sourceMap: true,
-        sourceMapName: 'dist/gridstack.min.map',
         output: {
           comments: 'some'
         }
       },
       dist: {
         files: {
-          '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.min.js': ['src/jquery.js'],
-          'dist/jquery-ui.min.js': ['src/jquery-ui.js'],
-          'dist/gridstack.all.js': ['src/gridstack-poly.js', 'src/jquery.js', 'src/gridstack.js', 'src/jquery-ui.js', 'src/gridstack.jQueryUI.js']
+          'dist/jq/jquery.js': 'src/jq/jquery.js',
+          'dist/jq/jquery-ui.js': 'src/jq/jquery-ui.js',
+          /*
+          'dist/jq/gridstack-dd-jqueryui.min.js': 'dist/jq/gridstack-dd-jqueryui.js',
+          'dist/gridstack-dd.min.js': 'dist/gridstack-dd.js',
+          'dist/gridstack-engine.min.js': 'dist/gridstack-engine.js',
+          'dist/gridstack-poly.min.js': 'src/gridstack-poly.js',
+          'dist/types.min.js': 'dist/types.js',
+          'dist/utils.min.js': 'dist/utils.js',
+          */
         }
       }
     },
-
     eslint: {
       target: ['*.js', 'src/*.js']
     },
 
     watch: {
       scripts: {
         files: ['src/*.js'],
-        tasks: ['uglify', 'copy'],
+        tasks: ['copy', 'uglify'],
         options: {
         },
       },
@@ -109,6 +105,7 @@ module.exports = function(grunt) {
       },
     },
 
+    // eslint-disable-next-line @typescript-eslint/camelcase
     protractor_webdriver: {
       all: {
         options: {
@@ -119,7 +116,6 @@ module.exports = function(grunt) {
   });
 
   grunt.registerTask('lint', ['eslint']);
-  grunt.registerTask('default', ['sass', 'cssmin', 'eslint', 'copy', 'uglify']);
+  grunt.registerTask('default', ['sass', 'cssmin', /*'eslint',*/ 'copy', 'uglify']);
   grunt.registerTask('e2e-test', ['connect', 'protractor_webdriver', 'protractor']);
 };
-/*eslint-enable camelcase */