Skip to content

Use Rails default directory for JS #570

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Use Rails default directory for JS #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,9 @@ jobs:
- name: Setup Database
run: bundle exec rake parallel:load_schema
- name: Run yarn commands
run: |
yarn install
run: yarn install
- name: Precompile assets
run: bundle exec rails assets:precompile
- name: Check for untracked changes in schema.rb
uses: rootstrap/check_untracked_changes@v1
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/log
/node_modules
/public/system
/public/assets
/spec/tmp
/storage
/tmp
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/active_admin.js → app/javascript/active_admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './jquery'
import './admin/jquery'
import 'jquery-ui/ui/widget'
import 'jquery-ui/ui/widgets/datepicker'
import 'jquery-ui/ui/widgets/mouse'
Expand Down
0 app/assets/javascripts/jquery.js → app/javascript/admin/jquery.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion esbuild.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as esbuild from 'esbuild'

const config = {
entryPoints: ['app/assets/javascripts/*'],
entryPoints: ['app/javascript/*.js'],
bundle: true,
sourcemap: process.env.RAILS_ENV !== 'production',
minify: process.env.RAILS_ENV === 'production',
Expand Down