From e6a3a79c13cc2546f0c5f157301f27e4cfc6dc5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 10 Nov 2019 14:04:43 +0000 Subject: [PATCH 01/13] Bump sequelize from 5.3.5 to 5.15.1 Bumps [sequelize](https://github.com/sequelize/sequelize) from 5.3.5 to 5.15.1. - [Release notes](https://github.com/sequelize/sequelize/releases) - [Commits](https://github.com/sequelize/sequelize/compare/v5.3.5...v5.15.1) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index c4ed57a6..12888a56 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "reveal.js": "~3.7.0", "scrypt": "~6.0.3", "select2": "~3.5.2-browserify", - "sequelize": "5.3.5", + "sequelize": "5.15.1", "sequelize-cli": "~5.4.0", "shortid": "~2.2.14", "socket.io": "~2.2.0", diff --git a/yarn.lock b/yarn.lock index 4901adea..6b6bd630 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11167,7 +11167,7 @@ semver@4.3.2: resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7" integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c= -semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0: +semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -11205,17 +11205,15 @@ sequelize-cli@~5.4.0: umzug "^2.1.0" yargs "^12.0.5" -sequelize-pool@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-1.0.2.tgz#89c767882bbdb8a41dac66922ed9820939a5401e" - integrity sha512-VMKl/gCCdIvB1gFZ7p+oqLFEyZEz3oMMYjkKvfEC7GoO9bBcxmfOOU9RdkoltfXGgBZFigSChihRly2gKtsh2w== - dependencies: - bluebird "^3.5.3" +sequelize-pool@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.3.0.tgz#64f1fe8744228172c474f530604b6133be64993d" + integrity sha512-Ibz08vnXvkZ8LJTiUOxRcj1Ckdn7qafNZ2t59jYHMX1VIebTAOYefWdRYFt6z6+hy52WGthAHAoLc9hvk3onqA== -sequelize@5.3.5: - version "5.3.5" - resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.3.5.tgz#2fffe8fbb28029d93a6f132e29b6a09ace15721f" - integrity sha512-eE9cq0XwDMb8hSRTfgx3r98ZstSLXvx5o3G6bhXG24uF4udXcooAv/23v9Jk170ohcI7KqnWgtmEslxCxsYWdQ== +sequelize@5.15.1: + version "5.15.1" + resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.15.1.tgz#f130ded17e74395ae7f5e265277c99577e895afb" + integrity sha512-DCzzJYvJLMKnyf8G3at2A+yM9M2fSQmTmuOYIpCWM8Gjqx3XfgNTd1NkuyPWFoi1/d1AXQsN2VDPXkPczida8A== dependencies: bluebird "^3.5.0" cls-bluebird "^2.1.0" @@ -11226,8 +11224,8 @@ sequelize@5.3.5: moment "^2.24.0" moment-timezone "^0.5.21" retry-as-promised "^3.1.0" - semver "^5.6.0" - sequelize-pool "^1.0.2" + semver "^6.1.1" + sequelize-pool "^2.3.0" toposort-class "^1.0.1" uuid "^3.2.1" validator "^10.11.0" From 56a35f59357ba6ac3bf999a618f65567216ca290 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Thu, 14 Nov 2019 17:30:11 +0800 Subject: [PATCH 02/13] Add line break to README migration section Signed-off-by: Yukai Huang --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ecf78a4f..a1824661 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ If you want to contribute to the project, start with [manual deployment](https:/ CodiMD is highly customizable, learn about all configuration options of networking, security, performance, resources, privilege, privacy, image storage, and authentication in [CodiMD Configuration](https://hackmd.io/c/codimd-documentation/%2Fs%2Fcodimd-configuration). ### Upgrading and Migration -Upgrade CodiMD from previous version? See [this guide](https://hackmd.io/c/codimd-documentation/%2Fs%2Fcodimd-upgrade) +Upgrade CodiMD from previous version? See [this guide](https://hackmd.io/c/codimd-documentation/%2Fs%2Fcodimd-upgrade)
Migrating from Etherpad? Follow [this guide](https://hackmd.io/c/codimd-documentation/%2Fs%2Fcodimd-migration-etherpad) ### Developer From f1594c56e23ddbcb6b5ab5cc9c64d8be0d9ce38c Mon Sep 17 00:00:00 2001 From: BoHong Li Date: Thu, 28 Nov 2019 13:44:02 +0800 Subject: [PATCH 03/13] feat: upgrade base image to resolve pcheck issues 1. upgrade node.js version from 8.16.0 to 8.16.2 2. upgrade pcheck to support connection string from environment 3. upgrade pcheck to fix connection string contains underscore might not resolve correctly Signed-off-by: BoHong Li --- deployments/Dockerfile | 2 +- deployments/docker-compose.yml | 2 ++ deployments/docker-entrypoint.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deployments/Dockerfile b/deployments/Dockerfile index 916012a5..11006b09 100644 --- a/deployments/Dockerfile +++ b/deployments/Dockerfile @@ -15,7 +15,7 @@ RUN set -xe && \ yarn.lock webpack.prod.js webpack.htmlexport.js webpack.dev.js webpack.common.js \ config.json.example README.md CONTRIBUTING.md AUTHORS -FROM hackmdio/runtime:1.0.4 +FROM hackmdio/runtime:1.0.6 USER hackmd WORKDIR /home/hackmd/app COPY --chown=1500:1500 --from=BUILD /home/hackmd/app . diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml index 0ec4a658..2897bcda 100644 --- a/deployments/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -10,6 +10,8 @@ services: - "database-data:/var/lib/postgresql/data" restart: always codimd: + # you can use image or custom build below + # image: nabo.codimd.dev/hackmdio/hackmd:1.4.0 build: context: .. dockerfile: ./deployments/Dockerfile diff --git a/deployments/docker-entrypoint.sh b/deployments/docker-entrypoint.sh index 0ea7f9a4..0016eaf8 100755 --- a/deployments/docker-entrypoint.sh +++ b/deployments/docker-entrypoint.sh @@ -8,7 +8,7 @@ if [[ "$#" -gt 0 ]]; then fi # check database and redis is ready -pcheck -constr "$CMD_DB_URL" +pcheck -env CMD_DB_URL # run DB migrate NEED_MIGRATE=${CMD_AUTO_MIGRATE:=true} From abde89064ff358b10b2a61420b6f4200ac26c004 Mon Sep 17 00:00:00 2001 From: Brandon WELSCH Date: Thu, 28 Nov 2019 16:34:16 +0100 Subject: [PATCH 04/13] Added Scalingo compatible deployment Signed-off-by: Brandon WELSCH --- .buildpacks | 2 + scalingo.json | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 .buildpacks create mode 100644 scalingo.json diff --git a/.buildpacks b/.buildpacks new file mode 100644 index 00000000..01611239 --- /dev/null +++ b/.buildpacks @@ -0,0 +1,2 @@ +https://github.com/alex88/heroku-buildpack-vips +https://github.com/Scalingo/nodejs-buildpack diff --git a/scalingo.json b/scalingo.json new file mode 100644 index 00000000..21da3da0 --- /dev/null +++ b/scalingo.json @@ -0,0 +1,157 @@ +{ + "name": "CodiMD", + "description": "Realtime collaborative markdown notes on all platforms", + "keywords": [ + "Collaborative", + "Markdown", + "Notes" + ], + "website": "https://github.com/hackmdio/codimd", + "repository": "https://github.com/hackmdio/codimd", + "logo": "https://github.com/hackmdio/codimd/raw/master/public/codimd-icon-1024.png", + "success_url": "/", + "env": { + "NPM_CONFIG_PRODUCTION": { + "description": "Let npm also install development build tool", + "value": "false" + }, + "CMD_SESSION_SECRET": { + "description": "Secret used to secure session cookies.", + "required": false + }, + "CMD_HSTS_ENABLE": { + "description": "whether to also use HSTS if HTTPS is enabled", + "required": false + }, + "CMD_HSTS_MAX_AGE": { + "description": "max duration, in seconds, to tell clients to keep HSTS status", + "required": false + }, + "CMD_HSTS_INCLUDE_SUBDOMAINS": { + "description": "whether to tell clients to also regard subdomains as HSTS hosts", + "required": false + }, + "CMD_HSTS_PRELOAD": { + "description": "whether to allow at all adding of the site to HSTS preloads (e.g. in browsers)", + "required": false + }, + "CMD_DOMAIN": { + "description": "domain name", + "required": false + }, + "CMD_URL_PATH": { + "description": "sub url path, like `www.example.com/`", + "required": false + }, + "CMD_ALLOW_ORIGIN": { + "description": "domain name whitelist (use comma to separate)", + "required": false, + "value": "localhost" + }, + "CMD_PROTOCOL_USESSL": { + "description": "set to use ssl protocol for resources path (only applied when domain is set)", + "required": false + }, + "CMD_URL_ADDPORT": { + "description": "set to add port on callback url (port 80 or 443 won't applied) (only applied when domain is set)", + "required": false + }, + "CMD_FACEBOOK_CLIENTID": { + "description": "Facebook API client id", + "required": false + }, + "CMD_FACEBOOK_CLIENTSECRET": { + "description": "Facebook API client secret", + "required": false + }, + "CMD_TWITTER_CONSUMERKEY": { + "description": "Twitter API consumer key", + "required": false + }, + "CMD_TWITTER_CONSUMERSECRET": { + "description": "Twitter API consumer secret", + "required": false + }, + "CMD_GITHUB_CLIENTID": { + "description": "GitHub API client id", + "required": false + }, + "CMD_GITHUB_CLIENTSECRET": { + "description": "GitHub API client secret", + "required": false + }, + "CMD_GITLAB_BASEURL": { + "description": "GitLab authentication endpoint, set to use other endpoint than GitLab.com (optional)", + "required": false + }, + "CMD_GITLAB_CLIENTID": { + "description": "GitLab API client id", + "required": false + }, + "CMD_GITLAB_CLIENTSECRET": { + "description": "GitLab API client secret", + "required": false + }, + "CMD_GITLAB_SCOPE": { + "description": "GitLab API client scope (optional)", + "required": false + }, + "CMD_MATTERMOST_BASEURL": { + "description": "Mattermost authentication endpoint", + "required": false + }, + "CMD_MATTERMOST_CLIENTID": { + "description": "Mattermost API client id", + "required": false + }, + "CMD_MATTERMOST_CLIENTSECRET": { + "description": "Mattermost API client secret", + "required": false + }, + "CMD_DROPBOX_CLIENTID": { + "description": "Dropbox API client id", + "required": false + }, + "CMD_DROPBOX_CLIENTSECRET": { + "description": "Dropbox API client secret", + "required": false + }, + "CMD_DROPBOX_APP_KEY": { + "description": "Dropbox app key (for import/export)", + "required": false + }, + "CMD_GOOGLE_CLIENTID": { + "description": "Google API client id", + "required": false + }, + "CMD_GOOGLE_CLIENTSECRET": { + "description": "Google API client secret", + "required": false + }, + "CMD_IMGUR_CLIENTID": { + "description": "Imgur API client id", + "required": false + }, + "CMD_ALLOW_PDF_EXPORT": { + "description": "Enable or disable PDF exports", + "required": false + }, + "CMD_DB_URL": { + "description": "Database query url", + "value": "$DATABASE_URL" + }, + "DYNO": { + "description": "Require this env var for deploy correctly the app", + "value": "Scalingo" + } + }, + "formation": { + "web": { + "amount": 1, + "size": "S" + } + }, + "addons": [ + "postgresql:postgresql-sandbox" + ] +} From f7ef491bf3e91d0134e8254e8062614f51c601a0 Mon Sep 17 00:00:00 2001 From: BoHong Li Date: Sat, 30 Nov 2019 14:37:22 +0800 Subject: [PATCH 05/13] fix: mysql2 not install Signed-off-by: BoHong Li --- package.json | 1 + yarn.lock | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 80 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a08d8255..b340ea23 100644 --- a/package.json +++ b/package.json @@ -105,6 +105,7 @@ "moment": "~2.24.0", "morgan": "~1.9.1", "mysql": "~2.17.1", + "mysql2": "^2.0.1", "passport": "~0.4.0", "passport-dropbox-oauth2": "~1.1.0", "passport-facebook": "~2.1.1", diff --git a/yarn.lock b/yarn.lock index 6b6bd630..e4df00f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1523,6 +1523,11 @@ ansi-wrap@0.1.0: resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768= +ansicolors@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" + integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk= + any-promise@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" @@ -2901,6 +2906,14 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000984: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz#b9193e293ccf7e4426c5245134b8f2a56c0ac4b9" integrity sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw== +cardinal@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505" + integrity sha1-fMEFXYItISlU0HsIXeolHMe8VQU= + dependencies: + ansicolors "~0.3.2" + redeyed "~2.1.0" + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -4251,6 +4264,11 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= +denque@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf" + integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ== + depd@2.0.0, depd@^2.0.0, depd@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" @@ -5208,7 +5226,7 @@ esprima@^3.1.3: resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM= -esprima@^4.0.0: +esprima@^4.0.0, esprima@~4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== @@ -5817,6 +5835,13 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" +generate-function@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f" + integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ== + dependencies: + is-property "^1.0.2" + generic-pool@2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff" @@ -6490,6 +6515,13 @@ iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.23, iconv-lite@^0.4.24, iconv dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.0.tgz#59cdde0a2a297cc2aeb0c6445a195ee89f127550" + integrity sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw== + dependencies: + safer-buffer ">= 2.1.2 < 3" + icss-replace-symbols@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" @@ -6935,6 +6967,11 @@ is-promise@^2.1, is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= +is-property@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" + integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ= + is-regex@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" @@ -7771,6 +7808,11 @@ lolex@^4.0.1, lolex@^4.1.0: resolved "https://registry.yarnpkg.com/lolex/-/lolex-4.2.0.tgz#ddbd7f6213ca1ea5826901ab1222b65d714b3cd7" integrity sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg== +long@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" + integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== + longest-streak@^2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.3.tgz#3de7a3f47ee18e9074ded8575b5c091f5d0a4105" @@ -7788,7 +7830,7 @@ lower-case@^1.1.1: resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= -lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.5: +lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.3, lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -8537,6 +8579,21 @@ mv@~2: ncp "~2.0.0" rimraf "~2.4.0" +mysql2@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.0.1.tgz#4b8e11d8a7e9d5e302b6edf2fb1ab32acf3b22d8" + integrity sha512-GbiolYnRPPgbkgI1Cbkkr15MvjBVcpbOsm5qBURhlNuokGkNUOv2I/ZYzKap7yirCf4zzyCUJ+qK6ZSWsr1m4A== + dependencies: + cardinal "^2.1.1" + denque "^1.4.1" + generate-function "^2.3.1" + iconv-lite "^0.5.0" + long "^4.0.0" + lru-cache "^5.1.1" + named-placeholders "^1.1.2" + seq-queue "^0.0.5" + sqlstring "^2.3.1" + mysql@~2.17.1: version "2.17.1" resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.17.1.tgz#62bba4a039a9b2f73638cd1652ce50fc6f682899" @@ -8547,6 +8604,13 @@ mysql@~2.17.1: safe-buffer "5.1.2" sqlstring "2.3.1" +named-placeholders@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.2.tgz#ceb1fbff50b6b33492b5cf214ccf5e39cef3d0e8" + integrity sha512-wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA== + dependencies: + lru-cache "^4.1.3" + nan@^2.0.8, nan@^2.10.0, nan@^2.12.1: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" @@ -10504,6 +10568,13 @@ readline-sync@~1.4.7: resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b" integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw== +redeyed@~2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-2.1.1.tgz#8984b5815d99cb220469c99eeeffe38913e6cc0b" + integrity sha1-iYS1gV2ZyyIEacme7v/jiRPmzAs= + dependencies: + esprima "~4.0.0" + redux-action-buffer@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/redux-action-buffer/-/redux-action-buffer-1.2.0.tgz#2ec0a1d899cc9f6f44ccdeb431ee52ad41dd9755" @@ -11191,6 +11262,11 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" +seq-queue@^0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" + integrity sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4= + sequelize-cli@~5.4.0: version "5.4.0" resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-5.4.0.tgz#6a2c2af331466414d8b2ecb6912e24d2de0d04b5" @@ -11589,7 +11665,7 @@ sqlite3@~4.0.9: node-pre-gyp "^0.11.0" request "^2.87.0" -sqlstring@2.3.1: +sqlstring@2.3.1, sqlstring@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz#475393ff9e91479aea62dcaf0ca3d14983a7fb40" integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A= From db0ee65fc8e1cece59bdcf73062611279741d433 Mon Sep 17 00:00:00 2001 From: Daniel Lublin Date: Sun, 1 Dec 2019 16:22:12 +0100 Subject: [PATCH 06/13] fix: correct to singular location Signed-off-by: Daniel Lublin --- public/js/lib/editor/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/lib/editor/index.js b/public/js/lib/editor/index.js index 4b30a130..d4c69b14 100644 --- a/public/js/lib/editor/index.js +++ b/public/js/lib/editor/index.js @@ -331,7 +331,7 @@ export default class Editor { if (!this.statusBar) return var cursor = this.editor.getCursor() - var cursorText = 'Line ' + (cursor.line + 1) + ', Columns ' + (cursor.ch + 1) + var cursorText = 'Line ' + (cursor.line + 1) + ', Column ' + (cursor.ch + 1) this.statusCursor.text(cursorText) var fileText = ' — ' + editor.lineCount() + ' Lines' this.statusFile.text(fileText) From 45d4daf0f36f9d20aa316c9eea634c0f3cd9243f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Wegener?= Date: Thu, 5 Dec 2019 02:00:48 +0100 Subject: [PATCH 07/13] Check for falsy existingUser variable. Fixes #1369 Use another return code for "User already exist" This allows external scripts differentiating between "failure" and "everything is fine" Co-Authored-By: Max Wu Signed-off-by: Soeren Wegener --- bin/manage_users | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/manage_users b/bin/manage_users index 0acbeeb1..113352a3 100755 --- a/bin/manage_users +++ b/bin/manage_users @@ -37,9 +37,9 @@ function getPass (argv, action) { async function createUser (argv) { const existingUser = await models.User.findOne({ where: { email: argv['add'] } }) // Cannot create already-existing users - if (existingUser !== undefined) { + if (existingUser) { console.log(`User with e-mail ${existingUser.email} already exists! Aborting ...`) - process.exit(1) + process.exit(2) } const pass = getPass(argv, 'add') @@ -56,7 +56,7 @@ async function createUser (argv) { async function deleteUser (argv) { // Cannot delete non-existing users const existingUser = await models.User.findOne({ where: { email: argv['del'] } }) - if (existingUser === undefined) { + if (!existingUser) { console.log(`User with e-mail ${argv['del']} does not exist, cannot delete`) process.exit(1) } @@ -71,7 +71,7 @@ async function deleteUser (argv) { async function resetUser (argv) { const existingUser = await models.User.findOne({ where: { email: argv['reset'] } }) // Cannot reset non-existing users - if (existingUser === undefined) { + if (!existingUser) { console.log(`User with e-mail ${argv['reset']} does not exist, cannot reset`) process.exit(1) } From 3fe6ec71e3569d207c4aba0b679b24d60db7e0a2 Mon Sep 17 00:00:00 2001 From: Martin Honermeyer Date: Thu, 5 Dec 2019 18:33:35 +0100 Subject: [PATCH 08/13] Explicitely set uploaded image ACLs for S3 to "public-read" This works around permission problems with DigitalOcean spaces (where files are always *private* by default). This should not pose a difference with AWS and other providers as CodiMD only works with public S3 assets either way. Signed-off-by: Martin Honermeyer --- lib/web/imageRouter/s3.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/web/imageRouter/s3.js b/lib/web/imageRouter/s3.js index 7fd78c32..fbed1b0c 100644 --- a/lib/web/imageRouter/s3.js +++ b/lib/web/imageRouter/s3.js @@ -29,7 +29,8 @@ exports.uploadImage = function (imagePath, callback) { const params = { Bucket: config.s3bucket, Key: path.join('uploads', path.basename(imagePath)), - Body: buffer + Body: buffer, + ACL: 'public-read' } const mimeType = getImageMimeType(imagePath) From d212d3fea0443cf679c7a1623f72e7a07ab1356a Mon Sep 17 00:00:00 2001 From: BoHong Li Date: Thu, 12 Dec 2019 22:35:27 +0800 Subject: [PATCH 09/13] fix: minio cannot upload caused by package upgrade Signed-off-by: BoHong Li --- package.json | 2 +- yarn.lock | 75 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 49 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index b340ea23..633f441b 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "mermaid": "~8.2.3", "method-override": "~3.0.0", "minimist": "~1.2.0", - "minio": "~7.0.10", + "minio": "~6.0.0", "moment": "~2.24.0", "morgan": "~1.9.1", "mysql": "~2.17.1", diff --git a/yarn.lock b/yarn.lock index e4df00f6..201f5d6a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1743,7 +1743,7 @@ async-limiter@^1.0.0, async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -async@>=0.6.0, async@^3.1.0, async@~3.1.0: +async@>=0.6.0, async@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/async/-/async-3.1.0.tgz#42b3b12ae1b74927b5217d8c0016baaf62463772" integrity sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ== @@ -2485,12 +2485,14 @@ blob@0.0.5: resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== -block-stream2@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/block-stream2/-/block-stream2-2.0.0.tgz#680b9d357ca8b9d5637f4ec8a41fb5968029108f" - integrity sha512-1oI+RHHUEo64xomy1ozLgVJetFlHkIfQfJzTBQrj6xWnEMEPooeo2fZoqFjp0yzfHMBrgxwgh70tKp6T17+i3g== +block-stream2@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/block-stream2/-/block-stream2-1.1.0.tgz#c738e3a91ba977ebb5e1fef431e13ca11d8639e2" + integrity sha1-xzjjqRupd+u14f70MeE8oR2GOeI= dependencies: - readable-stream "^3.4.0" + defined "^1.0.0" + inherits "^2.0.1" + readable-stream "^2.0.4" bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5: version "3.5.5" @@ -3302,7 +3304,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.6.0: +concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.4.8, concat-stream@^1.5.0, concat-stream@^1.6.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -4878,7 +4880,12 @@ es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@ es6-symbol "~3.1.1" next-tick "^1.0.0" -es6-error@^4.0.1, es6-error@^4.1.1: +es6-error@^2.0.2: + version "2.1.1" + resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-2.1.1.tgz#91384301ec5ed1c9a7247d1128247216f03547cd" + integrity sha1-kThDAexe0cmnJH0RKCRyFvA1R80= + +es6-error@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== @@ -8367,20 +8374,23 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minio@~7.0.10: - version "7.0.11" - resolved "https://registry.yarnpkg.com/minio/-/minio-7.0.11.tgz#42552b8f083659929b2c6dcd522f8e5f8d370011" - integrity sha512-krmu+vmczVt9fzN2B3l0OdWUbSk63PF6caJYjmbMgGOsaJNy8rm0U05u6AngORdhP/cvlyoa8HZSly/k0Dl6cA== +minio@~6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/minio/-/minio-6.0.0.tgz#7e514d38eaacf2264556b232f1c2c063cc6ca7ba" + integrity sha1-flFNOOqs8iZFVrIy8cLAY8xsp7o= dependencies: - async "^3.1.0" - block-stream2 "^2.0.0" - es6-error "^4.1.1" + async "^1.5.2" + block-stream2 "^1.0.0" + concat-stream "^1.4.8" + es6-error "^2.0.2" json-stream "^1.0.0" lodash "^4.14.2" mime-types "^2.1.14" mkdirp "^0.5.1" querystring "0.2.0" - through2 "^3.0.1" + source-map-support "^0.4.12" + through2 "^0.6.5" + uuid "^3.1.0" xml "^1.0.0" xml2js "^0.4.15" @@ -10507,7 +10517,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -"readable-stream@1 || 2", readable-stream@2.3.6, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@2.3.6, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== @@ -10520,7 +10530,17 @@ read-pkg@^3.0.0: string_decoder "~1.1.1" util-deprecate "~1.0.1" -"readable-stream@2 || 3", readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0: +"readable-stream@>=1.0.33-1 <1.1.0-0": + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc" integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ== @@ -11542,7 +11562,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.4.0, source-map-support@^0.4.15: +source-map-support@^0.4.0, source-map-support@^0.4.12, source-map-support@^0.4.15: version "0.4.18" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== @@ -12170,6 +12190,14 @@ through2-filter@^3.0.0: through2 "~2.0.0" xtend "~4.0.0" +through2@^0.6.5: + version "0.6.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" + integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= + dependencies: + readable-stream ">=1.0.33-1 <1.1.0-0" + xtend ">=4.0.0 <4.1.0-0" + through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -12178,13 +12206,6 @@ through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" -through2@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a" - integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww== - dependencies: - readable-stream "2 || 3" - through@2, "through@>=2.2.7 <3", through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -13763,7 +13784,7 @@ xss@~1.0.6: commander "^2.9.0" cssfilter "0.0.10" -xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: +"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== From 8629670b0ec05ed1fe227d52584556782d0f6900 Mon Sep 17 00:00:00 2001 From: BoHong Li Date: Fri, 13 Dec 2019 12:18:42 +0800 Subject: [PATCH 10/13] feat(imageUpload): upgrade minio version to 7.0.12 Signed-off-by: BoHong Li --- lib/web/imageRouter/minio.js | 2 +- package.json | 2 +- yarn.lock | 75 +++++++++++++----------------------- 3 files changed, 29 insertions(+), 50 deletions(-) diff --git a/lib/web/imageRouter/minio.js b/lib/web/imageRouter/minio.js index d0dd5eef..3ced94e2 100644 --- a/lib/web/imageRouter/minio.js +++ b/lib/web/imageRouter/minio.js @@ -10,7 +10,7 @@ const Minio = require('minio') const minioClient = new Minio.Client({ endPoint: config.minio.endPoint, port: config.minio.port, - secure: config.minio.secure, + useSSL: config.minio.secure, accessKey: config.minio.accessKey, secretKey: config.minio.secretKey }) diff --git a/package.json b/package.json index 633f441b..0babc740 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "mermaid": "~8.2.3", "method-override": "~3.0.0", "minimist": "~1.2.0", - "minio": "~6.0.0", + "minio": "^7.0.12", "moment": "~2.24.0", "morgan": "~1.9.1", "mysql": "~2.17.1", diff --git a/yarn.lock b/yarn.lock index 201f5d6a..2da0789f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1743,7 +1743,7 @@ async-limiter@^1.0.0, async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -async@>=0.6.0, async@~3.1.0: +async@>=0.6.0, async@^3.1.0, async@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/async/-/async-3.1.0.tgz#42b3b12ae1b74927b5217d8c0016baaf62463772" integrity sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ== @@ -2485,14 +2485,12 @@ blob@0.0.5: resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== -block-stream2@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/block-stream2/-/block-stream2-1.1.0.tgz#c738e3a91ba977ebb5e1fef431e13ca11d8639e2" - integrity sha1-xzjjqRupd+u14f70MeE8oR2GOeI= +block-stream2@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/block-stream2/-/block-stream2-2.0.0.tgz#680b9d357ca8b9d5637f4ec8a41fb5968029108f" + integrity sha512-1oI+RHHUEo64xomy1ozLgVJetFlHkIfQfJzTBQrj6xWnEMEPooeo2fZoqFjp0yzfHMBrgxwgh70tKp6T17+i3g== dependencies: - defined "^1.0.0" - inherits "^2.0.1" - readable-stream "^2.0.4" + readable-stream "^3.4.0" bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5: version "3.5.5" @@ -3304,7 +3302,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.4.8, concat-stream@^1.5.0, concat-stream@^1.6.0: +concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.6.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -4880,12 +4878,7 @@ es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@ es6-symbol "~3.1.1" next-tick "^1.0.0" -es6-error@^2.0.2: - version "2.1.1" - resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-2.1.1.tgz#91384301ec5ed1c9a7247d1128247216f03547cd" - integrity sha1-kThDAexe0cmnJH0RKCRyFvA1R80= - -es6-error@^4.0.1: +es6-error@^4.0.1, es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== @@ -8374,23 +8367,20 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minio@~6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/minio/-/minio-6.0.0.tgz#7e514d38eaacf2264556b232f1c2c063cc6ca7ba" - integrity sha1-flFNOOqs8iZFVrIy8cLAY8xsp7o= +minio@^7.0.12: + version "7.0.12" + resolved "https://registry.yarnpkg.com/minio/-/minio-7.0.12.tgz#5dca6daefd5efa94a61c08dc6a2cce44517f3743" + integrity sha512-mTa8bc2X1vcKwbzvNMNk/DHkuSrlfjlG3aA8IA1qihlH73XbwiloX/6skCabmDvrmmt6cx6pytaBJZmp4OMwnw== dependencies: - async "^1.5.2" - block-stream2 "^1.0.0" - concat-stream "^1.4.8" - es6-error "^2.0.2" + async "^3.1.0" + block-stream2 "^2.0.0" + es6-error "^4.1.1" json-stream "^1.0.0" lodash "^4.14.2" mime-types "^2.1.14" mkdirp "^0.5.1" querystring "0.2.0" - source-map-support "^0.4.12" - through2 "^0.6.5" - uuid "^3.1.0" + through2 "^3.0.1" xml "^1.0.0" xml2js "^0.4.15" @@ -10517,7 +10507,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -"readable-stream@1 || 2", readable-stream@2.3.6, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@2.3.6, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== @@ -10530,17 +10520,7 @@ read-pkg@^3.0.0: string_decoder "~1.1.1" util-deprecate "~1.0.1" -"readable-stream@>=1.0.33-1 <1.1.0-0": - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0: +"readable-stream@2 || 3", readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc" integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ== @@ -11562,7 +11542,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.4.0, source-map-support@^0.4.12, source-map-support@^0.4.15: +source-map-support@^0.4.0, source-map-support@^0.4.15: version "0.4.18" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== @@ -12190,14 +12170,6 @@ through2-filter@^3.0.0: through2 "~2.0.0" xtend "~4.0.0" -through2@^0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= - dependencies: - readable-stream ">=1.0.33-1 <1.1.0-0" - xtend ">=4.0.0 <4.1.0-0" - through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -12206,6 +12178,13 @@ through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" +through2@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a" + integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww== + dependencies: + readable-stream "2 || 3" + through@2, "through@>=2.2.7 <3", through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -13784,7 +13763,7 @@ xss@~1.0.6: commander "^2.9.0" cssfilter "0.0.10" -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: +xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== From a1c5c686116dc6c38a0a36379b7684bdc88d5e94 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Fri, 13 Dec 2019 17:05:00 +0800 Subject: [PATCH 11/13] Fix urlpath in webpack build Signed-off-by: Yukai Huang --- public/views/includes/header.ejs | 2 +- public/views/includes/scripts.ejs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/views/includes/header.ejs b/public/views/includes/header.ejs index 942a89f9..eda5e965 100644 --- a/public/views/includes/header.ejs +++ b/public/views/includes/header.ejs @@ -1,3 +1,3 @@ <% for (var css in htmlWebpackPlugin.files.css) { %> - + <% } %> diff --git a/public/views/includes/scripts.ejs b/public/views/includes/scripts.ejs index c4f5aa5a..08a7d218 100644 --- a/public/views/includes/scripts.ejs +++ b/public/views/includes/scripts.ejs @@ -1,4 +1,4 @@ <% for (var js in htmlWebpackPlugin.files.js) { %> - + <% } %> From 7d3931db3dbf022246076b11070087df1067a838 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Sat, 14 Dec 2019 00:12:11 +0800 Subject: [PATCH 12/13] Bump version to 1.4.1 Signed-off-by: Yukai Huang --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0babc740..6c82bfc4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codimd", - "version": "1.4.0", + "version": "1.4.1", "description": "Realtime collaborative markdown notes on all platforms.", "keywords": [ "Collaborative", From 520853387ad2116a568d9b5ed088b664ea0ba960 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Sat, 14 Dec 2019 00:12:37 +0800 Subject: [PATCH 13/13] Update 1.4.1 release note Signed-off-by: Yukai Huang --- public/docs/release-notes.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/public/docs/release-notes.md b/public/docs/release-notes.md index 63d746e3..547fc582 100644 --- a/public/docs/release-notes.md +++ b/public/docs/release-notes.md @@ -1,6 +1,27 @@ Release Notes === + 1.4.1 2019-12-13 +--- + +[CodiMD 1.4.1](https://github.com/hackmdio/codimd/releases/tag/1.4.1) is a minor release including bug fixes introduced in 1.4.0 and earlier versions. We encourage everyone to upgrade to 1.4.1 now. Also, we're preparing for the next major release, and you can see how things are going on [GitHub](https://github.com/hackmdio/codimd/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc+milestone%3ANext). Stay tuned, and we hope you love it! + +### Fixes + +- Fix urlpath in webpack build +- Fix mysql not bundled in package.json +- Fix minio image uploading +- Fix pcheck not parsed url correctly +- Fix manage_users script + +### Enhancement + +- Added Scalingo compatible deployment + +[Check out the complete release note][v1_4_1]. Thank you CodiMD community and all our contributors. ❤️ + +[v1_4_1]: https://hackmd.io/@codimd/release-notes/%2F%40codimd%2Fv1_4_1 + 1.4.0 Syrmaticus mikado 2019-11-11 --- @@ -20,7 +41,7 @@ It has been over 200+ commits since our last release. These are the highlights f - [New Emoji sets][new-emoji] - [Slide mode plugins][slide-mode-plugins]: Elapsed time bar and Spotlight -[Go read the complete release note here][v1_4_0]. Thank you CodiMD community and all our contributors. ❤️ +[Check out the complete release note][v1_4_0]. Thank you CodiMD community and all our contributors. ❤️ [table-tools]: https://hackmd.io/@codimd/v1_4_0#New-Table-Tools [markdownlint]: https://hackmd.io/@codimd/v1_4_0#Markdownlint-integration