almost mostly working, enketo badly broken

thecartercenter · Jul 19, 2024 · ab77bda · ab77bda
1 parent bdb62ef
commit ab77bda
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 155 deletions.
diff --git a/Gemfile b/Gemfile
@@ -42,7 +42,7 @@ gem "react-rails", "~> 2.4"
 gem "select2-rails", "~> 4.0"
 gem "spinjs-rails", "~> 1.3.0" # Breaking changes in v1.4 (spin.js v2.0).
 gem "uglifier", "~> 4.2"
-gem "webpacker", "6.0.0.rc.6"
+gem "shakapacker", "~> 6.0.0"
 
 # Authz and Authn
 gem "authlogic", "~> 6.1"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -588,6 +588,11 @@ GEM
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     sexp_processor (4.17.1)
+    shakapacker (6.0.2)
+      activesupport (>= 5.2)
+      rack-proxy (>= 0.6.1)
+      railties (>= 5.2)
+      semantic_range (>= 2.3.0)
     spinjs-rails (1.3)
       rails (>= 3.1)
     spreadsheet (1.3.1)
@@ -637,11 +642,6 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webpacker (6.0.0.rc.6)
-      activesupport (>= 5.2)
-      rack-proxy (>= 0.6.1)
-      railties (>= 5.2)
-      semantic_range (>= 2.3.0)
     webrick (1.8.1)
     websocket (1.2.10)
     websocket-driver (0.7.6)
@@ -761,6 +761,7 @@ DEPENDENCIES
   selenium-webdriver (~> 4.15.0)
   sentry-rails (~> 5.0)
   sentry-ruby (~> 5.0)
+  shakapacker (~> 6.0.0)
   spinjs-rails (~> 1.3.0)
   spreadsheet
   sprockets
@@ -775,7 +776,6 @@ DEPENDENCIES
   versionist (~> 2.0)
   warning (~> 1.3)
   webmock (~> 3.10)
-  webpacker (= 6.0.0.rc.6)
   whenever (~> 1.0)
   will_paginate (~> 3.1)
   will_paginate-bootstrap4 (~> 0.2.2)

diff --git a/bin/webpack → bin/webpacker b/bin/webpack → bin/webpacker
@@ -5,8 +5,8 @@ require "bundler/setup"
 require "webpacker"
 require "webpacker/webpack_runner"
 
-ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"]  ||= "development"
+ENV["RAILS_ENV"] ||= "development"
+ENV["NODE_ENV"]  ||= ENV["RAILS_ENV"]
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", Pathname.new(__FILE__).realpath)
 
 APP_ROOT = File.expand_path("..", __dir__)

diff --git a/bin/webpack-dev-server → bin/webpacker-dev-server b/bin/webpack-dev-server → bin/webpacker-dev-server
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"]  ||= "development"
+ENV["RAILS_ENV"] ||= "development"
+ENV["NODE_ENV"]  ||= ENV["RAILS_ENV"]
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",

diff --git a/config/webpack/development.js b/config/webpack/development.js
diff --git a/config/webpack/production.js b/config/webpack/production.js
diff --git a/config/webpack/test.js b/config/webpack/test.js
diff --git a/config/webpack/base.js → config/webpack/webpack.config.js b/config/webpack/base.js → config/webpack/webpack.config.js
diff --git a/package.json b/package.json
@@ -51,37 +51,40 @@
     "@babel/preset-env": "^7.24.8",
     "@babel/preset-react": "7.18.6",
     "@babel/runtime": "^7.24.8",
-    "@rails/webpacker": "^6.0.0-rc.6",
     "@sentry/react": "6.16.1",
     "@sentry/tracing": "6.16.1",
-    "babel-loader": "^9.1.3",
-    "compression-webpack-plugin": "^11.1.0",
+    "babel-loader": "^8.2.2",
+    "compression-webpack-plugin": "^9.0.0",
     "core-js": "3.25.1",
     "css-loader": "4.2.2",
     "enketo-core": "^8.0.0",
     "ignore-loader": "0.1.2",
     "jquery": "3.6.0",
     "lodash": "4.17.21",
+    "mini-css-extract-plugin": "^2.9.0",
     "mobx": "5.15.6",
     "mobx-react": "5.4.3",
     "moment": "2.29.4",
     "prop-types": "15.8.0",
     "query-string": "6.13.1",
-    "react": "16.13.0",
+    "react": "16.x.x",
     "react-bootstrap": "1.3.0",
     "react-dates": "21.8.0",
     "react-select2-wrapper": "sassafrastech/react-select2-wrapper#2019-03-08-select2Full",
+    "react-with-direction": "^1.3.1",
     "react_ujs": "2.6.1",
     "regenerator-runtime": "0.13.9",
+    "shakapacker": "~6.0.0",
     "style-loader": "1.2.1",
     "terser-webpack-plugin": "^5.3.10",
-    "webpack": "^5.53.0"
+    "webpack": "^5.53.0",
+    "webpack-assets-manifest": "^5.0.6",
+    "webpack-merge": "^5.8.0"
   },
   "devDependencies": {
     "@babel/eslint-parser": "7.18.9",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.7",
     "@sentry/cli": "1.71.0",
-    "@webpack-cli/serve": "^2.0.5",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "27.4.5",
     "caniuse-lite": "1.0.30001582",
@@ -97,7 +100,6 @@
     "eslint-plugin-react-hooks": "^4.3.0",
     "i18n-js": "3.8.0",
     "jest": "27.4.5",
-    "mini-css-extract-plugin": "^2.9.0",
     "react-dom": "16.13.0",
     "react-refresh": "0.14.0",
     "stylelint": "15.10.1",