apostrophe 3.63.3 → 4.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "3.63.3",
+  "version": "4.1.0",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {
@@ -31,41 +31,28 @@
   "author": "Apostrophe Technologies, Inc.",
   "license": "MIT",
   "dependencies": {
-    "@apostrophecms/vue-color": "^2.8.2",
+    "@apostrophecms/vue-material-design-icons": "^1.0.0",
+    "@ckpack/vue-color": "^1.4.1",
+    "@floating-ui/dom": "^1.5.3",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.1",
-    "@tiptap/core": "^2.0.0-beta.220",
-    "@tiptap/extension-blockquote": "^2.0.0-beta.220",
-    "@tiptap/extension-bold": "^2.0.0-beta.220",
-    "@tiptap/extension-bullet-list": "^2.0.0-beta.220",
-    "@tiptap/extension-code": "^2.0.0-beta.220",
-    "@tiptap/extension-code-block": "^2.0.0-beta.220",
-    "@tiptap/extension-dropcursor": "^2.0.0-beta.220",
-    "@tiptap/extension-floating-menu": "^2.0.0-beta.220",
-    "@tiptap/extension-gapcursor": "^2.0.0-beta.220",
-    "@tiptap/extension-hard-break": "^2.0.0-beta.220",
-    "@tiptap/extension-heading": "^2.0.0-beta.220",
-    "@tiptap/extension-highlight": "^2.0.0-beta.220",
-    "@tiptap/extension-history": "^2.0.0-beta.220",
-    "@tiptap/extension-horizontal-rule": "^2.0.0-beta.220",
-    "@tiptap/extension-italic": "^2.0.0-beta.220",
-    "@tiptap/extension-link": "^2.0.0-beta.220",
-    "@tiptap/extension-list-item": "^2.0.0-beta.220",
-    "@tiptap/extension-ordered-list": "^2.0.0-beta.220",
-    "@tiptap/extension-paragraph": "^2.0.0-beta.220",
-    "@tiptap/extension-placeholder": "^2.0.0-beta.220",
-    "@tiptap/extension-strike": "^2.0.0-beta.220",
-    "@tiptap/extension-subscript": "^2.0.0-beta.220",
-    "@tiptap/extension-superscript": "^2.0.0-beta.220",
-    "@tiptap/extension-table": "^2.0.0-beta.220",
-    "@tiptap/extension-table-cell": "^2.0.0-beta.220",
-    "@tiptap/extension-table-header": "^2.0.0-beta.220",
-    "@tiptap/extension-table-row": "^2.0.0-beta.220",
-    "@tiptap/extension-text": "^2.0.0-beta.220",
-    "@tiptap/extension-text-align": "^2.0.0-beta.220",
-    "@tiptap/extension-text-style": "^2.0.0-beta.220",
-    "@tiptap/extension-underline": "^2.0.0-beta.220",
-    "@tiptap/vue-2": "^2.0.0-beta.220",
+    "@tiptap/extension-floating-menu": "^2.0.3",
+    "@tiptap/extension-highlight": "^2.0.3",
+    "@tiptap/extension-link": "^2.0.3",
+    "@tiptap/extension-placeholder": "^2.0.3",
+    "@tiptap/extension-subscript": "^2.0.3",
+    "@tiptap/extension-superscript": "^2.0.3",
+    "@tiptap/extension-table": "^2.0.3",
+    "@tiptap/extension-table-cell": "^2.0.3",
+    "@tiptap/extension-table-header": "^2.0.3",
+    "@tiptap/extension-table-row": "^2.0.3",
+    "@tiptap/extension-text-align": "^2.0.3",
+    "@tiptap/extension-text-style": "^2.0.3",
+    "@tiptap/extension-underline": "^2.0.3",
+    "@tiptap/starter-kit": "^2.0.3",
+    "@tiptap/vue-3": "^2.0.3",
+    "@vue/compat": "^3.3.8",
+    "@vue/compiler-sfc": "^3.3.8",
     "autoprefixer": "^10.4.1",
     "bluebird": "^3.7.2",
     "body-parser": "^1.18.2",
@@ -91,7 +78,7 @@
     "form-data": "^4.0.0",
     "fs-extra": "^7.0.1",
     "glob": "^5.0.15",
-    "he": "^0.5.0",
+    "he": "^1.2.0",
     "html-to-text": "^9.0.5",
     "i18next": "^20.3.2",
     "i18next-http-middleware": "^3.1.5",
@@ -127,18 +114,17 @@
     "sass-loader": "^10.1.1",
     "server-destroy": "^1.0.1",
     "sluggo": "^1.0.0",
+    "sortablejs": "^1.15.0",
+    "sortablejs-vue3": "^1.2.11",
+    "tiny-emitter": "^2.1.0",
     "tinycolor2": "^1.4.2",
     "tough-cookie": "^4.0.0",
     "underscore.string": "^3.3.4",
     "uploadfs": "^1.22.3",
-    "v-tooltip": "^2.0.3",
-    "vue": "2.7.15",
-    "vue-advanced-cropper": "^1.10.1",
-    "vue-loader": "^15.10.0",
-    "vue-material-design-icons": "~4.12.1",
-    "vue-style-loader": "^4.1.2",
-    "vue-template-compiler": "^2.6.14",
-    "vuedraggable": "^2.24.3",
+    "vue": "^3.3.8",
+    "vue-advanced-cropper": "^2.8.8",
+    "vue-loader": "^17.1.0",
+    "vue-style-loader": "^4.1.3",
     "webpack": "^5.72.0",
     "webpack-merge": "^5.7.3",
     "xregexp": "^2.0.0"
@@ -157,7 +143,8 @@
     "stylelint": "^14.6.1",
     "stylelint-declaration-strict-value": "^1.8.0",
     "stylelint-order": "^5.0.0",
-    "vue-eslint-parser": "^7.1.1"
+    "vue-eslint-parser": "^7.1.1",
+    "vue-template-compiler": "^2.7.14"
   },
   "browserslist": [
     "ie >= 10"

package/test/attachments.js

@@ -442,5 +442,10 @@ describe('Attachment', function() {
 
       assert(height === 400);
     });
+
+    it('should generate an appropriate missing attachment url', function() {
+      const url = apos.attachment.url(null);
+      assert.strictEqual(url, '/apos-frontend/default/modules/@apostrophecms/attachment/img/missing-icon.svg');
+    });
   });
 });

