comfortable_media_surfer 3.0.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ebf4f5ffb32f8c4e6aa359c897a5d35aead15a9c3839fc7e41af49db4f44676
-  data.tar.gz: cec761f797bc01265e44d5f64f9426a59eb5940e722ab2f149b29e8d7dec818f
+  metadata.gz: 4a85a3f0b343392faa4c1a694a01ed10f22a2bbc4a0226457ccc4477560ca3d4
+  data.tar.gz: 637c668f4813532a4c184b7513b72497c636ff3d507d0f165b586b580cf3f536
 SHA512:
-  metadata.gz: c301e8f8152f0eaeadda3f7560f0926370987fda15647218701751953d712891e97aeedda19d462cbf054c50d2a9e56a85c8381640a5200dd623cd6b1a744760
-  data.tar.gz: 2aa71081385b605f87e1f9d4642f0ca4f3f92a9fd91e9b927562ec289adb3f3f71111d05f15ebb2e61f62491c61e1a2f7655bf9ca53787dd852678f091361e72
+  metadata.gz: 2f48fbc4b720a10e251a088d125a0e3e45e4539a7f2e5d697209f8ba21afa7f206a875e53702ed87f2819391886e344c32fc2cb3b170dd32a53e68c6a6b275cb
+  data.tar.gz: 78dbda62d0289007c4cf021866585057b4448a1452f06dd1b97d718b0ce597dc98b5a31fcf54962e13662bf0da012aa2106b0a5ebad0d1406e525b9ff7e8bd1c

data/.gitattributes

@@ -1,2 +1,3 @@
 app/assets/javascripts/comfy/vendor/* linguist-vendored
 app/assets/stylesheets/comfy/vendor/* linguist-vendored
+app/assets/builds/* linguist-generated

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Enable version updates for npm
+  - package-ecosystem: "bundler"
+    directory: "/"  # The root directory where your Gemfile is located
+    schedule:
+      interval: "monthly" # Options: "daily", "weekly", "monthly"

data/.github/workflows/coveralls.yml

@@ -26,14 +26,26 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v2
 
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+      - run: npm ci
+
       - name: Install Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Update surfer gem
+        run: bundle update comfortable_media_surfer
+
+      - name: Compile assets
+        run: bin/bundle exec rails comfy:compile_assets
 
       - name: Run tests, report coverage
         run: |
-          bin/bundle install --retry 3 --quiet
           bin/bundle exec rails db:drop
           bin/bundle exec rails db:create
           bin/bundle exec rails db:migrate

data/.github/workflows/rubyonrails.yml

@@ -10,13 +10,13 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
         rails-version:
-          - "6.1"
           - "7.1"
           - "7.2"
+          - "8.0"
         continue-on-error: [true]
     name: ${{ format('Tests (Ruby {0}, Rails {1})', matrix.ruby-version, matrix.rails-version) }}
     runs-on: ubuntu-latest
@@ -29,14 +29,26 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v2
 
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+      - run: npm ci
+
       - name: Install Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Update surfer gem
+        run: bundle update comfortable_media_surfer
+
+      - name: Compile assets
+        run: bin/bundle exec rails comfy:compile_assets
 
       - name: Run tests
         run: |
-          bin/bundle install --retry 3 --quiet
           bin/bundle exec rails db:drop
           bin/bundle exec rails db:create
           bin/bundle exec rails db:migrate

data/.gitignore

@@ -19,3 +19,7 @@ coverage/
 /storage
 db/cms_fixtures/test-site/
 .idea
+
+/node_modules
+/app/assets/builds/*
+!/app/assets/builds/.keep

data/.rubocop.yml

@@ -3,7 +3,7 @@ require:
   # - rubocop-minitest
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.2
   NewCops: enable
   Exclude:
     - bin/*
@@ -59,6 +59,9 @@ Style/Documentation:
 Style/DocumentDynamicEvalDefinition:
   Enabled: false
 
+Style/HashSyntax:
+  Enabled: false
+
 Style/IfUnlessModifier:
   Enabled: false
 

data/CHANGELOG.md

@@ -0,0 +1,86 @@
+# Changelog
+
+All notable changes to this project's source code will be documented in this file. Items under `Unreleased` are upcoming features that will be out in the next version.
+
+## Contributors
+
+Please follow the recommendations outlined at [keepachangelog.com](https://keepachangelog.com). Please use the existing headings and styling as a guide, and add a link for the version diff at the bottom of the file. Also, please update the `Unreleased` link to compare it to the latest release version.
+
+For all changes prior to the inception of this project, see the [Release History](https://github.com/comfy/comfortable-mexican-sofa/releases) of ComfortableMexicanSofa.
+
+## Versions
+
+## [Unreleased]
+
+### Fixed
+
+- Fixed Expand/Collapse error in Admin/Pages.
+- Include sassc-rails to gemspec, since it is deprecated after rails 7.0.8
+- Update documentation to reflect recent changes
+
+### Added
+
+- added migration for Markdown snippets
+
+## [v3.1.1] - 2025-02-08
+
+### Fixed
+
+- Fixed scss: use scss imports, not css ones that cannot be resolved by the browser
+
+### Added
+
+- Added rake task to compile assets, corresponding post install message
+- Added import Rails from UJS
+- Added missing jQuery import
+
+### Removed
+
+- Removed yarn, as not needed
+
+## [v3.1.0] - 2024-12-31 (gem yanked, pending resolution of [Issue 8](https://github.com/shakacode/comfortable-media-surfer/issues/8)
+
+### Added
+
+- Added compatibility and support for Rails 8
+- Added compatibility and support for propshaft (sprockets is still supported) - installing the gem now requires NodeJS to be installed. In addition, the `comfy:compile_assets` task needs to be run after installing the gem.
+
+### Removed
+
+- Removed sassc sprockets
+- Rails 6.x compatibility dropped, since it is not being maintained as of October 2024
+
+### Changed
+
+- Updated README links to point to the Surfer wiki
+
+## [v3.0.0] - 2024-11-30
+
+First release of `comfortable_media_surfer`. This new gem is a revival of [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) which had been dormant for nearly 5 years.
+
+### Fixed
+
+- Fixed all broken tests to now pass on Rails 6.x and 7.x
+- Code syntax per Rubocop linting
+
+### Added
+
+- Rails 7 compatibility, including many config and code changes. See the [PR](https://github.com/shakacode/comfortable-media-surfer/pull/1/files) for full details
+- Added github actions workflows for CI build and test coverage
+- Added CMS tags for navigation: children, siblings, breadcrumbs, with tests
+- Added CMS tag for embedded audio, with tests
+- Added CMS tag for image, with tests
+- Added ability to write CMS snippets in Markdown, with tests
+
+### Removed
+
+- Rails 5 compatibility dropped, as it is EOL
+
+### Changed
+
+- Rebranded **ComfortableMexicanSofa** as **ComfortableMediaSurfer** in order to publish new gem (database table names and schema have not changed).
+
+[Unreleased]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.0...master
+[v3.1.1]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.0...v3.1.1
+[v3.1.0]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.0.0...v3.1.0
+[v3.0.0]: https://github.com/shakacode/comfortable-media-surfer/compare/v2.0.19...v3.0.0

data/CONTRIBUTING.md

@@ -11,15 +11,18 @@ Fork the project. Optionally, create a branch you want to work on.
 - Install gem dependencies with `bundle install`
 - There's nothing to configure, by default database is SQLite so it will be
   created for you. Just run `bundle exec rake db:migrate`
+- Prepare the environment by running `rails comfy:compile_assets`, and
+  `rake db:test:prepare`
 - Make sure that existing tests are passing by running `bundle exec rake test`
 - There are system tests that can be run with `bundle exec rake test:system`.
   You need to have `chromedriver` installed for that.
 - You should be able to start the app via `bin/rails s` and navigate to http://localhost:3000/admin
+  and log in with username 'user' and password 'pass'
 
 ### 3. Hack away
 
 - Create a few small pull requests instead of a humoungous one. I can merge small stuff faster.
-- When adding new code just make sure it follows the same slyle as the existing code.
+- When adding new code just make sure it follows the same style as the existing code.
 - Avoid adding 3rd party dependencies if you can.
 - Tests please, but nothing complicated. UnitTest / Fixtures all the way. Make sure all tests pass.
 - Run `bundle exec rubocop` and fix any issues raised.
@@ -27,7 +30,7 @@ Fork the project. Optionally, create a branch you want to work on.
 ### 4. Make a pull request
 
 - If you never done it before read this: https://help.github.com/articles/using-pull-requests
-- When PR is submitted check if TravisCI ran all tests successfully and Rubocop didn't raise any issues
+- When PR is submitted check if Github actions CI ran all tests successfully
 
 ### 5. Done!
 

data/Gemfile

@@ -5,13 +5,15 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
-gem 'rails', '~> 7.2'
+gem 'rails', '~> 8.0'
 
 group :development, :test do
-  gem 'autoprefixer-rails', '~> 10.4.16.0'
-  gem 'byebug',             '~> 11.1.0', platforms: %i[mri mingw x64_mingw]
+  gem 'autoprefixer-rails', '~> 10.4.21.0'
+  gem 'byebug',             '~> 12.0.0', platforms: %i[mri mingw x64_mingw]
+  gem 'gem-release'
   gem 'image_processing',   '>= 1.12.0'
-  gem 'sqlite3',            '~> 1.6.7'
+  gem 'propshaft',          '~> 1.1.0'
+  gem 'sqlite3',            '>= 2.1'
   # gem 'mysql2',             '~> 0.5'
   # gem 'pg',                 '~> 1.5.4'
 end
@@ -22,7 +24,7 @@ group :development do
 end
 
 group :test do
-  gem 'brakeman',                 '~> 6.1.2'
+  gem 'brakeman',                 '~> 7.0.2'
   gem 'bundler-audit',            '~> 0.9.1'
   gem 'coveralls_reborn',         '~> 0.28.0', require: false
   gem 'cuprite',                  '>= 0.15'
@@ -30,8 +32,10 @@ group :test do
   gem 'minitest',                 '>= 5.23.0'
   gem 'minitest-reporters',       '>= 1.6.1'
   gem 'mocha',                    '>= 2.3.0', require: false
+  gem 'ostruct'
+  gem 'puma'
   gem 'rails-controller-testing', '~> 1.0.5'
-  gem 'rubocop',                  '~> 1.63.0', require: false
+  gem 'rubocop',                  '~> 1.75.7', require: false
   gem 'rubocop-minitest'
   gem 'rubocop-rails'
   gem 'simplecov', '~> 0.22.0', require: false

data/README.md

@@ -1,42 +1,50 @@
+[![Rails CI](https://github.com/shakacode/comfortable-media-surfer/actions/workflows/rubyonrails.yml/badge.svg)](https://github.com/shakacode/comfortable-media-surfer/actions/workflows/rubyonrails.yml)
+[![Coverage Status](https://coveralls.io/repos/github/shakacode/comfortable-media-surfer/badge.svg?branch=HEAD)](https://coveralls.io/github/shakacode/comfortable-media-surfer?branch=HEAD)
+[![Gem Version](https://img.shields.io/gem/v/comfortable_media_surfer.svg?style=flat)](http://rubygems.org/gems/comfortable_media_surfer)
+[![Gem Downloads](https://img.shields.io/gem/dt/comfortable_media_surfer.svg?style=flat)](http://rubygems.org/gems/comfortable_media_surfer)
+[![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/shakacode/comfortable-media-surfer?label=last%20release&color=seagreen)](https://github.com/shakacode/comfortable-media-surfer/releases)
+
 # ComfortableMediaSurfer
 
-ComfortableMediaSurfer is a powerful Ruby 6.1+ CMS (Content Management System) Engine, picking up where [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) left off.
+ComfortableMediaSurfer is a powerful Ruby 7.0+ CMS (Content Management System) Engine, picking up where [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) left off.
 
 ## Features
 
-* Simple drop-in integration with Rails 6.1+ apps with minimal configuration
+- Simple drop-in integration with Rails 7.0+ apps with minimal configuration
 * The CMS keeps clear from the rest of your application
-* Powerful page templating capability using [Content Tags](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Content-Tags)
-* [Multiple Sites](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Sites) from a single installation
+* Powerful page templating capability using [Content Tags](https://github.com/shakacode/comfortable-media-surfer/wiki/Docs:-Content-Tags)
+* [Multiple Sites](https://github.com/shakacode/comfortable-media-surfer/wiki/Docs:-Sites) from a single installation
 * Multi-Language Support (i18n) (ca, cs, da, de, en, es, fi, fr, gr, hr, it, ja, nb, nl, pl, pt-BR, ru, sv, tr, uk, zh-CN, zh-TW) and page localization.
-* [CMS Seeds](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-CMS-Seeds) for initial content population
-* [Revision History](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Revisions) to revert changes
-* [Extendable Admin Area](https://github.com/comfy/comfortable-mexican-sofa/wiki/HowTo:-Reusing-Admin-Area) built with [Bootstrap 4](http://getbootstrap.com) (responsive design). Using [CodeMirror](http://codemirror.net) for HTML and Markdown highlighing and [Redactor](http://imperavi.com/redactor) as the WYSIWYG editor.
+* [CMS Seeds](https://github.com/shakacode/comfortable-media-surfer/wiki/Docs:-CMS-Seeds) for initial content population
+* [Revision History](https://github.com/shakacode/comfortable-media-surfer/wiki/Docs:-Revisions) to revert changes
+* [Extendable Admin Area](https://github.com/shakacode/comfortable-media-surfer/wiki/HowTo:-Reusing-Admin-Area) built with [Bootstrap 4](http://getbootstrap.com) (responsive design). Using [CodeMirror](http://codemirror.net) for HTML and Markdown highlighing and [Redactor](http://imperavi.com/redactor) as the WYSIWYG editor.
 
 ## Dependencies
 
-* File attachments are handled by [ActiveStorage](https://github.com/rails/rails/tree/master/activestorage). Make sure that you can run appropriate migrations by running: `rails active_storage:install`
-* Image resizing is done with with [ImageMagick](http://www.imagemagick.org/script/download.php), so make sure it's installed.
-* Pagination is handled by [kaminari](https://github.com/amatsuda/kaminari) or [will_paginate](https://github.com/mislav/will_paginate). Please add one of those to your Gemfile.
+- File attachments are handled by [ActiveStorage](https://github.com/rails/rails/tree/master/activestorage). Make sure that you can run appropriate migrations by running: `rails active_storage:install`
+- Image resizing is done with with [ImageMagick](http://www.imagemagick.org/script/download.php), so make sure it's installed.
+- Pagination is handled by [kaminari](https://github.com/amatsuda/kaminari).
 
 ## Compatibility
 
-- Ruby >= 3.0 with Rails >= 6.1
-- On Ruby 3.x, Rails 7.x + is recommended, since performance is noticably better than on 6.x
+On Ruby 3.x, Rails 7.x +
 
 ## Installation
 
 Add gem definition to your Gemfile:
 
 ```ruby
-gem "comfortable_media_surfer", "~> 3.0.0"
+gem "comfortable_media_surfer", "~> 3.1.0"
 ```
 
 Then from the Rails project's root run:
 
+```
     bundle install
     rails generate comfy:cms
-    rake db:migrate
+    rails db:migrate
+    rails comfy:compile_assets
+```
 
 Now take a look inside your `config/routes.rb` file. You'll see where routes attach for the admin area and content serving. Make sure that content serving route appears as a very last item or it will make all other routes to be inaccessible.
 
@@ -45,11 +53,46 @@ comfy_route :cms_admin, path: "/admin"
 comfy_route :cms, path: "/"
 ```
 
+## Converting from ComfortableMexicanSofa or Occams
+
+### From Sofa to Surfer
+
+The database structure is the same.  Your Sofa project will also need to be upgraded to >= Rails 7.x  
+Then you should simply be able to update your Gemfile thus, and run bundle
+
+```ruby
+gem 'comfortable_media_surfer', '~> 3.1.0'
+```
+
+### From Occams to Surfer
+
+Again the project must be >= Rails 7.x.  Since the schema is different, executing this SQL should get you set for Surfer
+
+```sql
+ALTER TABLE occams_cms_categories RENAME TO comfy_cms_categories;
+ALTER TABLE occams_cms_categorizations RENAME TO comfy_cms_categorizations;
+ALTER TABLE occams_cms_files RENAME TO comfy_cms_files;
+ALTER TABLE occams_cms_fragments RENAME TO comfy_cms_fragments;
+ALTER TABLE occams_cms_layouts RENAME TO comfy_cms_layouts;
+ALTER TABLE occams_cms_pages RENAME TO comfy_cms_pages;
+ALTER TABLE occams_cms_revisions RENAME TO comfy_cms_revisions;
+ALTER TABLE occams_cms_sites RENAME TO comfy_cms_sites;
+ALTER TABLE occams_cms_snippets RENAME TO comfy_cms_snippets;
+ALTER TABLE occams_cms_translations RENAME TO comfy_cms_translations;
+UPDATE comfy_cms_fragments SET record_type = 'Comfy::Cms::Page' WHERE record_type = 'Occams::Cms::Page';
+UPDATE comfy_cms_fragments SET record_type = 'Comfy::Cms::Layout' WHERE record_type = 'Occams::Cms::Layout';
+UPDATE comfy_cms_fragments SET record_type = 'Comfy::Cms::Snippet' WHERE record_type = 'Occams::Cms::Snippet';
+UPDATE comfy_cms_revisions SET record_type = 'Comfy::Cms::Page' WHERE record_type = 'Occams::Cms::Page';
+UPDATE comfy_cms_revisions SET record_type = 'Comfy::Cms::Layout' WHERE record_type = 'Occams::Cms::Layout';
+UPDATE comfy_cms_revisions SET record_type = 'Comfy::Cms::Snippet' WHERE record_type = 'Occams::Cms::Snippet';
+UPDATE active_storage_attachments SET record_type = 'Comfy::Cms::File' WHERE record_type = 'Occams::Cms::File';
+```
+
 ## Quick Start Guide
 
 After finishing installation you should be able to navigate to http://localhost:3000/admin
 
-Default username and password is 'user' and 'pass'. You probably want to change it right away. Admin credentials (among other things) can be found and changed in the cms initializer: [/config/initializers/comfortable\_media\_surfer.rb](https://github.com/shakacode/comfortable-media-surfer/blob/master/config/initializers/comfortable_media_surfer.rb)
+Default username and password is 'user' and 'pass'. You probably want to change it right away. Admin credentials (among other things) can be found and changed in the cms initializer: [/config/initializers/comfortable_media_surfer.rb](https://github.com/shakacode/comfortable-media-surfer/blob/master/config/initializers/comfortable_media_surfer.rb)
 
 Before creating pages and populating them with content we need to create a Site. Site defines a hostname, content path and its language.
 
@@ -68,11 +111,8 @@ Once you have a layout, you may start creating pages and populating content. It'
 
 ## Documentation
 
-For more information on how to use this CMS please refer to the [Wiki](https://github.com/comfy/comfortable-mexican-sofa/wiki). Section that might be of interest is the entry
-on [Content Tags](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Content-Tags).
-
-[Comfy Demo App](https://github.com/comfy/comfy-demo) also can be used as an
-example of a default Rails app with CMS installed.
+For more information on how to use this CMS please refer to the [Wiki](https://github.com/shakacode/comfortable-media-surfer/wiki). Section that might be of interest is the entry
+on [Content Tags](https://github.com/shakacode/comfortable-media-surfer/wiki/Docs:-Content-Tags).
 
 ## Add-ons
 
@@ -81,16 +121,13 @@ If you want to add a Blog functionality to your app take a look at
 
 ![Admin Area Preview](doc/preview.jpg)
 
-#### Old Versions
+#### Old Versions of ComfortableMexicanSofa
 
-[CHANGELOG](//github.com/comfy/comfortable-mexican-sofa/releases) is documented
-in Github releases.
+[CHANGELOG](//github.com/comfy/comfortable-mexican-sofa/releases) is documented in ComfortableMexicanSofa Github releases.
 
 #### Contributing
 
-ComfortableMediaSurfer repository can be ran like a regular Rails application in
-development environment. It's as easy to work on as any other Rails app out there.
-For more detail take a look at [CONTRIBUTING](CONTRIBUTING.md)
+ComfortableMediaSurfer can run like any Rails application in development. It's as easy to work on as any other Rails app. For more detail see [CONTRIBUTING](CONTRIBUTING.md)
 
 #### Testing
 
@@ -105,5 +142,5 @@ For more detail take a look at [CONTRIBUTING](CONTRIBUTING.md)
 
 ---
 
-Copyright 2010-2019 Oleg Khabarov, 2024 ShakaCode LLC
+Copyright 2010-2019 Oleg Khabarov, 2024-2025 ShakaCode LLC
 Released under the [MIT license](LICENSE)

data/app/assets/config/manifest.js

@@ -0,0 +1 @@
+//= link_tree ../builds

data/app/assets/javascripts/comfy/admin/cms/application.js

@@ -1,39 +1,24 @@
-//= require rails-ujs
-//= require jquery3
+import ujs from "@rails/ujs";
+ujs.start();
 
-//= require comfy/vendor/codemirror
-//= require comfy/vendor/codemirror/mode/css/css
-//= require comfy/vendor/codemirror/mode/htmlmixed/htmlmixed
-//= require comfy/vendor/codemirror/mode/javascript/javascript
-//= require comfy/vendor/codemirror/mode/markdown/markdown
-//= require comfy/vendor/codemirror/mode/xml/xml
-//= require comfy/vendor/codemirror/addon/edit/closetag
-//= require comfy/vendor/sortable.min
-//= require comfy/vendor/bootstrap.bundle.min
-//= require comfy/vendor/diff/diff_match_patch.min
-//= require comfy/vendor/diff/pretty_text_diff
-//= require comfy/vendor/fontawesome
-//= require comfy/vendor/redactor
-//= require comfy/vendor/redactor/filemanager
-//= require comfy/vendor/redactor/imagemanager
-//= require comfy/vendor/redactor/definedlinks
-//= require comfy/vendor/redactor/table
-//= require comfy/vendor/redactor/video
-//= require_directory ../../vendor/redactor/i18n/
-//= require comfy/vendor/flatpickr.min
-//= require_directory ../../vendor/flatpickr/i18n/
+import "bootstrap/js/src/tab";
+import "bootstrap/js/src/collapse";
 
-//= require comfy/admin/cms/base
-//= require comfy/admin/cms/categories
-//= require comfy/admin/cms/codemirror
-//= require comfy/admin/cms/diff
-//= require comfy/admin/cms/file_link
-//= require comfy/admin/cms/file_upload
-//= require comfy/admin/cms/files_modal
-//= require comfy/admin/cms/page_fragments
-//= require comfy/admin/cms/sortable_list
-//= require comfy/admin/cms/slugify
-//= require comfy/admin/cms/timepicker
-//= require comfy/admin/cms/wysiwyg
+import "../../vendor/diff/diff_match_patch.min";
+import "../../vendor/diff/pretty_text_diff";
+import "../../vendor/fontawesome";
 
-//= require comfy/admin/cms/custom
+import "./base";
+import "./categories";
+import "./codemirror";
+import "./diff";
+import "./file_link";
+import "./file_upload";
+import "./files_modal";
+import "./page_fragments";
+import "./sortable_list";
+import "./slugify";
+import "./timepicker";
+import "./wysiwyg";
+
+import "./custom";

data/app/assets/javascripts/comfy/admin/cms/base.js

@@ -4,16 +4,16 @@
 
   // TODO(glebm): Use the battle-tested universal onPageLoad code and enable Turbolinks+async in the demo app.
   // See: https://gist.github.com/glebm/2496daf445877055447a6fac46509d9a
-  const isTurbolinks = 'Turbolinks' in window && window.Turbolinks.supported;
+  const isTurbolinks = "Turbolinks" in window && window.Turbolinks.supported;
   if (isTurbolinks) {
-    document.addEventListener('turbolinks:load', () => {
+    document.addEventListener("turbolinks:load", () => {
       window.CMS.init();
     });
-    document.addEventListener('turbolinks:before-cache', () => {
+    document.addEventListener("turbolinks:before-cache", () => {
       window.CMS.dispose();
     });
   } else {
-    document.addEventListener('DOMContentLoaded', () => {
+    document.addEventListener("DOMContentLoaded", () => {
       window.CMS.init();
     });
   }
@@ -42,5 +42,6 @@
     CMS.timepicker.dispose();
   };
 
-  CMS.getLocale = () => document.querySelector('meta[name="cms-locale"]').content;
+  CMS.getLocale = () =>
+    document.querySelector('meta[name="cms-locale"]').content;
 })();

data/app/assets/javascripts/comfy/admin/cms/codemirror.js

@@ -1,31 +1,43 @@
+import jQuery from "jquery";
+import CodeMirror from "codemirror";
+import "codemirror/mode/markdown/markdown";
+import "codemirror/mode/htmlmixed/htmlmixed";
+
 (() => {
   const codeMirrorInstances = [];
   window.CMS.codemirror = {
     init(root = document) {
-      for (const textarea of root.querySelectorAll('textarea[data-cms-cm-mode]')) {
+      for (const textarea of root.querySelectorAll(
+        "textarea[data-cms-cm-mode]"
+      )) {
         const codemirror = CodeMirror.fromTextArea(textarea, {
           mode: textarea.dataset.cmsCmMode,
           tabSize: 2,
           lineWrapping: true,
           autoCloseTags: true,
           lineNumbers: true,
-          viewportMargin: Infinity
+          viewportMargin: Infinity,
         });
         codeMirrorInstances.push(codemirror);
       }
 
-      const tabsRoot = root.id === 'form-fragments' ? root : root.querySelector('#form-fragments');
-      jQuery(tabsRoot).find('a[data-toggle="tab"]').on('shown.bs.tab', () => {
-        for (const codemirror of codeMirrorInstances) {
-          codemirror.refresh();
-        }
-      });
+      const tabsRoot =
+        root.id === "form-fragments"
+          ? root
+          : root.querySelector("#form-fragments");
+      jQuery(tabsRoot)
+        .find('a[data-toggle="tab"]')
+        .on("shown.bs.tab", () => {
+          for (const codemirror of codeMirrorInstances) {
+            codemirror.refresh();
+          }
+        });
     },
     dispose() {
       for (const codemirror of codeMirrorInstances) {
         codemirror.toTextArea();
       }
       codeMirrorInstances.length = 0;
-    }
-}
+    },
+  };
 })();

data/app/assets/javascripts/comfy/admin/cms/diff.js

@@ -1,10 +1,12 @@
+import jQuery from "jquery";
+
 (() => {
   window.CMS.diff = () => {
-    jQuery('.revision').prettyTextDiff({
+    jQuery(".revision").prettyTextDiff({
       cleanup: true,
-      originalContainer: '.original',
-      changedContainer: '.current',
-      diffContainer: '.diff .content',
+      originalContainer: ".original",
+      changedContainer: ".current",
+      diffContainer: ".diff .content",
     });
-  }
+  };
 })();