Merge branch 'v4-dev' of https://github.com/coreui/coreui into v4-dev-sync

# Conflicts:
#	config.yml
#	dist/css/coreui-grid.css
#	dist/css/coreui-grid.css.map
#	dist/css/coreui-grid.min.css
#	dist/css/coreui-grid.min.css.map
#	dist/css/coreui-grid.rtl.css
#	dist/css/coreui-grid.rtl.css.map
#	dist/css/coreui-grid.rtl.min.css
#	dist/css/coreui-grid.rtl.min.css.map
#	dist/css/coreui-reboot.css
#	dist/css/coreui-reboot.css.map
#	dist/css/coreui-reboot.min.css
#	dist/css/coreui-reboot.min.css.map
#	dist/css/coreui-reboot.rtl.css
#	dist/css/coreui-reboot.rtl.css.map
#	dist/css/coreui-reboot.rtl.min.css
#	dist/css/coreui-reboot.rtl.min.css.map
#	dist/css/coreui-utilities.css
#	dist/css/coreui-utilities.css.map
#	dist/css/coreui-utilities.min.css
#	dist/css/coreui-utilities.min.css.map
#	dist/css/coreui-utilities.rtl.css
#	dist/css/coreui-utilities.rtl.css.map
#	dist/css/coreui-utilities.rtl.min.css
#	dist/css/coreui-utilities.rtl.min.css.map
#	dist/css/coreui.css
#	dist/css/coreui.css.map
#	dist/css/coreui.min.css
#	dist/css/coreui.min.css.map
#	dist/css/coreui.rtl.css
#	dist/css/coreui.rtl.css.map
#	dist/css/coreui.rtl.min.css
#	dist/css/coreui.rtl.min.css.map
#	dist/js/coreui.bundle.js
#	dist/js/coreui.bundle.js.map
#	dist/js/coreui.bundle.min.js
#	dist/js/coreui.bundle.min.js.map
#	dist/js/coreui.esm.js
#	dist/js/coreui.esm.js.map
#	dist/js/coreui.esm.min.js
#	dist/js/coreui.esm.min.js.map
#	dist/js/coreui.js
#	dist/js/coreui.js.map
#	dist/js/coreui.min.js
#	dist/js/coreui.min.js.map
#	package-lock.json
#	scss/coreui-grid.rtl.scss
#	scss/coreui-grid.scss
#	scss/coreui-reboot.rtl.scss
#	scss/coreui-reboot.scss
#	scss/coreui-utilities.rtl.scss
#	scss/coreui-utilities.scss
#	scss/coreui.rtl.scss
#	scss/coreui.scss

Author: mrholek

.browserslistrc

@@ -5,11 +5,7 @@ last 2 major versions
 not dead
 Chrome >= 60
 Firefox >= 60
-# needed since Legacy Edge still has usage; 79 was the first Chromium Edge version
-# should be removed in the future when its usage drops or when it's moved to dead browsers
-not Edge < 79
 Firefox ESR
-iOS >= 10
-Safari >= 10
-Android >= 6
+iOS >= 12
+Safari >= 12
 not Explorer <= 11

.bundlewatch.config.json

@@ -59,7 +59,6 @@
   ],
   "ci": {
     "trackBranches": [
-      "main",
       "v4-dev"
     ]
   }

README.md

@@ -41,11 +41,11 @@
 
 Several quick start options are available:
 
