Skip to content

Commit

Permalink
DAH-1360: Upgrade Partners to React 18 (#584)
Browse files Browse the repository at this point in the history
* fix: app works, working through tests

* More tests

* Atom tests

* next wave of tests

* more tests

* add mini-css-extract

* Fix rspec tests

* Add more time to failing test

* fix dep

* fix dep

* fix webpack

* postcss-preset-env

* clean up testing

* Fix test snapshot

* cleanup

* JL PR Feedback

* e2e issues
  • Loading branch information
chadbrokaw committed Dec 20, 2023
1 parent 55d6948 commit 42444d6
Show file tree
Hide file tree
Showing 178 changed files with 24,916 additions and 65,370 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Expand Up @@ -106,7 +106,7 @@ module.exports = {
settings: {
react: {
// Must be updated when package.json react version is bumped
version: '16.9.0'
version: '18.2.0'
},
'import/resolver': {
node: {
Expand Down
31 changes: 14 additions & 17 deletions .vscode/settings.json
@@ -1,18 +1,15 @@
{
"javascript.validate.enable": true,
"jest.disabledWorkspaceFolders": [
"spec/javascript/e2e"
],
"editor.codeActionsOnSave": {
// For ESLint
"source.fixAll.eslint": true,
},
"eslint.format.enable": true,
"eslint.lintTask.enable": true,
"eslint.packageManager": "yarn",
"jest.runAllTestsFirst": false,
"jest.rootPath": "./",
"autoimport.sourceRoot": "./app/javascript",
"autoimport.semicolon": false,
"autoimport.absolute": true,
}
"javascript.validate.enable": true,
"jest.disabledWorkspaceFolders": ["spec/javascript/e2e"],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"eslint.format.enable": true,
"eslint.lintTask.enable": true,
"eslint.packageManager": "yarn",
"jest.runAllTestsFirst": false,
"jest.rootPath": "./",
"autoimport.sourceRoot": "./app/javascript",
"autoimport.semicolon": false,
"autoimport.absolute": true
}
12 changes: 2 additions & 10 deletions Gemfile
Expand Up @@ -82,31 +82,23 @@ gem "sentry-raven"
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
# gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

# Added at 2017-10-22 23:46:25 -0700 by dkaplan:
gem "devise", "~> 4.9.0"

# Added at 2017-10-22 23:48:56 -0700 by dkaplan:
gem "omniauth-salesforce", "~> 1.0.5"
gem "omniauth-rails_csrf_protection"

# Added at 2017-10-24 00:03:53 -0700 by dkaplan:
gem "restforce", "~> 6.2.2"
# handy ruby extensions
gem 'facets', require: false

# Added at 2017-10-24 08:23:22 -0700 by dkaplan:
gem "slim-rails", "~> 3.1"

# Added at 2017-10-25 00:30:33 -0700 by dkaplan:
gem "hashie"

# Added at 2017-10-29 23:29:10 -0700 by dkaplan:
gem "webpacker", "~> 5.4.4"
gem "shakapacker", "7.1.0"

# Added at 2017-10-29 23:57:32 -0700 by dkaplan:
gem "webpacker-react", "~> 0.3.2"
gem "react_on_rails", "13.4.0"

# Added at 2017-11-10 09:14:41 -0800 by dkaplan:
gem "pg", "~> 1.4.6"

gem 'scout_apm'
Expand Down
25 changes: 15 additions & 10 deletions Gemfile.lock
Expand Up @@ -95,6 +95,7 @@ GEM
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
crack (0.4.5)
rexml
crass (1.0.6)
Expand Down Expand Up @@ -216,7 +217,7 @@ GEM
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.6.4)
rack-proxy (0.7.6)
rack-proxy (0.7.7)
rack
rack-test (2.1.0)
rack (>= 1.3)
Expand Down Expand Up @@ -269,6 +270,12 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
react_on_rails (13.4.0)
addressable
connection_pool
execjs (~> 2.5)
rails (>= 5.2)
rainbow (~> 3.0)
regexp_parser (2.7.0)
require_all (3.0.0)
responders (3.1.0)
Expand Down Expand Up @@ -336,6 +343,11 @@ GEM
sentry-raven (3.1.2)
faraday (>= 1.0)
sexp_processor (4.16.1)
shakapacker (7.1.0)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
simplecov (0.17.1)
docile (~> 1.1)
json (>= 1.8, < 3)
Expand Down Expand Up @@ -386,13 +398,6 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webpacker (5.4.4)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
webpacker-react (0.3.2)
webpacker
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand Down Expand Up @@ -434,6 +439,7 @@ DEPENDENCIES
rails_12factor
rails_best_practices
rails_layout
react_on_rails (= 13.4.0)
restforce (~> 6.2.2)
rspec-rails (~> 4.0.2)
rubocop
Expand All @@ -442,6 +448,7 @@ DEPENDENCIES
scout_apm
selenium-webdriver (~> 3.142.7)
sentry-raven
shakapacker (= 7.1.0)
simplecov (~> 0.10, < 0.18)
slim-rails (~> 3.1)
spring
Expand All @@ -451,8 +458,6 @@ DEPENDENCIES
vcr
web-console (>= 3.3.0)
webmock
webpacker (~> 5.4.4)
webpacker-react (~> 0.3.2)

RUBY VERSION
ruby 3.1.3p185
Expand Down
2 changes: 1 addition & 1 deletion Procfile.development
@@ -1,2 +1,2 @@
# rails: bin/rails server -p 3000
webpack: bin/webpack-dev-server --hot
webpack: bin/shakapacker-dev-server --hot

0 comments on commit 42444d6

Please sign in to comment.