Merge branch 'master' into master-ysds-static-modal-animation

.babelrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   presets: [
     [
-      '@babel/env',
+      '@babel/preset-env',
       {
         loose: true,
         modules: false,

.browserslistrc

@@ -6,8 +6,8 @@ not dead
 Chrome >= 60
 Firefox >= 60
 Edge >= 16.16299
-Explorer 11
 iOS >= 10
 Safari >= 10
 Android >= 6
+not Explorer <= 11
 not ExplorerMobile <= 11

bundlesize.config.json → .bundlewatch.config.json

@@ -2,7 +2,7 @@
   "files": [
     {
       "path": "./dist/css/bootstrap-grid.css",
-      "maxSize": "7.1 kB"
+      "maxSize": "7.2 kB"
     },
     {
       "path": "./dist/css/bootstrap-grid.min.css",
@@ -56,5 +56,11 @@
       "path": "./dist/js/bootstrap.min.js",
       "maxSize": "16.5 kB"
     }
-  ]
+  ],
+  "ci": {
+    "trackBranches": [
+      "master",
+      "v4-dev"
+    ]
+  }
 }

.dependabot/config.yml

@@ -10,7 +10,3 @@ update_configs:
       - "dependencies"
       - "v5"
     version_requirement_updates: "increase_versions"
-    ignored_updates:
-      - match:
-          dependency_name: "karma-browserstack-launcher"
-          version_requirement: "1.5.1"

.eslintrc.json

@@ -39,14 +39,17 @@
     "unicorn/consistent-function-scoping": "off",
     "unicorn/explicit-length-check": "off",
     "unicorn/import-index": "off",
+    "unicorn/no-fn-reference-in-iterator": "off",
     "unicorn/no-for-loop": "off",
+    "unicorn/no-null": "off",
     "unicorn/no-unused-properties": "error",
     "unicorn/prefer-dataset": "off",
     "unicorn/prefer-includes": "off",
     "unicorn/prefer-node-append": "off",
     "unicorn/prefer-node-remove": "off",
+    "unicorn/prefer-number-properties": "off",
     "unicorn/prefer-query-selector": "off",
-    "unicorn/prefer-text-content": "off",
+    "unicorn/prefer-set-has": "off",
     "unicorn/prevent-abbreviations": "off"
   }
 }

.github/ISSUE_TEMPLATE/bug.md

@@ -6,6 +6,6 @@ Before opening:
 
 Bug reports must include:
 
-- Operating system and version (Windows, macOS, Android, iOS, Win10 Mobile)
-- Browser and version (Chrome, Firefox, Safari, IE, MS Edge, Opera 15+, Android Browser)
+- Operating system and version (Windows, macOS, Android, iOS)
+- Browser and version (Chrome, Firefox, Safari, Microsoft Edge, Opera, Android Browser)
 - [Reduced test case](https://css-tricks.com/reduced-test-cases/) and suggested fix using [CodePen](https://codepen.io/) or [JS Bin](https://jsbin.com/)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -12,6 +12,6 @@ Before opening:
 
 Bug reports must include:
 
-- Operating system and version (Windows, macOS, Android, iOS, Win10 Mobile)
-- Browser and version (Chrome, Firefox, Safari, IE, MS Edge, Opera 15+, Android Browser)
+- Operating system and version (Windows, macOS, Android, iOS)
+- Browser and version (Chrome, Firefox, Safari, Microsoft Edge, Opera, Android Browser)
 - [Reduced test case](https://css-tricks.com/reduced-test-cases/) and suggested fix using [CodePen](https://codepen.io/) or [JS Bin](https://jsbin.com/)

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,4 @@
+contact_links:
+  - name: Ask a question
+    url: https://github.com/twbs/bootstrap/discussions/new
+    about: Ask and discuss questions with other Bootstrap community members

.github/release-drafter.yml

@@ -0,0 +1,40 @@
+name-template: 'v$NEXT_MAJOR_VERSION'
+tag-template: 'v$NEXT_MAJOR_VERSION'
+prerelease: true
+exclude-labels:
+  - 'skip-changelog'
+categories:
+  - title: '🚀 Features'
+    labels:
+      - 'new-feature'
+      - 'feature'
+      - 'enhancement'
+  - title: '🐛 Bug fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: '🎨 CSS'
+    labels:
+      - 'css'
+  - title: '☕️ JavaScript'
+    labels:
+      - 'js'
+  - title: '📖 Docs'
+    labels:
+      - 'docs'
+  - title: '🌎 Accessibility'
+    labels:
+      - 'accessibility'
+  - title: '🧰 Misc'
+    labels:
+      - 'build'
+      - 'meta'
+      - 'chore'
+  - title: '📦 Dependencies'
+    labels:
+      - 'dependencies'
+change-template: '- #$NUMBER: $TITLE'
+template: |
+  ## Changes
+  $CHANGES

.github/workflows/codeql.yml

@@ -0,0 +1,28 @@
+name: "Code Scanning - Action"
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 0 * * 0"
+
+jobs:
+  CodeQL-Build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: javascript
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/release-notes.yml

@@ -0,0 +1,14 @@
+name: Release notes
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -22,8 +22,6 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - run: node --version
-      - run: npm --version
       - run: java -version
 
       - name: Set up npm cache
@@ -41,11 +39,11 @@ jobs:
       - name: Run tests
         run: npm test
 
-      - name: Run bundlesize
-        run: npm run bundlesize
+      - name: Run bundlewatch
+        run: npm run bundlewatch
         if: matrix.node == 10
         env:
-          BUNDLESIZE_GITHUB_TOKEN: "${{ secrets.BUNDLESIZE_GITHUB_TOKEN }}"
+          BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"
 
       - name: Run BrowserStack tests
         run: npm run js-test-cloud

.gitignore

@@ -3,6 +3,8 @@
 # This is the old Jekyll docs dist folder;
 # keeping it here so that when we switch branches it doesn't show up
 /site/docs/**/dist/
+# Jekyll's cache folder; keeping it for the same reason as above
+/site/.jekyll-cache/
 # Hugo resources folder
 /resources/
 

build/build-plugins.js

@@ -18,10 +18,12 @@ const plugins = [
     exclude: 'node_modules/**',
     // Include only required helpers
     externalHelpersWhitelist: [
-      'defineProperties',
       'createClass',
-      'inheritsLoose',
+      'createSuper',
+      'defineProperties',
       'defineProperty',
+      'getPrototypeOf',
+      'inheritsLoose',
       'objectSpread2'
     ]
   })

build/rollup.config.js

@@ -16,10 +16,12 @@ const plugins = [
     exclude: 'node_modules/**',
     // Include only required helpers
     externalHelpersWhitelist: [
-      'defineProperties',
       'createClass',
-      'inheritsLoose',
+      'createSuper',
+      'defineProperties',
       'defineProperty',
+      'getPrototypeOf',
+      'inheritsLoose',
       'objectSpread2'
     ]
   })

build/vnu-jar.js

@@ -37,10 +37,7 @@ childProcess.exec('java -version', (error, stdout, stderr) => {
     'The “month” input type is not supported in all browsers.*',
     'The “color” input type is not supported in all browsers.*',
     'The “datetime-local” input type is not supported in all browsers.*',
-    'The “time” input type is not supported in all browsers.*',
-    // IE11 doesn't recognize <main> / give the element an implicit "main" landmark.
-    // Explicit role="main" is redundant for other modern browsers, but still valid.
-    'The “main” role is unnecessary for element “main”.'
+    'The “time” input type is not supported in all browsers.*'
   ].join('|')
 
   const args = [

config.yml

@@ -51,6 +51,7 @@ params:
   current_ruby_version: "4.3.1"
   rfs_version:          "9.0.2"
   docs_version:         "4.3"
+  github_org:           "https://github.com/twbs"
   repo:                 "https://github.com/twbs/bootstrap"
   twitter:              "getbootstrap"
   slack:                "https://bootstrap-slack.herokuapp.com/"