Merge pull request #466 from matestack/next-release

1.0.1 Release

Author: jonasjabari

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.0.1 Release
+
+This release contains bugfixes.
+
+### Bugfixes
+
+*  Fixed javascript automatic scroll top on page transition for short pages #462
+*  Enable async components on app level, only usable in pages and components before #458
+*  Fixed duplicate directory error when using matestack-ui-core with webpacker #460
+
+
 ## v1.0.0 Release
 
 Please note that this release contains breaking changes and soft deprecations. To make things easy for users of the current `v0.7.*` version, we have provided **Migration TODOs** at the end of each chapter.

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM ruby:2.6.5-alpine3.9
+FROM ruby:2.7.2-alpine3.12
 
 RUN gem install bundler:2.1.4
 

Dockerfile.test

@@ -1,4 +1,4 @@
-FROM ruby:2.6.5-alpine3.9
+FROM ruby:2.7.2-alpine3.12
 
 RUN gem install bundler:2.1.4
 
@@ -20,14 +20,14 @@ RUN apk update && apk upgrade \
     && echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
     && echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
     && apk add --no-cache \
-    chromium@edge=72.0.3626.121-r0 \
+    chromium@edge \
     nss@edge \
     && rm -rf /var/lib/apt/lists/* \
     /var/cache/apk/* \
     /usr/share/man \
     /tmp/*
 
-RUN apk add chromium-chromedriver@edge=72.0.3626.121-r0
+RUN apk add chromium-chromedriver@edge
 
 ENV CHROME_BIN=/usr/bin/chromium-browser \
     CHROME_PATH=/usr/lib/chromium/

Gemfile

@@ -20,7 +20,7 @@ group :development, :test do
   gem 'capybara'
   gem 'webpacker', '~> 4.0'
   gem 'pg', '>= 0.18', '< 2.0'
-  gem 'selenium-webdriver', '~> 3.142', '>= 3.142.7'
+  gem 'selenium-webdriver'
   gem 'puma'
   gem 'simplecov', require: false, group: :test
   gem 'byebug'

Gemfile.lock

@@ -197,7 +197,7 @@ GEM
     rspec-support (3.9.2)
     rspec-wait (0.0.9)
       rspec (>= 3, < 4)
-    rubyzip (2.2.0)
+    rubyzip (2.3.0)
     safe_yaml (1.0.5)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
@@ -257,7 +257,7 @@ DEPENDENCIES
   rspec-rails (~> 3.8)
   rspec-retry
   rspec-wait (~> 0.0.9)
-  selenium-webdriver (~> 3.142, >= 3.142.7)
+  selenium-webdriver
   simplecov
   trailblazer-cells
   turbolinks

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

@@ -40,7 +40,11 @@ const store = new Vuex.Store({
           return getScrollParent(node.parentNode)
         }
       }
-      getScrollParent(document.getElementsByClassName("matestack-page-root")[0]).scrollTop = 0
+      var scrollParent = getScrollParent(document.getElementsByClassName("matestack-page-root")[0])
+      if(scrollParent){
+        scrollParent.scrollTop = 0;
+      }
+      // getScrollParent(document.getElementsByClassName("matestack-page-root")[0]).scrollTop = 0
     }
   },
   actions: {

app/lib/matestack/ui/core/rendering/main_renderer.rb

@@ -21,9 +21,10 @@ def render(controller_instance, page_class, options)
       render_matestack_object(controller_instance, page_instance)
     elsif (params[:component_key].present? && params[:component_class].blank?)
       # async component rerendering from non isolated context
+      app_instance = app_class.new(page_class, controller_instance, context)
       component_key = params[:component_key]
       page_instance = page_class.new(controller_instance: controller_instance, context: context)
-      render_component(component_key, page_instance, controller_instance, context)
+      render_component(component_key, app_instance, controller_instance, context)
     elsif (params[:component_class].present? && params[:component_key].blank?)
       # isolated component rendering
       component_class = params[:component_class]
@@ -75,15 +76,15 @@ def render_matestack_object(controller_instance, object, opts = {}, render_metho
     controller_instance.render rendering_options
   end
 
-  def render_component(component_key, page_instance, controller_instance, context)
+  def render_component(component_key, app_or_page_instance, controller_instance, context)
     matched_component = nil
 
-    page_instance.matestack_set_skip_defer(false)
+    app_or_page_instance.matestack_set_skip_defer(false)
 
-    page_instance.prepare
-    page_instance.response
+    app_or_page_instance.prepare
+    app_or_page_instance.response
 
-    matched_component = dig_for_component(component_key, page_instance)
+    matched_component = dig_for_component(component_key, app_or_page_instance)
 
     unless matched_component.nil?
       render_matestack_object(controller_instance, matched_component, {}, :render_content)

builder/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.6.5'
+ruby '2.7.2'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.0'

builder/Gemfile.lock

@@ -177,7 +177,7 @@ DEPENDENCIES
   webpacker
 
 RUBY VERSION
-   ruby 2.6.5p114
+   ruby 2.7.2p137
 
 BUNDLED WITH
    2.1.4

docs/guides/000-installation/README.md

@@ -27,7 +27,7 @@ Rails 6+ apps use webpacker by default. Rails 5 and below apps use the asset pip
 Add 'matestack-ui-core' to your `package.json` by running:
 
 ```
-$ yarn add https://github.com/matestack/matestack-ui-core#v1.0.0
+$ yarn add https://github.com/matestack/matestack-ui-core#v1.0.1
 $ yarn install
 ```
 
@@ -127,11 +127,11 @@ For further reading check out the [basic building blocks](/docs/guides/200-basic
 
 ## Usage
 
-There are two ways to use matestack. 
+There are two ways to use matestack.
 
 ### Full matestack
 
-First, as we call it, _full matestack_, enabling all features and developing with all benefits. Learn more about the _full matestack_  approach by following the [tutorial](/docs/guides/100-tutorial/README.md) or reading about matestacks [basic building blocks](/docs/guides/200-basic_building_blocks/README.md). 
+First, as we call it, _full matestack_, enabling all features and developing with all benefits. Learn more about the _full matestack_  approach by following the [tutorial](/docs/guides/100-tutorial/README.md) or reading about matestacks [basic building blocks](/docs/guides/200-basic_building_blocks/README.md).
 
 ### Integration in existing projects