Skip to content

Commit

Permalink
Update NPM libraries (houndci#1742)
Browse files Browse the repository at this point in the history
We've fallen behind on some of the major releases.
This was triggered because Webpacker was failing and local server was
crashing.
  • Loading branch information
gylaz authored Sep 14, 2019
1 parent 5e5d91c commit a10017f
Show file tree
Hide file tree
Showing 24 changed files with 6,064 additions and 5,495 deletions.
31 changes: 0 additions & 31 deletions .babelrc

This file was deleted.

1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
9 changes: 9 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"rules": {},
"env": {
"es6": true,
"node": true,
"browser": true
},
"extends": "eslint:recommended"
}
2 changes: 2 additions & 0 deletions .hound.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ scss:
config_file: .scss-lint.yml

eslint:
enabled: true
version: 5.7.0
config_file: .eslintrc
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ gem "sinatra", "~> 2.0"
gem "split", require: "split/dashboard"
gem "stripe"
gem "uglifier", ">= 2.7.2"
gem "webpacker", "~> 3.0"
gem "webpacker-react", "~> 0.3.1"
gem "webpacker"
gem "webpacker-react", "~> 1.0.0.beta.1"

group :staging, :production do
gem "rack-timeout"
Expand All @@ -50,7 +50,7 @@ group :development, :test do
end

group :test do
gem "capybara", ">= 2.4.0"
gem "capybara"
gem "factory_girl_rails"
gem "launchy"
gem "selenium-webdriver"
Expand Down
58 changes: 30 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,16 @@ GEM
byebug (3.2.0)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
capybara (2.13.0)
capybara (3.29.0)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
childprocess (2.0.0)
rake (< 13.0)
columnize (0.8.9)
commander (4.4.3)
highline (~> 1.7.2)
Expand Down Expand Up @@ -109,7 +110,7 @@ GEM
railties (>= 3.0.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.25)
ffi (1.11.1)
foreman (0.78.0)
thor (~> 0.19.1)
globalid (0.4.2)
Expand Down Expand Up @@ -163,10 +164,10 @@ GEM
mail (2.7.1)
mini_mime (>= 0.1.1)
method_source (0.9.2)
mime-types (3.2.2)
mime-types (3.3)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mini_mime (1.0.1)
mime-types-data (3.2019.0904)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
momentjs-rails (2.17.1)
Expand All @@ -180,7 +181,7 @@ GEM
thor (~> 0.19)
netrc (0.11.0)
nio4r (2.3.1)
nokogiri (1.10.3)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
Expand All @@ -203,12 +204,12 @@ GEM
activerecord (>= 4.0, < 5.2)
pathspec (0.1.0)
pg (0.19.0)
public_suffix (3.0.3)
public_suffix (3.1.1)
puma (3.9.1)
rack (2.0.7)
rack-protection (2.0.3)
rack
rack-proxy (0.6.4)
rack-proxy (0.6.5)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
Expand All @@ -229,7 +230,7 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
rails_12factor (0.0.3)
rails_serve_static_assets
Expand All @@ -242,13 +243,14 @@ GEM
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.2)
rake (12.3.3)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
record_tag_helper (1.0.0)
actionview (~> 5.x)
redis (3.3.3)
regexp_parser (1.6.0)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
Expand All @@ -272,7 +274,7 @@ GEM
rspec-support (3.5.0)
ruby_parser (3.10.1)
sexp_processor (~> 4.9)
rubyzip (1.2.2)
rubyzip (1.2.4)
safe_yaml (1.0.5)
sass (3.5.5)
sass-listen (~> 4.0.0)
Expand All @@ -289,9 +291,9 @@ GEM
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
selectize-rails (0.12.4)
selenium-webdriver (3.12.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
selenium-webdriver (3.142.4)
childprocess (>= 0.5, < 3.0)
rubyzip (~> 1.2, >= 1.2.2)
sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0)
sexp_processor (4.10.0)
Expand Down Expand Up @@ -337,17 +339,17 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
webpacker (3.5.3)
webpacker (4.0.7)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
webpacker-react (0.3.1)
webpacker-react (1.0.0.beta.1)
webpacker
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (2.1.0)
nokogiri (~> 1.3)
xpath (3.2.0)
nokogiri (~> 1.8)

