Skip to content

Commit

Permalink
chore: update react peer dependence (#189)
Browse files Browse the repository at this point in the history
* chore: update react peer dependence

* chore: versions

* chore: delete unused code

* chore: changelog

* chore: update react-useportal

* chore: changelog
  • Loading branch information
rboixaderg authored Nov 12, 2023
1 parent 553d37e commit 918951c
Show file tree
Hide file tree
Showing 11 changed files with 131 additions and 1,363 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
0.23.1
------
- chore: update use-reactportal

0.23.0
------
- chore: update dependences
- chore: update react peerDependences
- chore: delete unused code

0.22.4
------
- chore: update dependences
Expand Down
6 changes: 6 additions & 0 deletions e2e/example/pages/_app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import React from 'react'
import '../node_modules/react-gmi/dist/css/style.css'

export default function MyApp({ Component, pageProps }) {
return <Component {...pageProps} />
}
46 changes: 7 additions & 39 deletions e2e/example/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -62,31 +62,21 @@
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.1.0.tgz#d27e7e76c87a460a4da99c5bfdb1618dcd6cd064"
integrity sha512-aBvcbMwuanDH4EMrL2TthNJy+4nP59Bimn8egqv6GHMVj0a44cU6Au4PjOhLNqEh9l+IpRGBqMTzec94UdC5xg==

ace-builds@^1.4.6:
version "1.4.12"
resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.12.tgz#888efa386e36f4345f40b5233fcc4fe4c588fae7"
integrity sha512-G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg==

[email protected]:
version "0.11.1"
resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58"
integrity sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg=

[email protected].1:
version "0.9.1"
resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.1.tgz#2bf0e25062a22166db5c92e8c3dcb4605ab040d8"
integrity sha512-LSF69OumXg2HSKl2+rN0/OEXJy7WFEb681wtBlNS/ulJYR27J3rORHibdXZ6GVb/vyUzzYK/Arjyh56wjbFedA==
[email protected].4:
version "0.9.4"
resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.4.tgz#0ca8aeb1847a34264768dba26a064c8be72674a1"
integrity sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ==

caniuse-lite@^1.0.30001283:
version "1.0.30001312"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz#e11eba4b87e24d22697dae05455d5aea28550d5f"
integrity sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==

diff-match-patch@^1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37"
integrity sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==

"js-tokens@^3.0.0 || ^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
Expand All @@ -97,16 +87,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59"
integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==

lodash.get@^4.4.2:
version "4.4.2"
resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=

lodash.isequal@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=

loose-envify@^1.1.0, loose-envify@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
Expand Down Expand Up @@ -161,7 +141,7 @@ [email protected]:
picocolors "^1.0.0"
source-map-js "^1.0.1"

[email protected], prop-types@^15.7.2:
[email protected]:
version "15.7.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
Expand All @@ -170,17 +150,6 @@ [email protected], prop-types@^15.7.2:
object-assign "^4.1.1"
react-is "^16.8.1"

[email protected]:
version "9.2.1"
resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-9.2.1.tgz#1efaa0476c77649136def50e5c4ca30c7e546036"
integrity sha512-2arIeMER/W6/h+QGHs0YJ0pEJo5AmBOUs/R72Poa6eXSOSTpJPp/WkwD/KE7BgNy9vZ7YjlbqA+2ZcoVf6AjsQ==
dependencies:
ace-builds "^1.4.6"
diff-match-patch "^1.0.4"
lodash.get "^4.4.2"
lodash.isequal "^4.5.0"
prop-types "^15.7.2"

react-dom@^17.0.1:
version "17.0.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
Expand All @@ -191,13 +160,12 @@ react-dom@^17.0.1:
scheduler "^0.20.1"

"react-gmi@file:../..":
version "0.22.1"
version "0.23.0"
dependencies:
brace "0.11.1"
bulma "0.9.1"
bulma "0.9.4"
jwt-decode "3.1.2"
prop-types "15.7.2"
react-ace "9.2.1"
react-useportal "1.0.13"

react-is@^16.8.1:
Expand Down
6 changes: 3 additions & 3 deletions examples/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"author": "",
"license": "ISC",
"dependencies": {
"react": "17.0.2",
"react": "^17.0.2",
"next": "^12.1.0",
"react-dom": "17.0.2",
"@guillotinaweb/react-gmi":"^0.22.1"
"react-dom": "^17.0.2",
"@guillotinaweb/react-gmi": "^0.22.4"
}
}
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.22.4",
"version": "0.23.1",
"repository": {
"type": "git",
"url": "[email protected]:guillotinaweb/guillotina_react.git"
Expand All @@ -15,15 +15,14 @@
"name": "@guillotinaweb/react-gmi",
"dependencies": {
"brace": "0.11.1",
"bulma": "0.9.1",
"bulma": "0.9.4",
"jwt-decode": "3.1.2",
"prop-types": "15.7.2",
"react-ace": "9.2.1",
"react-useportal": "1.0.13"
"react-useportal": "1.0.19"
},
"peerDependencies": {
"react": "^16.12.0",
"react-dom": "^16.12.0"
"react": "^16.12.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.12.0 || ^17.0.0 || ^18.0.0"
},
"devDependencies": {
"@babel/cli": "7.12.10",
Expand All @@ -33,7 +32,7 @@
"@testing-library/user-event": "12.6.0",
"husky": "4.3.6",
"microbundle": "0.13.0",
"node-sass": "7.0.0",
"sass": "1.69.5",
"prettier": "2.2.1",
"serialize-javascript": "5.0.1"
},
Expand All @@ -43,7 +42,7 @@
"format:check": "prettier --check \"src/**/*.js\"",
"build": "yarn build:js && yarn build:css",
"build:js": "rm -rf ./dist && microbundle --jsx React.createElement --no-compress --sourcemap",
"build:css": "rm -rf ./dist/css && mkdir ./dist/css && node-sass ./src/guillo-gmi/scss/styles.sass ./dist/css/style.css",
"build:css": "rm -rf ./dist/css && mkdir ./dist/css && sass ./src/guillo-gmi/scss/styles.sass ./dist/css/style.css",
"prepublish": "yarn build"
},
"eslintConfig": {
Expand Down Expand Up @@ -74,5 +73,6 @@
},
"author": "Jordi Collell <[email protected]> ",
"license": "MIT",
"homepage": "https://github.com/guillotinaweb/guillotina_react/"
"homepage": "https://github.com/guillotinaweb/guillotina_react/",
"packageManager": "[email protected]"
}
148 changes: 0 additions & 148 deletions src/guillo-gmi/components/panel/requester.js

