Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot-preview[bot]
b886e3d8f6
Bump html-webpack-plugin from 4.4.1 to 4.5.0
Bumps [html-webpack-plugin](https://github.com/jantimon/html-webpack-plugin) from 4.4.1 to 4.5.0.
- [Release notes](https://github.com/jantimon/html-webpack-plugin/releases)
- [Changelog](https://github.com/jantimon/html-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jantimon/html-webpack-plugin/compare/v4.4.1...v4.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-02 01:11:34 +00:00
7 changed files with 21 additions and 37 deletions

View File

@ -53,7 +53,7 @@
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-react": "^7.20.0",
"file-loader": "^6.0.0",
"html-webpack-plugin": "^4.3.0",
"html-webpack-plugin": "^4.5.0",
"jest": "^26.0.1",
"mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.14.1",

View File

@ -1,11 +1,11 @@
import axios from "axios"
import { formatDate } from "utils"
const baseURL = (subdomain) => {
const baseURL = subdomain => {
if (process.env.NODE_ENV === "production") {
return `https://${encodeURIComponent(subdomain)}.mocoapp.com/api/browser_extensions`
} else {
return `https://${encodeURIComponent(subdomain)}.mocoapp.com/api/browser_extensions`
return `http://${encodeURIComponent(subdomain)}.mocoapp.localhost:3000/api/browser_extensions`
}
}
@ -27,7 +27,7 @@ export default class Client {
})
}
login = (service) =>
login = service =>
this.#client.post("session", {
api_key: this.#apiKey,
remote_service: service?.name,
@ -46,7 +46,7 @@ export default class Client {
params: { date: `${formatDate(fromDate)}:${formatDate(toDate)}` },
})
activitiesStatus = (service) => {
activitiesStatus = service => {
if (!service) {
return Promise.resolve({ data: { hours: 0 } })
}
@ -55,7 +55,7 @@ export default class Client {
})
}
createActivity = (activity) => this.#client.post("activities", { activity })
createActivity = activity => this.#client.post("activities", { activity })
stopTimer = (timedActivity) => this.#client.get(`activities/${timedActivity.id}/stop_timer`)
stopTimer = timedActivity => this.#client.get(`activities/${timedActivity.id}/stop_timer`)
}

View File

@ -122,31 +122,18 @@ export default {
allowHostOverride: false,
},
mstodo: {
wunderlist: {
name: "wunderlist",
host: "https://to-do.office.com",
urlPatterns: [":host:/tasks/id/:id(*)"],
host: "https://www.wunderlist.com",
urlPatterns: [":host:/(webapp)#/tasks/:id(/*)"],
description: (document) =>
document
.querySelector(".detailHeader")
?.textContent?.replace(/^[^[]+\[/, "[")
.replace(projectRegex, "")
.trim(),
projectId: projectIdentifierBySelector(".detailHeader"),
.querySelector(".taskItem.selected .taskItem-titleWrapper-title")
?.textContent?.trim(),
projectId: projectIdentifierBySelector(".taskItem.selected .taskItem-titleWrapper-title"),
allowHostOverride: false,
},
gitbase: {
name: "gitlab",
host: "https://gitbase.de",
urlPatterns: [":host:/:owner/:repo/issues/:id"],
description: (document) =>
document.querySelector("#issue-title")?.textContent?.replace(projectRegex, "").trim(),
projectId: projectIdentifierBySelector(".select-project.list a"),
allowHostOverride: false,
},
/*
"gitlab-mr": {
name: "gitlab",
host: "https://gitlab.com",
@ -174,7 +161,6 @@ export default {
},
allowHostOverride: true,
},
*/
monday: {
name: "monday",

View File

@ -28,8 +28,6 @@ export function tabUpdated(tab, { messenger, settings }) {
const service = matcher(tab.url)
const apiClient = new ApiClient(settings)
// console.log(service)
if (service?.match?.id) {
messenger.postMessage(tab, { type: "requestService" })
@ -69,7 +67,7 @@ export function settingsChanged(settings, { messenger }) {
queryTabs({ currentWindow: true })
.then(reject(isBrowserTab))
.then(
forEach((tab) => {
forEach(tab => {
messenger.postMessage(tab, { type: "closePopup" })
tabUpdated(tab, { settings, messenger })
}),
@ -77,7 +75,7 @@ export function settingsChanged(settings, { messenger }) {
}
export function togglePopup(tab, { messenger }) {
return function ({ isOpen, service } = {}) {
return function({ isOpen, service } = {}) {
if (isNil(isOpen)) {
return
}

View File

@ -20,7 +20,7 @@ module.exports = (env) => {
...manifest,
permissions: compact([
...manifest.permissions,
env.NODE_ENV === "development" ? "https://*.mocoapp.com/*" : null,
env.NODE_ENV === "development" ? "http://*.mocoapp.localhost/*" : null,
]),
options_ui: {
...manifest.options_ui,

View File

@ -21,7 +21,7 @@ module.exports = (env) => {
...manifest,
permissions: compact([
...manifest.permissions,
env.NODE_ENV === "development" ? "https://*.mocoapp.com/*" : null,
env.NODE_ENV === "development" ? "http://*.mocoapp.localhost/*" : null,
]),
options_ui: {
...manifest.options_ui,

View File

@ -4182,10 +4182,10 @@ html-minifier-terser@^5.0.1:
relateurl "^0.2.7"
terser "^4.6.3"
html-webpack-plugin@^4.3.0:
version "4.4.1"
resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.4.1.tgz#61ab85aa1a84ba181443345ebaead51abbb84149"
integrity sha512-nEtdEIsIGXdXGG7MjTTZlmhqhpHU9pJFc1OYxcP36c5/ZKP6b0BJMww2QTvJGQYA9aMxUnjDujpZdYcVOXiBCQ==
html-webpack-plugin@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz#625097650886b97ea5dae331c320e3238f6c121c"
integrity sha512-MouoXEYSjTzCrjIxWwg8gxL5fE2X2WZJLmBYXlaJhQUH5K/b5OrqmV7T4dB7iu0xkmJ6JlUuV6fFVtnqbPopZw==
dependencies:
"@types/html-minifier-terser" "^5.0.0"
"@types/tapable" "^1.0.5"