Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Legacy Edge support. #31972

Merged
merged 3 commits into from Nov 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion .browserslistrc
Expand Up @@ -5,7 +5,9 @@ last 1 major version
not dead
Chrome >= 60
Firefox >= 60
Edge >= 16
# 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
iOS >= 10
Safari >= 10
Android >= 6
Expand Down
14 changes: 7 additions & 7 deletions .bundlewatch.config.json
Expand Up @@ -30,31 +30,31 @@
},
{
"path": "./dist/css/bootstrap.min.css",
"maxSize": "21.6 kB"
"maxSize": "21.5 kB"
},
{
"path": "./dist/js/bootstrap.bundle.js",
"maxSize": "51 kB"
"maxSize": "50 kB"
},
{
"path": "./dist/js/bootstrap.bundle.min.js",
"maxSize": "22.5 kB"
"maxSize": "22 kB"
},
{
"path": "./dist/js/bootstrap.esm.js",
"maxSize": "28 kB"
"maxSize": "27 kB"
},
{
"path": "./dist/js/bootstrap.esm.min.js",
"maxSize": "19 kB"
"maxSize": "18 kB"
},
{
"path": "./dist/js/bootstrap.js",
"maxSize": "29 kB"
"maxSize": "28 kB"
},
{
"path": "./dist/js/bootstrap.min.js",
"maxSize": "16 kB"
"maxSize": "15.5 kB"
}
],
"ci": {
Expand Down
7 changes: 1 addition & 6 deletions build/build-plugins.js
Expand Up @@ -26,7 +26,6 @@ const bsPlugins = {
Data: path.resolve(__dirname, '../js/src/dom/data.js'),
EventHandler: path.resolve(__dirname, '../js/src/dom/event-handler.js'),
Manipulator: path.resolve(__dirname, '../js/src/dom/manipulator.js'),
Polyfill: path.resolve(__dirname, '../js/src/dom/polyfill.js'),
SelectorEngine: path.resolve(__dirname, '../js/src/dom/selector-engine.js'),
Alert: path.resolve(__dirname, '../js/src/alert.js'),
Button: path.resolve(__dirname, '../js/src/button.js'),
Expand Down Expand Up @@ -66,10 +65,7 @@ const getConfigByPluginKey = pluginKey => {
pluginKey === 'Sanitizer'
) {
return {
external: [bsPlugins.Polyfill],
globals: {
[bsPlugins.Polyfill]: 'Polyfill'
}
external: []
}
}

Expand Down Expand Up @@ -138,7 +134,6 @@ const domObjects = [
'Data',
'EventHandler',
'Manipulator',
'Polyfill',
'SelectorEngine'
]

Expand Down
7 changes: 0 additions & 7 deletions js/src/dom/event-handler.js
Expand Up @@ -6,7 +6,6 @@
*/

import { getjQuery } from '../util/index'
import { defaultPreventedPreservedOnDispatch } from './polyfill'

/**
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -314,12 +313,6 @@ const EventHandler = {

if (defaultPrevented) {
evt.preventDefault()

if (!defaultPreventedPreservedOnDispatch) {
Object.defineProperty(evt, 'defaultPrevented', {
get: () => true
})
}
}

if (nativeDispatch) {
Expand Down
80 changes: 0 additions & 80 deletions js/src/dom/polyfill.js

This file was deleted.

6 changes: 2 additions & 4 deletions js/src/dom/selector-engine.js
Expand Up @@ -5,8 +5,6 @@
* --------------------------------------------------------------------------
*/

import { find as findFn, findOne } from './polyfill'

/**
* ------------------------------------------------------------------------
* Constants
Expand All @@ -21,11 +19,11 @@ const SelectorEngine = {
},

find(selector, element = document.documentElement) {
return [].concat(...findFn.call(element, selector))
return [].concat(...Element.prototype.querySelectorAll.call(element, selector))
},

findOne(selector, element = document.documentElement) {
return findOne.call(element, selector)
return Element.prototype.querySelector.call(element, selector)
},

children(element, selector) {
Expand Down
7 changes: 0 additions & 7 deletions js/tests/browsers.js
Expand Up @@ -23,13 +23,6 @@ const browsers = {
browser: 'Firefox',
browser_version: 'latest'
},
edgeWin10: {
base: 'BrowserStack',
os: 'Windows',
os_version: '10',
browser: 'Edge',
browser_version: '16'
},
chromeWin10: {
base: 'BrowserStack',
os: 'Windows',
Expand Down
10 changes: 0 additions & 10 deletions js/tests/karma.conf.js
Expand Up @@ -137,16 +137,6 @@ if (browserStack) {
branches: 89,
functions: 90,
lines: 90
},
each: {
overrides: {
'js/src/dom/polyfill.js': {
statements: 30,
lines: 30,
branches: 8,
functions: 30
}
}
}
}
}
Expand Down
1 change: 0 additions & 1 deletion js/tests/visual/alert.html
Expand Up @@ -51,7 +51,6 @@ <h1>Alert <small>Bootstrap Visual Test</small></h1>
</div>
</div>

<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/event-handler.js"></script>
<script src="../../dist/dom/selector-engine.js"></script>
<script src="../../dist/dom/data.js"></script>
Expand Down
1 change: 0 additions & 1 deletion js/tests/visual/button.html
Expand Up @@ -44,7 +44,6 @@ <h1>Button <small>Bootstrap Visual Test</small></h1>
</div>
</div>

<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/event-handler.js"></script>
<script src="../../dist/dom/selector-engine.js"></script>
<script src="../../dist/dom/data.js"></script>
Expand Down
1 change: 0 additions & 1 deletion js/tests/visual/carousel.html
Expand Up @@ -45,7 +45,6 @@ <h1>Carousel <small>Bootstrap Visual Test</small></h1>
</div>
</div>

<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/event-handler.js"></script>
<script src="../../dist/dom/selector-engine.js"></script>
<script src="../../dist/dom/manipulator.js"></script>
Expand Down
1 change: 0 additions & 1 deletion js/tests/visual/collapse.html
Expand Up @@ -71,7 +71,6 @@ <h5 class="mb-0">
</div>
</div>

<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/event-handler.js"></script>
<script src="../../dist/dom/selector-engine.js"></script>
<script src="../../dist/dom/manipulator.js"></script>
Expand Down
1 change: 0 additions & 1 deletion js/tests/visual/dropdown.html
Expand Up @@ -210,7 +210,6 @@ <h1>Dropdown <small>Bootstrap Visual Test</small></h1>
</div>

<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/event-handler.js"></script>
<script src="../../dist/dom/selector-engine.js"></script>
<script src="../../dist/dom/data.js"></script>
Expand Down
1 change: 0 additions & 1 deletion js/tests/visual/modal.html
Expand Up @@ -206,7 +206,6 @@ <h4 class="modal-title" id="slowModalLabel">Lorem slowly</h4>
</div>

<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/event-handler.js"></script>
<script src="../../dist/dom/selector-engine.js"></script>
<script src="../../dist/dom/data.js"></script>
Expand Down
1 change: 0 additions & 1 deletion js/tests/visual/popover.html
Expand Up @@ -32,7 +32,6 @@ <h1>Popover <small>Bootstrap Visual Test</small></h1>
</div>

<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/event-handler.js"></script>
<script src="../../dist/dom/selector-engine.js"></script>
<script src="../../dist/dom/manipulator.js"></script>
Expand Down
1 change: 0 additions & 1 deletion js/tests/visual/scrollspy.html
Expand Up @@ -86,7 +86,6 @@ <h2 id="final">Final section</h2>
<p>Ad leggings keytar, brunch id art party dolor labore.</p>
</div>

<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/data.js"></script>
<script src="../../dist/dom/event-handler.js"></script>
<script src="../../dist/dom/selector-engine.js"></script>
Expand Down
1 change: 0 additions & 1 deletion js/tests/visual/tab.html
Expand Up @@ -222,7 +222,6 @@ <h4>Tabs with list-group (with fade)</h4>
</div>

<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/event-handler.js"></script>
<script src="../../dist/dom/selector-engine.js"></script>
<script src="../../dist/dom/data.js"></script>
Expand Down
1 change: 0 additions & 1 deletion js/tests/visual/toast.html
Expand Up @@ -52,7 +52,6 @@ <h1>Toast <small>Bootstrap Visual Test</small></h1>
</div>
</div>

<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/event-handler.js"></script>
<script src="../../dist/dom/manipulator.js"></script>
<script src="../../dist/dom/data.js"></script>
Expand Down
1 change: 0 additions & 1 deletion js/tests/visual/tooltip.html
Expand Up @@ -70,7 +70,6 @@ <h1>Tooltip <small>Bootstrap Visual Test</small></h1>
</div>

<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/selector-engine.js"></script>
<script src="../../dist/dom/event-handler.js"></script>
<script src="../../dist/dom/manipulator.js"></script>
Expand Down
16 changes: 2 additions & 14 deletions scss/_reboot.scss
Expand Up @@ -295,8 +295,6 @@ samp {
// 1. Remove browser default top margin
// 2. Reset browser default of `1em` to use `rem`s
// 3. Don't allow content to break outside
// 4. Disable auto-hiding scrollbar in legacy Edge to avoid overlap,
// making it impossible to interact with the content

pre {
display: block;
Expand All @@ -305,7 +303,6 @@ pre {
overflow: auto; // 3
@include font-size($code-font-size);
color: $pre-color;
-ms-overflow-style: scrollbar; // 4

// Account for some code outputs that place code tags in pre tags
code {
Expand Down Expand Up @@ -434,13 +431,6 @@ textarea {
line-height: inherit;
}

// Show the overflow in Edge

button,
input {
overflow: visible;
}

// Remove the inheritance of text transform in Firefox

button,
Expand Down Expand Up @@ -516,8 +506,7 @@ fieldset {

// 1. By using `float: left`, the legend will behave like a block element.
// This way the border of a fieldset wraps around the legend if present.
// 2. Correct the text wrapping in Edge.
// 3. Fix wrapping bug.
// 2. Fix wrapping bug.
// See https://github.com/twbs/bootstrap/issues/29712

legend {
Expand All @@ -528,10 +517,9 @@ legend {
@include font-size($legend-font-size);
font-weight: $legend-font-weight;
line-height: inherit;
white-space: normal; // 2

+ * {
clear: left; // 3
clear: left; // 2
}
}

Expand Down