Merge pull request #531 from matestack/next_release

2.0.0 Release

Author: jonasjabari

.ruby-version

@@ -1 +1 @@
-2.6.1
+2.6.5

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.0.0 Release - 2021-04-12
+
+Please refer to the [migration guide](./docs/migrate-from-1.x-to-2.0.md)
+
 ## v1.5.0 Release - 2021-03-07
 
 ### Improvements

Dockerfile.dev

@@ -3,7 +3,7 @@ FROM ruby:2.7.2-alpine3.12
 RUN gem install bundler:2.1.4
 
 RUN apk update --no-cache && \
-    apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev && \
+    apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev npm && \
     mkdir -p /app
 
 WORKDIR /app

Gemfile

@@ -11,12 +11,8 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
-gem "trailblazer-cells"
-gem "cells-rails"
-gem "cells-haml"
-
 group :development, :test do
-  gem 'rspec-rails', '~> 3.8'
+  gem 'rspec-rails', '~> 4.0.2'
   gem 'capybara'
   gem 'webpacker', '~> 4.0'
   gem 'pg', '>= 0.18', '< 2.0'
@@ -25,13 +21,12 @@ group :development, :test do
   gem 'simplecov', require: false, group: :test
   gem 'byebug'
   gem 'webmock'
-  gem 'turbolinks'
 end
 
 group :test do
   gem 'pry-rails'
   gem 'pry-byebug'
   gem "generator_spec"
-  gem "rspec-retry" # repeating flaky tests
-  gem "rspec-wait", "~> 0.0.9"
+  # gem "rspec-retry" # repeating flaky tests
+  # gem "rspec-wait", "~> 0.0.9"
 end

Gemfile.lock

@@ -1,12 +1,8 @@
 PATH
   remote: .
   specs:
-    matestack-ui-core (1.3.2)
-      cells-haml (>= 0.0.10)
-      cells-rails (>= 0.1.0)
-      haml (>= 4.1.0.beta.1)
+    matestack-ui-core (2.0.0)
       rails (>= 5.2)
-      trailblazer-cells (>= 0.0.3)
 
 GEM
   remote: https://rubygems.org/
@@ -73,47 +69,30 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
-    byebug (11.1.1)
-    capybara (3.31.0)
+    byebug (11.1.3)
+    capybara (3.35.3)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    cells (4.1.7)
-      declarative-builder (< 0.2.0)
-      declarative-option (< 0.2.0)
-      tilt (>= 1.4, < 3)
-      uber (< 0.2.0)
-    cells-haml (0.0.10)
-      cells (>= 4.0.1, <= 6.0.0)
-      haml (>= 4.1.0.beta.1)
-    cells-rails (0.1.0)
-      actionpack (>= 5.0)
-      cells (>= 4.1.6, < 5.0.0)
     childprocess (3.0.0)
-    coderay (1.1.2)
+    coderay (1.1.3)
     concurrent-ruby (1.1.8)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
-    declarative-builder (0.1.0)
-      declarative-option (< 0.2.0)
-    declarative-option (0.1.0)
-    diff-lcs (1.3)
-    docile (1.3.2)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
     erubi (1.10.0)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    haml (5.1.2)
-      temple (>= 0.8.0)
-      tilt
-    hashdiff (1.0.0)
+    hashdiff (1.0.1)
     i18n (1.8.8)
       concurrent-ruby (~> 1.0)
     loofah (2.9.0)
@@ -123,7 +102,7 @@ GEM
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
@@ -133,16 +112,16 @@ GEM
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     pg (1.2.3)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.8.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
+      pry (~> 0.13.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (4.0.3)
-    puma (4.3.5)
+    public_suffix (4.0.6)
+    puma (5.2.0)
       nio4r (~> 2.0)
     racc (1.5.2)
     rack (2.2.3)
@@ -177,64 +156,50 @@ GEM
       rake (>= 0.8.7)
       thor (~> 1.0)
     rake (13.0.3)
-    regexp_parser (1.6.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    regexp_parser (2.0.3)
+    rexml (3.2.4)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-retry (0.6.2)
-      rspec-core (> 3.3)
-    rspec-support (3.9.2)
-    rspec-wait (0.0.9)
-      rspec (>= 3, < 4)
+      rspec-support (~> 3.10.0)
+    rspec-rails (4.0.2)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.10.2)
     rubyzip (2.3.0)
-    safe_yaml (1.0.5)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    simplecov (0.18.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      simplecov-html (~> 0.11.0)
-    simplecov-html (0.11.0)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    temple (0.8.2)
     thor (1.1.0)
-    tilt (2.0.10)
-    trailblazer-cells (0.0.3)
-      cells (>= 4.1.0.rc1, < 5.0.0)
-    turbolinks (5.2.1)
-      turbolinks-source (~> 5.2)
-    turbolinks-source (5.2.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    uber (0.1.0)
-    webmock (3.8.1)
+    webmock (3.11.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webpacker (4.2.2)
+    webpacker (4.3.0)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
@@ -251,21 +216,15 @@ PLATFORMS
 DEPENDENCIES
   byebug
   capybara
-  cells-haml
-  cells-rails
   generator_spec
   matestack-ui-core!
   pg (>= 0.18, < 2.0)
   pry-byebug
   pry-rails
   puma
-  rspec-rails (~> 3.8)
-  rspec-retry
-  rspec-wait (~> 0.0.9)
+  rspec-rails (~> 4.0.2)
   selenium-webdriver
   simplecov
-  trailblazer-cells
-  turbolinks
   webmock
   webpacker (~> 4.0)
 

LICENSE

@@ -1,8 +1,20 @@
 Copyright (c) Matestack GmbH
 
-matestack-ui-core is an Open Source project licensed under the terms of
-the LGPLv3 license.  Please see <http://www.gnu.org/licenses/lgpl-3.0.html>
-for license text.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-Matestack will provide a commercial-friendly license allowing private forks
-and modifications of matestack-ui-core.  Please request at [email protected]
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.