-- [Download the latest release](https://github.com/coreui/coreui/archive/v4.0.0-alpha.4.zip)
+- [Download the latest release](https://github.com/coreui/coreui/archive/v4.0.0-alpha.5.zip)
 - Clone the repo: `git clone https://github.com/coreui/coreui.git`
 - Install with [npm](https://www.npmjs.com/): `npm install @coreui/coreui@next`
 - Install with [yarn](https://yarnpkg.com/): `yarn add @coreui/coreui@next`
-- Install with [Composer](https://getcomposer.org/): `composer require coreui/coreui:4.0.0-alpha.4`
+- Install with [Composer](https://getcomposer.org/): `composer require coreui/coreui:4.0.0-alpha.5`
 
 Read the [Getting started page](https://coreui.io/docs/4.0/getting-started/introduction/) for information on the framework contents, templates and examples, and more.
 

build/build-plugins.js

@@ -35,7 +35,7 @@ const bsPlugins = {
   Collapse: path.resolve(__dirname, '../js/src/collapse.js'),
   Dropdown: path.resolve(__dirname, '../js/src/dropdown.js'),
   Modal: path.resolve(__dirname, '../js/src/modal.js'),
-  OffCanvas: path.resolve(__dirname, '../js/src/offcanvas.js'),
+  Offcanvas: path.resolve(__dirname, '../js/src/offcanvas.js'),
   Popover: path.resolve(__dirname, '../js/src/popover.js'),
   ScrollSpy: path.resolve(__dirname, '../js/src/scrollspy.js'),
   Tab: path.resolve(__dirname, '../js/src/tab.js'),
@@ -72,7 +72,7 @@ const getConfigByPluginKey = pluginKey => {
     }
   }
 
-  if (pluginKey === 'Alert' || pluginKey === 'Tab' || pluginKey === 'OffCanvas') {
+  if (pluginKey === 'Alert' || pluginKey === 'Tab' || pluginKey === 'Offcanvas') {
     return defaultPluginConfig
   }
 

build/change-version.js

@@ -9,11 +9,24 @@
 
 'use strict'
 
-const fs = require('fs')
+const fs = require('fs').promises
 const path = require('path')
-const sh = require('shelljs')
-
-sh.config.fatal = true
+const globby = require('globby')
+
+const VERBOSE = process.argv.includes('--verbose')
+const DRY_RUN = process.argv.includes('--dry') || process.argv.includes('--dry-run')
+
+// These are the filetypes we only care about replacing the version
+const GLOB = [
+  '**/*.{css,html,js,json,md,scss,txt,yml}'
+]
+const GLOBBY_OPTIONS = {
+  cwd: path.join(__dirname, '..'),
+  gitignore: true
+}
+const EXCLUDED_FILES = [
+  'CHANGELOG.md'
+]
 
 // Blame TC39... https://github.com/benjamingr/RegExp.escape/issues/37
 function regExpQuote(string) {
@@ -24,93 +37,48 @@ function regExpQuoteReplacement(string) {
   return string.replace(/\$/g, '$$')
 }
 
-const DRY_RUN = false
+async function replaceRecursively(file, oldVersion, newVersion) {
+  const originalString = await fs.readFile(file, 'utf8')
+  const newString = originalString.replace(
+    new RegExp(regExpQuote(oldVersion), 'g'), regExpQuoteReplacement(newVersion)
+  )
 
-function walkAsync(directory, excludedDirectories, fileCallback, errback) {
-  if (excludedDirectories.has(path.parse(directory).base)) {
+  // No need to move any further if the strings are identical
+  if (originalString === newString) {
     return
   }
 
-  fs.readdir(directory, (err, names) => {
-    if (err) {
-      errback(err)
-      return
-    }
-
-    names.forEach(name => {
-      const filepath = path.join(directory, name)
-      fs.lstat(filepath, (err, stats) => {
-        if (err) {
-          process.nextTick(errback, err)
-          return
-        }
-
-        if (stats.isDirectory()) {
-          process.nextTick(walkAsync, filepath, excludedDirectories, fileCallback, errback)
-        } else if (stats.isFile()) {
-          process.nextTick(fileCallback, filepath)
-        }
-      })
-    })
-  })
-}
+  if (VERBOSE) {
+    console.log(`FILE: ${file}`)
+  }
 
-// eslint-disable-next-line max-params
-function replaceRecursively(directory, excludedDirectories, excludedFiles, allowedExtensions, original, replacement) {
-  original = new RegExp(regExpQuote(original), 'g')
-  replacement = regExpQuoteReplacement(replacement)
-  const updateFile = DRY_RUN ?
-    filepath => {
-      if (allowedExtensions.has(path.parse(filepath).ext)) {
-        console.log(`FILE: ${filepath}`)
-      } else {
-        console.log(`EXCLUDED:${filepath}`)
-      }
-    } :
-    filepath => {
-      if (allowedExtensions.has(path.parse(filepath).ext) && !excludedFiles.has(path.parse(filepath).base)) {
-        sh.sed('-i', original, replacement, filepath)
-      }
-    }
-
-  walkAsync(directory, excludedDirectories, updateFile, err => {
-    console.error('ERROR while traversing directory!:')
-    console.error(err)
-    process.exit(1)
-  })
+  if (DRY_RUN) {
+    return
+  }
+
+  await fs.writeFile(file, newString, 'utf8')
 }
 
-function main(args) {
-  if (args.length !== 2) {
-    console.error('USAGE: change-version old_version new_version')
+async function main(args) {
+  const [oldVersion, newVersion] = args
+
+  if (!oldVersion || !newVersion) {
+    console.error('USAGE: change-version old_version new_version [--verbose] [--dry[-run]]')
     console.error('Got arguments:', args)
     process.exit(1)
   }
 
-  const oldVersion = args[0]
-  const newVersion = args[1]
-  const EXCLUDED_DIRS = new Set([
-    '.git',
-    '_gh_pages',
-    'node_modules',
-    'resources'
-  ])
-  const EXCLUDED_FILES = new Set([
-    'CHANGELOG.md'
-  ])
-  const INCLUDED_EXTENSIONS = new Set([
-    // This extension allowlist is how we avoid modifying binary files
-    '',
-    '.css',
-    '.html',
-    '.js',
-    '.json',
-    '.md',
-    '.scss',
-    '.txt',
-    '.yml'
-  ])
-  replaceRecursively('.', EXCLUDED_DIRS, EXCLUDED_FILES, INCLUDED_EXTENSIONS, oldVersion, newVersion)
+  // Strip any leading `v` from arguments because otherwise we will end up with duplicate `v`s
+  [oldVersion, newVersion].map(arg => arg.startsWith('v') ? arg.slice(1) : arg)
+
+  try {
+    const files = await globby(GLOB, GLOBBY_OPTIONS, EXCLUDED_FILES)
+
+    await Promise.all(files.map(file => replaceRecursively(file, oldVersion, newVersion)))
+  } catch (error) {
+    console.error(error)
+    process.exit(1)
+  }
 }
 
 main(process.argv.slice(2))

build/rollup.config.js

@@ -28,7 +28,13 @@ if (BUNDLE) {
   // Remove last entry in external array to bundle Popper
   external.pop()
   delete globals['@popperjs/core']
-  plugins.push(replace({ 'process.env.NODE_ENV': '"production"' }), nodeResolve())
+  plugins.push(
+    replace({
+      'process.env.NODE_ENV': '"production"',
+      preventAssignment: true
+    }),
+    nodeResolve()
+  )
 }
 
 const rollupConfig = {

config.yml

@@ -46,9 +46,8 @@ params:
   authors:              "Lukasz Holeczek, Andrzej Kopanski"
   social_image_path:    /4.0/assets/brand/coreui-social.jpg
   social_logo_path:     /4.0/assets/brand/coreui-social-logo.png
-
-  current_version:      "4.0.0-alpha.4"
-  current_ruby_version: "4.0.0-alpha.4"
+  current_version:      "4.0.0-alpha.5"
+  current_ruby_version: "4.0.0-alpha.5"
   docs_version:         "4.0"
   rfs_version:          "9.0.3"
   github_org:           "https://github.com/coreui"
@@ -59,17 +58,18 @@ params:
   icons:                "https://icons.coreui.io/"
 
   download:
-    source:             "https://github.com/coreui/coreui/archive/v4.0.0-alpha.4.zip"
-    dist:               "https://github.com/coreui/coreui/releases/download/v4.0.0-alpha.4/coreui-4.0.0-alpha.4-dist.zip"
+    source:             "https://github.com/coreui/coreui/archive/v4.0.0-alpha.5.zip"
+    dist:               "https://github.com/coreui/coreui/releases/download/v4.0.0-alpha.5/coreui-4.0.0-alpha.5-dist.zip"
 
   cdn:
-    css:             "https://cdn.jsdelivr.net/npm/@coreui/[email protected]/dist/css/coreui.min.css"
-    css_hash:        "sha384-Cuk9C8m0rzqvRAuSeKrC0v7IZOb6K0SsEQw/2VkgAxSMiTfuN3o+QU8DmXA0z8sc"
-    css_rtl:         "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/coreui.rtl.min.css"
-    css_rtl_hash:    "sha384-yuKCtc48GzCRCByKfWCJYoaois+UPGWUAg/2KzaFcQ99QzsQEUfqw0e+NVX0Fb1a"
-    js:              "https://cdn.jsdelivr.net/npm/@coreui/[email protected]/dist/js/coreui.min.js"
-    js_hash:         "sha384-JjNO7eIqYvTAoQIV/PF/Pqibxsue8Um47wwQ9xEbbRzsMzedRHlWZeW6qJkAQoXK"
-    js_bundle:       "https://cdn.jsdelivr.net/npm/@coreui/[email protected]/dist/js/coreui.bundle.min.js"
-    js_bundle_hash:  "sha384-5262ffIwClekK93HvKLcR75mskXJwxCGETszstBDw+RiVsEWa20d7ws9Z9Kj7Qhs"
+  # See https://www.srihash.org for info on how to generate the hashes
+    css:             "https://cdn.jsdelivr.net/npm/@coreui/[email protected]/dist/css/coreui.min.css"
+    css_hash:        "sha384-nq/FcuyWO6kBZwQBQe8qhEg1ZijKo3hUGxXUPioCrYg3+qzJ5oiOWxgdMbx99Uvn"
+    css_rtl:         "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/coreui.rtl.min.css"
+    css_rtl_hash:    "sha384-aYFu/+a5HgTdKB1OifM22TDa8/olw1MwfLfFKmt3eghKMgvObHs50k1TDMJZKLrN"
+    js:              "https://cdn.jsdelivr.net/npm/@coreui/[email protected]/dist/js/coreui.min.js"
+    js_hash:         "sha384-wcl5o76hhofzSFCtu4v3MPp2iasgPXqvmTRH42vlbCSKGQW6fTJfNtXgZoptMh+O"
+    js_bundle:       "https://cdn.jsdelivr.net/npm/@coreui/[email protected]/dist/js/coreui.bundle.min.js"
+    js_bundle_hash:  "sha384-AwyzMIzmGh58Iz7SoiQ2VoGasfZw82kgX0vYAOtapnFtlSv2UXjQ4VkM4BJAo6A4"
     popper:           "https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
-    popper_hash:      "sha384-EOlc5FUOsy7obkrpNXqD9DtrephzQpK7DXijDIKexeJT0qfn4dZ7GDid8suWuQHq"
+    popper_hash:      "sha384-SR1sx49pcuLnqZUnnPwx6FCym0wLsk5JZuNx2bPPENzswTNFaQU1RDvt3wT4gWFG"