Merge pull request #66711 from WilliButz/update-codimd

codimd: 1.4.0 -> 1.5.0
This commit is contained in:
Maximilian Bosch 2019-08-20 21:33:14 +02:00 committed by GitHub
commit 69fab67a57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5630 additions and 1723 deletions

View file

@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper
, which, nodejs, yarn2nix, python2, phantomjs2 }:
, which, nodejs, yarn2nix, python2 }:
yarn2nix.mkYarnPackage rec {
name = "codimd";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "codimd";
repo = "server";
rev = version;
sha256 = "0cljgc056p19pjzphwkcfbvgp642w3r6p626w2fl6m5kdk78qd1g";
sha256 = "1sd7r5ws1k7dxmr57m67c1k23pzbkn25k2wvcnbrqn7gza6mhlf0";
};
nativeBuildInputs = [ which makeWrapper ];
extraBuildInputs = [ python2 phantomjs2 ];
extraBuildInputs = [ python2 ];
yarnNix = ./yarn.nix;
yarnLock = ./yarn.lock;
@ -45,10 +45,6 @@ yarn2nix.mkYarnPackage rec {
unset OLD_HOME
popd
pushd node_modules/phantomjs-prebuilt
npm run install
popd
npm run build
runHook postBuild

View file

@ -1,12 +1,12 @@
{
"name": "CodiMD",
"version": "1.4.0",
"version": "1.5.0",
"description": "Realtime collaborative markdown notes on all platforms.",
"main": "app.js",
"license": "AGPL-3.0",
"scripts": {
"test": "npm run-script eslint && npm run-script jsonlint && npm run-script mocha-suite",
"eslint": "node_modules/.bin/eslint lib public test app.js",
"eslint": "node_modules/.bin/eslint --max-warnings 0 lib public test app.js",
"jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done",
"mocha-suite": "NODE_ENV=test CMD_DB_URL=\"sqlite::memory:\" mocha --exit",
"standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1",
@ -31,7 +31,7 @@
"codemirror": "git+https://github.com/hackmdio/CodeMirror.git",
"compression": "^1.6.2",
"connect-flash": "^0.1.1",
"connect-session-sequelize": "^4.1.0",
"connect-session-sequelize": "^6.0.0",
"cookie": "0.3.1",
"cookie-parser": "1.4.3",
"deep-freeze": "^0.0.1",
@ -81,14 +81,14 @@
"markdown-pdf": "^9.0.0",
"mathjax": "~2.7.0",
"mattermost": "^3.4.0",
"mermaid": "~7.1.0",
"meta-marked": "git+https://github.com/codimd/meta-marked#semver:^0.4.2",
"mermaid": "~8.2.3",
"meta-marked": "git+https://github.com/codimd/meta-marked#semver:^0.4.5",
"method-override": "^2.3.7",
"minimist": "^1.2.0",
"minio": "^6.0.0",
"moment": "^2.17.1",
"morgan": "^1.7.0",
"mysql": "^2.12.0",
"mysql2": "^1.6.5",
"passport": "^0.4.0",
"passport-dropbox-oauth2": "^1.1.0",
"passport-facebook": "^2.1.1",
@ -113,8 +113,7 @@
"scrypt-async": "^2.0.1",
"scrypt-kdf": "^2.0.1",
"select2": "^3.5.2-browserify",
"sequelize": "^3.28.0",
"sequelize-cli": "^2.5.1",
"sequelize": "^5.8.12",
"shortid": "2.2.8",
"socket.io": "~2.1.1",
"socket.io-client": "~2.1.1",
@ -195,6 +194,7 @@
"mock-require": "^3.0.3",
"optimize-css-assets-webpack-plugin": "^5.0.0",
"script-loader": "^0.7.2",
"sequelize-cli": "^5.4.0",
"string-loader": "^0.0.1",
"style-loader": "^0.21.0",
"uglifyjs-webpack-plugin": "^1.2.7",

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff