From 222817aad20688fc48f39515bad4790baff1dd7e Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Tue, 22 May 2018 11:22:05 +0900 Subject: [PATCH 1/5] Remove unused files Signed-off-by: Kenji Okimoto --- app/assets/javascripts/application.js | 13 ----- app/javascript/app.vue | 22 --------- app/javascript/packs/hello_vue.js | 71 --------------------------- 3 files changed, 106 deletions(-) delete mode 100644 app/assets/javascripts/application.js delete mode 100644 app/javascript/app.vue delete mode 100644 app/javascript/packs/hello_vue.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js deleted file mode 100644 index a314b04..0000000 --- a/app/assets/javascripts/application.js +++ /dev/null @@ -1,13 +0,0 @@ -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// compiled file. -// -// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details -// about supported directives. -// -//= require rails-ujs diff --git a/app/javascript/app.vue b/app/javascript/app.vue deleted file mode 100644 index e304dc1..0000000 --- a/app/javascript/app.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/app/javascript/packs/hello_vue.js b/app/javascript/packs/hello_vue.js deleted file mode 100644 index be8707a..0000000 --- a/app/javascript/packs/hello_vue.js +++ /dev/null @@ -1,71 +0,0 @@ -/* eslint no-console: 0 */ -// Run this example by adding <%= javascript_pack_tag 'hello_vue' %> (and -// <%= stylesheet_pack_tag 'hello_vue' %> if you have styles in your component) -// to the head of your layout file, -// like app/views/layouts/application.html.erb. -// All it does is render
Hello Vue
at the bottom of the page. - -import Vue from 'vue' -import App from '../app.vue' - -document.addEventListener('DOMContentLoaded', () => { - const el = document.body.appendChild(document.createElement('hello')) - const app = new Vue({ - el, - render: h => h(App) - }) - - console.log(app) -}) - - -// The above code uses Vue without the compiler, which means you cannot -// use Vue to target elements in your existing html templates. You would -// need to always use single file components. -// To be able to target elements in your existing html/erb templates, -// comment out the above code and uncomment the below -// Add <%= javascript_pack_tag 'hello_vue' %> to your layout -// Then add this markup to your html template: -// -//
-// {{message}} -// -//
- - -// import Vue from 'vue/dist/vue.esm' -// import App from '../app.vue' -// -// document.addEventListener('DOMContentLoaded', () => { -// const app = new Vue({ -// el: '#hello', -// data: { -// message: "Can you say hello?" -// }, -// components: { App } -// }) -// }) -// -// -// -// If the using turbolinks, install 'vue-turbolinks': -// -// yarn add 'vue-turbolinks' -// -// Then uncomment the code block below: -// -// import TurbolinksAdapter from 'vue-turbolinks'; -// import Vue from 'vue/dist/vue.esm' -// import App from '../app.vue' -// -// Vue.use(TurbolinksAdapter) -// -// document.addEventListener('turbolinks:load', () => { -// const app = new Vue({ -// el: '#hello', -// data: { -// message: "Can you say hello?" -// }, -// components: { App } -// }) -// }) From 7b6eb814495d0f1ed1d7539df6921234e27133c4 Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Tue, 22 May 2018 12:05:28 +0900 Subject: [PATCH 2/5] Append pre-compiled assets to gem package Signed-off-by: Kenji Okimoto --- fluentd-ui.gemspec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fluentd-ui.gemspec b/fluentd-ui.gemspec index 802db7a..70a2774 100644 --- a/fluentd-ui.gemspec +++ b/fluentd-ui.gemspec @@ -19,6 +19,15 @@ Gem::Specification.new do |spec| # And spec.files required for building a .gem only. # Thus git ls-files only invoked with `rake build` command spec.files = `git ls-files`.split($/) + # Add pre-compiled assets + Dir.chdir(__dir__) do + Dir.glob("public/assets/.sprockets-manifest-*.json") do |file| + spec.files << file + end + Dir.glob("public/{assets,packs}/*") do |file| + spec.files << file + end + end end spec.executables = ["fluentd-ui"] spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) From bacc51f8f220cdc948e92a2a11acd1b0d4564dda Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Tue, 22 May 2018 12:05:49 +0900 Subject: [PATCH 3/5] Update release procedure Signed-off-by: Kenji Okimoto --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cf68f5b..a978d86 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,11 @@ NOTE: `chromedriver` executable binary should be located under your `$PATH`. ## Building fluentd-ui.gem - $ bundle exec rake build - fluentd-ui X.X.X built to pkg/fluentd-ui-X.X.X.gem. + # Generate pre-compiled assets + $ RAILS_ENV=production bin/rails assets:precompile + + # fluentd-ui X.X.X built to pkg/fluentd-ui-X.X.X.gem. + $ RAILS_ENV=production bin/rails build - $ bundle exec rake release # Push to rubygems.org + $ bin/rails release From 0cb09fbefac900f2632203703fe1fa420474ab88 Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Tue, 22 May 2018 12:06:02 +0900 Subject: [PATCH 4/5] v1.0.0-alpha.1 Signed-off-by: Kenji Okimoto --- Gemfile.lock | 2 +- lib/fluentd-ui/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c56de5b..45fff6c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - fluentd-ui (0.4.5) + fluentd-ui (1.0.0.alpha.1) addressable bootsnap (>= 1.1.0) bundler diff --git a/lib/fluentd-ui/version.rb b/lib/fluentd-ui/version.rb index 2c694ea..d97b661 100644 --- a/lib/fluentd-ui/version.rb +++ b/lib/fluentd-ui/version.rb @@ -1,3 +1,3 @@ module FluentdUI - VERSION = "0.4.5" + VERSION = "1.0.0.alpha.1" end From 743299aaa861d12415131eaea58d4d6ac9927433 Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Tue, 22 May 2018 12:12:37 +0900 Subject: [PATCH 5/5] Add changelog entries Signed-off-by: Kenji Okimoto --- ChangeLog.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 5325f6c..ffa9618 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,8 @@ +## Release 1.0.0-alpha.1 - 2018/05/22 + +* [maintenance] Use Rails 5.2.0 [#223](https://github.com/fluent/fluentd-ui/pull/223) +* [maintenance] Use Fluentd 1.2.0 [#232](https://github.com/fluent/fluentd-ui/pull/232) + ## Release 0.4.5 - 2018/04/20 * [maintenance] Use twilio instead of boundio [#212](https://github.com/fluent/fluentd-ui/pull/212) @@ -15,8 +20,8 @@ ## Release 0.4.2 - 2015/05/28 -* [maintenance] Update httpclient as 2.5.x [#193](https://github.com/fluent/fluentd-ui/pull/193) -* [fixed] Fix confused license [#192](https://github.com/fluent/fluentd-ui/pull/192) +* [maintenance] Update httpclient as 2.5.x [#193](https://github.com/fluent/fluentd-ui/pull/193) +* [fixed] Fix confused license [#192](https://github.com/fluent/fluentd-ui/pull/192) ## Release 0.4.1 - 2015/04/24