package/test/schemas.js

@@ -288,6 +288,44 @@ describe('Schemas', function() {
               }
             };
           }
+        },
+        article: {
+          extend: '@apostrophecms/piece-type',
+          options: {
+            alias: 'article'
+          },
+          fields(self) {
+            return {
+              add: {
+                title: {
+                  label: '',
+                  type: 'string',
+                  required: true
+                },
+                area: {
+                  label: 'Area',
+                  type: 'area',
+                  options: {
+                    widgets: {
+                      '@apostrophecms/rich-text': {}
+                    }
+                  }
+                },
+                array: {
+                  label: 'Array',
+                  type: 'array',
+                  fields: {
+                    add: {
+                      arrayTitle: {
+                        label: 'Array Title',
+                        type: 'string'
+                      }
+                    }
+                  }
+                }
+              }
+            };
+          }
         }
       }
     });
@@ -2263,6 +2301,106 @@ describe('Schemas', function() {
     assert(output.goodValue === '2022-05-09T22:36:00.000Z');
   });
 
+  it('should compare two document properly with the method getChanges', async function() {
+    const req = apos.task.getReq();
+    const instance = apos.article.newInstance();
+    const article1 = {
+      ...instance,
+      title: 'article 1',
+      area: {
+        _id: 'clrth36680007mnmd3jj7cta0',
+        items: [
+          {
+            _id: 'clt79l48g001h2061j5ihxjkv',
+            metaType: 'widget',
+            type: '@apostrophecms/rich-text',
+            aposPlaceholder: false,
+            content: '<p>Some text here.</p>',
+            permalinkIds: [],
+            imageIds: []
+          }
+        ],
+        metaType: 'area'
+      },
+      array: [
+        {
+          _id: 'clt79llm800242061v4dx9kv5',
+          metaType: 'arrayItem',
+          scopedArrayName: 'doc.article.array',
+          arrayTitle: 'array title 1'
+        },
+        {
+          _id: 'clt79llm800242061v4d47364',
+          metaType: 'arrayItem',
+          scopedArrayName: 'doc.article.array',
+          arrayTitle: 'array title 2'
+        }
+      ]
+    };
+    const article2 = {
+      ...article1,
+      title: 'article 2'
+    };
+    const article3 = {
+      ...instance,
+      title: 'article 3',
+
+      area: {
+        _id: 'clrth36680007mnmd3jj7cta0',
+        items: [
+          {
+            _id: 'clt79l48g001h2061j5ihxjkv',
+            metaType: 'widget',
+            type: '@apostrophecms/rich-text',
+            aposPlaceholder: false,
+            content: '<p>Some text here changed.</p>',
+            permalinkIds: [],
+            imageIds: []
+          }
+        ],
+        metaType: 'area'
+      },
+      array: [
+        {
+          _id: 'clt79llm800242061v4dx9kv5',
+          metaType: 'arrayItem',
+          scopedArrayName: 'doc.article.array',
+          arrayTitle: 'array title 1 changed'
+        },
+        {
+          _id: 'clt79llm800242061v4d47364',
+          metaType: 'arrayItem',
+          scopedArrayName: 'doc.article.array',
+          arrayTitle: 'array title 2'
+        }
+      ]
+    };
+
+    await apos.article.insert(req, article1);
+    await apos.article.insert(req, article2);
+    await apos.article.insert(req, article3);
+
+    const art1 = await apos.doc.db.findOne({ title: 'article 1' });
+    const art2 = await apos.doc.db.findOne({ title: 'article 2' });
+    const art3 = await apos.doc.db.findOne({ title: 'article 3' });
+
+    const changes11 = apos.schema.getChanges(req, apos.article.schema, art1, art1);
+    const changes12 = apos.schema.getChanges(req, apos.article.schema, art1, art2);
+    const changes23 = apos.schema.getChanges(req, apos.article.schema, art2, art3);
+    const actual = {
+      changes11,
+      changes12,
+      changes23
+    };
+    const expected = {
+      changes11: [],
+      changes12: [ 'title', 'slug' ],
+      changes23: [ 'title', 'slug', 'area', 'array' ]
+    };
+
+    assert.deepEqual(actual, expected);
+  });
+
   describe('field editPermission|viewPermission', function() {
     const schema = [
       {