@rails/actiontext 6.1.4 → 7.0.0-rc2

package/README.md

@@ -4,6 +4,10 @@ Action Text brings rich text content and editing to Rails. It includes the [Trix
 
 You can read more about Action Text in the [Action Text Overview](https://edgeguides.rubyonrails.org/action_text_overview.html) guide.
 
+## Development
+
+The JavaScript for Action Text is distributed both as a npm module under @rails/actiontext and via the asset pipeline as actiontext.js (and we mirror Trix as trix.js). To ensure that the latter remains in sync, you must run `yarn build` and checkin the artifacts whenever the JavaScript source or the Trix dependency is bumped. CSS changes must be brought over manually to app/assets/stylesheets/trix.css
+
 ## License
 
 Action Text is released under the [MIT License](https://opensource.org/licenses/MIT).

package/app/javascript/actiontext/attachment_upload.js

@@ -4,7 +4,7 @@ export class AttachmentUpload {
   constructor(attachment, element) {
     this.attachment = attachment
     this.element = element
-    this.directUpload = new DirectUpload(attachment.file, this.directUploadUrl, this)
+    this.directUpload = new DirectUpload(attachment.file, this.directUploadUrl, this.directUploadToken, this.attachmentName, this)
   }
 
   start() {
@@ -42,4 +42,11 @@ export class AttachmentUpload {
   get blobUrlTemplate() {
     return this.element.dataset.blobUrlTemplate
   }
+
+  get directUploadToken() {
+    return this.element.getAttribute("data-direct-upload-token");
+  }
+  get attachmentName() {
+    return this.element.getAttribute("data-direct-upload-attachment-name");
+  }
 }

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@rails/actiontext",
-  "version": "6.1.4",
+  "version": "7.0.0-rc2",
   "description": "Edit and display rich text in Rails applications",
   "main": "app/javascript/actiontext/index.js",
+  "type": "module",
   "files": [
     "app/javascript/actiontext/*.js"
   ],
@@ -21,9 +22,18 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@rails/activestorage": "^6.0.0"
+    "@rails/activestorage": ">= 7.0.0-alpha1"
   },
   "peerDependencies": {
-    "trix": "^1.2.0"
+    "trix": "^1.3.1"
+  },
+  "devDependencies": {
+    "@rollup/plugin-node-resolve": "^11.0.1",
+    "@rollup/plugin-commonjs": "^19.0.1",
+    "rollup": "^2.35.1",
+    "trix": "^1.3.1"
+  },
+  "scripts": {
+    "build": "rollup --config rollup.config.js"
   }
 }

package/CHANGELOG.md

@@ -1,101 +0,0 @@
-## Rails 6.1.4 (June 24, 2021) ##
-
-*   Always render attachment partials as HTML with `:html` format inside trix editor.
-
-    *James Brooks*
-
-
-## Rails 6.1.3.2 (May 05, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.3.1 (March 26, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.3 (February 17, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.2.1 (February 10, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.2 (February 09, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.1 (January 07, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.0 (December 09, 2020) ##
-
-*   Declare `ActionText::FixtureSet.attachment` to generate an
-    `<action-text-attachment sgid="..."></action-text-attachment>` element with
-    a valid `sgid` attribute.
-
-    ```ruby
-    hello_world_review_content:
-      record: hello_world (Review)
-      name: content
-      body: <p><%= ActionText::FixtureSet.attachment("messages", :hello_world) %> is great!</p>
-    ```
-
-    *Sean Doyle*
-
-*   Locate `fill_in_rich_text_area` by `<label>` text
-
-    In addition to searching for `<trix-editor>` elements with the appropriate
-    `aria-label` attribute, also support locating elements that match the
-    corresponding `<label>` element's text.
-
-    *Sean Doyle*
-
-*   Be able to add a default value to `rich_text_area`.
-
-    ```ruby
-    form.rich_text_area :content, value: "<h1>Hello world</h1>"
-    #=> <input type="hidden" name="message[content]" id="message_content_trix_input_message_1" value="<h1>Hello world</h1>">
-    ```
-
-    *Paulo Ancheta*
-
-*   Add method to confirm rich text content existence by adding `?` after rich
-    text attribute.
-
-    ```ruby
-    message = Message.create!(body: "<h1>Funny times!</h1>")
-    message.body? #=> true
-    ```
-
-    *Kyohei Toyoda*
-
-*   The `fill_in_rich_text_area` system test helper locates a Trix editor
-    and fills it in with the given HTML.
-
-    ```ruby
-    # <trix-editor id="message_content" ...></trix-editor>
-    fill_in_rich_text_area "message_content", with: "Hello <em>world!</em>"
-
-    # <trix-editor placeholder="Your message here" ...></trix-editor>
-    fill_in_rich_text_area "Your message here", with: "Hello <em>world!</em>"
-
-    # <trix-editor aria-label="Message content" ...></trix-editor>
-    fill_in_rich_text_area "Message content", with: "Hello <em>world!</em>"
-
-    # <input id="trix_input_1" name="message[content]" type="hidden">
-    # <trix-editor input="trix_input_1"></trix-editor>
-    fill_in_rich_text_area "message[content]", with: "Hello <em>world!</em>"
-    ```
-
-    *George Claghorn*
-
-
-Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actiontext/CHANGELOG.md) for previous changes.