diff --git a/CHANGELOG.md b/CHANGELOG.md index df1e7778b..075671bec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ Fixing other platforms In Progress. [How to upgrade WeKan](https://github.com/wekan/wekan/issues/4585) -# Upcoming WeKan ® release +# v7.52 2024-08-03 WeKan ® release This release adds the following new features: diff --git a/Dockerfile b/Dockerfile index a9d5ef82f..28d9cada4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -202,7 +202,7 @@ ln -s "/usr/local/bin/node" "/usr/local/bin/nodejs" mkdir -p "/opt/nodejs/lib/node_modules/fibers/.node-gyp" "/root/.node-gyp/${NODE_VERSION} /home/wekan/.config" # Install node dependencies -npm install -g npm@${NPM_VERSION} +npm install -g npm@${NPM_VERSION} --production chown --recursive wekan:wekan /home/wekan/.config # Install Meteor @@ -222,11 +222,11 @@ cd /home/wekan/app mkdir -p /home/wekan/.npm chown --recursive wekan:wekan /home/wekan/.npm chmod u+w *.json -gosu wekan:wekan meteor npm install +gosu wekan:wekan meteor npm install --production gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build cd /home/wekan/app_build/bundle/programs/server/ chmod u+w *.json -gosu wekan:wekan meteor npm install +gosu wekan:wekan meteor npm install --production cd node_modules/fibers node build.js cd ../.. diff --git a/Stackerfile.yml b/Stackerfile.yml index b48adb849..7f622b236 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v7.51.0" +appVersion: "v7.52.0" files: userUploads: - README.md diff --git a/models/server/createWorkbook.js b/models/server/createWorkbook.js index 493f678cd..28b1c45f8 100644 --- a/models/server/createWorkbook.js +++ b/models/server/createWorkbook.js @@ -1,4 +1,4 @@ -import Excel from 'exceljs'; +import Excel from '@wekanteam/exceljs'; export const createWorkbook = function() { return new Excel.Workbook(); diff --git a/package-lock.json b/package-lock.json index 86a8a1a43..75dfe704a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v7.51.0", + "version": "v7.52.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -108,11 +108,106 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz", "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==" }, + "@wekanteam/asn1": { + "version": "github:wekan/asn1#5afa10711f3d59d39412ca30f8d27d4010aea2ab", + "from": "github:wekan/asn1" + }, + "@wekanteam/attribute": { + "version": "github:wekan/attribute#16b53c09c8b321187a2c9d1394abd2efaa3e0e1e", + "from": "github:wekan/attribute", + "requires": { + "@wekanteam/asn1": "github:wekan/asn1", + "@wekanteam/protocol": "github:wekan/protocol", + "process-warning": "^2.1.0" + } + }, + "@wekanteam/change": { + "version": "github:wekan/change#0edd63e0da9bd7fb6de8983d13982b5479d5ba61", + "from": "github:wekan/change", + "requires": { + "@wekanteam/asn1": "github:wekan/asn1", + "@wekanteam/attribute": "github:wekan/attribute" + } + }, + "@wekanteam/controls": { + "version": "github:wekan/controls#1b2dd5c0a9179e0cccf96e40049793a584e29a32", + "from": "github:wekan/controls", + "requires": { + "@wekanteam/asn1": "github:wekan/asn1", + "@wekanteam/protocol": "github:wekan/protocol" + } + }, + "@wekanteam/dn": { + "version": "github:wekan/dn#89d02a4e67dc115f2026e68f4fbd9eede7f2a669", + "from": "github:wekan/dn", + "requires": { + "@wekanteam/asn1": "github:wekan/asn1", + "process-warning": "^2.1.0" + } + }, + "@wekanteam/exceljs": { + "version": "github:wekan/exceljs#e0229907e7a81bc3fe6daf4e42b1fdfbecdcb7cb", + "from": "github:wekan/exceljs", + "requires": { + "archiver": "^5.0.0", + "dayjs": "^1.8.34", + "fast-csv": "^4.3.1", + "jszip": "^3.10.1", + "readable-stream": "^3.6.0", + "saxes": "^5.0.1", + "tmp": "^0.2.0", + "unzipper": "^0.10.11", + "uuid": "^8.3.0" + } + }, + "@wekanteam/filter": { + "version": "github:wekan/filter#062de81f55aab95e75f0851b6da4cf3c7a69559c", + "from": "github:wekan/filter", + "requires": { + "@wekanteam/asn1": "github:wekan/asn1", + "@wekanteam/protocol": "github:wekan/protocol", + "process-warning": "^2.1.0" + } + }, "@wekanteam/html-to-markdown": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@wekanteam/html-to-markdown/-/html-to-markdown-1.0.2.tgz", "integrity": "sha512-PxeGIu/HMjmL84N2Dj5qp4lFlBP4jV/y6WU/JhDiFPx6gfGEWXgDcc9sShTPNvECtToGAA0SCD6T/k50CMHi8Q==" }, + "@wekanteam/ldapjs": { + "version": "github:wekan/node-ldapjs#9500317e0b583f6581bf82b720efdbf287b04e1f", + "from": "github:wekan/node-ldapjs", + "requires": { + "@wekanteam/asn1": "github:wekan/asn1", + "@wekanteam/attribute": "github:wekan/attribute", + "@wekanteam/change": "github:wekan/change", + "@wekanteam/controls": "github:wekan/controls", + "@wekanteam/dn": "github:wekan/dn", + "@wekanteam/filter": "github:wekan/filter", + "@wekanteam/messages": "github:wekan/messages", + "@wekanteam/protocol": "github:wekan/protocol", + "abstract-logging": "^2.0.1", + "assert-plus": "^1.0.0", + "backoff": "^2.5.0", + "once": "^1.4.0", + "vasync": "^2.2.1", + "verror": "^1.10.1" + } + }, + "@wekanteam/messages": { + "version": "github:wekan/messages#fc64622aaa572016140464f16ce08cace1c5e40c", + "from": "github:wekan/messages", + "requires": { + "@wekanteam/asn1": "github:wekan/asn1", + "@wekanteam/attribute": "github:wekan/attribute", + "@wekanteam/change": "github:wekan/change", + "@wekanteam/controls": "github:wekan/controls", + "@wekanteam/dn": "github:wekan/dn", + "@wekanteam/filter": "github:wekan/filter", + "@wekanteam/protocol": "github:wekan/protocol", + "process-warning": "^2.2.0" + } + }, "@wekanteam/meteor-globals": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@wekanteam/meteor-globals/-/meteor-globals-1.1.4.tgz", @@ -129,6 +224,10 @@ "@wekanteam/meteor-globals": "^1.1.4" } }, + "@wekanteam/protocol": { + "version": "github:wekan/protocol#58ae926cbe694c83b3d000674245b3c0115cfc77", + "from": "github:wekan/protocol" + }, "@zxing/text-encoding": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz", @@ -253,14 +352,6 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, - "asn1": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", - "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", - "requires": { - "safer-buffer": "~2.1.0" - } - }, "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", @@ -697,21 +788,6 @@ "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz", "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==" }, - "exceljs": { - "version": "git+https://github.com/exceljs/exceljs.git#5bed18b45e824f409b08456b59b87430ded023ab", - "from": "git+https://github.com/exceljs/exceljs.git", - "requires": { - "archiver": "^5.0.0", - "dayjs": "^1.8.34", - "fast-csv": "^4.3.1", - "jszip": "^3.10.1", - "readable-stream": "^3.6.0", - "saxes": "^5.0.1", - "tmp": "^0.2.0", - "unzipper": "^0.10.11", - "uuid": "^8.3.0" - } - }, "extsprintf": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", @@ -1173,29 +1249,6 @@ } } }, - "ldap-filter": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.3.3.tgz", - "integrity": "sha512-/tFkx5WIn4HuO+6w9lsfxq4FN3O+fDZeO9Mek8dCD8rTUpqzRa766BOBO7BcGkn3X86m5+cBm1/2S/Shzz7gMg==", - "requires": { - "assert-plus": "^1.0.0" - } - }, - "ldapjs": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-2.3.3.tgz", - "integrity": "sha512-75QiiLJV/PQqtpH+HGls44dXweviFwQ6SiIK27EqzKQ5jU/7UFrl2E5nLdQ3IYRBzJ/AVFJI66u0MZ0uofKYwg==", - "requires": { - "abstract-logging": "^2.0.0", - "asn1": "^0.2.4", - "assert-plus": "^1.0.0", - "backoff": "^2.5.0", - "ldap-filter": "^0.3.3", - "once": "^1.4.0", - "vasync": "^2.2.0", - "verror": "^1.8.1" - } - }, "lie": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", @@ -2465,6 +2518,11 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, + "process-warning": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-2.3.2.tgz", + "integrity": "sha512-n9wh8tvBe5sFmsqlg+XQhaQLumwpqoAUruLwjCopgTmUBjJ/fjtBsJzKleCaIGBOMXYEhp1YfKl4d7rJ5ZKJGA==" + }, "punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -2551,11 +2609,6 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, "sax": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz", diff --git a/package.json b/package.json index a93ccdd43..eadfbebe1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v7.51.0", + "version": "v7.52.0", "description": "Open-Source kanban", "private": true, "repository": { @@ -23,13 +23,14 @@ "@wekanteam/html-to-markdown": "^1.0.2", "@wekanteam/meteor-globals": "^1.1.4", "@wekanteam/meteor-reactive-cache": "^1.0.6", + "@wekanteam/exceljs": "github:wekan/exceljs", + "@wekanteam/ldapjs": "github:wekan/node-ldapjs", "ajv": "^6.12.6", "bcryptjs": "^2.4.3", "bson": "^4.5.2", "dompurify": "^2.5.5", "es6-promise": "^4.2.4", "escape-string-regexp": "^5.0.0", - "exceljs": "git+https://github.com/exceljs/exceljs.git", "fibers": "^5.0.3", "file-type": "^16.5.4", "filesize": "^8.0.7", @@ -38,7 +39,6 @@ "jquery": "^3.7.1", "jquery-ui": "^1.13.3", "jszip": "^3.7.1", - "ldapjs": "^2.3.3", "markdown-it": "^12.3.2", "markdown-it-emoji": "^2.0.0", "markdown-it-mathjax3": "^4.3.2", diff --git a/packages/wekan-ldap/server/ldap.js b/packages/wekan-ldap/server/ldap.js index 428196423..3e8986b15 100644 --- a/packages/wekan-ldap/server/ldap.js +++ b/packages/wekan-ldap/server/ldap.js @@ -1,4 +1,4 @@ -import ldapjs from 'ldapjs'; +import ldapjs from '@wekanteam/ldapjs'; import { Log } from 'meteor/logging'; // copied from https://github.com/ldapjs/node-ldapjs/blob/a113953e0d91211eb945d2a3952c84b7af6de41c/lib/filters/index.js#L167 diff --git a/public/api/wekan.html b/public/api/wekan.html index 21fd7c0d8..c1ec4fc3f 100644 --- a/public/api/wekan.html +++ b/public/api/wekan.html @@ -7,7 +7,7 @@ - Wekan REST API v7.51 + Wekan REST API v7.52 @@ -1548,7 +1548,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc