Merge 4.9.0

acidb · Nov 28, 2019 · cd0f74f · cd0f74f
1 parent 9319278
commit cd0f74f
Show file tree

Hide file tree

Showing 29 changed files with 2,886 additions and 1,344 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,10 +1,14 @@
 {
   "presets": [
+    "@babel/preset-react",
     [
-      "es2015",
+      "@babel/preset-env",
       {
         "modules": false
       }
     ]
+  ],
+  "plugins": [
+    "@babel/plugin-proposal-class-properties"
   ]
 }
diff --git a/grunt/aliases.js b/grunt/aliases.js
@@ -1,14 +1,12 @@
 module.exports = {
     default: [
-        'babel',
         'sass',
         'run:transpile',
         'rollup:dev',
         'copy:icons'
     ],
     build: [
         'clean:packages',
-        'babel',
         'sass',
         'run:transpile',
         'run:scss',

diff --git a/grunt/rollup.js b/grunt/rollup.js
@@ -1,6 +1,8 @@
 var babel = require('rollup-plugin-babel');
-var uglify = require('rollup-plugin-uglify');
+var uglify = require('rollup-plugin-uglify').uglify;
 var resolve = require('rollup-plugin-node-resolve');
+var terser = require('rollup-plugin-terser').terser;
+var postprocess = require('rollup-plugin-postprocess');
 
 var globals = {
     angular: 'angular',
@@ -34,10 +36,10 @@ var external = [
 module.exports = {
     dev: {
         options: {
-            sourceMap: true,
+            sourcemap: true,
             globals: globals,
             external: external,
-            moduleName: 'mobiscroll',
+            name: 'mobiscroll',
             format: 'umd',
             context: 'this',
             onwarn(warning) {
@@ -47,9 +49,7 @@ module.exports = {
             },
             plugins: [
                 resolve(),
-                babel({
-                    plugins: ['external-helpers']
-                })
+                babel()
             ]
         },
         files: {
@@ -64,7 +64,7 @@ module.exports = {
         options: {
             globals: globals,
             external: external,
-            moduleName: 'mobiscroll',
+            name: 'mobiscroll',
             format: 'umd',
             banner: '/* eslint-disable */',
             onwarn(warning) {
@@ -74,9 +74,7 @@ module.exports = {
             },
             plugins: [
                 resolve(),
-                babel({
-                    plugins: ['external-helpers']
-                }),
+                babel(),
                 uglify({
                     output: {
                         comments: /eslint-disable/
@@ -96,7 +94,7 @@ module.exports = {
         options: {
             globals: globals,
             external: external,
-            moduleName: 'mobiscroll',
+            name: 'mobiscroll',
             format: 'es',
             banner: '/* eslint-disable */',
             onwarn(warning) {
@@ -107,13 +105,27 @@ module.exports = {
             plugins: [
                 resolve(),
                 babel({
-                    plugins: ['external-helpers']
+                    exclude: ['**/*.angular.js', '**/angular.js']
                 }),
-                uglify({
+                terser({
+                    mangle: {
+                        keep_fnames: /^Mbsc/,
+                        module: false,
+                        reserved: ['_super'],
+                        toplevel: false,
+                    },
+                    compress: {
+                        join_vars: false,
+                        reduce_vars: false,
+                        sequences: false,
+                    },
                     output: {
-                        comments: /eslint-disable/
+                        wrap_iife: true,
                     }
-                })
+                }),
+                postprocess([
+                    [/}\)\(\);/, '}());']
+                ])
             ]
         },
         files: {

diff --git a/grunt/run.js b/grunt/run.js
@@ -4,10 +4,10 @@ module.exports = {
     },
     scss: {
         exec: '' +
-            '"./node_modules/.bin/scss-bundle" -e ./bundles/mobiscroll.angular.scss -d ./packages/angular/dist/css/mobiscroll.scss --dedupe ./src/**/*.scss && ' +
-            '"./node_modules/.bin/scss-bundle" -e ./bundles/mobiscroll.javascript.scss -d ./packages/javascript/dist/css/mobiscroll.scss --dedupe ./src/**/*.scss && ' +
-            '"./node_modules/.bin/scss-bundle" -e ./bundles/mobiscroll.jquery.scss -d ./packages/jquery/dist/css/mobiscroll.scss --dedupe ./src/**/*.scss && ' +
-            '"./node_modules/.bin/scss-bundle" -e ./bundles/mobiscroll.ng.scss -d ./packages/angularjs/dist/css/mobiscroll.scss --dedupe ./src/**/*.scss && ' +
-            '"./node_modules/.bin/scss-bundle" -e ./bundles/mobiscroll.react.scss -d ./packages/react/dist/css/mobiscroll.scss --dedupe ./src/**/*.scss'
+            '"./node_modules/.bin/scss-bundle" --verbosity Errors -e ./bundles/mobiscroll.angular.scss -d ./packages/angular/dist/css/mobiscroll.scss --dedupe ./src/**/*.scss && ' +
+            '"./node_modules/.bin/scss-bundle" --verbosity Errors -e ./bundles/mobiscroll.javascript.scss -d ./packages/javascript/dist/css/mobiscroll.scss --dedupe ./src/**/*.scss && ' +
+            '"./node_modules/.bin/scss-bundle" --verbosity Errors -e ./bundles/mobiscroll.jquery.scss -d ./packages/jquery/dist/css/mobiscroll.scss --dedupe ./src/**/*.scss && ' +
+            '"./node_modules/.bin/scss-bundle" --verbosity Errors -e ./bundles/mobiscroll.ng.scss -d ./packages/angularjs/dist/css/mobiscroll.scss --dedupe ./src/**/*.scss && ' +
+            '"./node_modules/.bin/scss-bundle" --verbosity Errors -e ./bundles/mobiscroll.react.scss -d ./packages/react/dist/css/mobiscroll.scss --dedupe ./src/**/*.scss'
     }
 };