Skip to content
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

Jump to bottom

Update dependencies #2360

Merged
merged 3 commits into from Nov 12, 2019
Merged

Update dependencies #2360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb573e2
Upgrade gem deps
gauravtiwari Nov 11, 2019
681bd4d
Upgrade npm packages
gauravtiwari Nov 11, 2019
b6af62e
Don't splat
gauravtiwari Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .rubocop.yml
View file
Open in desktop
@@ -1,3 +1,4 @@
require: rubocop-performance
AllCops:
TargetRubyVersion: 2.2
# RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
Expand Down Expand Up @@ -71,7 +72,7 @@ Layout/SpaceAroundOperators:
Enabled: true

Layout/SpaceBeforeFirstArg:
Enabled: true
Enabled: true

# Defining a method with parameters needs parentheses.
Style/MethodDefParentheses:
Expand Down
131 changes: 75 additions & 56 deletions Gemfile.lock
View file
Open in desktop
Expand Up @@ -9,59 +9,72 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.3)
actionpack (= 5.2.3)
actioncable (6.0.1)
actionpack (= 6.0.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
actionmailbox (6.0.1)
actionpack (= 6.0.1)
activejob (= 6.0.1)
activerecord (= 6.0.1)
activestorage (= 6.0.1)
activesupport (= 6.0.1)
mail (>= 2.7.1)
actionmailer (6.0.1)
actionpack (= 6.0.1)
actionview (= 6.0.1)
activejob (= 6.0.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.3)
actionview (= 5.2.3)
activesupport (= 5.2.3)
actionpack (6.0.1)
actionview (= 6.0.1)
activesupport (= 6.0.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.3)
activesupport (= 5.2.3)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.1)
actionpack (= 6.0.1)
activerecord (= 6.0.1)
activestorage (= 6.0.1)
activesupport (= 6.0.1)
nokogiri (>= 1.8.5)
actionview (6.0.1)
activesupport (= 6.0.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.3)
activesupport (= 5.2.3)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.1)
activesupport (= 6.0.1)
globalid (>= 0.3.6)
activemodel (5.2.3)
activesupport (= 5.2.3)
activerecord (5.2.3)
activemodel (= 5.2.3)
activesupport (= 5.2.3)
arel (>= 9.0)
activestorage (5.2.3)
actionpack (= 5.2.3)
activerecord (= 5.2.3)
activemodel (6.0.1)
activesupport (= 6.0.1)
activerecord (6.0.1)
activemodel (= 6.0.1)
activesupport (= 6.0.1)
activestorage (6.0.1)
actionpack (= 6.0.1)
activejob (= 6.0.1)
activerecord (= 6.0.1)
marcel (~> 0.3.1)
activesupport (5.2.3)
activesupport (6.0.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (9.0.0)
zeitwerk (~> 2.2)
ast (2.4.0)
builder (3.2.3)
byebug (11.0.1)
concurrent-ruby (1.1.5)
crass (1.0.5)
erubi (1.8.0)
erubi (1.9.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.6.0)
i18n (1.7.0)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.2)
jaro_winkler (1.5.4)
loofah (2.3.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
Expand All @@ -71,55 +84,59 @@ GEM
mimemagic (~> 0.3.2)
method_source (0.9.2)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
nio4r (2.3.1)
nokogiri (1.9.1)
minitest (5.13.0)
nio4r (2.5.2)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
parallel (1.17.0)
parser (2.6.3.0)
parallel (1.18.0)
parser (2.6.5.0)
ast (~> 2.4.0)
rack (2.0.7)
rack-proxy (0.6.5)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.3)
actioncable (= 5.2.3)
actionmailer (= 5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
activemodel (= 5.2.3)
activerecord (= 5.2.3)
activestorage (= 5.2.3)
activesupport (= 5.2.3)
rails (6.0.1)
actioncable (= 6.0.1)
actionmailbox (= 6.0.1)
actionmailer (= 6.0.1)
actionpack (= 6.0.1)
actiontext (= 6.0.1)
actionview (= 6.0.1)
activejob (= 6.0.1)
activemodel (= 6.0.1)
activerecord (= 6.0.1)
activestorage (= 6.0.1)
activesupport (= 6.0.1)
bundler (>= 1.3.0)
railties (= 5.2.3)
railties (= 6.0.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.0.1)
actionpack (= 6.0.1)
activesupport (= 6.0.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
thor (>= 0.20.3, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
rake (13.0.0)
rubocop (0.68.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.6)
rubocop-performance (1.3.0)
rubocop (>= 0.68.0)
ruby-progressbar (1.10.1)
sprockets (3.7.2)
sprockets (4.0.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
Expand All @@ -131,9 +148,10 @@ GEM
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.5.0)
websocket-driver (0.7.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
websocket-extensions (0.1.4)
zeitwerk (2.2.1)

PLATFORMS
ruby
Expand All @@ -146,6 +164,7 @@ DEPENDENCIES
rails
rake (>= 11.1)
rubocop (< 0.69)
rubocop-performance
webpacker!

BUNDLED WITH
Expand Down
8 changes: 4 additions & 4 deletions lib/webpacker/helper.rb
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ def current_webpacker_instance
# <%= asset_pack_path 'calendar.css' %> # => "/packs/calendar-1016838bab065ae1e122.css"
def asset_pack_path(name, **options)
if current_webpacker_instance.config.extract_css? || !stylesheet?(name)
asset_path(current_webpacker_instance.manifest.lookup!(name), **options)
asset_path(current_webpacker_instance.manifest.lookup!(name), options)
end
end

Expand All @@ -36,7 +36,7 @@ def asset_pack_path(name, **options)
# <%= asset_pack_url 'calendar.css' %> # => "http://example.com/packs/calendar-1016838bab065ae1e122.css"
def asset_pack_url(name, **options)
if current_webpacker_instance.config.extract_css? || !stylesheet?(name)
asset_url(current_webpacker_instance.manifest.lookup!(name), **options)
asset_url(current_webpacker_instance.manifest.lookup!(name), options)
end
end

Expand All @@ -47,7 +47,7 @@ def asset_pack_url(name, **options)
# <%= image_pack_tag 'application.png', size: '16x10', alt: 'Edit Entry' %>
# <img alt='Edit Entry' src='/packs/application-k344a6d59eef8632c9d1.png' width='16' height='10' />
def image_pack_tag(name, **options)
image_tag(resolve_path_to_image(name), **options)
image_tag(resolve_path_to_image(name), options)
end

# Creates a link tag for a favicon that references the named pack file.
Expand All @@ -57,7 +57,7 @@ def image_pack_tag(name, **options)
# <%= favicon_pack_tag 'mb-icon.png', rel: 'apple-touch-icon', type: 'image/png' %>
# <link href="/packs/mb-icon-k344a6d59eef8632c9d1.png" rel="apple-touch-icon" type="image/png" />
def favicon_pack_tag(name, **options)
favicon_link_tag(resolve_path_to_image(name), **options)
favicon_link_tag(resolve_path_to_image(name), options)
end

# Creates a script tag that references the named pack file, as compiled by webpack per the entries list
Expand Down
60 changes: 30 additions & 30 deletions package.json
View file
Open in desktop
Expand Up @@ -12,52 +12,52 @@
"yarn": ">=1.0.0"
},
"dependencies": {
"@babel/core": "^7.4.5",
"@babel/plugin-proposal-class-properties": "^7.4.4",
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
"@babel/core": "^7.7.2",
"@babel/plugin-proposal-class-properties": "^7.7.0",
"@babel/plugin-proposal-object-rest-spread": "^7.6.2",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-transform-destructuring": "^7.4.4",
"@babel/plugin-transform-regenerator": "^7.4.5",
"@babel/plugin-transform-runtime": "^7.4.4",
"@babel/preset-env": "^7.4.5",
"@babel/runtime": "^7.4.5",
"@babel/plugin-transform-destructuring": "^7.6.0",
"@babel/plugin-transform-regenerator": "^7.7.0",
"@babel/plugin-transform-runtime": "^7.6.2",
"@babel/preset-env": "^7.7.1",
"@babel/runtime": "^7.7.2",
"babel-loader": "^8.0.6",
"babel-plugin-dynamic-import-node": "^2.2.0",
"babel-plugin-dynamic-import-node": "^2.3.0",
"babel-plugin-macros": "^2.6.1",
"case-sensitive-paths-webpack-plugin": "^2.2.0",
"compression-webpack-plugin": "^3.0.0",
"core-js": "^3.1.3",
"css-loader": "^3.0.0",
"file-loader": "^4.0.0",
"flatted": "^2.0.0",
"glob": "^7.1.4",
"core-js": "^3.4.0",
"css-loader": "^3.2.0",
"file-loader": "^4.2.0",
"flatted": "^2.0.1",
"glob": "^7.1.6",
"js-yaml": "^3.13.1",
"mini-css-extract-plugin": "^0.7.0",
"node-sass": "^4.12.0",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"mini-css-extract-plugin": "^0.8.0",
"node-sass": "^4.13.0",
"optimize-css-assets-webpack-plugin": "^5.0.3",
"path-complete-extname": "^1.0.0",
"pnp-webpack-plugin": "^1.5.0",
"postcss-flexbugs-fixes": "^4.1.0",
"postcss-import": "^12.0.1",
"postcss-loader": "^3.0.0",
"postcss-preset-env": "^6.6.0",
"postcss-preset-env": "^6.7.0",
"postcss-safe-parser": "^4.0.1",
"regenerator-runtime": "^0.13.2",
"sass-loader": "^7.1.0",
"regenerator-runtime": "^0.13.3",
"sass-loader": "7.3.1",
"style-loader": "^1.0.0",
"terser-webpack-plugin": "^1.3.0",
"webpack": "^4.34.0",
"terser-webpack-plugin": "^2.2.1",
"webpack": "^4.41.2",
"webpack-assets-manifest": "^3.1.1",
"webpack-cli": "^3.3.4",
"webpack-sources": "^1.3.0"
"webpack-cli": "^3.3.10",
"webpack-sources": "^1.4.3"
},
"devDependencies": {
"eslint": "^5.16.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-plugin-import": "^2.17.3",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-react": "^7.13.0",
"jest": "^24.8.0"
"eslint": "^6.6.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.16.0",
"jest": "^24.9.0"
},
"jest": {
"testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$",
Expand Down
6 changes: 3 additions & 3 deletions package/config_types/config_list.js
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@ class ConfigList extends Array {
}

getIndex(key, shouldThrow = false) {
const index = this.findIndex(entry => (
const index = this.findIndex((entry) => (
entry === key
|| entry.key === key
|| (entry.constructor && entry.constructor.name === key)
Expand All @@ -64,11 +64,11 @@ class ConfigList extends Array {
}

values() {
return this.map(item => item.value)
return this.map((item) => item.value)
}

keys() {
return this.map(item => item.key)
return this.map((item) => item.key)
}
}

Expand Down
2 changes: 1 addition & 1 deletion package/config_types/config_object.js
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@ class ConfigObject extends Object {
toObject() {
const object = {}
/* eslint no-return-assign: 0 */
Object.keys(this).forEach(key => (object[key] = this[key]))
Object.keys(this).forEach((key) => (object[key] = this[key]))
return object
}

Expand Down
4 changes: 2 additions & 2 deletions package/environments/base.js
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ const config = require('../config')

const getLoaderList = () => {
const result = new ConfigList()
Object.keys(rules).forEach(key => result.append(key, rules[key]))
Object.keys(rules).forEach((key) => result.append(key, rules[key]))
return result
}

Expand Down Expand Up @@ -74,7 +74,7 @@ const getModulePaths = () => {
const result = new ConfigList()
result.append('source', resolve(config.source_path))
if (config.resolved_paths) {
config.resolved_paths.forEach(path => result.append(path, resolve(path)))
config.resolved_paths.forEach((path) => result.append(path, resolve(path)))
}
result.append('node_modules', 'node_modules')
return result
Expand Down
2 changes: 1 addition & 1 deletion package/rules/babel.js
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ const { nodeEnv } = require('../env')
// Uses application .babelrc to apply any transformations
module.exports = {
test: /\.(js|jsx|mjs)?(\.erb)?$/,
include: [sourcePath, ...resolvedPaths].map(p => resolve(p)),
include: [sourcePath, ...resolvedPaths].map((p) => resolve(p)),
exclude: /node_modules/,
use: [
{
Expand Down