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.

Sign up for GitHub

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

Bump various dependencies #591

Merged
merged 4 commits into from
Jun 19, 2019
Merged

Bump various dependencies #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e88d691
Bump various dep
Jun 19, 2019
406a005
Fix code style
Jun 19, 2019
c790bc9
Include @babel/plugin-transform-runtime for Jest
Jun 19, 2019
27b827d
Move webextension-polyfill to related package
Jun 19, 2019
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
26 changes: 18 additions & 8 deletions babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
module.exports = {
env: {
test: {
presets: ['@babel/preset-env'],
},
},
plugins: [
module.exports = api => {
const isTest = api.env('test');

const plugins = [
'@babel/plugin-proposal-object-rest-spread',
['@babel/transform-react-jsx', { pragma: 'h' }],
],
];

if (isTest) {
plugins.push('@babel/plugin-transform-runtime');
}

return {
env: {
test: {
presets: ['@babel/preset-env'],
},
},
plugins,
};
};
66 changes: 34 additions & 32 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,49 +25,51 @@
"firefox-launch": "web-ext run --source-dir dist --pref startup.homepage_welcome_url=https://github.com/OctoLinker/OctoLinker/blob/master/package.json"
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/plugin-transform-react-jsx": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"@babel/core": "^7.4.5",
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
"@babel/plugin-transform-react-jsx": "^7.3.0",
"@babel/preset-env": "^7.4.5",
"async": "^3.0.1",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"babel-loader": "^8.0.0",
"babel-preset-jest": "^23.2.0",
"babel-jest": "^24.8.0",
"babel-loader": "^8.0.6",
"babel-preset-jest": "^24.6.0",
"chrome-launch": "^1.1.4",
"chrome-webstore-upload-cli": "^1.2.0",
"codecov": "^3.1.0",
"copy-webpack-plugin": "^4.6.0",
"css-loader": "^1.0.1",
"dotenv": "^6.1.0",
"eslint": "^5.8.0",
"codecov": "^3.5.0",
"copy-webpack-plugin": "^5.0.3",
"css-loader": "^3.0.0",
"dotenv": "^8.0.0",
"eslint": "^5.16.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-prettier": "^3.1.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-prettier": "^3.0.0",
"eslint-plugin-react": "^7.11.1",
"jest": "^23.6.0",
"jest-fetch-mock": "^2.1.0",
"jest-puppeteer": "^3.4.0",
"json": "^9.0.4",
"eslint-config-prettier": "^5.0.0",
"eslint-plugin-import": "^2.17.3",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-react": "^7.13.0",
"jest": "^24.8.0",
"jest-fetch-mock": "^2.1.2",
"jest-puppeteer": "^4.2.0",
"json": "^9.0.6",
"json-loader": "^0.5.7",
"lerna": "^3.4.3",
"lerna": "^3.15.0",
"mkdirp": "^0.5.1",
"npm-run-all": "^4.1.1",
"prettier": "^1.14.3",
"puppeteer": "^1.10.0",
"npm-run-all": "^4.1.5",
"prettier": "^1.18.2",
"puppeteer": "^1.17.0",
"recursive-readdir": "^2.2.2",
"sinon": "^7.1.1",
"sinon": "^7.3.2",
"style-loader": "^0.23.1",
"web-ext": "^2.9.1",
"web-ext": "^3.0.0",
"webext": "1.9.1-with-submit.1",
"webextension-polyfill": "^0.3.1",
"webpack": "^4.24.0",
"webpack-cli": "^3.1.2"
"webpack": "^4.34.0",
"webpack-cli": "^3.3.4"
},
"optionalDependencies": {
"fsevents": "1.2.4"
"fsevents": "2.0.7"
},
"private": true
"private": true,
"dependencies": {
"@babel/plugin-transform-runtime": "^7.4.4"
}
}
4 changes: 1 addition & 3 deletions packages/core/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,7 @@ export default async function(matches) {
el.classList.add('octospotlight');

const container = document.createElement('div');
container.innerHTML = `<div class="octospotlight-inner">${
el.innerHTML
}</div>`;
container.innerHTML = `<div class="octospotlight-inner">${el.innerHTML}</div>`;
el.innerHTML = container.innerHTML;

const spot = document.createElement('div');
Expand Down
4 changes: 2 additions & 2 deletions packages/helper-settings/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"license": "MIT",
"main": "./index.js",
"dependencies": {
"chrome-promise": "^2.1.1",
"linkstate": "^1.1.0",
"preact": "^8.2.5",
"primer-core": "^7.0.0",
"primer-forms": "^1.4.0",
"primer-product": "^5.7.0"
"primer-product": "^5.7.0",
"webextension-polyfill": "^0.4.0"
}
}
4 changes: 1 addition & 3 deletions packages/user-interface/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ export const showNotification = ({ body, type = 'info' }) => {
};

const el = document.createElement('div');
el.innerHTML = `<div class="js-octolinker-flash flash flash-full ${
typeClass[type]
}">
el.innerHTML = `<div class="js-octolinker-flash flash flash-full ${typeClass[type]}">
<div class="container">
<button class="flash-close js-flash-close" type="button" aria-label="Dismiss this message">
<svg aria-hidden="true" class="octicon octicon-x" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"></path></svg>
Expand Down
Loading