Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot-preview[bot]
9711abf4dd Bump query-string from 6.13.1 to 6.13.4
Bumps [query-string](https://github.com/sindresorhus/query-string) from 6.13.1 to 6.13.4.
- [Release notes](https://github.com/sindresorhus/query-string/releases)
- [Commits](https://github.com/sindresorhus/query-string/compare/v6.13.1...v6.13.4)

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

View File

@@ -25,7 +25,7 @@
"mobx": "^5.15.4", "mobx": "^5.15.4",
"mobx-react": "^6.2.2", "mobx-react": "^6.2.2",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"query-string": "^6.12.1", "query-string": "^6.13.4",
"react": "^16.13.1", "react": "^16.13.1",
"react-dom": "^16.13.1", "react-dom": "^16.13.1",
"react-select": "^3.1.0", "react-select": "^3.1.0",

View File

@@ -1,11 +1,11 @@
import axios from "axios" import axios from "axios"
import { formatDate } from "utils" import { formatDate } from "utils"
const baseURL = (subdomain) => { const baseURL = subdomain => {
if (process.env.NODE_ENV === "production") { if (process.env.NODE_ENV === "production") {
return `https://${encodeURIComponent(subdomain)}.mocoapp.com/api/browser_extensions` return `https://${encodeURIComponent(subdomain)}.mocoapp.com/api/browser_extensions`
} else { } 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", { this.#client.post("session", {
api_key: this.#apiKey, api_key: this.#apiKey,
remote_service: service?.name, remote_service: service?.name,
@@ -46,7 +46,7 @@ export default class Client {
params: { date: `${formatDate(fromDate)}:${formatDate(toDate)}` }, params: { date: `${formatDate(fromDate)}:${formatDate(toDate)}` },
}) })
activitiesStatus = (service) => { activitiesStatus = service => {
if (!service) { if (!service) {
return Promise.resolve({ data: { hours: 0 } }) 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, allowHostOverride: false,
}, },
mstodo: { wunderlist: {
name: "wunderlist", name: "wunderlist",
host: "https://to-do.office.com", host: "https://www.wunderlist.com",
urlPatterns: [":host:/tasks/id/:id(*)"], urlPatterns: [":host:/(webapp)#/tasks/:id(/*)"],
description: (document) => description: (document) =>
document document
.querySelector(".detailHeader") .querySelector(".taskItem.selected .taskItem-titleWrapper-title")
?.textContent?.replace(/^[^[]+\[/, "[") ?.textContent?.trim(),
.replace(projectRegex, "") projectId: projectIdentifierBySelector(".taskItem.selected .taskItem-titleWrapper-title"),
.trim(),
projectId: projectIdentifierBySelector(".detailHeader"),
allowHostOverride: false, 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": { "gitlab-mr": {
name: "gitlab", name: "gitlab",
host: "https://gitlab.com", host: "https://gitlab.com",
@@ -174,7 +161,6 @@ export default {
}, },
allowHostOverride: true, allowHostOverride: true,
}, },
*/
monday: { monday: {
name: "monday", name: "monday",

View File

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

View File

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

View File

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

View File

@@ -6542,10 +6542,10 @@ query-string@^4.1.0:
object-assign "^4.1.0" object-assign "^4.1.0"
strict-uri-encode "^1.0.0" strict-uri-encode "^1.0.0"
query-string@^6.12.1: query-string@^6.13.4:
version "6.13.1" version "6.13.4"
resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.1.tgz#d913ccfce3b4b3a713989fe6d39466d92e71ccad" resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.4.tgz#b35a9a3bd4955bce55f94feb0e819b3d0be6f66f"
integrity sha512-RfoButmcK+yCta1+FuU8REvisx1oEzhMKwhLUNcepQTPGcNMp1sIqjnfCtfnvGSQZQEhaBHvccujtWoUV3TTbA== integrity sha512-E2NPIeJoBEJGQNy3ib1k/Z/OkDBUKIo8IV2ZVwbKfoa65IS9unqWWUlLcbfU70Da0qNoxUZZA8CfKUjKLE641Q==
dependencies: dependencies:
decode-uri-component "^0.2.0" decode-uri-component "^0.2.0"
split-on-first "^1.0.0" split-on-first "^1.0.0"