ops/upgrade-packages (everii-Group#330)

* Bump query-string from 6.14.1 to 7.0.0 (everii-Group#312) Bumps [query-string](https://github.com/sindresorhus/query-string) from 6.14.1 to 7.0.0. - [Release notes](https://github.com/sindresorhus/query-string/releases) - [Commits](sindresorhus/query-string@v6.14.1...v7.0.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Update babel config * Upgrade react-spring * Upgrade to GitHub-native Dependabot (everii-Group#313) Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump eslint-config-prettier from 7.2.0 to 8.3.0 (everii-Group#324) Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 7.2.0 to 8.3.0. - [Release notes](https://github.com/prettier/eslint-config-prettier/releases) - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md) - [Commits](prettier/eslint-config-prettier@v7.2.0...v8.3.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump copy-webpack-plugin from 7.0.0 to 8.1.1 (everii-Group#314) Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 7.0.0 to 8.1.1. - [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](webpack-contrib/copy-webpack-plugin@v7.0.0...v8.1.1) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * yarn install * Remove react-spring dependency Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
i-gelb · May 4, 2021 · 10aaeb5 · 10aaeb5
1 parent 869c6de
commit 10aaeb5
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 96 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,11 +1,11 @@
 {
   "presets": [
-    ["@babel/preset-env", { useBuiltIns: "entry", corejs: 3 }],
+    ["@babel/preset-env", { "useBuiltIns": "entry", "corejs": 3 }],
     "@babel/preset-react"
   ],
   "plugins": [
     ["@babel/plugin-proposal-decorators", { "legacy": true }],
-    ["@babel/plugin-proposal-class-properties", { "loose": true }],
+    ["@babel/plugin-proposal-class-properties"],
     "@babel/plugin-proposal-optional-chaining",
     "@babel/plugin-proposal-nullish-coalescing-operator"
   ]

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,40 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: "06:00"
+    timezone: Europe/Zurich
+  open-pull-requests-limit: 99
+  ignore:
+  - dependency-name: "@babel/plugin-proposal-optional-chaining"
+    versions:
+    - 7.13.8
+  - dependency-name: webpack
+    versions:
+    - 5.24.2
+  - dependency-name: css-loader
+    versions:
+    - 5.1.0
+  - dependency-name: "@babel/plugin-proposal-decorators"
+    versions:
+    - 7.13.5
+  - dependency-name: "@babel/plugin-proposal-nullish-coalescing-operator"
+    versions:
+    - 7.13.8
+  - dependency-name: "@babel/plugin-proposal-class-properties"
+    versions:
+    - 7.13.0
+  - dependency-name: query-string
+    versions:
+    - 6.14.1
+  - dependency-name: "@babel/core"
+    versions:
+    - 7.13.8
+  - dependency-name: "@babel/preset-env"
+    versions:
+    - 7.13.8
+  - dependency-name: lodash
+    versions:
+    - 4.17.21
diff --git a/package.json b/package.json
@@ -31,11 +31,10 @@
     "mobx": "^5.15.4",
     "mobx-react": "^6.2.2",
     "prop-types": "^15.6.2",
-    "query-string": "^6.12.1",
+    "query-string": "^7.0.0",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-select": "^4.0.2",
-    "react-spring": "^8.0.7",
     "url-pattern": "^1.0.3"
   },
   "devDependencies": {
@@ -50,11 +49,11 @@
     "babel-loader": "^8.2.2",
     "babel-plugin-module-resolver": "^4.0.0",
     "clean-webpack-plugin": "^3.0.0",
-    "copy-webpack-plugin": "^7.0.0",
+    "copy-webpack-plugin": "^8.1.1",
     "copyfiles": "^2.4.1",
     "css-loader": "^5.0.1",
     "eslint": "^7.19.0",
-    "eslint-config-prettier": "7.2.0",
+    "eslint-config-prettier": "8.3.0",
     "eslint-plugin-jest": "^24.1.3",
     "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-react": "^7.20.0",

diff --git a/src/css/_animation.scss b/src/css/_animation.scss
@@ -0,0 +1,8 @@
+@keyframes fadeIn {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
diff --git a/src/css/content.scss b/src/css/content.scss
@@ -1,5 +1,6 @@
 @import "variables";
 @import "button";
+@import "animation";
 
 #moco-bx-root {
   font-family: $font-family;
@@ -21,8 +22,8 @@
     box-shadow: -1px -1px 15px 4px rgba(0, 0, 0, 0.05), 2px 2px 15px 4px rgba(0, 0, 0, 0.05);
     padding: 5px;
     z-index: 9999;
-
     cursor: pointer;
+    animation: fadeIn ease-in-out 300ms;
 
     .moco-bx-bubble-inner {
       display: flex;

diff --git a/src/css/popup.scss b/src/css/popup.scss
@@ -1,6 +1,7 @@
 @import "variables";
 @import "form";
 @import "spinner";
+@import "animation";
 
 html {
   overflow: hidden;
@@ -41,6 +42,7 @@ html {
       .moco-bx-app-container {
         width: 324px;
         padding: 3rem 6rem;
+        animation: fadeIn ease-in-out 300ms;
 
         .moco-bx-logo__container {
           margin-bottom: 3rem;

diff --git a/src/js/components/App.js b/src/js/components/App.js
@@ -6,7 +6,6 @@ import Calendar from "components/Calendar"
 import TimerView from "components/App/TimerView"
 import { observable, computed } from "mobx"
 import { Observer, observer } from "mobx-react"
-import { Spring, animated, config } from "react-spring/renderprops"
 import {
   ERROR_UNKNOWN,
   ERROR_UNAUTHORIZED,
@@ -209,38 +208,34 @@ class App extends Component {
     }
 
     return (
-      <Spring native from={{ opacity: 0 }} to={{ opacity: 1 }} config={config.stiff}>
-        {(props) => (
-          <animated.div className="moco-bx-app-container" style={props}>
-            <Header subdomain={subdomain} />
-            <Observer>
-              {() =>
-                timedActivity ? (
-                  <TimerView timedActivity={timedActivity} onStopTimer={this.handleStopTimer} />
-                ) : (
-                  <>
-                    <Calendar
-                      fromDate={parseISO(fromDate)}
-                      toDate={parseISO(toDate)}
-                      activities={activities}
-                      schedules={schedules}
-                      selectedDate={new Date(this.changesetWithDefaults.date)}
-                      onChange={this.handleSelectDate}
-                    />
-                    <Form
-                      changeset={this.changesetWithDefaults}
-                      projects={projects}
-                      errors={this.formErrors}
-                      onChange={this.handleChange}
-                      onSubmit={this.handleSubmit}
-                    />
-                  </>
-                )
-              }
-            </Observer>
-          </animated.div>
-        )}
-      </Spring>
+      <div className="moco-bx-app-container">
+        <Header subdomain={subdomain} />
+        <Observer>
+          {() =>
+            timedActivity ? (
+              <TimerView timedActivity={timedActivity} onStopTimer={this.handleStopTimer} />
+            ) : (
+              <>
+                <Calendar
+                  fromDate={parseISO(fromDate)}
+                  toDate={parseISO(toDate)}
+                  activities={activities}
+                  schedules={schedules}
+                  selectedDate={new Date(this.changesetWithDefaults.date)}
+                  onChange={this.handleSelectDate}
+                />
+                <Form
+                  changeset={this.changesetWithDefaults}
+                  projects={projects}
+                  errors={this.formErrors}
+                  onChange={this.handleChange}
+                  onSubmit={this.handleSubmit}
+                />
+              </>
+            )
+          }
+        </Observer>
+      </div>
     )
   }
 }

diff --git a/src/js/content.js b/src/js/content.js
@@ -1,6 +1,5 @@
 import React, { createRef } from "react"
 import ReactDOM from "react-dom"
-import { Transition, animated, config } from "react-spring/renderprops"
 import Bubble from "./components/Bubble"
 import Popup from "components/Popup"
 import { createServiceFinder } from "utils/urlMatcher"
@@ -37,33 +36,20 @@ chrome.runtime.onConnect.addListener(function (port) {
       document.body.appendChild(domRoot)
       window.addEventListener("click", clickHandler, true)
     }
-
-    ReactDOM.render(
-      <Transition
-        native
-        items={service}
-        from={{ opacity: "0" }}
-        enter={{ opacity: "1" }}
-        leave={{ opacity: "0" }}
-        config={config.stiff}
-      >
-        {(service) =>
-          service &&
-          // eslint-disable-next-line react/display-name
-          ((props) => (
-            <animated.div className="moco-bx-bubble" style={{ ...props, ...service.position }}>
-              <Bubble
-                key={service.url}
-                bookedSeconds={bookedSeconds}
-                settingTimeTrackingHHMM={settingTimeTrackingHHMM}
-                timedActivity={timedActivity}
-              />
-            </animated.div>
-          ))
-        }
-      </Transition>,
-      document.getElementById("moco-bx-root"),
-    )
+    if (service) {
+      ReactDOM.render(
+        // eslint-disable-next-line react/display-name
+        <div className="moco-bx-bubble" style={{ ...service.position }}>
+          <Bubble
+            key={service.url}
+            bookedSeconds={bookedSeconds}
+            settingTimeTrackingHHMM={settingTimeTrackingHHMM}
+            timedActivity={timedActivity}
+          />
+        </div>,
+        document.getElementById("moco-bx-root"),
+      )
+    }
   }
 
   function openPopup(payload) {

diff --git a/yarn.lock b/yarn.lock
@@ -918,7 +918,7 @@
     "@babel/plugin-transform-react-jsx-development" "^7.12.17"
     "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
-"@babel/runtime@^7.12.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+"@babel/runtime@^7.12.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
   version "7.14.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6"
   integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==
@@ -2445,17 +2445,16 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-7.0.0.tgz#3506f867ca6e861ee2769d4deaf8fa0d2563ada9"
-  integrity sha512-SLjQNa5iE3BoCP76ESU9qYo9ZkEWtXoZxDurHoqPchAFRblJ9g96xTeC560UXBMre1Nx6ixIIUfiY3VcjpJw3g==
+copy-webpack-plugin@^8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-8.1.1.tgz#3f697e162764925c2f0d235f380676125508fd26"
+  integrity sha512-rYM2uzRxrLRpcyPqGceRBDpxxUV8vcDqIKxAUKfcnFpcrPxT5+XvhTxv7XLjo5AvEJFPdAE3zCogG2JVahqgSQ==
   dependencies:
-    fast-glob "^3.2.4"
+    fast-glob "^3.2.5"
     glob-parent "^5.1.1"
-    globby "^11.0.1"
-    loader-utils "^2.0.0"
+    globby "^11.0.3"
     normalize-path "^3.0.0"
-    p-limit "^3.0.2"
+    p-limit "^3.1.0"
     schema-utils "^3.0.0"
     serialize-javascript "^5.0.1"
 
@@ -2932,10 +2931,10 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-prettier@7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"
-  integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==
+eslint-config-prettier@8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
+  integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
 
 eslint-plugin-jest@^24.1.3:
   version "24.3.6"
@@ -3217,7 +3216,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
-fast-glob@^3.1.1, fast-glob@^3.2.4:
+fast-glob@^3.1.1, fast-glob@^3.2.5:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
   integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
@@ -3530,7 +3529,7 @@ globals@^13.6.0:
   dependencies:
     type-fest "^0.20.2"
 
-globby@^11.0.1:
+globby@^11.0.1, globby@^11.0.3:
   version "11.0.3"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
   integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
@@ -5335,7 +5334,7 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2, p-limit@^3.1.0:
+p-limit@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -5670,10 +5669,10 @@ qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-query-string@^6.12.1:
-  version "6.14.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a"
-  integrity sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==
+query-string@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.0.0.tgz#aaad2c8d5c6a6d0c6afada877fecbd56af79e609"
+  integrity sha512-Iy7moLybliR5ZgrK/1R3vjrXq03S13Vz4Rbm5Jg3EFq1LUmQppto0qtXz4vqZ386MSRjZgnTSZ9QC+NZOSd/XA==
   dependencies:
     decode-uri-component "^0.2.0"
     filter-obj "^1.1.0"
@@ -5731,14 +5730,6 @@ react-select@^4.0.2:
     react-input-autosize "^3.0.0"
     react-transition-group "^4.3.0"
 
-react-spring@^8.0.7:
-  version "8.0.27"
-  resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-8.0.27.tgz#97d4dee677f41e0b2adcb696f3839680a3aa356a"
-  integrity sha512-nDpWBe3ZVezukNRandTeLSPcwwTMjNVu1IDq9qA/AMiUqHuRN4BeSWvKr3eIxxg1vtiYiOLy4FqdfCP5IoP77g==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    prop-types "^15.5.8"
-
 react-transition-group@^4.3.0:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9"