Skip to content

Commit 77e44da

Browse files
juliodialpadjuliodialpad
committed
Merge branch 'remove-tiptap-dependency' into beta
2 parents e926ae1 + 2ebe440 commit 77e44da

43 files changed

Lines changed: 665 additions & 402 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
# TEMPORARY can be removed once we upgrade to eslint 9
22
**/common/emoji/index.js
3+
packages/dialtone-vue2/index.js
4+
packages/dialtone-vue3/index.js
5+
36
**/common/storybook_utils.js
47
**/components/emoji/emoji.test.js
58
**/components/emoji_text_wrapper/emoji_text_wrapper.test.js
69
**/components/icon/icon_constants.js
710
**/components/illustration/illustration_constants.js
811

912
# Language server test files
10-
packages/language-server/sample/*
13+
packages/language-server/sample/*

‎package.json‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,20 @@
7474
"import": "./dist/vue2/dialtone-vue.js",
7575
"require": "./dist/vue2/dialtone-vue.cjs"
7676
},
77-
"./vue2/*": {
77+
"./vue2/lib/*": {
7878
"types": "./dist/vue2/types/index.d.ts",
79-
"import": "./dist/vue2/*.js",
80-
"require": "./dist/vue2/*.cjs"
79+
"import": "./dist/vue2/lib/*/index.js",
80+
"require": "./dist/vue2/lib/*/index.cjs"
8181
},
8282
"./vue3": {
8383
"types": "./dist/vue3/types/index.d.ts",
8484
"import": "./dist/vue3/dialtone-vue.js",
8585
"require": "./dist/vue3/dialtone-vue.cjs"
8686
},
87-
"./vue3/*": {
87+
"./vue3/lib/*": {
8888
"types": "./dist/vue3/types/index.d.ts",
89-
"import": "./dist/vue3/*.js",
90-
"require": "./dist/vue3/*.cjs"
89+
"import": "./dist/vue3/lib/*/index.js",
90+
"require": "./dist/vue3/lib/*/index.cjs"
9191
},
9292
"./themes/*": {
9393
"types": "./dist/tokens/types/themes/*.d.ts",
@@ -100,30 +100,31 @@
100100
"@dialpad/dialtone-emojis": "workspace:*",
101101
"@dialpad/dialtone-icons": "workspace:*",
102102
"@dialpad/dialtone-tokens": "workspace:*",
103-
"@tiptap/core": "^2.6.6",
104-
"@tiptap/extension-blockquote": "^2.6.6",
105-
"@tiptap/extension-bold": "^2.6.6",
103+
"@tiptap/core": "2.6.6",
104+
"@tiptap/extension-blockquote": "2.6.6",
105+
"@tiptap/extension-bold": "2.6.6",
106106
"@tiptap/extension-bubble-menu": "2.6.6",
107-
"@tiptap/extension-bullet-list": "^2.6.6",
108-
"@tiptap/extension-code": "^2.6.6",
109-
"@tiptap/extension-code-block": "^2.6.6",
110-
"@tiptap/extension-document": "^2.6.6",
111-
"@tiptap/extension-hard-break": "^2.6.6",
112-
"@tiptap/extension-history": "^2.6.6",
113-
"@tiptap/extension-image": "^2.6.6",
114-
"@tiptap/extension-italic": "^2.6.6",
115-
"@tiptap/extension-link": "^2.6.6",
116-
"@tiptap/extension-list-item": "^2.6.6",
117-
"@tiptap/extension-mention": "^2.6.6",
118-
"@tiptap/extension-ordered-list": "^2.6.6",
119-
"@tiptap/extension-paragraph": "^2.6.6",
120-
"@tiptap/extension-placeholder": "^2.6.6",
121-
"@tiptap/extension-strike": "^2.6.6",
122-
"@tiptap/extension-text": "^2.6.6",
123-
"@tiptap/extension-text-align": "^2.6.6",
124-
"@tiptap/extension-underline": "^2.6.6",
125-
"@tiptap/pm": "^2.6.6",
126-
"@tiptap/suggestion": "^2.6.6",
107+
"@tiptap/extension-bullet-list": "2.6.6",
108+
"@tiptap/extension-code": "2.6.6",
109+
"@tiptap/extension-code-block": "2.6.6",
110+
"@tiptap/extension-document": "2.6.6",
111+
"@tiptap/extension-floating-menu": "2.6.6",
112+
"@tiptap/extension-hard-break": "2.6.6",
113+
"@tiptap/extension-history": "2.6.6",
114+
"@tiptap/extension-image": "2.6.6",
115+
"@tiptap/extension-italic": "2.6.6",
116+
"@tiptap/extension-link": "2.6.6",
117+
"@tiptap/extension-list-item": "2.6.6",
118+
"@tiptap/extension-mention": "2.6.6",
119+
"@tiptap/extension-ordered-list": "2.6.6",
120+
"@tiptap/extension-paragraph": "2.6.6",
121+
"@tiptap/extension-placeholder": "2.6.6",
122+
"@tiptap/extension-strike": "2.6.6",
123+
"@tiptap/extension-text": "2.6.6",
124+
"@tiptap/extension-text-align": "2.6.6",
125+
"@tiptap/extension-underline": "2.6.6",
126+
"@tiptap/pm": "2.6.6",
127+
"@tiptap/suggestion": "2.6.6",
127128
"date-fns": "4.1.0",
128129
"deep-equal": "2.2.3",
129130
"docopt": "0.6.2",
@@ -154,8 +155,8 @@
154155
"@storybook/test-runner": "^0.16.0",
155156
"@storybook/theming": "7.6.20",
156157
"@types/node": "^20.4.5",
157-
"@vitejs/plugin-vue": "^5.0.3",
158-
"@vitejs/plugin-vue2": "^2.3.1",
158+
"@vitejs/plugin-vue": "^5.2.3",
159+
"@vitejs/plugin-vue2": "^2.3.3",
159160
"@vue/tsconfig": "^0.4.0",
160161
"axe-core": "^4.7.2",
161162
"axe-playwright": "^2.0.3",

‎packages/dialtone-vue2/.storybook/preview.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import Vue from 'vue';
1313
import { setEmojiAssetUrlSmall, setEmojiAssetUrlLarge, setCustomEmojiUrl, setCustomEmojiJson } from '@/common/emoji';
1414
import customEmojiJson from '@/common/custom-emoji.json';
1515
import { dialtoneDarkTheme, dialtoneLightTheme } from './dialtone-themes.js';
16-
import { DtTooltipDirective } from '@/directives/tooltip';
16+
import { DtTooltipDirective } from '@/directives/tooltip_directive';
17+
import { DtScrollbarDirective } from '@/directives/scrollbar_directive';
1718
import { faker } from '@faker-js/faker';
18-
import { DtScrollbarDirective } from '@/directives/scrollbar';
1919
import { DialtoneLocalizationPlugin } from '@/localization';
2020

2121
setTheme(DpLight);

‎packages/dialtone-vue2/common/mixins/index.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
export { default as DtDOMMixin } from './dom';
2+
13
export {
24
InputMixin as DtInputMixin,
35
CheckableMixin as DtCheckableInputMixin,
@@ -11,3 +13,15 @@ export {
1113
export {
1214
default as DtKeyboardListNavigationMixin,
1315
} from './keyboard_list_navigation';
16+
17+
export {
18+
default as DtModalMixin,
19+
} from './modal';
20+
21+
export {
22+
default as DtSkeletonMixin,
23+
} from './skeleton';
24+
25+
export {
26+
default as DtSrOnlyCloseButtonMixin,
27+
} from './sr_only_close_button';

‎packages/dialtone-vue2/common/mixins/input_group.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Vue from 'vue';
22
import { DtValidationMessages } from '@/components/validation_messages';
3-
import { validationMessageValidator } from '../validators';
3+
import { validationMessageValidator } from '@/common/validators';
44
import {
55
getUniqueString,
66
formatMessages,

‎packages/dialtone-vue2/common/validators/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {
22
VALIDATION_MESSAGE_TYPES,
3-
} from '../constants';
3+
} from '@/common/constants';
44

55
export function validationMessageValidator (rawMessages) {
66
if (!rawMessages) {

‎packages/dialtone-vue2/components/breadcrumbs/breadcrumb_item.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323

2424
<script>
2525
import { BREADCRUMB_ITEM_SELECTED_MODIFIER } from './breadcrumbs_constants';
26-
import { DtLink } from '../link';
27-
import { MUTED } from '../link/link_constants';
26+
import { DtLink, MUTED } from '@/components/link';
2827
2928
export default {
3029
name: 'DtBreadcrumbItem',

‎packages/dialtone-vue2/components/link/index.js‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
11
export { default as DtLink } from './link.vue';
2-
export { LINK_VARIANTS, LINK_KIND_MODIFIERS, getLinkKindModifier } from './link_constants';
2+
export {
3+
DANGER,
4+
WARNING,
5+
SUCCESS,
6+
MUTED,
7+
MENTION,
8+
LINK_VARIANTS,
9+
LINK_KIND_MODIFIERS,
10+
getLinkKindModifier,
11+
} from './link_constants';

‎packages/dialtone-vue2/components/split_button/split_button.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { createLocalVue, mount } from '@vue/test-utils';
22
import { flushPromises } from '@/common/utils';
33
import DtSplitButton from './split_button.vue';
44
import { DtIconSend } from '@dialpad/dialtone-icons/vue2';
5-
import { DtTooltipDirective } from '@/directives/tooltip';
5+
import { DtTooltipDirective } from '@/directives/tooltip_directive';
66

77
const MOCK_TRANSITION_STUB = () => ({
88
render: function (h) {

packages/dialtone-vue2/directives/scrollbar/index.js renamed to packages/dialtone-vue2/directives/scrollbar_directive/index.js

File renamed without changes.

0 commit comments

Comments
 (0)