Merge branch 'MDL-77559-39-2' of https://github.com/andrewnicols/moodle…

… into MOODLE_39_STABLE

.nvmrc

@@ -1 +1 @@
-lts/hydrogen
+lts/gallium

.stylelintrc

@@ -1,14 +1,9 @@
 {
-    "customSyntax": "postcss-scss",
     "plugins": [
         "stylelint-csstree-validator"
     ],
     "rules": {
-        "csstree/validator": {
-          "syntaxExtensions": [
-            "sass"
-          ]
-        },
+        "csstree/validator": true,
         "at-rule-empty-line-before": [ "always",
           {"except": [ "blockless-after-blockless"], ignore: ["after-comment", "inside-block"]}
         ],
@@ -50,7 +45,7 @@
         "function-name-case": "lower",
         "function-parentheses-newline-inside": "always-multi-line",
         "function-parentheses-space-inside": "never-single-line",
-        "function-url-scheme-disallowed-list": ["data"],
+        "function-url-scheme-blacklist": ["data"],
         "function-whitespace-after": "always",
         "indentation": 4,
         "keyframe-declaration-no-important": true,
@@ -89,19 +84,12 @@
         "selector-type-no-unknown": true,
         "string-no-newline": true,
         "time-min-milliseconds": 100,
-        "unit-disallowed-list": ["pt"],
+        "unit-blacklist": ["pt"],
         "unit-case": "lower",
         "unit-no-unknown": true,
         "value-keyword-case": ["lower", {"ignoreKeywords": ["/(@|$)/"]}],
         "value-list-comma-newline-after": "always-multi-line",
         "value-list-comma-space-after": "always-single-line",
         "value-list-comma-space-before": "never",
-  },
-  "overrides": [
-    {
-      "files": ["**/yui/**/*.css"],
-      "rules": {
-      }
-    }
-  ]
+  }
 }

Gruntfile.js

@@ -80,9 +80,7 @@ const registerStyleLintTasks = (grunt, files, fullRunDir) => {
         return {
             stylelint: {
                 scss: {
-                    options: {
-                        customSyntax: 'postcss-scss',
-                    },
+                    options: {syntax: 'scss'},
                     src: files,
                 },
             },
@@ -221,7 +219,7 @@ module.exports = function(grunt) {
     }
 
     /**
-     * Function to generate the destination for the minification task
+     * Function to generate the destination for the uglify task
      * (e.g. build/file.min.js). This function will be passed to
      * the rename property of files array when building dynamically:
      * http://gruntjs.com/configuring-tasks#building-the-files-object-dynamically
@@ -350,7 +348,7 @@ module.exports = function(grunt) {
         };
     };
 
-    const terser = require('@rollup/plugin-terser');
+    const terser = require('rollup-plugin-terser').terser;
 
     // Project configuration.
     grunt.initConfig({
@@ -376,13 +374,6 @@ module.exports = function(grunt) {
                     sourcemap: true,
                     treeshake: false,
                     context: 'window',
-
-                    // Treat all modules as external and do not try to resolve them.
-                    // https://rollupjs.org/configuration-options/#external
-                    // We do not need to resolve them as each module is transpiled individually and there is no tree shaking
-                    // or combining of dependencies.
-                    external: true,
-
                     plugins: [
                         rateLimit({initialDelay: 0}),
                         babel({
@@ -406,6 +397,16 @@ module.exports = function(grunt) {
                             ],
                             presets: [
                                 ['@babel/preset-env', {
+                                    targets: {
+                                        browsers: [
+                                            ">0.25%",
+                                            "last 2 versions",
+                                            "not ie <= 10",
+                                            "not op_mini all",
+                                            "not Opera > 0",
+                                            "not dead"
+                                        ]
+                                    },
                                     modules: false,
                                     useBuiltIns: false
                                 }]
@@ -904,6 +905,7 @@ module.exports = function(grunt) {
     });
 
     // Register NPM tasks.
+    grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('grunt-sass');
     grunt.loadNpmTasks('grunt-eslint');