diff --git a/package.json b/package.json index f73523c0db..eafc681168 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,8 @@ "typedi@0.10.0": "patches/typedi@0.10.0.patch", "@sentry/cli@2.17.0": "patches/@sentry__cli@2.17.0.patch", "pkce-challenge@3.0.0": "patches/pkce-challenge@3.0.0.patch", - "typeorm@0.3.12": "patches/typeorm@0.3.12.patch" + "typeorm@0.3.12": "patches/typeorm@0.3.12.patch", + "element-plus@2.3.6": "patches/element-plus@2.3.6.patch" } } } diff --git a/packages/design-system/src/components/N8nButton/overrides/ElButton.ts b/packages/design-system/src/components/N8nButton/overrides/ElButton.ts index 88c583bba1..b00dfa115f 100644 --- a/packages/design-system/src/components/N8nButton/overrides/ElButton.ts +++ b/packages/design-system/src/components/N8nButton/overrides/ElButton.ts @@ -1,3 +1,4 @@ import ElButton from './ElButton.vue'; +export { ElButton }; export default ElButton; diff --git a/packages/design-system/src/css/dialog.scss b/packages/design-system/src/css/dialog.scss index 4eca1fddc7..08c250836b 100644 --- a/packages/design-system/src/css/dialog.scss +++ b/packages/design-system/src/css/dialog.scss @@ -19,6 +19,14 @@ padding-top: var(--spacing-2xl); } +@include mixins.b(overlay-message-box) { + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} + @include mixins.b(dialog) { position: relative; margin: 0 auto 50px; diff --git a/packages/design-system/vite.config.ts b/packages/design-system/vite.config.ts index 62a07d3f39..b37ff74b3f 100644 --- a/packages/design-system/vite.config.ts +++ b/packages/design-system/vite.config.ts @@ -11,6 +11,7 @@ export default mergeConfig( resolve: { alias: { '@': resolve(__dirname, 'src'), + 'n8n-design-system': resolve(__dirname, 'src'), }, }, build: { diff --git a/packages/editor-ui/vite.config.ts b/packages/editor-ui/vite.config.ts index 9ec24c11f5..cf40a722cb 100644 --- a/packages/editor-ui/vite.config.ts +++ b/packages/editor-ui/vite.config.ts @@ -57,7 +57,7 @@ const alias = [ replacement: 'lodash-es/$1', }, { - find: /element-plus\/(packages|lib)\/button$/, + find: /^element-plus\/(es|lib)\/components\/button\/src\/button2\.m?js$/, replacement: resolve( __dirname, '..', diff --git a/patches/element-plus@2.3.6.patch b/patches/element-plus@2.3.6.patch new file mode 100644 index 0000000000..43b19740e1 --- /dev/null +++ b/patches/element-plus@2.3.6.patch @@ -0,0 +1,33 @@ +diff --git a/es/components/button/index.mjs b/es/components/button/index.mjs +index da11b9b6e31d5e57681ce705eda09dd5238ced4b..335ace1ee16ac76cdafaf12d2e597224480039e0 100644 +--- a/es/components/button/index.mjs ++++ b/es/components/button/index.mjs +@@ -1,5 +1,5 @@ + import '../../utils/index.mjs'; +-import Button from './src/button2.mjs'; ++import Button from 'n8n-design-system/components/N8nButton/overrides/ElButton.ts'; + import ButtonGroup from './src/button-group2.mjs'; + export { buttonEmits, buttonNativeTypes, buttonProps, buttonTypes } from './src/button.mjs'; + export { buttonGroupContextKey } from './src/constants.mjs'; +diff --git a/lib/components/button/index.js b/lib/components/button/index.js +index 6aed7dd91c7270fc0e0ab98bfcaa4b5aa66a9dcf..69517bb81c4855f08db0f5427c7f1df66e98306c 100644 +--- a/lib/components/button/index.js ++++ b/lib/components/button/index.js +@@ -3,13 +3,15 @@ + Object.defineProperty(exports, '__esModule', { value: true }); + + require('../../utils/index.js'); +-var button$1 = require('./src/button2.js'); ++var button$1 = require('n8n-design-system'); + var buttonGroup = require('./src/button-group2.js'); + var button = require('./src/button.js'); + var constants = require('./src/constants.js'); + var install = require('../../utils/vue/install.js'); + +-const ElButton = install.withInstall(button$1["default"], { ++console.log(button$1); ++ ++const ElButton = install.withInstall(button$1["default"]["N8nElButton"], { + ButtonGroup: buttonGroup["default"] + }); + const ElButtonGroup = install.withNoopInstall(buttonGroup["default"]); \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6e0f7254e1..222aeb4469 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,6 +29,9 @@ patchedDependencies: '@sentry/cli@2.17.0': hash: nchnoezkq6p37qaiku3vrpwraq path: patches/@sentry__cli@2.17.0.patch + element-plus@2.3.6: + hash: 43j4rcrsuthfakksgtflxlcgeq + path: patches/element-plus@2.3.6.patch pkce-challenge@3.0.0: hash: dypouzb3lve7vncq25i5fuanki path: patches/pkce-challenge@3.0.0.patch @@ -657,7 +660,7 @@ importers: dependencies: element-plus: specifier: ^2.3.6 - version: 2.3.6(vue@3.3.4) + version: 2.3.6(patch_hash=43j4rcrsuthfakksgtflxlcgeq)(vue@3.3.4) markdown-it: specifier: ^13.0.1 version: 13.0.1 @@ -6068,7 +6071,7 @@ packages: ts-dedent: 2.2.0 type-fest: 2.19.0 vue: 3.3.4 - vue-component-type-helpers: 1.8.1 + vue-component-type-helpers: 1.8.2 transitivePeerDependencies: - supports-color dev: true @@ -10535,7 +10538,7 @@ packages: resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==} dev: true - /element-plus@2.3.6(vue@3.3.4): + /element-plus@2.3.6(patch_hash=43j4rcrsuthfakksgtflxlcgeq)(vue@3.3.4): resolution: {integrity: sha512-GLz0pXUYI2zRfIgyI6W7SWmHk6dSEikP9yR++hsQUyy63+WjutoiGpA3SZD4cGPSXUzRFeKfVr8CnYhK5LqXZw==} peerDependencies: vue: ^3.2.0 @@ -10559,6 +10562,7 @@ packages: transitivePeerDependencies: - '@vue/composition-api' dev: false + patched: true /emittery@0.13.1: resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} @@ -20980,8 +20984,8 @@ packages: resolution: {integrity: sha512-iGdlqtajmiqed8ptURKPJ/Olz0/mwripVZszg6tygfZSIL9kYFPJTNY6+Q6OjWGznl2L06vxG5HvNvAnWrnzbg==} dev: true - /vue-component-type-helpers@1.8.1: - resolution: {integrity: sha512-+pNNtPARczRWVgoQCBXSgJdpnZic7rSmnvEV3IWQLwZcf1RSVjniQ+JnmYGm+9BFWX0MN0hqrIWVyC7HDhoXhA==} + /vue-component-type-helpers@1.8.2: + resolution: {integrity: sha512-jfXT8gLNUcg4QBbA9j88fpY5hWUmZGmvgFti5O0mSD8xesVR2i47J/rdRSXzfjoHIpLOiRfT5zOX6o0k/CiJMg==} dev: true /vue-demi@0.13.11(vue@3.3.4):