From 7154dad8a3c9edf72874810f3f03d40d01243f07 Mon Sep 17 00:00:00 2001 From: Jose Chirivella Date: Sun, 2 Jun 2024 22:22:28 -0500 Subject: [PATCH 1/5] FOUR-15522 Added some logic when package-slideshow is installed to treat the script as module * Added Modeler to the window object --- resources/js/bootstrap.js | 1 + resources/views/processes/modeler/index.blade.php | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js index 36adc17e16..d731776833 100644 --- a/resources/js/bootstrap.js +++ b/resources/js/bootstrap.js @@ -81,6 +81,7 @@ window.VueMonaco = require("vue-monaco"); window.ScreenBuilder = require("@processmaker/screen-builder"); window.VueFormElements = require("@processmaker/vue-form-elements"); +window.Modeler = require("@processmaker/modeler"); window.VueRouter = Router; diff --git a/resources/views/processes/modeler/index.blade.php b/resources/views/processes/modeler/index.blade.php index 72d996dd78..d1f1c9f7ab 100644 --- a/resources/views/processes/modeler/index.blade.php +++ b/resources/views/processes/modeler/index.blade.php @@ -110,7 +110,11 @@ @if (is_bool($value)) {{ $key }} @else + @if (str_contains($value, 'package-slideshow')) + type="module" {{ $key }}="{{ $value }}" + @else {{ $key }}="{{ $value }}" + @endif @endif @endforeach > From d6e61c71eac8b0672f833ce8b57a5275fba5cec4 Mon Sep 17 00:00:00 2001 From: Henry Jonas Date: Mon, 3 Jun 2024 11:49:11 -0400 Subject: [PATCH 2/5] update file for using composition API in packages --- resources/js/bootstrap.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js index d731776833..fcfa7b0e22 100644 --- a/resources/js/bootstrap.js +++ b/resources/js/bootstrap.js @@ -16,6 +16,7 @@ import VueI18Next from "@panter/vue-i18next"; import { install as VuetableInstall } from "vuetable-2"; import MonacoEditor from "vue-monaco"; import Vue from "vue"; +import * as vue from "vue"; import VueCookies from "vue-cookies"; import Pagination from "./components/common/Pagination"; import ScreenSelect from "./processes/modeler/components/inspector/ScreenSelect.vue"; @@ -68,7 +69,7 @@ window.$ = window.jQuery = require("jquery"); */ window.Vue = Vue; - +window.vue = vue; window.Vue.use(BootstrapVue); window.Vue.use(BootstrapVueIcons); window.Vue.use(ScreenBuilder); From 96f94d0fbfd47d977fc775a38202d98ae4724b71 Mon Sep 17 00:00:00 2001 From: Jose Chirivella Date: Mon, 3 Jun 2024 14:25:51 -0500 Subject: [PATCH 3/5] FOUR-15521 Removing type=module code, not needed --- resources/views/processes/modeler/index.blade.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/resources/views/processes/modeler/index.blade.php b/resources/views/processes/modeler/index.blade.php index d1f1c9f7ab..72d996dd78 100644 --- a/resources/views/processes/modeler/index.blade.php +++ b/resources/views/processes/modeler/index.blade.php @@ -110,11 +110,7 @@ @if (is_bool($value)) {{ $key }} @else - @if (str_contains($value, 'package-slideshow')) - type="module" {{ $key }}="{{ $value }}" - @else {{ $key }}="{{ $value }}" - @endif @endif @endforeach > From a6952ad402d9c1004628154ed7b5002b7037850d Mon Sep 17 00:00:00 2001 From: Jose Chirivella Date: Mon, 3 Jun 2024 16:40:44 -0500 Subject: [PATCH 4/5] FOUR-15521 Fixed copy of modeler images --- webpack.mix.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.mix.js b/webpack.mix.js index 811935b1a2..160f1612ba 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -64,7 +64,7 @@ mix .copy("resources/js/components/FilterBar.vue", "public/js") .copy("resources/js/timeout.js", "public/js") // Copy files necessary for images for the designer/modeler to it's own img directory - .copy("node_modules/@processmaker/modeler/dist/img", "public/js/processes/modeler/img") + .copy("node_modules/@processmaker/modeler/dist/img", "public/js/img") // .copy("node_modules/@processmaker/screen-builder/dist/img", "public/js/img") // .copy("node_modules/@processmaker/vue-form-elements/dist", "public/js") .copy("node_modules/bpmn-font/dist", "public/css/bpmn-symbols"); From bf82d7528035e404fca0977b0e72667e36d01f68 Mon Sep 17 00:00:00 2001 From: Henry Jonas Date: Tue, 4 Jun 2024 17:20:08 -0400 Subject: [PATCH 5/5] expose bootstrap --- resources/js/bootstrap.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js index fcfa7b0e22..24b959fde8 100644 --- a/resources/js/bootstrap.js +++ b/resources/js/bootstrap.js @@ -1,5 +1,6 @@ import "bootstrap-vue/dist/bootstrap-vue.css"; import { BootstrapVue, BootstrapVueIcons } from "bootstrap-vue"; +import * as bootstrap from "bootstrap"; import Echo from "laravel-echo"; import Router from "vue-router"; import ScreenBuilder, { initializeScreenCache } from "@processmaker/screen-builder"; @@ -70,6 +71,7 @@ window.$ = window.jQuery = require("jquery"); window.Vue = Vue; window.vue = vue; +window.bootstrap = bootstrap; window.Vue.use(BootstrapVue); window.Vue.use(BootstrapVueIcons); window.Vue.use(ScreenBuilder);