Browse Source

Updated deps + versions

NGPixel 8 years ago
parent
commit
44318eea48
6 changed files with 35 additions and 17 deletions
  1. 2 2
      .snyk
  2. 13 0
      CHANGELOG.md
  3. 2 1
      libs/entries.js
  4. 4 0
      models/entry.js
  5. 1 1
      npm/package.json
  6. 13 13
      package.json

+ 2 - 2
.snyk

@@ -5,11 +5,11 @@ ignore:
   'npm:marked:20170112':
     - simplemde > marked:
         reason: None given
-        expires: '2017-04-08T03:11:24.935Z'
+        expires: '2017-05-08T20:36:21.933Z'
   'npm:shelljs:20140723':
     - pm2 > shelljs:
         reason: None given
-        expires: '2017-04-08T03:11:24.935Z'
+        expires: '2017-05-08T20:36:21.933Z'
   'npm:qs:20170213':
     - chokidar > fsevents > node-pre-gyp > request > qs:
         reason: None given

+ 13 - 0
CHANGELOG.md

@@ -2,6 +2,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v1.0.0-beta.10] - 2017-04-08
+### Added
+- Installation: Wiki.js can now install via local tarball
+- Installation: RAM check during install to prevent crashing due to low memory
+
+### Changed
+- Updated dependencies + snyk policy
+
+### Fixed
+- UI: Code blocks longer than page width are now displayed with scrollbars
+- Configuration Wizard: Git version check no longer fails if between 2.7.4 and 2.11.0
+- Init: Admin account is no longer attempted to be created during init
+
 ## [v1.0.0-beta.9] - 2017-04-05
 ### Added
 - Interactive setup

+ 2 - 1
libs/entries.js

@@ -305,7 +305,8 @@ module.exports = {
         _id: content.entryPath,
         title: content.meta.title || content.entryPath,
         subtitle: content.meta.subtitle || '',
-        parent: content.parent.title || ''
+        parent: content.parent.title || '',
+        parentPath: content.parent.path || ''
       }, {
         new: true,
         upsert: true

+ 4 - 0
models/entry.js

@@ -21,6 +21,10 @@ var entrySchema = Mongoose.Schema({
   parent: {
     type: String,
     default: ''
+  },
+  parentPath: {
+    type: String,
+    default: ''
   }
 
 },

+ 1 - 1
npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki.js",
-  "version": "1.0.0-beta.9.5",
+  "version": "1.0.0-beta.10",
   "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
   "main": "install.js",
   "scripts": {

+ 13 - 13
package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-beta.10",
   "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
   "main": "server.js",
   "scripts": {
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "auto-load": "^2.1.0",
-    "axios": "^0.16.0",
+    "axios": "^0.16.1",
     "bcryptjs-then": "^1.0.1",
     "bluebird": "^3.4.7",
     "body-parser": "^1.17.1",
@@ -56,7 +56,7 @@
     "execa": "^0.6.3",
     "express": "^4.15.2",
     "express-brute": "^1.0.0",
-    "express-brute-mongoose": "0.0.7",
+    "express-brute-mongoose": "0.0.8",
     "express-session": "^1.15.2",
     "file-type": "^4.0.0",
     "filesize.js": "^1.0.2",
@@ -69,7 +69,7 @@
     "i18next-node-fs-backend": "^0.1.3",
     "image-size": "^0.5.1",
     "jimp": "github:ngpixel/jimp",
-    "js-yaml": "^3.8.2",
+    "js-yaml": "^3.8.3",
     "klaw": "^1.3.1",
     "levelup": "^1.3.5",
     "lodash": "^4.17.3",
@@ -85,7 +85,7 @@
     "memdown": "^1.2.4",
     "mime-types": "^2.1.15",
     "moment": "^2.18.1",
-    "moment-timezone": "^0.5.11",
+    "moment-timezone": "^0.5.13",
     "mongodb": "^2.2.25",
     "mongoose": "^4.9.2",
     "multer": "^1.2.1",
@@ -99,7 +99,7 @@
     "passport-slack": "0.0.7",
     "passport-windowslive": "^1.0.2",
     "passport.socketio": "^3.7.0",
-    "pm2": "^2.4.3",
+    "pm2": "^2.4.4",
     "pug": "^2.0.0-beta11",
     "read-chunk": "^2.0.0",
     "remove-markdown": "^0.1.0",
@@ -120,18 +120,18 @@
     "winston": "^2.3.1"
   },
   "devDependencies": {
-    "babel-cli": "latest",
+    "babel-cli": "^6.24.1",
     "babel-jest": "latest",
-    "babel-preset-es2015": "latest",
+    "babel-preset-es2015": "^6.24.1",
     "brace": "^0.10.0",
     "colors": "^1.1.2",
     "eslint": "latest",
-    "eslint-config-standard": "latest",
+    "eslint-config-standard": "^10.2.0",
     "eslint-plugin-import": "latest",
     "eslint-plugin-node": "latest",
     "eslint-plugin-promise": "latest",
-    "eslint-plugin-standard": "latest",
-    "fuse-box": "^1.3.129",
+    "eslint-plugin-standard": "^3.0.1",
+    "fuse-box": "^1.3.131",
     "jest": "latest",
     "jquery": "^3.2.1",
     "jquery-contextmenu": "^2.4.4",
@@ -140,8 +140,8 @@
     "node-sass": "latest",
     "nodemon": "latest",
     "pug-lint": "latest",
-    "snyk": "latest",
-    "standard": "latest",
+    "snyk": "^1.27.1",
+    "standard": "^10.0.1",
     "sticky-js": "^1.1.9",
     "twemoji-awesome": "^1.0.4",
     "uglify-js": "latest",