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

# Conflicts:
#	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.map
#	dist/js/coreui.bundle.min.js
#	dist/js/coreui.bundle.min.js.map
#	dist/js/coreui.esm.js.map
#	dist/js/coreui.esm.min.js
#	dist/js/coreui.esm.min.js.map
#	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
#	scss/mixins/_utilities.scss

Author: mrholek

CHANGELOG.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.3.zip)
+- [Download the latest release](https://github.com/coreui/coreui/archive/v4.0.0-alpha.4.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.3`
+- Install with [Composer](https://getcomposer.org/): `composer require coreui/coreui:4.0.0-alpha.4`
 
 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.
 

README.md

@@ -55,7 +55,8 @@ function walkAsync(directory, excludedDirectories, fileCallback, errback) {
   })
 }
 
-function replaceRecursively(directory, excludedDirectories, allowedExtensions, original, replacement) {
+// 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 ?
@@ -67,7 +68,7 @@ function replaceRecursively(directory, excludedDirectories, allowedExtensions, o
       }
     } :
     filepath => {
-      if (allowedExtensions.has(path.parse(filepath).ext)) {
+      if (allowedExtensions.has(path.parse(filepath).ext) && !excludedFiles.has(path.parse(filepath).base)) {
         sh.sed('-i', original, replacement, filepath)
       }
     }
@@ -94,6 +95,9 @@ function main(args) {
     '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
     '',
@@ -106,7 +110,7 @@ function main(args) {
     '.txt',
     '.yml'
   ])
-  replaceRecursively('.', EXCLUDED_DIRS, INCLUDED_EXTENSIONS, oldVersion, newVersion)
+  replaceRecursively('.', EXCLUDED_DIRS, EXCLUDED_FILES, INCLUDED_EXTENSIONS, oldVersion, newVersion)
 }
 
 main(process.argv.slice(2))

build/change-version.js

@@ -47,8 +47,8 @@ params:
   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.3"
-  current_ruby_version: "4.0.0-alpha.3"
+  current_version:      "4.0.0-alpha.4"
+  current_ruby_version: "4.0.0-alpha.4"
   docs_version:         "4.0"
   rfs_version:          "9.0.3"
   github_org:           "https://github.com/coreui"
@@ -59,17 +59,17 @@ params:
   icons:                "https://icons.coreui.io/"
 
   download:
-    source:             "https://github.com/coreui/coreui/archive/v4.0.0-alpha.3.zip"
-    dist:               "https://github.com/coreui/coreui/releases/download/v4.0.0-alpha.3/coreui-4.0.0-alpha.3-dist.zip"
+    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"
 
   cdn:
-    css:             "https://cdn.jsdelivr.net/npm/@coreui/[email protected].3/dist/css/coreui.min.css"
-    css_hash:        "sha384-1OzM0xuZ2+vwv0HCsz4CVa+qURRpsuaXsH8NoyulqmWfdEC/yFZwpvnf7dq4+QJ/"
-    css_rtl:         "https://cdn.jsdelivr.net/npm/[email protected].3/dist/css/coreui.rtl.min.css"
-    css_rtl_hash:    "sha384-LkXDdYCdlOz0/da3BntY6ffDhCJj4T6D0iUcoeHpiUOP9Jv06yqfzOGyHOubZy+g"
-    js:              "https://cdn.jsdelivr.net/npm/@coreui/[email protected].3/dist/js/coreui.min.js"
-    js_hash:         "sha384-Y1KxpwMe9yL1HyI13hZe/8UImxZX08ss9/WjXc5PeMFpPzvLOgdIp5fh0LRf4dy2"
-    js_bundle:       "https://cdn.jsdelivr.net/npm/@coreui/[email protected].3/dist/js/coreui.bundle.min.js"
-    js_bundle_hash:  "sha384-rvB6A6RvkuUVLkdNjB1Nag2N/TzDHnd6sgPeVjDn8RfasT5/JJaUA0D+GvEwNQyU"
+    css:             "https://cdn.jsdelivr.net/npm/@coreui/[email protected].4/dist/css/coreui.min.css"
+    css_hash:        "sha384-xUjkPBI56rBrpBIPWcgh/w8Pe/iSvonEIieCv2yl24JA1oFvdurv4N9or048okLb"
+    css_rtl:         "https://cdn.jsdelivr.net/npm/[email protected].4/dist/css/coreui.rtl.min.css"
+    css_rtl_hash:    "sha384-66ZHlmQMNy8A5AKQx/O+BQFk2KOX/G4uEKBnT2Y4GtMaoKv42BYN24vRNy4/YipS"
+    js:              "https://cdn.jsdelivr.net/npm/@coreui/[email protected].4/dist/js/coreui.min.js"
+    js_hash:         "sha384-osy3Ix+ppMhGM3dX3LnRNFVxRVc6Iixz+Nxyk6HR6mqX38o1EbTq/NPsFvpKj6aA"
+    js_bundle:       "https://cdn.jsdelivr.net/npm/@coreui/[email protected].4/dist/js/coreui.bundle.min.js"
+    js_bundle_hash:  "sha384-WdVZKwZm70EZo92ui9WlS9BoX73YumUL6PGST2b1H6zmDA4zebpjWlQDoXYqm6Ge"
     popper:           "https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
     popper_hash:      "sha384-EOlc5FUOsy7obkrpNXqD9DtrephzQpK7DXijDIKexeJT0qfn4dZ7GDid8suWuQHq"