using relative paths for js imports within matestack-ui-core

fiedl · fiedl · commit a8b5296048fe · 2020-02-01T17:15:03.000+01:00
#343 (comment)
diff --git a/app/concepts/matestack/ui/core/action/action.js b/app/concepts/matestack/ui/core/action/action.js
@@ -2,9 +2,8 @@ import Vue from 'vue/dist/vue.esm'
 import Vuex from 'vuex'
 import axios from 'axios'
 
-import matestackEventHub from 'js/event-hub'
-
-import componentMixin from 'component/component'
+import matestackEventHub from '../js/event-hub'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin],
diff --git a/app/concepts/matestack/ui/core/app/store.js b/app/concepts/matestack/ui/core/app/store.js
@@ -1,7 +1,7 @@
 import Vue from 'vue/dist/vue.esm'
 import Vuex from 'vuex'
 import axios from 'axios'
-import matestackEventHub from 'js/event-hub'
+import matestackEventHub from '../js/event-hub'
 
 Vue.use(Vuex)
 
diff --git a/app/concepts/matestack/ui/core/async/async.js b/app/concepts/matestack/ui/core/async/async.js
@@ -1,6 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
-import matestackEventHub from 'js/event-hub'
-import componentMixin from 'component/component'
+import matestackEventHub from '../js/event-hub'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin],
diff --git a/app/concepts/matestack/ui/core/collection/content/content.js b/app/concepts/matestack/ui/core/collection/content/content.js
@@ -1,8 +1,8 @@
 import Vue from 'vue/dist/vue.esm'
-import matestackEventHub from 'js/event-hub'
-import queryParamsHelper from 'js/helpers/query-params-helper'
-import componentMixin from 'component/component'
-import asyncMixin from 'async/async'
+import matestackEventHub from '../../js/event-hub'
+import queryParamsHelper from '../../js/helpers/query-params-helper'
+import componentMixin from '../../component/component'
+import asyncMixin from '../../async/async'
 
 const componentDef = {
   mixins: [componentMixin, asyncMixin],
diff --git a/app/concepts/matestack/ui/core/collection/filter/filter.js b/app/concepts/matestack/ui/core/collection/filter/filter.js
@@ -1,7 +1,7 @@
 import Vue from 'vue/dist/vue.esm'
-import matestackEventHub from 'js/event-hub'
-import queryParamsHelper from 'js/helpers/query-params-helper'
-import componentMixin from 'component/component'
+import matestackEventHub from '../../js/event-hub'
+import queryParamsHelper from '../../js/helpers/query-params-helper'
+import componentMixin from '../../component/component'
 
 const componentDef = {
   mixins: [componentMixin],
diff --git a/app/concepts/matestack/ui/core/collection/order/order.js b/app/concepts/matestack/ui/core/collection/order/order.js
@@ -1,7 +1,7 @@
 import Vue from 'vue/dist/vue.esm'
-import matestackEventHub from 'js/event-hub'
-import queryParamsHelper from 'js/helpers/query-params-helper'
-import componentMixin from 'component/component'
+import matestackEventHub from '../../js/event-hub'
+import queryParamsHelper from '../../js/helpers/query-params-helper'
+import componentMixin from '../../component/component'
 
 const componentDef = {
   mixins: [componentMixin],
diff --git a/app/concepts/matestack/ui/core/component/anonym-dynamic-component.js b/app/concepts/matestack/ui/core/component/anonym-dynamic-component.js
@@ -1,5 +1,5 @@
 import Vue from 'vue/dist/vue.esm'
-import componentMixin from 'component/component'
+import componentMixin from './component'
 
 const componentDef = {
   mixins: [componentMixin]
diff --git a/app/concepts/matestack/ui/core/component/component.js b/app/concepts/matestack/ui/core/component/component.js
@@ -1,7 +1,7 @@
 import Vue from 'vue/dist/vue.esm'
 import axios from 'axios'
 import VRuntimeTemplate from "v-runtime-template"
-import matestackEventHub from 'js/event-hub'
+import matestackEventHub from '../js/event-hub'
 
 const componentMixin = {
   props: ['componentConfig', 'params'],
diff --git a/app/concepts/matestack/ui/core/form/form.js b/app/concepts/matestack/ui/core/form/form.js
@@ -2,9 +2,8 @@ import Vue from 'vue/dist/vue.esm'
 import Vuex from 'vuex'
 import axios from 'axios'
 
-import matestackEventHub from 'js/event-hub'
-
-import componentMixin from 'component/component'
+import matestackEventHub from '../js/event-hub'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin],
diff --git a/app/concepts/matestack/ui/core/html/html.js b/app/concepts/matestack/ui/core/html/html.js
@@ -1,5 +1,5 @@
 import Vue from 'vue/dist/vue.esm'
-import componentMixin from 'component/component'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin]
diff --git a/app/concepts/matestack/ui/core/js/core.js b/app/concepts/matestack/ui/core/js/core.js
@@ -1,19 +1,20 @@
 import Vue from 'vue/dist/vue.esm'
 
-import app from 'app/app'
-import async from 'async/async'
-import pageContent from 'page/content'
-import store from 'app/store'
-import component from 'component/component'
-import anonymDynamicComponent from 'component/anonym-dynamic-component'
-import html from 'html/html'
-import transition from 'transition/transition'
-import action from 'action/action'
-import form from 'form/form'
-import onclick from 'onclick/onclick'
-import collectionContent from 'collection/content/content'
-import collectionFilter from 'collection/filter/filter'
-import collectionOrder from 'collection/order/order'
+// Import from app/concepts/matestack/ui/core:
+import app from '../app/app'
+import async from '../async/async'
+import pageContent from '../page/content'
+import store from '../app/store'
+import component from '../component/component'
+import anonymDynamicComponent from '../component/anonym-dynamic-component'
+import html from '../html/html'
+import transition from '../transition/transition'
+import action from '../action/action'
+import form from '../form/form'
+import onclick from '../onclick/onclick'
+import collectionContent from '../collection/content/content'
+import collectionFilter from '../collection/filter/filter'
+import collectionOrder from '../collection/order/order'
 
 let matestackUiApp = undefined
 
diff --git a/app/concepts/matestack/ui/core/onclick/onclick.js b/app/concepts/matestack/ui/core/onclick/onclick.js
@@ -1,8 +1,7 @@
 import Vue from 'vue/dist/vue.esm'
 
-import matestackEventHub from 'js/event-hub'
-
-import componentMixin from 'component/component'
+import matestackEventHub from '../js/event-hub'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin],
diff --git a/app/concepts/matestack/ui/core/page/content.js b/app/concepts/matestack/ui/core/page/content.js
@@ -1,6 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
 import Vuex from 'vuex'
-import componentMixin from 'component/component'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin],
diff --git a/app/concepts/matestack/ui/core/transition/transition.js b/app/concepts/matestack/ui/core/transition/transition.js
@@ -1,6 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
 import Vuex from 'vuex'
-import componentMixin from 'component/component'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin],
diff --git a/builder/config/webpacker.yml b/builder/config/webpacker.yml
@@ -7,8 +7,7 @@ default: &default
   cache_path: tmp/cache/webpacker
 
   # Additional paths webpack should lookup modules
-  # ['app/assets', 'engine/foo/app/assets']
-  resolved_paths: ['vendor/matestack-ui-core/app/concepts/matestack/ui/core', 'vendor/matestack-ui-core/node_modules']
+  resolved_paths: ['../node_modules']
 
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
