Merge branch 'v3_release__vue3_rails7_gem_split' into main

Author: jonasjabari

.github/workflows/dockerpush.yml

@@ -3,6 +3,19 @@ name: specs
 on: [push]
 
 jobs:
+  test_7_0_ruby_3_0:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run tests
+        run: |
+          docker-compose -f ./ci/docker-compose.ci.yml run --rm test_7_0_ruby_3_0
+      - name: Upload lock files
+        uses: actions/upload-artifact@v2
+        with:
+          name: lockfiles_test_7_0_ruby_3_0
+          path: |
+            ./ci/artifacts/Gemfile.lock
   test_6_1_ruby_3_0:
     runs-on: ubuntu-latest
     steps:
@@ -15,7 +28,6 @@ jobs:
         with:
           name: lockfiles_test_6_1_ruby_3_0
           path: |
-            ./ci/artifacts/yarn.lock
             ./ci/artifacts/Gemfile.lock
   test_6_1_ruby_2_7:
     runs-on: ubuntu-latest
@@ -29,7 +41,6 @@ jobs:
         with:
           name: lockfiles_test_6_1_ruby_2_7
           path: |
-            ./ci/artifacts/yarn.lock
             ./ci/artifacts/Gemfile.lock
   test_6_0_ruby_2_6:
     runs-on: ubuntu-latest
@@ -43,7 +54,6 @@ jobs:
         with:
           name: lockfiles_test_6_0_ruby_2_6
           path: |
-            ./ci/artifacts/yarn.lock
             ./ci/artifacts/Gemfile.lock
   test_5_2_ruby_2_6:
     runs-on: ubuntu-latest
@@ -57,5 +67,4 @@ jobs:
         with:
           name: lockfiles_test_5_2_ruby_2_6
           path: |
-            ./ci/artifacts/yarn.lock
             ./ci/artifacts/Gemfile.lock

.gitignore

@@ -1,6 +1,7 @@
 .bundle/
 log/*.log
 node_modules/
+coverage/
 spec/dummy/db/*.sqlite3
 spec/dummy/db/*.sqlite3-journal
 spec/dummy/log/*.log

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.0.0.rc1 Release - 2022-02-11
+
+- Please read the [migration guide](docs/migrate-from-2.x-to-3.0.md)
+
 ## v2.1.1 Release - 2021-06-30
 
 ### Bugfixes

Dockerfile.dev

@@ -12,6 +12,3 @@ COPY ./lib/ /app/lib/
 COPY matestack-ui-core.gemspec /app/
 COPY Gemfile* /app/
 RUN bundle install
-
-COPY package.json yarn* /app/
-RUN yarn install

Dockerfile.test

@@ -13,9 +13,6 @@ COPY matestack-ui-core.gemspec /app/
 COPY Gemfile* /app/
 RUN bundle install
 
-COPY package.json yarn* /app/
-RUN yarn install
-
 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 \

Gemfile

@@ -11,10 +11,12 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
+gem 'rails', '7.0.1'
+
 group :development, :test do
   gem 'rspec-rails', '~> 4.0.2'
   gem 'capybara'
-  gem 'webpacker', '~> 4.0'
+  gem 'webpacker', '~> 5.0'
   gem 'pg', '>= 0.18', '< 2.0'
   gem 'selenium-webdriver'
   gem 'puma'