Skip to content

Commit

Permalink
Update dependencies (#100)
Browse files Browse the repository at this point in the history
* Upgrade babel and related packages to v.7.
  Closes #54, closes #83, and closes #84.
* Update webpack and related packages.
  Closes #86, closes #81, and closes #91.
* Update postcss and related packages.
  Closes #79, closes #82, closes #85, closes #95, and closes #97.
* Update rollup to 0.66.2 as 0.66.3 breaks sourcemaps.
  Let's close #80 anyways and update again later.
* Update eslint and related packages.
* Upgrade nyc and related packages.
  Closes #48.
* Upgrade selenium.
* Regenerate yarn.lock.
  • Loading branch information
paulsmirnov committed Nov 7, 2018
1 parent 779f720 commit f6f66e9
Show file tree
Hide file tree
Showing 25 changed files with 2,183 additions and 2,377 deletions.
13 changes: 10 additions & 3 deletions .babelrc
@@ -1,9 +1,16 @@
{
"presets": ["env"],
"plugins": ["syntax-dynamic-import", "transform-class-properties"],
"presets": [
"@babel/preset-env"
],
"plugins": [
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-proposal-class-properties"
],
"env": {
"coverage": {
"plugins": ["istanbul"]
"plugins": [
"istanbul"
]
}
}
}
2 changes: 1 addition & 1 deletion demo/scripts/index.js
Expand Up @@ -4,7 +4,7 @@ import '../../node_modules/bootstrap-switch/dist/css/bootstrap3/bootstrap-switch
import '../../node_modules/toastr/build/toastr.min.css';
import '../../node_modules/jquery.terminal/css/jquery.terminal.min.css';
import '../styles/main.scss';
import 'babel-polyfill';
import '@babel/polyfill';

import Miew from './Miew.full';
import Menu from './ui/Menu';
Expand Down
8 changes: 4 additions & 4 deletions docs/tutorials/embed.md
Expand Up @@ -32,7 +32,7 @@ _index.html_
<title>Miew via Global</title>

<link rel="stylesheet" href="Miew.min.css">
<script src="https://unpkg.com/babel-polyfill@6.26.0/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="Miew.min.js"></script>
</head>
<body>
Expand Down Expand Up @@ -66,7 +66,7 @@ _index.html_
<title>Miew via Require.js</title>

<link rel="stylesheet" href="Miew.min.css">
<script src="https://unpkg.com/babel-polyfill@6.26.0/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js"></script>
</head>
<body>
Expand Down Expand Up @@ -109,7 +109,7 @@ _index.html_
<title>Miew via Browserify</title>

<link rel="stylesheet" href="Miew.min.css">
<script src="https://unpkg.com/babel-polyfill@6.26.0/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="bundle.js"></script>
</head>
<body>
Expand Down Expand Up @@ -145,7 +145,7 @@ _index.html_
<head>
<meta charset="UTF-8">
<title>Miew via Webpack</title>
<script src="https://unpkg.com/babel-polyfill@6.26.0/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="bundle.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/api.html
Expand Up @@ -5,7 +5,7 @@
<title>Miew API</title>

<link rel="stylesheet" href="../dist/Miew.min.css">
<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="../dist/Miew.min.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/empty.html
Expand Up @@ -5,7 +5,7 @@
<title>Miew via Global</title>

<link rel="stylesheet" href="../dist/Miew.min.css">
<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="../dist/Miew.min.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/fullscreen.html
Expand Up @@ -9,7 +9,7 @@
html, body { width: 100%; height: 100%; margin: 0 }
</style>

<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="../dist/Miew.min.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/grid.html
Expand Up @@ -91,7 +91,7 @@ <h2>Adverse effects</h2>
</div>


<script src="https://unpkg.com/babel-polyfill@6.26.0/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="../dist/Miew.min.js"></script>
<script>
(function() {
Expand Down
2 changes: 1 addition & 1 deletion examples/labels.html
Expand Up @@ -5,7 +5,7 @@
<title>Miew labels</title>

<link rel="stylesheet" href="../dist/Miew.min.css">
<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="../dist/Miew.min.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/miew_via_browserify.html
Expand Up @@ -5,7 +5,7 @@
<title>Miew via Browserify</title>

<link rel="stylesheet" href="../dist/Miew.min.css">
<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="miew_via_browserify.bundle.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/miew_via_global.html
Expand Up @@ -5,7 +5,7 @@
<title>Miew via Global</title>

<link rel="stylesheet" href="../dist/Miew.min.css">
<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="../dist/Miew.min.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/miew_via_require.html
Expand Up @@ -5,7 +5,7 @@
<title>Miew via Require.js</title>

<link rel="stylesheet" href="../dist/Miew.min.css">
<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/miew_via_webpack.html
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>Miew via Webpack</title>

<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
</head>
<body>
<div class="miew-container" style="width:640px; height:480px;">Loading Miew...</div>
Expand Down
2 changes: 1 addition & 1 deletion examples/multiple.html
Expand Up @@ -5,7 +5,7 @@
<title>Multiple Miew Instances</title>

<link rel="stylesheet" href="../dist/Miew.min.css">
<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="../dist/Miew.min.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/options.html
Expand Up @@ -5,7 +5,7 @@
<title>Miew options</title>

<link rel="stylesheet" href="../dist/Miew.min.css">
<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="../dist/Miew.min.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/options_fromAttr.html
Expand Up @@ -5,7 +5,7 @@
<title>.options.fromAttr() - Miew API</title>

<link rel="stylesheet" href="../dist/Miew.min.css">
<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="../dist/Miew.min.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/options_fromURL.html
Expand Up @@ -5,7 +5,7 @@
<title>.options.fromURL() - Miew API</title>

<link rel="stylesheet" href="../dist/Miew.min.css">
<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="../dist/Miew.min.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/projected.html
Expand Up @@ -25,7 +25,7 @@
}
</style>

<script src="https://unpkg.com/babel-polyfill@6.26.0/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="../dist/Miew.min.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion examples/terminal.html
Expand Up @@ -28,7 +28,7 @@
}
</style>

<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/jquery@3/dist/jquery.min.js"></script>
<script src="https://unpkg.com/jquery.terminal@1/js/jquery.terminal.min.js"></script>
<script src="../dist/Miew.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/transparent_background.html
Expand Up @@ -33,7 +33,7 @@
<div class="miew-container" style="width:640px; height:480px"></div>
</div>

<script src="https://unpkg.com/babel-polyfill@6/dist/polyfill.min.js"></script>
<script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
<script src="../dist/Miew.min.js"></script>
<script>
(function() {
Expand Down
77 changes: 38 additions & 39 deletions package.json
Expand Up @@ -84,7 +84,7 @@
"**/*.test.js"
],
"require": [
"babel-register"
"@babel/register"
],
"reporter": [
"lcov",
Expand All @@ -99,32 +99,32 @@
]
},
"devDependencies": {
"autoprefixer": "^9.0.1",
"babel-core": "^6.26.3",
"babel-eslint": "^7.2.3",
"babel-loader": "^7.1.5",
"babel-plugin-external-helpers": "^6.22.0",
"babel-plugin-istanbul": "^4.1.6",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.7.0",
"babel-register": "^6.26.0",
"@babel/core": "^7.0.0",
"@babel/plugin-external-helpers": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/register": "^7.0.0",
"autoprefixer": "^9.3.1",
"babel-eslint": "^10.0.1",
"babel-loader": "^8.0.0",
"babel-plugin-istanbul": "^5.1.0",
"bootstrap": "^3.3.7",
"bootstrap-switch": "^3.3.4",
"browserify": "^16.2.2",
"chai": "^4.1.2",
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"copy-webpack-plugin": "^4.5.2",
"copy-webpack-plugin": "^4.6.0",
"coveralls": "^3.0.2",
"cross-env": "^5.2.0",
"cssnano": "^4.0.4",
"cssnano": "^4.1.7",
"dirty-chai": "^2.0.1",
"eslint": "^5.2.0",
"eslint-config-airbnb-base": "^13.0.0",
"eslint-plugin-import": "^2.13.0",
"eslint": "^5.8.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-import": "^2.14.0",
"express": "^4.16.3",
"file-loader": "^1.1.11",
"file-loader": "^2.0.0",
"glob": "^7.1.2",
"handlebars": "^4.0.11",
"html-webpack-plugin": "^3.2.0",
Expand All @@ -133,45 +133,44 @@
"jquery.terminal": "~1.14.0",
"jsdoc": "^3.5.5",
"lodash": "^4.17.10",
"mini-css-extract-plugin": "^0.4.1",
"mini-css-extract-plugin": "^0.4.4",
"mocha": "^5.2.0",
"ncp": "^2.0.0",
"node-resemble-js": "^0.2.0",
"npm-run-all": "^4.1.3",
"nyc": "^11.8.0",
"nyc": "^13.1.0",
"open": "^0.0.5",
"postcss-advanced-variables": "^2.3.3",
"postcss-calc": "^6.0.1",
"postcss-cli": "^6.0.0",
"postcss-import": "^11.1.0",
"postcss-loader": "^2.1.6",
"postcss-nested": "^3.0.0",
"postcss-calc": "^7.0.1",
"postcss-cli": "^6.0.1",
"postcss-import": "^12.0.1",
"postcss-loader": "^3.0.0",
"postcss-nested": "^4.1.0",
"postcss-scss": "^2.0.0",
"raw-loader": "^0.5.1",
"rimraf": "^2.6.2",
"rollup": "^0.63.4",
"rollup-plugin-babel": "^3.0.7",
"rollup": "0.66.2",
"rollup-plugin-babel": "^4.0.1",
"rollup-plugin-commonjs": "^9.1.4",
"rollup-plugin-node-resolve": "^3.3.0",
"rollup-plugin-replace": "^2.0.0",
"rollup-plugin-string": "^2.0.2",
"sass-loader": "^7.0.3",
"script-ext-html-webpack-plugin": "^2.0.1",
"selenium-webdriver": "^3.5.0",
"sinon": "^6.1.4",
"script-ext-html-webpack-plugin": "^2.1.2",
"selenium-webdriver": "^4.0.0-alpha.1",
"sinon": "^7.1.1",
"sinon-chai": "^3.2.0",
"spin.js": "^4.0.0",
"string-replace-webpack-plugin": "^0.1.3",
"style-loader": "^0.21.0",
"stylelint": "^9.4.0",
"style-loader": "^0.23.1",
"stylelint": "^9.7.1",
"stylelint-config-standard": "^18.2.0",
"three": "0.94.0",
"toastr": "^2.1.4",
"uglify-js": "^3.4.6",
"url-loader": "^1.0.1",
"webpack": "^4.16.3",
"webpack-cli": "^3.1.0",
"webpack-dev-server": "^3.1.5",
"uglify-js": "^3.4.9",
"url-loader": "^1.1.2",
"webpack": "^4.25.1",
"webpack-cli": "^3.1.2",
"webpack-dev-server": "^3.1.10",
"yargs": "^12.0.1"
}
}
7 changes: 0 additions & 7 deletions rollup.config.js
Expand Up @@ -42,18 +42,11 @@ export default {
'./src/utils/SelectionParser.js',
'./src/utils/MiewCLIParser.js',
],
exclude: [
'./vendor/js/three.module.js',
],
namedExports: {
'vendor/js/Smooth.js': ['Smooth'],
},
}),
rollupPluginBabel({
babelrc: false,
runtimeHelpers: true,
presets: [['env', {modules: false}]],
plugins: ['external-helpers', 'transform-class-properties'],
exclude: [
'./node_modules/**',
'./vendor/js/**',
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/golden.js
Expand Up @@ -81,7 +81,7 @@ const report = {
function _prepareBrowser(width = 1024, height = 768) {
const getPadding = 'return[window.outerWidth-window.innerWidth,window.outerHeight-window.innerHeight];';
return driver.executeScript(getPadding)
.then((pad) => driver.manage().window().setSize(width + pad[0], height + pad[1]))
.then((pad) => driver.manage().window().setRect({width: width + pad[0], height: height + pad[1]}))
.then(() => driver.getCapabilities())
.then((caps) => {
const browserName = caps.get('browserName').replace(/\b\w/g, c => c.toUpperCase());
Expand Down
2 changes: 1 addition & 1 deletion test/mocha.e2e.opts
@@ -1,3 +1,3 @@
--recursive
--require babel-register
--require @babel/register
test/**/*.e2e.js
2 changes: 1 addition & 1 deletion test/mocha.opts
@@ -1,5 +1,5 @@
--recursive
--require babel-register
--require @babel/register
--reporter dot
src/**/*.test.js
test/**/*.test.js

0 comments on commit f6f66e9

Please sign in to comment.