Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to shakapacker #2236

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 0 additions & 10 deletions .babelrc.bak

This file was deleted.

4 changes: 2 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"prefer-destructuring": ["error", {"object": true, "array": false}],
"no-relative-import-paths/no-relative-import-paths": [
"error",
{ "allowSameFolder": false, "rootDir": "app/packs" }
{ "allowSameFolder": false, "rootDir": "app/javascript" }
],
"max-len": [
"error",
Expand All @@ -32,7 +32,7 @@
"settings": {
"import/resolver": {
"node": {
"paths": ["app/packs"]
"paths": ["app/javascript"]
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}

# - name: precompile
# run: RAILS_ENV=test bundle exec rake webpacker:compile
# run: RAILS_ENV=test bundle exec rake shakapacker:compile

# - name: rspec acceptance
# continue-on-error: true # don't fail job because this step; TODO: fix flaky acceptance tests...
Expand Down
10 changes: 3 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
.env

/config/matrices.json
/config/klasses.json
/config/mailcollector.yml
/config/datamailcollector.yml
/config/datacollector.yml
Expand Down Expand Up @@ -94,6 +93,7 @@
!/public/editors/.keep
/public/favicon.ico

# written by Labimotion gem
/public/klasses.json

/public/ontologies/*
Expand Down Expand Up @@ -161,9 +161,6 @@

#config generated files
aliasifyConfig.js
/app/assets/javascripts/components/extra/*
/app/packs/src/components/extra/*
/app/packs/klasses.json

# Backups folder
backup/deploy_backup
Expand Down Expand Up @@ -213,12 +210,11 @@ public/sprite.png

!spec/fixtures/import/sample_import_template.xlsx

# generic elements
data/klasses.json

# pdf worker
public/pdf.worker.min.js

# Sentry Config File
.env.sentry-build-plugin

# Changes from Shakapacker Installation
.yarn-integrity
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
{
"label": "mocha - unit tests current file",
"type": "shell",
"command": "NODE_PATH=./spec/javascripts:./app/packs yarn mocha --watch --exit --require '@babel/register' './spec/javascripts/helper/setup.js' '${file}'"
"command": "NODE_PATH=./spec/javascripts:./app/javascript yarn mocha --watch --exit --require '@babel/register' './spec/javascripts/helper/setup.js' '${file}'"
}
]
}
6 changes: 1 addition & 5 deletions Dockerfile.chemotion-dev
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN apt update && apt-get install -yqq --fix-missing bash ca-certificates wget a
fonts-dejavu fonts-dejavu-core fonts-dejavu-extra fonts-liberation2 fonts-liberation \
fonts-linuxlibertine fonts-noto-core fonts-noto-extra fonts-noto-ui-core \
fonts-opensymbol fonts-sil-gentium fonts-sil-gentium-basic inkscape \
libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libxtst6 xauth xvfb
libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libxtst6 xauth xvfb nano
RUN apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN useradd -ms /bin/bash chemotion-dev \
Expand All @@ -39,7 +39,3 @@ SHELL ["/bin/bash", "-c"]
# Even if asdf and the related tools are only installed by running run-ruby-dev.sh, we set the PATH variables here, so when we enter the container via docker exec, we have the path set correctly
ENV ASDF_DIR=/home/chemotion-dev/.asdf
ENV PATH=/home/chemotion-dev/.asdf/shims:/home/chemotion-dev/.asdf/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

RUN echo 'network-timeout 600000' > /home/chemotion-dev/.yarnrc
# use node modules from outside the application directory
RUN echo '--modules-folder /home/chemotion-dev/node_modules/' >> /home/chemotion-dev/.yarnrc
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ gem 'ruby-ole'
gem 'sablon', git: 'https://github.com/ComPlat/sablon'
gem 'sassc-rails'
gem 'scenic'
gem 'shakapacker', '8.0.2'
gem 'schmooze'
gem 'semacode', git: 'https://github.com/toretore/semacode.git', branch: 'master' # required for Barby but not listed...

Expand All @@ -119,7 +120,6 @@ gem 'thumbnailer', git: 'https://github.com/merlin-p/thumbnailer.git'
gem 'turbo-sprockets-rails4'
gem 'tzinfo-data'

gem 'webpacker', git: 'https://github.com/rails/webpacker', branch: 'master'
gem 'whenever', require: false

gem 'yaml_db'
Expand Down
24 changes: 10 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,6 @@ GIT
specs:
rdkit_chem (2020.04.30.1)

GIT
remote: https://github.com/rails/webpacker
revision: a715e055d937748c7cfd34b0450295348ca13ee6
branch: master
specs:
webpacker (6.0.0.rc.6)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)

GIT
remote: https://github.com/toretore/semacode.git
revision: 4e31e0b79a1a63c98f2560359c1c6a527b00bacc
Expand Down Expand Up @@ -534,6 +523,7 @@ GEM
validate_url
webfinger (~> 2.0)
orm_adapter (0.5.0)
package_json (0.1.0)
pandoc-ruby (2.1.10)
paperclip (5.2.1)
activemodel (>= 4.2.0)
Expand Down Expand Up @@ -730,7 +720,7 @@ GEM
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
semantic_range (3.0.0)
semantic_range (3.1.0)
sentry-delayed_job (5.19.0)
delayed_job (>= 4.0)
sentry-ruby (~> 5.19.0)
Expand All @@ -740,6 +730,12 @@ GEM
sentry-ruby (5.19.0)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
shakapacker (8.0.2)
activesupport (>= 5.2)
package_json
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
shoulda-matchers (5.3.0)
activesupport (>= 5.2.0)
shrine (3.6.0)
Expand Down Expand Up @@ -845,7 +841,7 @@ GEM
rails (>= 3.0)
rake (>= 0.8.7)
yard (0.9.36)
zeitwerk (2.7.0)
zeitwerk (2.6.18)

PLATFORMS
x86_64-linux
Expand Down Expand Up @@ -970,6 +966,7 @@ DEPENDENCIES
sentry-delayed_job
sentry-rails
sentry-ruby
shakapacker (= 8.0.2)
shoulda-matchers
shrine (~> 3.0)
simplecov
Expand All @@ -985,7 +982,6 @@ DEPENDENCIES
web-console
webdrivers
webmock
webpacker!
whenever
yaml_db

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading
Loading