PLATFORMS
ruby
Expand All @@ -361,7 +363,7 @@ DEPENDENCIES
bourbon (~> 5.0)
bundler-audit
byebug
capybara (>= 2.4.0)
capybara
dotenv-rails
email_validator
factory_girl_rails
Expand Down Expand Up @@ -397,8 +399,8 @@ DEPENDENCIES
stripe
uglifier (>= 2.7.2)
webmock
webpacker (~> 3.0)
webpacker-react (~> 0.3.1)
webpacker
webpacker-react (~> 1.0.0.beta.1)

RUBY VERSION
ruby 2.6.2p47
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`renders appropriately 1`] = `
<a
className="repo-toggle tier-change-accept"
href="javascript:void(0);"
href=""
onClick={[Function]}
>
Upgrade
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default class UpgradeSubscriptionLink extends React.Component {
this.state = { disabled: false };
}

componentWillMount() {
componentDidMount() {
$.ajaxSetup({
headers: {
"X-XSRF-Token": getCSRFfromHead()
Expand Down Expand Up @@ -72,7 +72,9 @@ export default class UpgradeSubscriptionLink extends React.Component {
}
}

handleClick() {
handleClick = (e) => {
e.preventDefault();

if (this.props.marketplaceUpgradeUrl) {
// improve this flow so we end up back at houndci.com
window.open(this.props.marketplaceUpgradeUrl, '_blank');
Expand All @@ -94,13 +96,13 @@ export default class UpgradeSubscriptionLink extends React.Component {
render() {
return(
<a
href=""
className={
this.state.disabled ?
"repo-toggle tier-change-accept disabled" :
"repo-toggle tier-change-accept"
}
href="javascript:void(0);"
onClick={() => this.handleClick()}
onClick={this.handleClick}
>Upgrade</a>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default class App extends React.Component {
};
}

componentWillMount() {
componentDidMount() {
$.ajaxSetup({
headers: {
"X-XSRF-Token": getCSRFfromHead()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import $ from 'jquery';
import { getCSRFfromHead } from '../../../modules/Utils';

export default class UpdateAccountCreditCard extends React.Component {
componentWillMount() {
componentDidMount() {
$.ajaxSetup({
headers: {
"X-XSRF-Token": getCSRFfromHead()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class UpdateAccountEmail extends React.Component {
};
}

componentWillMount() {
componentDidMount() {
$.ajaxSetup({
headers: {
"X-XSRF-Token": getCSRFfromHead()
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/packs/notify_tier_change.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import NotifyTierChange from 'components/NotifyTierChange';
import WebpackerReact from 'webpacker-react';
import NotifyTierChange from '../components/NotifyTierChange';

WebpackerReact.setup({NotifyTierChange});
2 changes: 1 addition & 1 deletion app/javascript/packs/repos_container.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ReposContainer from 'components/ReposContainer';
import WebpackerReact from 'webpacker-react';
import ReposContainer from '../components/ReposContainer';

WebpackerReact.setup({ReposContainer});
2 changes: 1 addition & 1 deletion app/javascript/packs/update_account_credit_card.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import UpdateAccountCreditCard from 'components/UpdateAccountCreditCard';
import WebpackerReact from 'webpacker-react';
import UpdateAccountCreditCard from '../components/UpdateAccountCreditCard';

WebpackerReact.setup({UpdateAccountCreditCard});
2 changes: 1 addition & 1 deletion app/javascript/packs/update_account_email.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import UpdateAccountEmail from 'components/UpdateAccountEmail';
import WebpackerReact from 'webpacker-react';
import UpdateAccountEmail from '../components/UpdateAccountEmail';

WebpackerReact.setup({UpdateAccountEmail});
Loading

0 comments on commit a10017f

Please sign in to comment.