Skip to content

Commit

Permalink
Merge pull request #180 from contember/pr/deps-update
Browse files Browse the repository at this point in the history
deps update
  • Loading branch information
JanTvrdik authored Feb 10, 2022
2 parents 4b4953f + 3e249a5 commit c83850c
Show file tree
Hide file tree
Showing 12 changed files with 178 additions and 249 deletions.
7 changes: 7 additions & 0 deletions ee/admin-server/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ export default defineConfig({
},
},
},
css: {
preprocessorOptions: {
sass: {
charset: false,
},
},
},
esbuild: {
jsxInject: `import * as React from 'react'`,
target: 'esnext',
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@typescript-eslint/parser": "4.29.0",
"@vitejs/plugin-react-refresh": "1.3.5",
"babel-jest": "27.0.6",
"esbuild": "^0.13.15",
"esbuild": "^0.14.21",
"eslint": "7.32.0",
"eslint-config-prettier": "8.3.0",
"eslint-plugin-prettier": "3.4.0",
Expand All @@ -44,9 +44,9 @@
"prettier": "2.3.2",
"react": "17.0.2",
"react-dom": "17.0.2",
"sass": "1.35.2",
"sass": "1.49.7",
"tsm": "2.2.1",
"typescript": "4.3.5",
"vite": "2.6.14"
"vite": "2.8.0"
}
}
7 changes: 7 additions & 0 deletions packages/admin-sandbox/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,11 @@ export default defineConfig({
replacement: resolve(rootDirectory, getPackagePath(packageName)),
})),
},
css: {
preprocessorOptions: {
sass: {
charset: false,
},
},
},
})
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createElement } from 'react'
import { CustomMarkPlugin } from '../../../baseEditor'
import isHotkey from 'is-hotkey'
import { isHotkey } from 'is-hotkey'

export const boldMark = 'isBold'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CustomMarkPlugin } from '../../../baseEditor'
import isHotkey from 'is-hotkey'
import { isHotkey } from 'is-hotkey'
import { createElement } from 'react'

export const codeMark = 'isCode'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CustomMarkPlugin } from '../../../baseEditor'
import isHotkey from 'is-hotkey'
import { isHotkey } from 'is-hotkey'
import { createElement } from 'react'

export const highlightMark = 'isHighlighted'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CustomMarkPlugin } from '../../../baseEditor'
import isHotkey from 'is-hotkey'
import { isHotkey } from 'is-hotkey'
import { createElement } from 'react'

export const italicMark = 'isItalic'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CustomMarkPlugin } from '../../../baseEditor'
import { createElement } from 'react'
import isHotkey from 'is-hotkey'
import { isHotkey } from 'is-hotkey'

export const strikeThroughMark = 'isStruckThrough'
export const strikeThroughPlugin: CustomMarkPlugin = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CustomMarkPlugin } from '../../../baseEditor'
import isHotkey from 'is-hotkey'
import { isHotkey } from 'is-hotkey'
import { createElement } from 'react'

export const underlineMark = 'isUnderlined'
Expand Down
5 changes: 4 additions & 1 deletion packages/admin/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ export * from './acl'
export * from './bootstrap'
export * from './components'
export * from './i18n'
export * from './reexport'
export * from './routing'
export * from './tenant'
export * from './utils/eventSourceReader'

export type { AdminDictionary } from './adminDictionary'

export * from '@contember/binding'
export * from '@contember/react-client'
export * from '@contember/ui'
3 changes: 0 additions & 3 deletions packages/admin/src/reexport.ts

This file was deleted.

Loading

0 comments on commit c83850c

Please sign in to comment.