Merge branch 'develop' into dockerized_core_dev

Author: jonasjabari

Gemfile

@@ -20,13 +20,13 @@ gem "cells-haml"
 group :development, :test do
   gem 'rspec-rails', '~> 3.8'
   gem 'capybara'
-  gem 'webpacker', '~> 3.5'
+  gem 'webpacker', '~> 4.0'
   gem 'sqlite3', '~> 1.3.13'
   gem 'selenium-webdriver'
   gem 'puma'
   gem 'simplecov', require: false, group: :test
   gem 'byebug'
-  # gem 'pry-byebug'
+  gem 'pry-byebug'
   gem 'webmock'
   # gem 'webdrivers', '~> 4.1'
 end

Gemfile.lock

@@ -80,6 +80,7 @@ GEM
       cells (>= 4.1.6, < 5.0.0)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -125,6 +126,12 @@ GEM
     nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     pipetree (0.1.1)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.8.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
     public_suffix (3.0.3)
     puma (4.3.1)
       nio4r (~> 2.0)
@@ -229,7 +236,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpacker (3.5.5)
+    webpacker (4.2.2)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
@@ -249,6 +256,7 @@ DEPENDENCIES
   cells-rails
   generator_spec
   matestack-ui-core!
+  pry-byebug
   puma
   rspec-rails (~> 3.8)
   selenium-webdriver
@@ -258,7 +266,7 @@ DEPENDENCIES
   trailblazer-cells
   trailblazer-rails
   webmock
-  webpacker (~> 3.5)
+  webpacker (~> 4.0)
 
 BUNDLED WITH
    2.1.4

Rakefile

@@ -32,3 +32,35 @@ require 'rake/testtask'
 # end
 #
 # task default: :test
+
+task :webpack => 'webpack:build'
+
+namespace :webpack do
+  task :build => ['build:development', 'build:production']
+  
+  namespace :build do
+    task :development => 'yarn:install' do
+      Bundler.with_clean_env do
+        sh "cd builder && bin/webpack"
+      end
+    end
+    task :production => 'yarn:install' do
+      Bundler.with_clean_env do
+        sh "cd builder && bin/rake webpacker:compile"
+      end
+    end
+  end
+  
+  task :watch => 'yarn:install' do
+    Bundler.with_clean_env do
+      sh "cd builder && bin/webpack --watch"
+    end
+  end
+  
+  namespace :yarn do
+    task :install do
+      sh "yarn install && cd builder && yarn install"
+    end
+  end
+end 
+

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],

app/concepts/matestack/ui/core/app/app.js

@@ -1,7 +1,7 @@
 import Vue from 'vue/dist/vue.esm'
-import axios from 'axios'
 import VRuntimeTemplate from "v-runtime-template"
 import Vuex from 'vuex'
+import isNavigatingToAnotherPage from "./location"
 
 const componentDef = {
   props: ['appConfig', 'params'],
@@ -12,9 +12,10 @@ const componentDef = {
     asyncTemplate: state => state.pageTemplate,
   }),
   mounted: function(){
-    const self = this;
-    window.onpopstate = function(event) {
-      self.$store.dispatch("navigateTo", {url: document.location.pathname, backwards: true} );
+    window.onpopstate = (event) => {
+      if (isNavigatingToAnotherPage(document.location, event)) {
+        this.$store.dispatch("navigateTo", {url: document.location.pathname, backwards: true} );
+      };
     }
   },
   components: {

app/concepts/matestack/ui/core/app/location.js

@@ -0,0 +1,10 @@
+const isNavigatingToAnotherPage = function(currentLocation, popstateEvent) {
+  const targetLocation = popstateEvent.target.location;
+
+  // omits hash by design
+  return currentLocation.pathname !== targetLocation.pathname ||
+    currentLocation.origin !== targetLocation.origin ||
+    currentLocation.search !== targetLocation.search
+}
+
+export default isNavigatingToAnotherPage

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)
 

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],

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],

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],