Merge branch 'master' of https://github.com/boazpoolman/strapi-plugin-config-sync into dont-recompile-typescript-project

pull/77/head
Tim Raasveld 2022-11-28 07:04:09 +00:00
commit 63ff9bb2e4
12 changed files with 1173 additions and 1021 deletions

View File

@ -2,7 +2,7 @@ import React, { useState } from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import { Button } from '@strapi/design-system/Button'; import { Button } from '@strapi/design-system';
import { Map } from 'immutable'; import { Map } from 'immutable';
import { useNotification } from '@strapi/helper-plugin'; import { useNotification } from '@strapi/helper-plugin';

View File

@ -1,9 +1,14 @@
import React from 'react'; import React from 'react';
import ReactDiffViewer, { DiffMethod } from 'react-diff-viewer'; import ReactDiffViewer, { DiffMethod } from 'react-diff-viewer-continued';
import { ModalLayout, ModalBody, ModalHeader } from '@strapi/design-system/ModalLayout'; import {
import { Grid, GridItem } from '@strapi/design-system/Grid'; ModalLayout,
import { Typography } from '@strapi/design-system/Typography'; ModalBody,
ModalHeader,
Grid,
GridItem,
Typography,
} from '@strapi/design-system';
const ConfigDiff = ({ isOpen, onClose, oldValue, newValue, configName }) => { const ConfigDiff = ({ isOpen, onClose, oldValue, newValue, configName }) => {
if (!isOpen) { if (!isOpen) {

View File

@ -1,6 +1,5 @@
import React from 'react'; import React from 'react';
import { Tr, Td } from '@strapi/design-system/Table'; import { Tr, Td, BaseCheckbox } from '@strapi/design-system';
import { BaseCheckbox } from '@strapi/design-system/BaseCheckbox';
const CustomRow = ({ row, checked, updateValue }) => { const CustomRow = ({ row, checked, updateValue }) => {
const { configName, configType, state, onClick } = row; const { configName, configType, state, onClick } = row;

View File

@ -2,10 +2,16 @@ import React, { useState, useEffect } from 'react';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { Table, Thead, Tbody, Tr, Th } from '@strapi/design-system/Table'; import {
import { Typography } from '@strapi/design-system/Typography'; Table,
import { BaseCheckbox } from '@strapi/design-system/BaseCheckbox'; Thead,
import { Loader } from '@strapi/design-system/Loader'; Tbody,
Tr,
Th,
Typography,
BaseCheckbox,
Loader,
} from '@strapi/design-system';
import ConfigDiff from '../ConfigDiff'; import ConfigDiff from '../ConfigDiff';
import FirstExport from '../FirstExport'; import FirstExport from '../FirstExport';

View File

@ -1,12 +1,16 @@
import React from 'react'; import React from 'react';
import { useIntl } from 'react-intl'; import { useIntl } from 'react-intl';
import { Dialog, DialogBody, DialogFooter } from '@strapi/design-system/Dialog'; import {
import { Flex } from '@strapi/design-system/Flex'; Dialog,
import { Typography } from '@strapi/design-system/Typography'; DialogBody,
import { Stack } from '@strapi/design-system/Stack'; DialogFooter,
import { Button } from '@strapi/design-system/Button'; Flex,
import ExclamationMarkCircle from '@strapi/icons/ExclamationMarkCircle'; Typography,
Stack,
Button,
} from '@strapi/design-system';
import { ExclamationMarkCircle } from '@strapi/icons';
const ConfirmModal = ({ isOpen, onClose, onSubmit, type }) => { const ConfirmModal = ({ isOpen, onClose, onSubmit, type }) => {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();

View File

@ -1,7 +1,7 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { NoContent, useNotification } from '@strapi/helper-plugin'; import { NoContent, useNotification } from '@strapi/helper-plugin';
import { Button } from '@strapi/design-system/Button'; import { Button } from '@strapi/design-system';
import { exportAllConfig } from '../../state/actions/Config'; import { exportAllConfig } from '../../state/actions/Config';
import ConfirmModal from '../ConfirmModal'; import ConfirmModal from '../ConfirmModal';

View File

@ -7,8 +7,7 @@
import React, { memo } from 'react'; import React, { memo } from 'react';
import { useIntl } from 'react-intl'; import { useIntl } from 'react-intl';
import { HeaderLayout } from '@strapi/design-system/Layout'; import { HeaderLayout, Box } from '@strapi/design-system';
import { Box } from '@strapi/design-system/Box';
const HeaderComponent = () => { const HeaderComponent = () => {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();

View File

@ -5,7 +5,7 @@
*/ */
import React from 'react'; import React from 'react';
import { Icon } from '@strapi/design-system/Icon'; import { Icon } from '@strapi/design-system';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import pluginPkg from '../../../../package.json'; import pluginPkg from '../../../../package.json';

View File

@ -1,11 +1,13 @@
import React, { useEffect } from 'react'; import React, { useEffect } from 'react';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { Map } from 'immutable'; import { Map } from 'immutable';
import { Box } from '@strapi/design-system/Box'; import {
import { ContentLayout } from '@strapi/design-system/Layout'; Box,
ContentLayout,
Alert,
Typography,
} from '@strapi/design-system';
import { useNotification } from '@strapi/helper-plugin'; import { useNotification } from '@strapi/helper-plugin';
import { Alert } from '@strapi/design-system/Alert';
import { Typography } from '@strapi/design-system/Typography';
import { getAllConfigDiff, getAppEnv } from '../../state/actions/Config'; import { getAllConfigDiff, getAppEnv } from '../../state/actions/Config';
import ConfigList from '../../components/ConfigList'; import ConfigList from '../../components/ConfigList';

View File

@ -30,7 +30,7 @@
"git-diff": "^2.0.6", "git-diff": "^2.0.6",
"immutable": "^3.8.2", "immutable": "^3.8.2",
"inquirer": "^8.2.0", "inquirer": "^8.2.0",
"react-diff-viewer": "^3.1.1", "react-diff-viewer-continued": "^3.2.3",
"redux-immutable": "^4.0.0", "redux-immutable": "^4.0.0",
"redux-thunk": "^2.3.0" "redux-thunk": "^2.3.0"
}, },
@ -58,10 +58,10 @@
}, },
"devDependencies": { "devDependencies": {
"@fortawesome/react-fontawesome": "^0.1.16", "@fortawesome/react-fontawesome": "^0.1.16",
"@strapi/design-system": "^0.0.1-alpha.79", "@strapi/design-system": "^1.3.1",
"@strapi/helper-plugin": "^4.1.8", "@strapi/helper-plugin": "^4.5.2",
"@strapi/icons": "^0.0.1-alpha.79", "@strapi/icons": "^1.3.1",
"@strapi/utils": "^4.1.8", "@strapi/utils": "^4.5.2",
"babel-eslint": "9.0.0", "babel-eslint": "9.0.0",
"eslint": "^7.32.0", "eslint": "^7.32.0",
"eslint-config-airbnb": "^18.2.1", "eslint-config-airbnb": "^18.2.1",

View File

@ -18,7 +18,7 @@
"@strapi/plugin-i18n": "^4.0.0", "@strapi/plugin-i18n": "^4.0.0",
"@strapi/plugin-users-permissions": "^4.0.0", "@strapi/plugin-users-permissions": "^4.0.0",
"@strapi/strapi": "^4.0.0", "@strapi/strapi": "^4.0.0",
"sqlite3": "5.0.2", "better-sqlite3": "7.4.6",
"strapi-plugin-config-sync": "./.." "strapi-plugin-config-sync": "./.."
}, },
"author": { "author": {

2117
yarn.lock

File diff suppressed because it is too large Load Diff