Change directory structure & move all app/javascript to app/assets

vishnugopal · Sep 6, 2018 · 619eb2e · 619eb2e
1 parent dfccb12
commit 619eb2e
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 41 deletions.
diff --git a/app/javascript/application/images/.keep → app/assets/images/.keep b/app/javascript/application/images/.keep → app/assets/images/.keep
diff --git a/app/assets/images/index.js.erb b/app/assets/images/index.js.erb
@@ -0,0 +1,4 @@
+<% images_glob = Rails.application.root.join('app', 'assets', 'images', '**', '*.{png,jpg,svg}') %>
+<% Dir.glob(images_glob).each do |image| %>
+  import '<%= image %>';
+<% end %>
diff --git a/...ascript/controllers/authors_controller.js → ...scripts/controllers/authors_controller.js b/...ascript/controllers/authors_controller.js → ...scripts/controllers/authors_controller.js
diff --git a/...script/controllers/chapters_controller.js → ...cripts/controllers/chapters_controller.js b/...script/controllers/chapters_controller.js → ...cripts/controllers/chapters_controller.js
diff --git a/...avascript/controllers/hello_controller.js → ...vascripts/controllers/hello_controller.js b/...avascript/controllers/hello_controller.js → ...vascripts/controllers/hello_controller.js
diff --git a/...ascript/controllers/stories_controller.js → ...scripts/controllers/stories_controller.js b/...ascript/controllers/stories_controller.js → ...scripts/controllers/stories_controller.js
diff --git a/...ript/application/javascripts/index.js.erb → app/assets/javascripts/index.js b/...ript/application/javascripts/index.js.erb → app/assets/javascripts/index.js
diff --git a/app/assets/packs/application.js b/app/assets/packs/application.js
@@ -0,0 +1,10 @@
+import { Application } from "stimulus";
+import { definitionsFromContext } from "stimulus/webpack-helpers";
+
+import "../images/index.js.erb";
+import "../stylesheets/index.js.erb";
+import "../javascripts/index.js";
+
+const application = Application.start();
+const context = require.context("javascripts/controllers", true, /.js$/);
+application.load(definitionsFromContext(context));
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
diff --git a/...cript/application/stylesheets/authors.css → app/assets/stylesheets/authors.css b/...cript/application/stylesheets/authors.css → app/assets/stylesheets/authors.css
diff --git a/...ript/application/stylesheets/chapters.css → app/assets/stylesheets/chapters.css b/...ript/application/stylesheets/chapters.css → app/assets/stylesheets/chapters.css
diff --git a/app/assets/stylesheets/index.js.erb b/app/assets/stylesheets/index.js.erb
@@ -0,0 +1,4 @@
+<% css_glob = Rails.application.root.join('app', 'assets', 'stylesheets', '**', '*.{css}') %>
+<% Dir.glob(css_glob).each do |file| %>
+  import '<%= file %>';
+<% end %>
diff --git a/...cript/application/stylesheets/stories.css → app/assets/stylesheets/stories.css b/...cript/application/stylesheets/stories.css → app/assets/stylesheets/stories.css
diff --git a/app/javascript/application/images/index.js.erb b/app/javascript/application/images/index.js.erb
diff --git a/app/javascript/application/stylesheets/application.css b/app/javascript/application/stylesheets/application.css
diff --git a/app/javascript/application/stylesheets/index.js.erb b/app/javascript/application/stylesheets/index.js.erb
diff --git a/app/javascript/packs/application.js.erb b/app/javascript/packs/application.js.erb
diff --git a/config/application.rb b/config/application.rb
@@ -14,7 +14,6 @@
 # require "action_cable/engine"
 require "rails/test_unit/railtie"
 
-
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)

diff --git a/config/webpacker.yml b/config/webpacker.yml
@@ -1,7 +1,7 @@
 # Note: You must restart bin/webpack-dev-server for changes to take effect
 
 default: &default
-  source_path: app/javascript
+  source_path: app/assets
   source_entry_path: packs
   public_output_path: packs
   cache_path: tmp/cache/webpacker
@@ -16,11 +16,7 @@ default: &default
   extensions:
     - .erb
     - .js
-    - .sass
-    - .scss
     - .css
-    - .module.sass
-    - .module.scss
     - .module.css
     - .png
     - .svg
@@ -47,11 +43,10 @@ development:
     use_local_ip: false
     quiet: false
     headers:
-      'Access-Control-Allow-Origin': '*'
+      "Access-Control-Allow-Origin": "*"
     watch_options:
       ignored: /node_modules/
 
-
 test:
   <<: *default
   compile: true