alchemy_cms 6.0.0.pre.rc2 → 6.0.0.pre.rc5

data/lib/alchemy/upgrader.rb

@@ -24,6 +24,12 @@ module Alchemy
           todo "Check the default configuration file (./config/alchemy/config.yml.defaults) for new configuration options and insert them into your config file.", "Configuration has changed"
         end
       end
+
+      def update_npm_package
+        desc "Install new npm package."
+        `yarn add @alchemy_cms/admin@~#{Alchemy.version}`
+        log "Installed new npm package."
+      end
     end
   end
 end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.0-rc2"
+  VERSION = "6.0.0-rc5"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -37,6 +37,7 @@ require_relative "alchemy/controller_actions"
 require_relative "alchemy/deprecation"
 require_relative "alchemy/element_definition"
 require_relative "alchemy/elements_finder"
+require_relative "alchemy/error_tracking"
 require_relative "alchemy/errors"
 require_relative "alchemy/essence"
 require_relative "alchemy/filetypes"

data/lib/generators/alchemy/install/install_generator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require "rails/generators"
 require "alchemy/install/tasks"
+require "alchemy/version"
 
 module Alchemy
   module Generators
@@ -88,7 +89,7 @@ module Alchemy
       end
 
       def add_npm_package
-        run "yarn add @alchemy_cms/admin"
+        run "yarn add @alchemy_cms/admin@~#{Alchemy.version}"
       end
 
       def copy_alchemy_entry_point

data/lib/tasks/alchemy/upgrade.rake

@@ -17,6 +17,7 @@ namespace :alchemy do
     task prepare: [
       "alchemy:upgrade:database",
       "alchemy:upgrade:config",
+      "alchemy:upgrade:package",
     ]
 
     desc "Alchemy Upgrader: Prepares the database."
@@ -30,6 +31,11 @@ namespace :alchemy do
       Alchemy::Upgrader.copy_new_config_file
     end
 
+    desc "Alchemy Upgrader: Install new Node package."
+    task package: [:environment] do
+      Alchemy::Upgrader.update_npm_package
+    end
+
     desc "Upgrade Alchemy to v5.0"
     task "5.0" => [
       "alchemy:upgrade:prepare",

data/package/admin.js

@@ -5,6 +5,7 @@ import fileEditors from "./src/file_editors"
 import pictureEditors from "./src/picture_editors"
 import ImageLoader from "./src/image_loader"
 import ImageCropper from "./src/image_cropper"
+import Datepicker from "./src/datepicker"
 
 // Global Alchemy object
 if (typeof window.Alchemy === "undefined") {
@@ -20,5 +21,6 @@ Object.assign(Alchemy, {
   fileEditors,
   pictureEditors,
   ImageLoader: ImageLoader.init,
-  ImageCropper
+  ImageCropper,
+  Datepicker
 })

data/package/src/datepicker.js

@@ -0,0 +1,39 @@
+import flatpickr from "flatpickr"
+
+export default function Datepicker(scope = document) {
+  if (scope === "") {
+    scope = document
+  } else if (scope instanceof String) {
+    scope = document.querySelectorAll(scope)
+  }
+
+  const datepickerInputs = scope.querySelectorAll("input[data-datepicker-type]")
+
+  // Initializes the datepickers on the text inputs and sets the proper type
+  // to enable browsers default datepicker if the current OS is iOS.
+  if (Alchemy.isiOS) {
+    datepickerInputs.forEach((input) => {
+      input.attributes.type = input.dataset.datepickerType
+    })
+  } else {
+    datepickerInputs.forEach((input) => {
+      const type = input.dataset.datepickerType
+      const options = {
+        // alchemy_i18n supports `zh_CN` etc., but flatpickr only has two-letter codes (`zh`)
+        locale: Alchemy.locale.slice(0, 2),
+        altInput: true,
+        altFormat: Alchemy.t(`formats.${type}`),
+        altInputClass: "flatpickr-input",
+        enableTime: /time/.test(type),
+        noCalendar: type === "time",
+        time_24hr: Alchemy.t("formats.time_24hr"),
+        onValueUpdate(_selectedDates, _dateStr, instance) {
+          return Alchemy.setElementDirty(
+            instance.element.closest(".element-editor")
+          )
+        }
+      }
+      flatpickr(input, options)
+    })
+  }
+}

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.0-rc2",
+  "version": "6.0.0-rc4",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [
@@ -24,6 +24,7 @@
   },
   "homepage": "https://github.com/AlchemyCMS/alchemy_cms#readme",
   "dependencies": {
+    "flatpickr": "^4.6.9",
     "lodash-es": "^4.17.21",
     "sortablejs": "^1.10.2"
   },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.rc2
+  version: 6.0.0.pre.rc5
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -408,9 +408,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -418,9 +418,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -571,6 +571,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: cuprite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -655,20 +669,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
-- !ruby/object:Gem::Dependency
-  name: webdrivers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -757,7 +757,6 @@ files:
 - app/assets/javascripts/alchemy/alchemy.buttons.js.coffee
 - app/assets/javascripts/alchemy/alchemy.char_counter.js.coffee
 - app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee
-- app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee
 - app/assets/javascripts/alchemy/alchemy.dialog.js.coffee
 - app/assets/javascripts/alchemy/alchemy.dirty.js.coffee
 - app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee
@@ -1008,6 +1007,7 @@ files:
 - app/serializers/alchemy/picture_serializer.rb
 - app/services/alchemy/delete_elements.rb
 - app/services/alchemy/duplicate_element.rb
+- app/services/alchemy/tag_validations.rb
 - app/views/alchemy/_edit_mode.html.erb
 - app/views/alchemy/_menubar.html.erb
 - app/views/alchemy/_preview_mode_code.html.erb
@@ -1308,6 +1308,7 @@ files:
 - lib/alchemy/element_definition.rb
 - lib/alchemy/elements_finder.rb
 - lib/alchemy/engine.rb
+- lib/alchemy/error_tracking.rb
 - lib/alchemy/errors.rb
 - lib/alchemy/essence.rb
 - lib/alchemy/filetypes.rb
@@ -1424,6 +1425,7 @@ files:
 - package.json
 - package/admin.js
 - package/src/__tests__/i18n.spec.js
+- package/src/datepicker.js
 - package/src/file_editors.js
 - package/src/i18n.js
 - package/src/image_cropper.js
@@ -1518,7 +1520,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.2.28
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails

data/app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee

@@ -1,29 +0,0 @@
-window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
-
-$.extend Alchemy,
-
-  Datepicker: (scope) ->
-    $datepicker_inputs = $('input[data-datepicker-type]', scope)
-
-    # Initializes the datepickers on the text inputs and sets the proper type
-    # to enable browsers default datepicker if the current OS is iOS.
-    if Alchemy.isiOS
-      $datepicker_inputs.prop "type", ->
-        return $(this).data('datepicker-type')
-    else
-      $datepicker_inputs.each ->
-        type = $(this).data('datepicker-type')
-        options =
-          # alchemy_i18n supports `zh_CN` etc., but flatpickr only has two-letter codes (`zh`)
-          locale: Alchemy.locale.slice(0, 2)
-          altInput: true
-          altFormat: Alchemy.t("formats.#{type}")
-          altInputClass: ""
-          enableTime: /time/.test(type)
-          noCalendar: type == "time"
-          time_24hr: Alchemy.t("formats.time_24hr")
-          onValueUpdate: (_selectedDates, _dateStr, instance) ->
-            Alchemy.setElementDirty $(instance.element).closest(".element-editor")
-        $(this).flatpickr(options)
-
-    return