Merge branch 'go-go-gadget-webpack' into 'master'
Integrate webpack for frontend asset compilation Closes #14634 See merge request !7288
Showing
... | @@ -7,7 +7,6 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' | ... | @@ -7,7 +7,6 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' |
gem 'responders', '~> 2.0' | gem 'responders', '~> 2.0' | ||
gem 'sprockets', '~> 3.7.0' | gem 'sprockets', '~> 3.7.0' | ||
gem 'sprockets-es6', '~> 0.9.2' | |||
# Default values for AR models | # Default values for AR models | ||
gem 'default_value_for', '~> 3.0.0' | gem 'default_value_for', '~> 3.0.0' | ||
... | @@ -219,6 +218,7 @@ gem 'oj', '~> 2.17.4' | ... | @@ -219,6 +218,7 @@ gem 'oj', '~> 2.17.4' |
gem 'chronic', '~> 0.10.2' | gem 'chronic', '~> 0.10.2' | ||
gem 'chronic_duration', '~> 0.10.6' | gem 'chronic_duration', '~> 0.10.6' | ||
gem 'webpack-rails', '~> 0.9.9' | |||
gem 'sass-rails', '~> 5.0.6' | gem 'sass-rails', '~> 5.0.6' | ||
gem 'coffee-rails', '~> 4.1.0' | gem 'coffee-rails', '~> 4.1.0' | ||
gem 'uglifier', '~> 2.7.2' | gem 'uglifier', '~> 2.7.2' | ||
... | @@ -291,13 +291,9 @@ group :development, :test do | ... | @@ -291,13 +291,9 @@ group :development, :test do |
gem 'capybara-screenshot', '~> 1.0.0' | gem 'capybara-screenshot', '~> 1.0.0' | ||
gem 'poltergeist', '~> 1.9.0' | gem 'poltergeist', '~> 1.9.0' | ||
gem 'teaspoon', '~> 1.1.0' | |||
gem 'teaspoon-jasmine', '~> 2.2.0' | |||
gem 'spring', '~> 1.7.0' | gem 'spring', '~> 1.7.0' | ||
gem 'spring-commands-rspec', '~> 1.0.4' | gem 'spring-commands-rspec', '~> 1.0.4' | ||
gem 'spring-commands-spinach', '~> 1.1.0' | gem 'spring-commands-spinach', '~> 1.1.0' | ||
gem 'spring-commands-teaspoon', '~> 0.0.2' | |||
gem 'rubocop', '~> 0.46.0', require: false | gem 'rubocop', '~> 0.46.0', require: false | ||
gem 'rubocop-rspec', '~> 1.9.1', require: false | gem 'rubocop-rspec', '~> 1.9.1', require: false | ||
... | @@ -315,6 +311,8 @@ group :development, :test do | ... | @@ -315,6 +311,8 @@ group :development, :test do |
gem 'activerecord_sane_schema_dumper', '0.2' | gem 'activerecord_sane_schema_dumper', '0.2' | ||
gem 'stackprof', '~> 0.2.10' | gem 'stackprof', '~> 0.2.10' | ||
gem 'rack-proxy', '~> 0.6.0' | |||
end | end | ||
group :test do | group :test do | ||
... | ... |
bin/teaspoon
deleted
100755 → 0
config/karma.config.js
0 → 100644
config/webpack.config.js
0 → 100644
{ | { | ||
"private": true, | "private": true, | ||
"scripts": { | "scripts": { | ||
"dev-server": "node_modules/.bin/webpack-dev-server --config config/webpack.config.js", | |||
"eslint": "eslint --max-warnings 0 --ext .js,.js.es6 .", | "eslint": "eslint --max-warnings 0 --ext .js,.js.es6 .", | ||
"eslint-fix": "npm run eslint -- --fix", | "eslint-fix": "npm run eslint -- --fix", | ||
"eslint-report": "npm run eslint -- --format html --output-file ./eslint-report.html" | "eslint-report": "npm run eslint -- --format html --output-file ./eslint-report.html", | ||
"karma": "karma start config/karma.config.js --single-run", | |||
"karma-start": "karma start config/karma.config.js" | |||
}, | |||
"dependencies": { | |||
"babel": "^5.8.38", | |||
"babel-core": "^5.8.38", | |||
"babel-loader": "^5.4.2", | |||
"bootstrap-sass": "3.3.6", | |||
"compression-webpack-plugin": "^0.3.2", | |||
"d3": "3.5.11", | |||
"dropzone": "4.2.0", | |||
"exports-loader": "^0.6.3", | |||
"imports-loader": "^0.6.5", | |||
"jquery": "2.2.1", | |||
"jquery-ui": "github:jquery/jquery-ui#1.11.4", | |||
"jquery-ujs": "1.2.1", | |||
"json-loader": "^0.5.4", | |||
"mousetrap": "1.4.6", | |||
"select2": "3.5.2-browserify", | |||
"stats-webpack-plugin": "^0.4.2", | |||
"underscore": "1.8.3", | |||
"vue": "2.0.3", | |||
"vue-resource": "0.9.3", | |||
"webpack": "^1.14.0", | |||
"webpack-dev-server": "^1.16.2" | |||
}, | }, | ||
"devDependencies": { | "devDependencies": { | ||
"eslint": "^3.10.1", | "eslint": "^3.10.1", | ||
... | @@ -11,6 +37,13 @@ | ... | @@ -11,6 +37,13 @@ |
"eslint-plugin-filenames": "^1.1.0", | "eslint-plugin-filenames": "^1.1.0", | ||
"eslint-plugin-import": "^2.2.0", | "eslint-plugin-import": "^2.2.0", | ||
"eslint-plugin-jasmine": "^2.1.0", | "eslint-plugin-jasmine": "^2.1.0", | ||
"istanbul": "^0.4.5" | "istanbul": "^0.4.5", | ||
"jasmine-core": "^2.5.2", | |||
"jasmine-jquery": "^2.1.1", | |||
"karma": "^1.3.0", | |||
"karma-jasmine": "^1.1.0", | |||
"karma-phantomjs-launcher": "^1.0.2", | |||
"karma-sourcemap-loader": "^0.3.7", | |||
"karma-webpack": "^1.8.0" | |||
} | } | ||
} | } |
spec/teaspoon_env.rb
deleted
100644 → 0
Please register or sign in to comment