set up jsbundling-rails

Floppy · Floppy · commit 5307b1e0a3a5 · 2022-08-02T15:00:36.000+01:00
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+app/assets/builds
diff --git a/.gitignore b/.gitignore
@@ -45,3 +45,6 @@ yarn-debug.log*
 
 /config/credentials/test.key
 docker-compose.yml
+
+/app/assets/builds/*
+!/app/assets/builds/.keep
diff --git a/Gemfile b/Gemfile
@@ -9,6 +9,8 @@ gem "rails", "~> 7.0.3"
 gem "puma", "~> 5.6"
 # Use SCSS for stylesheets
 gem "sass-rails", ">= 6"
+# Bundle and transpile JavaScript [https://github.com/rails/jsbundling-rails]
+gem "jsbundling-rails"
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem "jbuilder", "~> 2.11"
 # Use Redis adapter to run Action Cable in production
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -161,6 +161,8 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    jsbundling-rails (1.0.3)
+      railties (>= 6.0.0)
     json (2.6.2)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -387,6 +389,7 @@ DEPENDENCIES
   guard-rspec (~> 4.7)
   hiredis
   jbuilder (~> 2.11)
+  jsbundling-rails
   kaminari (~> 1.2)
   listen (~> 3.7)
   lograge (~> 0.12.0)
diff --git a/Procfile.dev b/Procfile.dev
@@ -0,0 +1,3 @@
+rails: bin/rails server -p $PORT
+worker: bin/rake jobs:work
+js: yarn build --watch
diff --git a/app/assets/builds/.keep b/app/assets/builds/.keep
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,3 +1,4 @@
 //= link_tree ../images
 //= link_directory ../stylesheets .css
 //= link_directory ../../../node_modules/bootstrap-icons/icons .svg
+//= link_tree ../builds
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -13,4 +13,7 @@
  *= require_tree .
  *= stub "active_admin"
  *= require_self
+ *= require 'bootstrap/dist/css/bootstrap'
+ *= require 'bootstrap-icons/font/bootstrap-icons.css'
+ *= require '@selectize/selectize/dist/css/selectize.bootstrap5.css'
  */
diff --git a/app/javascript/application.js b/app/javascript/application.js
@@ -0,0 +1,13 @@
+// Entry point for the build script in your package.json
+
+import Rails from '@rails/ujs'
+import 'bootstrap'
+
+import 'src/preview'
+import 'src/bulk_edit'
+import 'src/model_edit'
+
+import '@nathanvda/cocoon'
+import '@selectize/selectize/dist/js/standalone/selectize.min.js'
+
+Rails.start()
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -6,9 +6,8 @@
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 
-    <%= javascript_pack_tag 'application' %>
-    <%= stylesheet_pack_tag 'application', media: 'all' %>
     <%= stylesheet_link_tag 'application', media: 'all' %>
+    <%= javascript_include_tag "application", defer: true %>
 </head>
 
   <body>
diff --git a/bin/dev b/bin/dev
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if ! foreman version &> /dev/null
+then
+  echo "Installing foreman..."
+  gem install foreman
+fi
+
+foreman start -f Procfile.dev "$@"
diff --git a/package.json b/package.json
@@ -2,7 +2,8 @@
   "name": "van-dam",
   "private": true,
   "scripts": {
-    "lint:ts": "ts-standard --fix"
+    "lint:ts": "ts-standard --fix",
+    "build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds --public-path=assets"
   },
   "dependencies": {
     "@babel/preset-typescript": "^7.18.6",
@@ -13,8 +14,10 @@
     "@selectize/selectize": "^0.13.6",
     "bootstrap": "^5.2.0",
     "bootstrap-icons": "^1.9.1",
+    "esbuild": "^0.14.51",
     "jquery": "^3.6.0",
     "popper.js": "^1.16.1",
+    "sifter": "^0.5.4",
     "three": "^0.143.0",
     "typescript": "^4.7.4"
   },
diff --git a/tsconfig.json b/tsconfig.json
@@ -12,7 +12,7 @@
     },
     "sourceMap": true,
     "strictNullChecks": true,
-    "target": "es5",
+    "target": "es6",
     "noEmit": true,
     "types": [
       "./app/javascript/src/globals",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+rails: bin/rails server -p $PORT`
	`2`	`+worker: bin/rake jobs:work`
	`3`	`+js: yarn build --watch`