From 734a535242e92bead96b0480e3e21fab000d9d4a Mon Sep 17 00:00:00 2001 From: dziraf Date: Fri, 18 Jun 2021 17:21:09 +0200 Subject: [PATCH] chore: update @adminjs/design-system package --- .github/workflows/push.yml | 3 --- README.md | 2 +- package.json | 2 +- src/backend/bundler/config.js | 2 +- yarn.lock | 14 ++++++++++---- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 7b8965789..49847e0a6 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -164,9 +164,6 @@ jobs: needs: build if: | contains(github.ref, 'refs/heads/next') - || contains(github.ref, 'refs/heads/master') - || contains(github.ref, 'refs/heads/next-major') - || contains(github.ref, 'refs/heads/beta') services: mongo: image: mongo:3.4.23 diff --git a/README.md b/README.md index 102ab2165..643441397 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ You can find there instructions on how to run adminjs for development. ## License -AdminJS is Copyright © 2018 SoftwareBrothers.co. It is free software, and may be redistributed under the terms specified in the [LICENSE](LICENSE.md) file. +AdminJS is Copyright © 2021 SoftwareBrothers.co. It is free software, and may be redistributed under the terms specified in the [LICENSE](LICENSE.md) file. ## About SoftwareBrothers.co diff --git a/package.json b/package.json index f072a5edf..ccd845e88 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ }, "homepage": "https://github.com/SoftwareBrothers/adminjs#readme", "dependencies": { - "@adminjs/design-system": "^1.7.3", + "@adminjs/design-system": "^2.0.0", "@babel/core": "^7.10.2", "@babel/parser": "^7.10.2", "@babel/plugin-transform-runtime": "^7.10.1", diff --git a/src/backend/bundler/config.js b/src/backend/bundler/config.js index 853391d0e..822532b47 100644 --- a/src/backend/bundler/config.js +++ b/src/backend/bundler/config.js @@ -53,7 +53,7 @@ const globals = { 'react-redux': 'ReactRedux', 'react-router': 'ReactRouter', 'react-router-dom': 'ReactRouterDOM', - 'adminjs': 'AdminJS', + adminJs: 'AdminJS', '@adminjs/design-system': 'AdminJSDesignSystem', 'adminjs/property-types': 'AdminJS.PropertyTypes', 'adminjs/types': 'AdminJS.types', diff --git a/yarn.lock b/yarn.lock index f064dff26..212cda818 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,12 +2,13 @@ # yarn lockfile v1 -"@admin-bro/design-system@^1.7.3": - version "1.7.3" - resolved "https://registry.yarnpkg.com/@admin-bro/design-system/-/design-system-1.7.3.tgz#ca4f20819f71f43ec133bbe56929111b72effc8a" - integrity sha512-XEPV8gUG0Kob3v5K93QAQs7wVV13V0oWCxn4x0ZSKwYNq+5iV+sYVF27NnXMf+Qqlu3VD3JuQAEVEJ1V5mQAHw== +"@adminjs/design-system@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@adminjs/design-system/-/design-system-2.0.0.tgz#3380910ffa2c8dc7418476e83474f586896104e2" + integrity sha512-nVObZNsFtU9k/qLw6AylLTwg9gR0aOpxImgDZf21crKCz7s/9u+N2BVozr3SWU94m90nz/VEL/3mOqRGQ2uk2w== dependencies: "@carbon/icons-react" "^10.14.0" + date-fns "2.15.0" jw-paginate "^1.0.4" lodash "^4.17.20" polished "^3.6.5" @@ -4021,6 +4022,11 @@ data-urls@^1.1.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" +date-fns@2.15.0: + version "2.15.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.15.0.tgz#424de6b3778e4e69d3ff27046ec136af58ae5d5f" + integrity sha512-ZCPzAMJZn3rNUvvQIMlXhDr4A+Ar07eLeGsGREoWU19a3Pqf5oYa+ccd+B3F6XVtQY6HANMFdOQ8A+ipFnvJdQ== + date-fns@^2.0.1: version "2.16.1" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b"