diff --git a/.meteor/packages b/.meteor/packages index 1ae9aed82..34d9ae88a 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -43,7 +43,6 @@ tracker@1.3.3 underscore@1.0.13 audit-argument-checks@1.0.7 mquandalle:autofocus -ongoworks:speakingurl raix:handlebar-helpers http@2.0.0! # force new http package diff --git a/.meteor/versions b/.meteor/versions index e8b8793db..775365caf 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -86,7 +86,6 @@ npm-mongo@4.17.2 oauth@2.2.1 oauth2@1.3.2 observe-sequence@1.0.21 -ongoworks:speakingurl@1.1.0 ordered-dict@1.1.0 ostrio:cookies@2.7.2 ostrio:cstorage@4.0.1 diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index 166079b75..381d37cde 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -1,6 +1,7 @@ import { ReactiveCache } from '/imports/reactiveCache'; import { TAPi18n } from '/imports/i18n'; import { FlowRouter } from 'meteor/ostrio:flow-router-extra'; +import getSlug from 'limax'; const subManager = new SubsManager(); diff --git a/client/components/import/import.js b/client/components/import/import.js index b8f7fe66b..b1e156b5e 100644 --- a/client/components/import/import.js +++ b/client/components/import/import.js @@ -3,6 +3,7 @@ import { trelloGetMembersToMap } from './trelloMembersMapper'; import { FlowRouter } from 'meteor/ostrio:flow-router-extra'; import { wekanGetMembersToMap } from './wekanMembersMapper'; import { csvGetMembersToMap } from './csvMembersMapper'; +import getSlug from 'limax'; const Papa = require('papaparse'); diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js index a9271ca6b..d85bcce51 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -2,6 +2,7 @@ import { ReactiveCache } from '/imports/reactiveCache'; import { TAPi18n } from '/imports/i18n'; import { FlowRouter } from 'meteor/ostrio:flow-router-extra'; import { Spinner } from '/client/lib/spinner'; +import getSlug from 'limax'; const subManager = new SubsManager(); const InfiniteScrollIter = 10; diff --git a/models/boards.js b/models/boards.js index 5afff4034..55328683d 100644 --- a/models/boards.js +++ b/models/boards.js @@ -12,6 +12,7 @@ import { import Users from "./users"; import { FlowRouter } from 'meteor/ostrio:flow-router-extra'; import TableVisibilityModeSettings from "./tableVisibilityModeSettings"; +import getSlug from 'limax'; // const escapeForRegex = require('escape-string-regexp'); diff --git a/models/trelloCreator.js b/models/trelloCreator.js index 19ae3aba3..a16a7d491 100644 --- a/models/trelloCreator.js +++ b/models/trelloCreator.js @@ -1,26 +1,27 @@ import { ReactiveCache } from '/imports/reactiveCache'; import { TAPi18n } from '/imports/i18n'; import { CustomFields } from './customFields'; -import { - formatDateTime, - formatDate, - formatTime, - getISOWeek, - isValidDate, - isBefore, - isAfter, - isSame, - add, - subtract, - startOf, - endOf, - format, - parseDate, - now, - createDate, - fromNow, - calendar +import { + formatDateTime, + formatDate, + formatTime, + getISOWeek, + isValidDate, + isBefore, + isAfter, + isSame, + add, + subtract, + startOf, + endOf, + format, + parseDate, + now, + createDate, + fromNow, + calendar } from '/imports/lib/dateUtils'; +import getSlug from 'limax'; const DateString = Match.Where(function(dateAsString) { check(dateAsString, String); diff --git a/models/wekanCreator.js b/models/wekanCreator.js index 39f0fee86..0580ca139 100644 --- a/models/wekanCreator.js +++ b/models/wekanCreator.js @@ -1,25 +1,26 @@ import { ReactiveCache } from '/imports/reactiveCache'; import { CustomFields } from './customFields'; -import { - formatDateTime, - formatDate, - formatTime, - getISOWeek, - isValidDate, - isBefore, - isAfter, - isSame, - add, - subtract, - startOf, - endOf, - format, - parseDate, - now, - createDate, - fromNow, - calendar +import { + formatDateTime, + formatDate, + formatTime, + getISOWeek, + isValidDate, + isBefore, + isAfter, + isSame, + add, + subtract, + startOf, + endOf, + format, + parseDate, + now, + createDate, + fromNow, + calendar } from '/imports/lib/dateUtils'; +import getSlug from 'limax'; const DateString = Match.Where(function(dateAsString) { check(dateAsString, String); diff --git a/package-lock.json b/package-lock.json index 86e04bf83..3038c422a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -943,6 +943,11 @@ "function-bind": "^1.1.2" } }, + "hepburn": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/hepburn/-/hepburn-1.2.2.tgz", + "integrity": "sha512-DeykBc4XmfAWsnN+Y1Svi9uaQnnz21Q/ARuGWvIBxP1iUFeMIWL41DfVkgTh7tU23LFIbmIBO2Bk17BTPu0kVA==" + }, "hotkeys-js": { "version": "3.13.15", "resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.13.15.tgz", @@ -1143,6 +1148,17 @@ "immediate": "~3.0.5" } }, + "limax": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/limax/-/limax-4.1.0.tgz", + "integrity": "sha512-vciK5Mx+y+GrJjcVjbEjItzZ6Pbt+LXCb9d3qo3B+HcnTLZYRFyuszD6Hbwk0PDVEmZzS+FA0nT5aBy1HlZgGg==", + "requires": { + "hepburn": "^1.2.0", + "lodash.deburr": "^4.1.0", + "pinyin-pro": "^3.14.0", + "speakingurl": "^14.0.1" + } + }, "linkify-it": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", @@ -1156,6 +1172,11 @@ "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz", "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==" }, + "lodash.deburr": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/lodash.deburr/-/lodash.deburr-4.1.0.tgz", + "integrity": "sha512-m/M1U1f3ddMCs6Hq2tAsYThTBDaAKFDX3dwDo97GEYzamXi9SqUpjWi/Rrj/gf3X2n8ktwgZrlP1z6E3v/IExQ==" + }, "lodash.defaults": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", @@ -2526,6 +2547,11 @@ "is-reference": "^1.1.4" } }, + "pinyin-pro": { + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/pinyin-pro/-/pinyin-pro-3.28.0.tgz", + "integrity": "sha512-mMRty6RisoyYNphJrTo3pnvp3w8OMZBrXm9YSWkxhAfxKj1KZk2y8T2PDIZlDDRsvZ0No+Hz6FI4sZpA6Ey25g==" + }, "possible-typed-array-names": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", @@ -2786,6 +2812,11 @@ "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" }, + "speakingurl": { + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz", + "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==" + }, "speech-rule-engine": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/speech-rule-engine/-/speech-rule-engine-4.1.2.tgz", diff --git a/package.json b/package.json index bed4fa107..b4de5757e 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "jquery-ui": "^1.13.3", "jszip": "^3.7.1", "ldapjs": "^2.3.3", + "limax": "4.1.0", "markdown-it": "^12.3.2", "markdown-it-emoji": "^2.0.0", "markdown-it-mathjax3": "^4.3.2",