This file was deleted.

7 changes: 4 additions & 3 deletions src/guillo-gmi/lib/client.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react'
import { RestClient } from './rest'
import { toQueryString } from './helpers'
import { Icon } from '../components/ui'
import { TdLink } from '../components/TdLink'
import { Icon } from '../components/ui'
import { toQueryString } from './helpers'
import { RestClient } from './rest'
import { parser } from './search'

let cacheTypes = {}
Expand Down Expand Up @@ -84,6 +84,7 @@ export class GuillotinaClient {
result = [
...parser(start.toString(), '_from'),
...parser(pageSize.toString(), 'size'),
...parser('*', '_metadata=*'),
]

if (withDepth) {
Expand Down
2 changes: 1 addition & 1 deletion src/guillo-gmi/scss/gmi.sass
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ body

section.main
min-height: 80vh
padding: 10px;
padding: 10px

.box.main-panel
height: 100%
Expand Down
3 changes: 0 additions & 3 deletions src/guillo-gmi/views/container.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { useTraversal } from '../contexts'
import { PanelNotImplemented } from './base'
import { PanelPermissions } from '../components/panel/permissions'
import { PanelBehaviors } from '../components/panel/behaviors'
// import { PanelRequester } from "../components/panel/requester";

const tabs = {
Items: PanelItems,
Expand All @@ -17,7 +16,6 @@ const tabs = {
Behaviors: PanelBehaviors,
Permissions: PanelPermissions,
Actions: PanelActions,
// Requester: PanelRequester
}

const tabsPermissions = {
Expand All @@ -26,7 +24,6 @@ const tabsPermissions = {
Registry: 'guillotina.ReadConfiguration',
Behaviors: 'guillotina.ModifyContent',
Permissions: 'guillotina.SeePermissions',
// Requester: "guillotina.swagger.View"
}

export function ContainerCtx(props) {
Expand Down
Loading

0 comments on commit 918951c

Please sign in to comment.