Skip to content
This repository has been archived by the owner on Aug 22, 2021. It is now read-only.

Commit

Permalink
Update dependencies, drop support for IE11 and iOS 9
Browse files Browse the repository at this point in the history
  • Loading branch information
web-padawan committed Jun 3, 2019
1 parent a2a5f3b commit 918a307
Show file tree
Hide file tree
Showing 6 changed files with 948 additions and 990 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ addons:
chrome: stable

script:
- if [[ "$TRAVIS_EVENT_TYPE" != "pull_request" ]]; then
npm run test:modern && npm run test:legacy;
else
npm test;
fi
- npm test

after_success:
- "cat ${TRAVIS_BUILD_DIR}/coverage/lcov.info | coveralls"
51 changes: 11 additions & 40 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,42 +1,13 @@
module.exports = {
env: {
modern: {
presets: [
[
'@babel/preset-env',
{
modules: false,
targets: {
esmodules: true
}
}
]
],
},
legacy: {
presets: [
[
'@babel/preset-env',
{
modules: false,
targets: {
ie: 11,
safari: 9
}
}
]
],
plugins: [
[
'@babel/plugin-transform-runtime',
{
corejs: false,
helpers: false,
regenerator: true,
useESModules: false
}
]
]
}
}
presets: [
[
'@babel/preset-env',
{
modules: false,
targets: {
esmodules: true
}
}
]
]
};
26 changes: 7 additions & 19 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,25 +102,13 @@ module.exports = function(config) {
'chrome_headless',
'firefox_headless'
],
sauce: {
modern: [
'sl_safari_11',
'sl_edge_17',
'sl_ios_11'
],
legacy: [
'sl_ie_11',
'sl_ios_9'
]
}
sauce: [
'sl_safari_12',
'sl_edge_18',
'sl_ios_10',
'sl_ios_12'
]
};

const isSauce = process.env['TEST_PLATFORM'] === 'sauce';
const env = process.env['BABEL_ENV'] || 'modern';

if (isSauce) {
config.browsers = platformMap['sauce'][env];
} else {
config.browsers = platformMap['local'];
}
config.browsers = platformMap[process.env['TEST_PLATFORM'] === 'sauce' ? 'sauce' : 'local'];
};
30 changes: 13 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@
"lint:css": "stylelint *.js src/*.js demo/*.js theme/**/*.js test/*.js",
"lint:js": "eslint *.js src demo theme test",
"lint:polymer": "polymer lint --rules polymer-3 --input ./src/*.js ./theme/**/*.js",
"test": "cross-env BABEL_ENV=modern karma start",
"test:modern": "cross-env BABEL_ENV=modern TEST_PLATFORM=sauce karma start",
"test:legacy": "cross-env BABEL_ENV=legacy TEST_PLATFORM=sauce karma start",
"test": "karma start",
"prestart": "polymer analyze vaadin-* > analysis.json",
"start": "polymer serve --npm --open",
"preversion": "gulp version:update",
Expand All @@ -40,25 +38,23 @@
"lit-html": "^1.0.0"
},
"devDependencies": {
"@babel/core": "^7.4.0",
"@babel/plugin-transform-runtime": "^7.4.0",
"@babel/preset-env": "^7.4.2",
"@babel/runtime": "^7.4.2",
"@open-wc/testing-helpers": "^0.8.2",
"@babel/core": "^7.4.5",
"@babel/plugin-transform-runtime": "^7.4.4",
"@babel/preset-env": "^7.4.5",
"@babel/runtime": "^7.4.5",
"@open-wc/testing-helpers": "^0.9.5",
"@polymer/iron-component-page": "^4.0.1",
"@vaadin/vaadin-demo-helpers": "vaadin/vaadin-demo-helpers#proto/next",
"@webcomponents/webcomponentsjs": "^2.2.7",
"alias-regex-webpack-plugin": "^0.1.2",
"@webcomponents/webcomponentsjs": "^2.2.10",
"babel-eslint": "^10.0.1",
"babel-loader": "^8.0.5",
"babel-loader": "^8.0.6",
"chai": "^4.2.0",
"coveralls": "^3.0.3",
"cross-env": "^5.2.0",
"eslint": "^5.15.3",
"eslint": "^5.16.0",
"eslint-config-vaadin": "^0.2.7",
"fast-async": "^6.3.8",
"istanbul-instrumenter-loader": "^3.0.1",
"karma": "^4.0.1",
"karma": "^4.1.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage-istanbul-reporter": "^2.0.5",
"karma-firefox-launcher": "^1.1.0",
Expand All @@ -68,15 +64,15 @@
"karma-sinon-chai": "^2.0.2",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^4.0.0-rc.6",
"mocha": "^6.0.2",
"mocha": "^6.1.4",
"npm-run-all": "^4.1.5",
"polymer-webpack-loader": "^2.0.3",
"sinon": "^7.3.1",
"sinon-chai": "^3.3.0",
"stylelint": "^9.10.1",
"stylelint-config-styled-components": "^0.1.1",
"stylelint-config-vaadin": "^0.1.4",
"stylelint-processor-styled-components": "^1.6.0",
"webpack": "^4.29.6"
"stylelint-processor-styled-components": "^1.8.0",
"webpack": "^4.32.2"
}
}
24 changes: 9 additions & 15 deletions test/karma-browsers.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,34 +12,28 @@
"-headless"
]
},
"sl_safari_11": {
"sl_safari_12": {
"base": "SauceLabs",
"browserName": "safari",
"platform": "Mac 10.13",
"version": "11.1"
"version": "12.1"
},
"sl_ios_9": {
"sl_ios_10": {
"base": "SauceLabs",
"browserName": "iphone",
"platform": "OS X 10.11",
"version": "9.3"
"platform": "OS X 10.12",
"version": "10.3"
},
"sl_ios_11": {
"sl_ios_12": {
"base": "SauceLabs",
"browserName": "iphone",
"platform": "OS X 10.13",
"version": "11.2"
"version": "12.2"
},
"sl_ie_11": {
"base": "SauceLabs",
"browserName": "internet explorer",
"platform": "Windows 8.1",
"version": "11"
},
"sl_edge_17": {
"sl_edge_18": {
"base": "SauceLabs",
"browserName": "microsoftedge",
"platform": "Windows 10",
"version": "17"
"version": "18"
}
}
Loading

1 comment on commit 918a307

@moderndeveloperllc
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@web-padawan Is this going to be a @vaadin-wide thing to drop IE11 compatibility in future products? Just trying to plan.

Please sign in to comment.