Skip to content

Commit

Permalink
Merge pull request #78 from berkmancenter/dev
Browse files Browse the repository at this point in the history
release 1.1.7
  • Loading branch information
jsdiaz authored Jan 16, 2019
2 parents bbb8708 + 2a532c7 commit 2273863
Show file tree
Hide file tree
Showing 117 changed files with 5,950 additions and 4,508 deletions.
47 changes: 35 additions & 12 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,18 +1,41 @@
{
"presets": [
["env", {
"modules": false,
"targets": {
"browsers": "> 1%",
"uglify": true
},
"useBuiltIns": true
}]
[
"@babel/preset-env",
{
"modules": false,
"forceAllTransforms": true,
"useBuiltIns": "entry"
}
]
],

"plugins": [
"syntax-dynamic-import",
"transform-object-rest-spread",
["transform-class-properties", { "spec": true }]
"@babel/plugin-transform-destructuring",
"@babel/plugin-syntax-dynamic-import",
[
"@babel/plugin-proposal-object-rest-spread",
{
"useBuiltIns": true
}
],
[
"@babel/plugin-transform-runtime",
{
"helpers": false,
"regenerator": true
}
],
[
"@babel/plugin-transform-regenerator",
{
"async": false
}
],
[
"@babel/plugin-proposal-class-properties",
{
"loose": true
}
]
]
}
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
> 1%
12 changes: 11 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ module.exports = {
'plugin:vue/recommended'
],
rules: {
"no-debugger": 0 // TODO: Re-enable this rule after production launch
"no-debugger": 0, // TODO: Re-enable this rule after production launch
"vue/component-name-in-template-casing": [
"error",
"kebab-case" // default is PascalCase but vue-router and bootstrap-vue currently require kebab-case
],
"vue/multiline-html-element-content-newline": [
"error",
{
"ignores": ["a"] // Enforcement of this rule can introduce unwanted trailing whitepace in link tags
}
]
}
}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
*.swp

/node_modules
/yarn-error.log
yarn-error.log
yarn-debug.log*
.yarn-integrity

.byebug_history
/nginx
Expand Down
2 changes: 1 addition & 1 deletion .postcssrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins:
postcss-import: {}
postcss-cssnext: {}
postcss-preset-env: {}
5 changes: 4 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ require: rubocop-rspec
AllCops:
Exclude:
- 'bin/**/*'
TargetRailsVersion: 5.1
TargetRailsVersion: 5.2
TargetRubyVersion: 2.4
Metrics/BlockLength:
Exclude:
Expand All @@ -13,5 +13,8 @@ Metrics/LineLength:
Enabled: false
Rails:
Enabled: true
Rails/Output:
Exclude:
- 'db/**/*'
RSpec/NestedGroups:
Max: 4
2 changes: 2 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.gql
*.json
20 changes: 10 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,20 @@ gem 'devise_cas_authenticatable', '~> 1.10'
gem 'dotenv-rails', '~> 2.5'
gem 'graphql', '~> 1.8'
gem 'haml-rails', '~> 1.0'
gem 'jbuilder', '~> 2.7'
gem 'jbuilder', '~> 2.8'
gem 'pg', '~> 1.1'
gem 'progress_bar', '~> 1.2'
gem 'progress_bar', '~> 1.3'
gem 'puma', '~> 3.12'
gem 'rails', '5.2.1' # @drg skip
gem 'smarter_csv', '~> 1.2'
gem 'rails', '5.2.2' # @drg skip
gem 'sanitize', '~> 5.0'
gem 'seedbank', '~> 0.5'
gem 'sunspot_rails', '~> 2.3'
gem 'webpacker', '~> 3.5'
gem 'webpacker', '~> 4.0.0.pre' # @drg skip

group :development, :test do
gem 'awesome_print', '~> 1.8'
gem 'factory_bot_rails', '~> 4.11'
gem 'pry', '~> 0.11'
gem 'pry', '~> 0.12'
gem 'pry-byebug', '~> 3.6'
gem 'pry-rails', '~> 0.3'
gem 'rspec-rails', '~> 3.8'
Expand All @@ -31,15 +32,14 @@ end
group :development do
gem 'brakeman', '~> 4.3'
gem 'drg', '~> 1.5'
gem 'graphiql-rails', '~> 1.4'
gem 'graphiql-rails', '~> 1.5'
gem 'listen', '~> 3.1'
gem 'rack-cors', '~> 1.0'
gem 'rubocop', '~> 0.59'
gem 'rubocop-rspec', '~> 1.29'
gem 'rubocop', '~> 0.61'
gem 'rubocop-rspec', '~> 1.30'
gem 'spring', '~> 2.0'
gem 'spring-commands-rspec', '~> 1.0'
gem 'spring-commands-rubocop', '~> 0.2'
gem 'spring-watcher-listen', '~> 2.0'
gem 'sunspot_solr', '~> 2.3'
gem 'web-console', '~> 3.7'
end
Expand Down
Loading

0 comments on commit 2273863

Please sign in to comment.