commit f3fdebec72279cffcb8bc8344857ffa5b56f76ca
parent 33c944571dac5e91f1b6bd3c7b2f0c43981297e8
Author: Sebastian <sebasjm@gmail.com>
Date: Thu, 9 Dec 2021 15:01:08 -0300
replaced enzyme for standard testing-library, preact to 10.6, swr to 1.1
Diffstat:
5 files changed, 252 insertions(+), 46 deletions(-)
diff --git a/contrib/split-formatting-vs-content-in-commit.sh b/contrib/split-formatting-vs-content-in-commit.sh
@@ -1,13 +1,16 @@
#!/bin/bash
# This Makefile has been placed in the public domain.
-FILES=$(git status --short --untracked-files=no --porcelain | colrm 1 3)
+export FILES=$(git status --short --untracked-files=no --porcelain | grep -v '^ D' | colrm 1 3)
+
+pnpx prettier $FILES -w
git stash
pnpx prettier $FILES -w
git add $FILES
git commit -S -m '-formatted with prettier'
git stash pop
git checkout --theirs -- $FILES
+grep ======= $FILES
git add $FILES
-git commit -S
+#git commit -S
diff --git a/packages/merchant-backoffice/package.json b/packages/merchant-backoffice/package.json
@@ -48,10 +48,10 @@
"date-fns": "^2.21.1",
"history": "4.10.1",
"jed": "^1.1.1",
- "preact": "^10.5.13",
+ "preact": "10.6.1",
"preact-router": "^3.2.1",
"qrcode-generator": "^1.4.4",
- "swr": "^0.5.5",
+ "swr": "1.1.0",
"yup": "^0.32.9"
},
"devDependencies": {
@@ -67,7 +67,6 @@
"@storybook/preset-scss": "^1.0.3",
"@testing-library/preact": "^2.0.1",
"@testing-library/preact-hooks": "^1.1.0",
- "@types/enzyme": "^3.10.10",
"@types/history": "^4.7.8",
"@types/jest": "^26.0.23",
"@types/mocha": "^8.2.2",
@@ -83,8 +82,6 @@
"bulma-timeline": "^3.0.4",
"bulma-upload-control": "^1.2.0",
"dotenv": "^8.2.0",
- "enzyme": "^3.11.0",
- "enzyme-adapter-preact-pure": "^3.2.0",
"eslint": "^7.25.0",
"eslint-config-preact": "^1.1.4",
"eslint-plugin-header": "^3.1.1",
diff --git a/packages/merchant-backoffice/src/context/fetch.ts b/packages/merchant-backoffice/src/context/fetch.ts
@@ -21,7 +21,8 @@
import { h, createContext, VNode, ComponentChildren } from "preact";
import { useContext } from "preact/hooks";
-import useSWR, { trigger, useSWRInfinite, cache, mutate } from "swr";
+import useSWR from "swr";
+import useSWRInfinite from "swr/infinite";
interface Type {
useSWR: typeof useSWR;
diff --git a/packages/merchant-backoffice/tests/__mocks__/setupTests.ts b/packages/merchant-backoffice/tests/__mocks__/setupTests.ts
@@ -20,9 +20,9 @@
*/
import "regenerator-runtime/runtime";
-import { configure } from "enzyme";
-import Adapter from "enzyme-adapter-preact-pure";
+// import { configure } from 'enzyme';
+// import Adapter from 'enzyme-adapter-preact-pure';
-configure({
- adapter: new Adapter(),
-});
+// configure({
+// adapter: new Adapter()
+// });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
@@ -258,7 +258,6 @@ importers:
"@storybook/preset-scss": ^1.0.3
"@testing-library/preact": ^2.0.1
"@testing-library/preact-hooks": ^1.1.0
- "@types/enzyme": ^3.10.10
"@types/history": ^4.7.8
"@types/jest": ^26.0.23
"@types/mocha": ^8.2.2
@@ -276,8 +275,6 @@ importers:
bulma-upload-control: ^1.2.0
date-fns: ^2.21.1
dotenv: ^8.2.0
- enzyme: ^3.11.0
- enzyme-adapter-preact-pure: ^3.2.0
eslint: ^7.25.0
eslint-config-preact: ^1.1.4
eslint-plugin-header: ^3.1.1
@@ -290,7 +287,7 @@ importers:
jest: ^26.6.3
jest-preset-preact: ^4.0.2
po2json: ^0.4.5
- preact: ^10.5.13
+ preact: 10.6.1
preact-cli: ^3.0.5
preact-render-to-json: ^3.6.6
preact-render-to-string: ^5.1.19
@@ -301,7 +298,7 @@ importers:
sass-loader: 10.1.1
script-ext-html-webpack-plugin: ^2.1.5
sirv-cli: ^1.0.11
- swr: ^0.5.5
+ swr: 1.1.0
typedoc: ^0.20.36
typescript: ^4.2.4
yup: ^0.32.9
@@ -311,10 +308,10 @@ importers:
date-fns: 2.21.1
history: 4.10.1
jed: 1.1.1
- preact: 10.5.13
- preact-router: 3.2.1_preact@10.5.13
+ preact: 10.6.1
+ preact-router: 3.2.1_preact@10.6.1
qrcode-generator: 1.4.4
- swr: 0.5.5
+ swr: 1.1.0
yup: 0.32.9
devDependencies:
"@babel/core": 7.13.16
@@ -325,11 +322,10 @@ importers:
"@storybook/addon-actions": 6.2.9
"@storybook/addon-essentials": 6.2.9_472ba1443a3a7dfb9d5f96aaff5418de
"@storybook/addon-links": 6.2.9
- "@storybook/preact": 6.2.9_882cc89bf78b48705bbb2db542e898fd
+ "@storybook/preact": 6.2.9_2561f77462050ddffc15f70dcb541d23
"@storybook/preset-scss": 1.0.3_sass-loader@10.1.1
- "@testing-library/preact": 2.0.1_preact@10.5.13
- "@testing-library/preact-hooks": 1.1.0_8a3b8354086a0a31d950b2aa8b26d524
- "@types/enzyme": 3.10.10
+ "@testing-library/preact": 2.0.1_preact@10.6.1
+ "@testing-library/preact-hooks": 1.1.0_7fdee47da7d27b5d94dfdd87b2336891
"@types/history": 4.7.8
"@types/jest": 26.0.23
"@types/mocha": 8.2.2
@@ -345,8 +341,6 @@ importers:
bulma-timeline: 3.0.4
bulma-upload-control: 1.2.0
dotenv: 8.2.0
- enzyme: 3.11.0
- enzyme-adapter-preact-pure: 3.3.0_enzyme@3.11.0+preact@10.5.13
eslint: 7.25.0
eslint-config-preact: 1.1.4_eslint@7.25.0+typescript@4.2.4
eslint-plugin-header: 3.1.1_eslint@7.25.0
@@ -355,11 +349,11 @@ importers:
html-webpack-skip-assets-plugin: 1.0.1
inline-chunk-html-plugin: 1.1.1
jest: 26.6.3
- jest-preset-preact: 4.0.2_669f037bdb6c36f0a67e918c516dafdd
+ jest-preset-preact: 4.0.2_ebec29cd9f62b94873d88c4b89ea43c5
po2json: 0.4.5
- preact-cli: 3.0.5_c069246dc1d99535ac277c76f8ef56e0
- preact-render-to-json: 3.6.6_preact@10.5.13
- preact-render-to-string: 5.1.19_preact@10.5.13
+ preact-cli: 3.0.5_cb407e6c46a89f140e61fa4ac2ea45aa
+ preact-render-to-json: 3.6.6_preact@10.6.1
+ preact-render-to-string: 5.1.19_preact@10.6.1
rimraf: 3.0.2
sass: 1.32.13
sass-loader: 10.1.1_sass@1.32.13
@@ -4890,6 +4884,17 @@ packages:
preact: 10.5.13
dev: true
+ /@prefresh/core/0.8.1_preact@10.6.1:
+ resolution:
+ {
+ integrity: sha512-woho+Ja8w3pxnZwq68MnWzH9ffdidrpJsV6PDTNIsJOpsLYmfCNxqxGsxIqYw40d1yjg4h6HFGbb6Y9lhyTPNA==,
+ }
+ peerDependencies:
+ preact: ^10.0.0
+ dependencies:
+ preact: 10.6.1
+ dev: true
+
/@prefresh/core/1.3.2_preact@10.6.1:
resolution:
{
@@ -4930,6 +4935,21 @@ packages:
webpack: 4.46.0
dev: true
+ /@prefresh/webpack/1.1.0_preact@10.6.1+webpack@4.46.0:
+ resolution:
+ {
+ integrity: sha512-a3JG2maH3bacDobb4WywVTuqvAyBxJ7dRNSG2Ywv1AytAdgpgNZKJpR4xUTzPTwPGpRkfNOOf4mODqoOZ7W0Sw==,
+ }
+ peerDependencies:
+ preact: ^10.4.0
+ webpack: ^4.0.0 || ^5.0.0
+ dependencies:
+ "@prefresh/core": 0.8.1_preact@10.6.1
+ "@prefresh/utils": 0.3.1
+ preact: 10.6.1
+ webpack: 4.46.0
+ dev: true
+
/@prefresh/webpack/3.3.2_2577837c1433926d182eaf5785057d86:
resolution:
{
@@ -7413,6 +7433,41 @@ packages:
core-js: 3.11.1
dev: true
+ /@storybook/preact/6.2.9_2561f77462050ddffc15f70dcb541d23:
+ resolution:
+ {
+ integrity: sha512-AnbRtJfIyI6AGIIaduBe2Fnr4HPldycWr1fadqpytm9LBMQsYRCzXy2+AtBIfa0O5YDVqDcKda/uBsj1tNJzqw==,
+ }
+ engines: { node: ">=10.13.0" }
+ hasBin: true
+ peerDependencies:
+ "@babel/core": "*"
+ preact: ^8.0.0||^10.0.0
+ dependencies:
+ "@babel/core": 7.13.16
+ "@babel/plugin-transform-react-jsx": 7.16.0_@babel+core@7.13.16
+ "@storybook/addons": 6.2.9_react-dom@16.14.0+react@16.14.0
+ "@storybook/core": 6.2.9_776ac593e89849bc223e2b1c0ddc61da
+ "@storybook/core-common": 6.2.9_776ac593e89849bc223e2b1c0ddc61da
+ "@types/webpack-env": 1.16.0
+ core-js: 3.11.1
+ global: 4.4.0
+ preact: 10.6.1
+ react: 16.14.0
+ react-dom: 16.14.0_react@16.14.0
+ read-pkg-up: 7.0.1
+ regenerator-runtime: 0.13.7
+ ts-dedent: 2.1.1
+ transitivePeerDependencies:
+ - "@storybook/builder-webpack5"
+ - "@types/react"
+ - supports-color
+ - typescript
+ - webpack
+ - webpack-cli
+ - webpack-command
+ dev: true
+
/@storybook/preact/6.2.9_882cc89bf78b48705bbb2db542e898fd:
resolution:
{
@@ -7755,6 +7810,19 @@ packages:
pretty-format: 26.6.2
dev: true
+ /@testing-library/preact-hooks/1.1.0_7fdee47da7d27b5d94dfdd87b2336891:
+ resolution:
+ {
+ integrity: sha512-+JIor+NsOHkK3oIrwMDGKGHXTN0JJi462dBJlj4FNbGaDPTlctE6eu2ranWQirh7/FJMkWfzQCP+tk7jmY8ZrQ==,
+ }
+ peerDependencies:
+ "@testing-library/preact": ^2.0.0
+ preact: ^10.4.8
+ dependencies:
+ "@testing-library/preact": 2.0.1_preact@10.6.1
+ preact: 10.6.1
+ dev: true
+
/@testing-library/preact-hooks/1.1.0_8a3b8354086a0a31d950b2aa8b26d524:
resolution:
{
@@ -7781,6 +7849,19 @@ packages:
preact: 10.5.13
dev: true
+ /@testing-library/preact/2.0.1_preact@10.6.1:
+ resolution:
+ {
+ integrity: sha512-79kwVOY+3caoLgaPbiPzikjgY0Aya7Fc7TvGtR1upCnz2wrtmPDnN2t9vO7I7vDP2zoA+feSwOH5Q0BFErhaaQ==,
+ }
+ engines: { node: ">= 10" }
+ peerDependencies:
+ preact: ">=10 || ^10.0.0-alpha.0 || ^10.0.0-beta.0"
+ dependencies:
+ "@testing-library/dom": 7.30.4
+ preact: 10.6.1
+ dev: true
+
/@tootallnate/once/1.1.2:
resolution:
{
@@ -13323,20 +13404,6 @@ packages:
preact: 10.5.13
dev: true
- /enzyme-adapter-preact-pure/3.3.0_enzyme@3.11.0+preact@10.5.13:
- resolution:
- {
- integrity: sha512-+FNEZBEXwuDDsA8YOvC9p6gcvxQG5V6QnXKkUVJte/GKMWadOXDR+uw0w+QGwxreA8oMOlK/1+O8F7PzealpKA==,
- }
- peerDependencies:
- enzyme: ^3.8.0
- preact: ^10.0.0
- dependencies:
- array.prototype.flatmap: 1.2.4
- enzyme: 3.11.0
- preact: 10.5.13
- dev: true
-
/enzyme-adapter-preact-pure/3.3.0_enzyme@3.11.0+preact@10.6.1:
resolution:
{
@@ -17865,6 +17932,32 @@ packages:
- supports-color
dev: true
+ /jest-preset-preact/4.0.2_ebec29cd9f62b94873d88c4b89ea43c5:
+ resolution:
+ {
+ integrity: sha512-Grgu1scmHcNcU9pKOS4FX8pVPxfqmlKCc6SWkOEg17JiBhvYjVdyxsPw22v/P98iYc6Y+357JSoh5f0lyASr1Q==,
+ }
+ peerDependencies:
+ jest: 26.x
+ preact: 10.x
+ preact-render-to-string: 5.x
+ dependencies:
+ "@babel/core": 7.13.16
+ "@babel/plugin-proposal-class-properties": 7.13.0_@babel+core@7.13.16
+ "@babel/plugin-transform-react-jsx": 7.13.12_@babel+core@7.13.16
+ "@babel/preset-env": 7.13.15_@babel+core@7.13.16
+ "@babel/preset-typescript": 7.13.0_@babel+core@7.13.16
+ babel-jest: 26.6.3_@babel+core@7.13.16
+ identity-obj-proxy: 3.0.0
+ isomorphic-unfetch: 3.1.0
+ jest: 26.6.3
+ jest-watch-typeahead: 0.6.3_jest@26.6.3
+ preact: 10.6.1
+ preact-render-to-string: 5.1.19_preact@10.6.1
+ transitivePeerDependencies:
+ - supports-color
+ dev: true
+
/jest-preset-preact/4.0.5_ba32543649dff618c2f0cc2f9508b32f:
resolution:
{
@@ -22127,6 +22220,102 @@ packages:
- webpack-command
dev: true
+ /preact-cli/3.0.5_cb407e6c46a89f140e61fa4ac2ea45aa:
+ resolution:
+ {
+ integrity: sha512-Oc9HOjwX/3Zk1eXkmP7TMmtqbaROl7F0RWZ2Ni5Q/grmx3yBLJmarkUcOSKabkI/Usw2dU3RVju32Q3Pvy5qIw==,
+ }
+ engines: { node: ">=8" }
+ hasBin: true
+ peerDependencies:
+ preact: "*"
+ preact-render-to-string: "*"
+ dependencies:
+ "@babel/core": 7.13.16
+ "@babel/plugin-proposal-class-properties": 7.13.0_@babel+core@7.13.16
+ "@babel/plugin-proposal-decorators": 7.13.15_@babel+core@7.13.16
+ "@babel/plugin-proposal-object-rest-spread": 7.13.8_@babel+core@7.13.16
+ "@babel/plugin-syntax-dynamic-import": 7.8.3_@babel+core@7.13.16
+ "@babel/plugin-transform-object-assign": 7.12.13_@babel+core@7.13.16
+ "@babel/plugin-transform-react-jsx": 7.13.12_@babel+core@7.13.16
+ "@babel/preset-env": 7.13.15_@babel+core@7.13.16
+ "@babel/preset-typescript": 7.13.0_@babel+core@7.13.16
+ "@preact/async-loader": 3.0.1_preact@10.6.1
+ "@prefresh/webpack": 1.1.0_preact@10.6.1+webpack@4.46.0
+ autoprefixer: 9.8.6
+ babel-esm-plugin: 0.9.0_webpack@4.46.0
+ babel-loader: 8.2.2_0fc9aa51f8dda8b91e4c31310ffa16c5
+ babel-plugin-macros: 2.8.0
+ babel-plugin-transform-react-remove-prop-types: 0.4.24
+ browserslist: 4.16.5
+ compression-webpack-plugin: 4.0.1_webpack@4.46.0
+ console-clear: 1.1.1
+ copy-webpack-plugin: 5.1.2_webpack@4.46.0
+ critters-webpack-plugin: 2.5.0
+ cross-spawn-promise: 0.10.2
+ css-loader: 3.6.0_webpack@4.46.0
+ ejs-loader: 0.5.0
+ envinfo: 7.8.1
+ esm: 3.2.25
+ fast-async: 6.3.8
+ file-loader: 6.2.0_webpack@4.46.0
+ fork-ts-checker-webpack-plugin: 4.1.6
+ get-port: 5.1.1
+ gittar: 0.1.1
+ glob: 7.1.6
+ html-webpack-exclude-assets-plugin: 0.0.7
+ html-webpack-plugin: 3.2.0_webpack@4.46.0
+ ip: 1.1.5
+ isomorphic-unfetch: 3.1.0
+ kleur: 4.1.4
+ loader-utils: 2.0.0
+ mini-css-extract-plugin: 0.9.0_webpack@4.46.0
+ minimatch: 3.0.4
+ native-url: 0.3.4
+ optimize-css-assets-webpack-plugin: 5.0.4_webpack@4.46.0
+ ora: 4.1.1
+ postcss-load-config: 2.1.2
+ postcss-loader: 3.0.0
+ preact: 10.6.1
+ preact-render-to-string: 5.1.19_preact@10.6.1
+ progress-bar-webpack-plugin: 2.1.0_webpack@4.46.0
+ promise-polyfill: 8.2.0
+ prompts: 2.4.1
+ raw-loader: 4.0.2_webpack@4.46.0
+ react-refresh: 0.8.3
+ require-relative: 0.8.7
+ resolve-from: 5.0.0
+ rimraf: 3.0.2
+ sade: 1.7.4
+ size-plugin: 2.0.2_webpack@4.46.0
+ source-map: 0.7.3
+ stack-trace: 0.0.10
+ style-loader: 1.3.0_webpack@4.46.0
+ terser-webpack-plugin: 3.1.0_webpack@4.46.0
+ typescript: 3.9.9
+ update-notifier: 4.1.3
+ url-loader: 4.1.1_file-loader@6.2.0+webpack@4.46.0
+ validate-npm-package-name: 3.0.0
+ webpack: 4.46.0
+ webpack-bundle-analyzer: 3.9.0
+ webpack-dev-server: 3.11.2_webpack@4.46.0
+ webpack-fix-style-only-entries: 0.5.2
+ webpack-merge: 4.2.2
+ webpack-plugin-replace: 1.2.0
+ which: 2.0.2
+ workbox-cacheable-response: 5.1.4
+ workbox-core: 5.1.4
+ workbox-precaching: 5.1.4
+ workbox-routing: 5.1.4
+ workbox-strategies: 5.1.4
+ workbox-webpack-plugin: 5.1.4_webpack@4.46.0
+ transitivePeerDependencies:
+ - debug
+ - supports-color
+ - webpack-cli
+ - webpack-command
+ dev: true
+
/preact-cli/3.3.2_dcdc246b65d76e55ed7ef0751a3049ab:
resolution:
{
@@ -22247,6 +22436,14 @@ packages:
preact: 10.5.13
dev: true
+ /preact-render-to-json/3.6.6_preact@10.6.1:
+ resolution: { integrity: sha1-9n9IWBkSrFP8n0hzvG1840L3HCA= }
+ peerDependencies:
+ preact: "*"
+ dependencies:
+ preact: 10.6.1
+ dev: true
+
/preact-render-to-string/5.1.19_preact@10.5.13:
resolution:
{
@@ -22269,7 +22466,6 @@ packages:
dependencies:
preact: 10.6.1
pretty-format: 3.8.0
- dev: false
/preact-router/3.2.1_preact@10.5.13:
resolution:
@@ -25369,6 +25565,15 @@ packages:
dequal: 2.0.2
dev: false
+ /swr/1.1.0:
+ resolution:
+ {
+ integrity: sha512-MFL3mkl752Uap81nLA1tEu7vQmikPamSziW+6dBidYKAo4oLOlUx/x5GZy4ZCkCwfZe2uedylkz1UMGnatUX4g==,
+ }
+ peerDependencies:
+ react: ^16.11.0 || ^17.0.0 || ^18.0.0
+ dev: false
+
/symbol-tree/3.2.4:
resolution:
{
