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

Chore update deps #582

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
{
"presets": ["@babel/preset-env"],
"presets": [
[
"@babel/preset-env",
{
"useBuiltIns": "usage", // or "entry"
"corejs": 3
}
]
],
"plugins": [
[
"module-resolver",
Expand All @@ -22,8 +30,7 @@
[
"@babel/plugin-transform-runtime",
{
"corejs": 2,
"regenerator": true
"corejs": 3
}
]
]
Expand Down
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"error",
{ "max": 1, "maxEOF": 0, "maxBOF": 0 }
],
"import/no-unresolved": false
"import/no-unresolved": 0,
"import/no-cycle": 0
},
"settings": {
"import/resolver": {
Expand Down
1,713 changes: 1,147 additions & 566 deletions dist/mercury.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/mercury.js.map

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions dist/mercury.web.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/mercury.web.js.map

Large diffs are not rendered by default.

102 changes: 50 additions & 52 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,83 +54,81 @@
"node": ">=10"
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.0.0",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/runtime": "^7.0.0",
"@babel/core": "^7.11.6",
"@babel/plugin-transform-runtime": "^7.11.5",
"@babel/preset-env": "^7.11.5",
"@babel/runtime": "^7.11.2",
"@jesses/circle-github-bot": "^2.1.0",
"@octokit/rest": "^16.9.0",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.4.2",
"babel-plugin-module-alias": "^1.6.0",
"babel-plugin-module-resolver": "^3.1.2",
"@octokit/rest": "^16.43.2",
"@rollup/plugin-babel": "^5.2.0",
"@rollup/plugin-commonjs": "^15.0.0",
"@rollup/plugin-node-resolve": "^9.0.0",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.3.0",
"babel-plugin-module-resolver": "^4.0.0",
"babelify": "^10.0.0",
"babelrc-rollup": "^3.0.0",
"brfs": "^2.0.1",
"brfs": "^2.0.2",
"brfs-babel": "^2.0.0",
"browserify": "^16.2.3",
"changelog-maker": "^2.3.0",
"eslint": "^5.12.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-prettier": "^6.1.0",
"eslint-import-resolver-babel-module": "^2.2.1",
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-react": "^7.12.3",
"express": "^4.16.4",
"husky": "^3.0.0",
"inquirer": "^7.0.0",
"jasmine-core": "^2.5.2",
"jest": "^23.6.0",
"jest-cli": "^23.6.0",
"browserify": "^16.5.2",
"changelog-maker": "^2.4.2",
"eslint": "^7.8.1",
"eslint-config-airbnb": "^18.2.0",
"eslint-config-prettier": "^6.11.0",
"eslint-import-resolver-babel-module": "^5.1.2",
"eslint-plugin-babel": "^5.3.1",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-react": "^7.20.6",
"express": "^4.17.1",
"husky": "^4.2.5",
"inquirer": "^7.3.3",
"jasmine-core": "^2.99.1",
"jest": "^26.4.2",
"jest-cli": "^26.4.2",
"karma": "^6.3.16",
"karma-browserify": "8.1.0",
"karma-chrome-launcher": "^3.0.0",
"karma-chrome-launcher": "^3.1.0",
"karma-cli": "^2.0.0",
"karma-jasmine": "^1.0.2",
"karma-jasmine": "^1.1.2",
"karma-mocha": "^1.3.0",
"karma-requirejs": "^1.1.0",
"lint-staged": "^8.1.0",
"mocha": "^6.0.0",
"lint-staged": "^8.2.1",
"mocha": "^6.2.3",
"nock": "^10.0.6",
"ora": "^4.0.0",
"prettier": "^1.15.3",
"remark-cli": "^7.0.0",
"remark-lint": "^6.0.4",
"remark-preset-lint-recommended": "^3.0.2",
"ora": "^4.1.1",
"prettier": "^1.19.1",
"remark-cli": "^7.0.1",
"remark-lint": "^6.0.6",
"remark-preset-lint-recommended": "^3.0.4",
"requirejs": "^2.3.6",
"rollup": "^1.1.0",
"rollup-plugin-babel": "^4.0.1",
"rollup-plugin-commonjs": "^9.2.0",
"rollup": "^2.26.9",
"rollup-plugin-node-globals": "^1.4.0",
"rollup-plugin-node-resolve": "^2.0.0",
"rollup-plugin-terser": "^6.1.0",
"rollup-plugin-uglify": "^6.0.1",
"rollup-plugin-uglify": "^6.0.4",
"watchify": "^3.11.1"
},
"dependencies": {
"@babel/runtime-corejs2": "^7.2.0",
"@postlight/ci-failed-test-reporter": "^1.0",
"@babel/runtime-corejs3": "^7.11.2",
"@postlight/ci-failed-test-reporter": "^1.0.26",
"browser-request": "github:postlight/browser-request#feat-add-headers-to-response",
"cheerio": "^0.22.0",
"cheerio": "0.22.0",
"core-js": "3.6.5",
"difflib": "github:postlight/difflib.js",
"ellipsize": "0.1.0",
"iconv-lite": "0.5.0",
"jquery": "^3.5.0",
"moment": "^2.23.0",
"eslint-plugin-react-hooks": "^4.1.0",
"iconv-lite": "0.6.2",
"jquery": "3.5.0",
"moment": "^2.27.0",
"moment-parseformat": "3.0.0",
"moment-timezone": "0.5.26",
"postman-request": "^2.88.1-postman.7.1",
"request-promise": "^4.2.2",
"request": "^2.88.2",
"string-direction": "^0.1.2",
"turndown": "^5.0.3",
"url": "^0.11.0",
"valid-url": "^1.0.9",
"wuzzy": "^0.1.4",
"yargs-parser": "^15.0.1"
"wuzzy": "^0.1.5",
"yargs-parser": "^14.0.0"
},
"bundleDependencies": [
"jquery",
Expand Down
9 changes: 4 additions & 5 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
/* eslint-disable import/no-extraneous-dependencies */
import babel from 'rollup-plugin-babel';
import commonjs from 'rollup-plugin-commonjs';
import babel from '@rollup/plugin-babel';
import commonjs from '@rollup/plugin-commonjs';

export default {
input: 'src/mercury.js',
plugins: [
commonjs(),
babel({
externalHelpers: false,
runtimeHelpers: true,
babelHelpers: 'runtime',
}),
],
treeshake: true,
Expand All @@ -17,6 +16,6 @@ export default {
? 'dist/mercury_test.js'
: 'dist/mercury.js',
format: 'cjs',
sourceMap: true,
sourcemap: true,
},
};
11 changes: 6 additions & 5 deletions rollup.config.web.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import nodeResolve from 'rollup-plugin-node-resolve';
import nodeResolve from '@rollup/plugin-node-resolve';
import globals from 'rollup-plugin-node-globals';
import { uglify } from 'rollup-plugin-uglify'; // eslint-disable-line import/extensions
import babel from 'rollup-plugin-babel';
import commonjs from 'rollup-plugin-commonjs';
import babel from '@rollup/plugin-babel';
import commonjs from '@rollup/plugin-commonjs';

export default {
input: 'src/mercury.js',
plugins: [
babel({
runtimeHelpers: true,
babelHelpers: 'runtime',
skipPreflightCheck: true,
exclude: './node_modules#<{(|*',
}),
commonjs({
Expand All @@ -28,6 +29,6 @@ export default {
: 'dist/mercury.web.js',
format: 'iife',
name: 'Mercury',
sourceMap: true,
sourcemap: true,
},
};
9 changes: 4 additions & 5 deletions scripts/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
/* eslint-disable import/no-extraneous-dependencies */
import babel from 'rollup-plugin-babel';
import commonjs from 'rollup-plugin-commonjs';
import babel from '@rollup/plugin-babel';
import commonjs from '@rollup/plugin-commonjs';

export default {
input: 'scripts/generate-custom-parser.js',
plugins: [
commonjs(),
babel({
externalHelpers: false,
runtimeHelpers: true,
babelHelpers: 'runtime',
}),
],
treeshake: true,
output: {
file: 'dist/generate-custom-parser.js',
format: 'cjs',
sourceMap: true,
sourcemap: true,
},
};
2 changes: 1 addition & 1 deletion src/utils/dom/fixtures/html.js
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ const HTML = {
<html><body><div><p><a href="">Wow how about that</a></p></div></body></html>
`,
after: `
<div><div><div><p><a href="">Wow how about that</a></p></div></div></div>
<div><div><div><p><a href>Wow how about that</a></p></div></div></div>
`,
},

Expand Down
2 changes: 1 addition & 1 deletion src/utils/dom/make-links-absolute.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ describe('makeLinksAbsolute($)', () => {
result,
`<div>
<picture>
<source srcset="" media="(max-width: 450px)">
<source srcset media="(max-width: 450px)">
<source srcset=" ">
<img src="http://example.com/assets/images/rhythm/076.jpg" alt="Vertical and horizontal rhythm">
</picture>
Expand Down
Loading