]> BookStack Code Mirror - bookstack/commitdiff
Merge branch 'webpack-2018'
authorDan Brown <redacted>
Sat, 17 Mar 2018 13:05:25 +0000 (13:05 +0000)
committerDan Brown <redacted>
Sat, 17 Mar 2018 13:05:25 +0000 (13:05 +0000)
1  2 
package-lock.json
package.json

index e4d99d2fd4a034fec0f7ec37d2f529fda4507752,461efa256138999c7f5790db0d092a61b31ab2fc..2fc23910a308bc3687d3d8d2ca348c69aee14044
          }
        }
      },
-     "is-posix-bracket": {
-       "version": "0.1.1",
-       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-       "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-       "dev": true
-     },
-     "is-primitive": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-       "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-       "dev": true
-     },
-     "is-promise": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-       "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-       "dev": true
-     },
-     "is-relative": {
-       "version": "0.2.1",
-       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz",
-       "integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=",
+     "mkdirp": {
+       "version": "0.5.1",
+       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
        "dev": true,
        "requires": {
-         "is-unc-path": "0.1.2"
+         "minimist": "0.0.8"
+       },
+       "dependencies": {
+         "minimist": {
+           "version": "0.0.8",
+           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+           "dev": true
+         }
        }
      },
-     "is-typedarray": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-       "dev": true
+     "moment": {
 -      "version": "2.19.1",
 -      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz",
 -      "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc="
++      "version": "2.21.0",
++      "resolved": "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz",
++      "integrity": "sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ=="
      },
-     "is-unc-path": {
-       "version": "0.1.2",
-       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz",
-       "integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=",
+     "move-concurrently": {
+       "version": "1.0.1",
+       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
        "dev": true,
        "requires": {
-         "unc-path-regex": "0.1.2"
+         "aproba": "1.2.0",
+         "copy-concurrently": "1.0.5",
+         "fs-write-stream-atomic": "1.0.10",
+         "mkdirp": "0.5.1",
+         "rimraf": "2.6.2",
+         "run-queue": "1.0.3"
        }
      },
-     "is-utf8": {
-       "version": "0.2.1",
-       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-       "dev": true
-     },
-     "is-windows": {
-       "version": "0.2.0",
-       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-       "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
-       "dev": true
-     },
-     "isarray": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-       "dev": true
-     },
-     "isexe": {
+     "ms": {
        "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-       "dev": true
+       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
      },
-     "isobject": {
+     "multimatch": {
        "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-       "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+       "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
+       "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
        "dev": true,
        "requires": {
-         "isarray": "1.0.0"
+         "array-differ": "1.0.0",
+         "array-union": "1.0.2",
+         "arrify": "1.0.1",
+         "minimatch": "3.0.4"
        }
      },
-     "isstream": {
-       "version": "0.1.2",
-       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-       "dev": true
-     },
-     "js-base64": {
-       "version": "2.3.2",
-       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz",
-       "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==",
+     "mute-stream": {
+       "version": "0.0.7",
+       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+       "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
        "dev": true
      },
-     "js-tokens": {
-       "version": "3.0.2",
-       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-       "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+     "nan": {
+       "version": "2.7.0",
+       "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
+       "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
        "dev": true
      },
-     "jsbn": {
-       "version": "0.1.1",
-       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+     "nanomatch": {
+       "version": "1.2.9",
+       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
+       "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
        "dev": true,
-       "optional": true
+       "requires": {
+         "arr-diff": "4.0.0",
+         "array-unique": "0.3.2",
+         "define-property": "2.0.2",
+         "extend-shallow": "3.0.2",
+         "fragment-cache": "0.2.1",
+         "is-odd": "2.0.0",
+         "is-windows": "1.0.2",
+         "kind-of": "6.0.2",
+         "object.pick": "1.3.0",
+         "regex-not": "1.0.2",
+         "snapdragon": "0.8.2",
+         "to-regex": "3.0.2"
+       },
+       "dependencies": {
+         "arr-diff": {
+           "version": "4.0.0",
+           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+           "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+           "dev": true
+         },
+         "array-unique": {
+           "version": "0.3.2",
+           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+           "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+           "dev": true
+         },
+         "is-windows": {
+           "version": "1.0.2",
+           "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+           "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+           "dev": true
+         },
+         "kind-of": {
+           "version": "6.0.2",
+           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+           "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+           "dev": true
+         }
+       }
      },
-     "jsesc": {
-       "version": "0.5.0",
-       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-       "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+     "neo-async": {
+       "version": "2.5.0",
+       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.0.tgz",
+       "integrity": "sha512-nJmSswG4As/MkRq7QZFuH/sf/yuv8ODdMZrY4Bedjp77a5MK4A6s7YbBB64c9u79EBUOfXUXBvArmvzTD0X+6g==",
        "dev": true
      },
-     "json-schema": {
-       "version": "0.2.3",
-       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+     "nice-try": {
+       "version": "1.0.4",
+       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz",
+       "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==",
        "dev": true
      },
-     "json-schema-traverse": {
-       "version": "0.3.1",
-       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-       "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+     "node-dir": {
+       "version": "0.1.8",
+       "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.8.tgz",
+       "integrity": "sha1-VfuN62mQcHB/tn+RpGDwRIKUx30=",
        "dev": true
      },
-     "json-stable-stringify": {
-       "version": "0.0.1",
-       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
-       "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
+     "node-gyp": {
+       "version": "3.6.2",
+       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
+       "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
        "dev": true,
        "requires": {
-         "jsonify": "0.0.0"
+         "fstream": "1.0.11",
+         "glob": "7.1.2",
+         "graceful-fs": "4.1.11",
+         "minimatch": "3.0.4",
+         "mkdirp": "0.5.1",
+         "nopt": "3.0.6",
+         "npmlog": "4.1.2",
+         "osenv": "0.1.5",
+         "request": "2.79.0",
+         "rimraf": "2.6.2",
+         "semver": "5.3.0",
+         "tar": "2.2.1",
+         "which": "1.3.0"
+       },
+       "dependencies": {
+         "semver": {
+           "version": "5.3.0",
+           "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+           "dev": true
+         }
        }
      },
-     "json-stringify-safe": {
-       "version": "5.0.1",
-       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-       "dev": true
-     },
-     "json5": {
-       "version": "0.5.1",
-       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-       "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-       "dev": true
-     },
-     "jsonify": {
-       "version": "0.0.0",
-       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-       "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-       "dev": true
-     },
-     "jsonparse": {
-       "version": "1.3.1",
-       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-       "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-       "dev": true
-     },
-     "jsprim": {
-       "version": "1.4.1",
-       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+     "node-libs-browser": {
+       "version": "2.1.0",
+       "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
+       "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
        "dev": true,
        "requires": {
-         "assert-plus": "1.0.0",
-         "extsprintf": "1.3.0",
-         "json-schema": "0.2.3",
-         "verror": "1.10.0"
+         "assert": "1.4.1",
+         "browserify-zlib": "0.2.0",
+         "buffer": "4.9.1",
+         "console-browserify": "1.1.0",
+         "constants-browserify": "1.0.0",
+         "crypto-browserify": "3.12.0",
+         "domain-browser": "1.1.7",
+         "events": "1.1.1",
+         "https-browserify": "1.0.0",
+         "os-browserify": "0.3.0",
+         "path-browserify": "0.0.0",
+         "process": "0.11.10",
+         "punycode": "1.4.1",
+         "querystring-es3": "0.2.1",
+         "readable-stream": "2.3.3",
+         "stream-browserify": "2.0.1",
+         "stream-http": "2.7.2",
+         "string_decoder": "1.0.3",
+         "timers-browserify": "2.0.6",
+         "tty-browserify": "0.0.0",
+         "url": "0.11.0",
+         "util": "0.10.3",
+         "vm-browserify": "0.0.4"
+       },
+       "dependencies": {
+         "buffer": {
+           "version": "4.9.1",
+           "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+           "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+           "dev": true,
+           "requires": {
+             "base64-js": "1.2.1",
+             "ieee754": "1.1.8",
+             "isarray": "1.0.0"
+           }
+         },
+         "timers-browserify": {
+           "version": "2.0.6",
+           "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz",
+           "integrity": "sha512-HQ3nbYRAowdVd0ckGFvmJPPCOH/CHleFN/Y0YQCX1DVaB7t+KFvisuyN09fuP8Jtp1CpfSh8O8bMkHbdbPe6Pw==",
+           "dev": true,
+           "requires": {
+             "setimmediate": "1.0.5"
+           }
+         },
+         "tty-browserify": {
+           "version": "0.0.0",
+           "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+           "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+           "dev": true
+         }
        }
      },
-     "kind-of": {
-       "version": "3.2.2",
-       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+     "node-sass": {
+       "version": "4.7.2",
+       "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz",
+       "integrity": "sha512-CaV+wLqZ7//Jdom5aUFCpGNoECd7BbNhjuwdsX/LkXBrHl8eb1Wjw4HvWqcFvhr5KuNgAk8i/myf/MQ1YYeroA==",
        "dev": true,
        "requires": {
-         "is-buffer": "1.1.6"
+         "async-foreach": "0.1.3",
+         "chalk": "1.1.3",
+         "cross-spawn": "3.0.1",
+         "gaze": "1.1.2",
+         "get-stdin": "4.0.1",
+         "glob": "7.1.2",
+         "in-publish": "2.0.0",
+         "lodash.assign": "4.2.0",
+         "lodash.clonedeep": "4.5.0",
+         "lodash.mergewith": "4.6.1",
+         "meow": "3.7.0",
+         "mkdirp": "0.5.1",
+         "nan": "2.7.0",
+         "node-gyp": "3.6.2",
+         "npmlog": "4.1.2",
+         "request": "2.79.0",
+         "sass-graph": "2.2.4",
+         "stdout-stream": "1.4.0",
+         "true-case-path": "1.0.2"
        }
      },
-     "labeled-stream-splicer": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz",
-       "integrity": "sha1-pS4dE4AkwAuGscDJH2d5GLiuClk=",
+     "nomnom": {
+       "version": "1.8.1",
+       "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
+       "integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
        "dev": true,
        "requires": {
-         "inherits": "2.0.3",
-         "isarray": "0.0.1",
-         "stream-splicer": "2.0.0"
+         "chalk": "0.4.0",
+         "underscore": "1.6.0"
        },
        "dependencies": {
-         "isarray": {
-           "version": "0.0.1",
-           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-           "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+         "ansi-styles": {
+           "version": "1.0.0",
+           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
+           "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=",
+           "dev": true
+         },
+         "chalk": {
+           "version": "0.4.0",
+           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
+           "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
+           "dev": true,
+           "requires": {
+             "ansi-styles": "1.0.0",
+             "has-color": "0.1.7",
+             "strip-ansi": "0.1.1"
+           }
+         },
+         "strip-ansi": {
+           "version": "0.1.1",
+           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
+           "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
            "dev": true
          }
        }
diff --cc package.json
index 31b1ca48a53ac61bb285cfa27843a37a61db50cf,523531ab97fd02ba3528f8c950b11cd7b8fbabca..cfa1a4a9f6726d416f48fcbc5bbdb5791cbd05e9
@@@ -8,34 -9,32 +9,32 @@@
      "permissions": "chown -R $USER:$USER bootstrap/cache storage public/uploads"
    },
    "devDependencies": {
-     "babelify": "^7.3.0",
-     "babel-polyfill": "^6.23.0",
-     "babel-preset-es2015": "^6.24.1",
-     "browserify": "^14.3.0",
-     "envify": "^4.0.0",
-     "gulp": "^3.9.1",
-     "gulp-autoprefixer": "3.1.1",
-     "gulp-clean-css": "^3.0.4",
-     "gulp-livereload": "^3.8.1",
-     "gulp-minify-css": "1.2.4",
-     "gulp-plumber": "1.1.0",
-     "gulp-sass": "3.1.0",
-     "gulp-sourcemaps": "^2.6.1",
-     "gulp-uglify": "2.1.2",
-     "gulp-util": "^3.0.8",
-     "vinyl-buffer": "^1.0.0",
-     "vinyl-source-stream": "^1.1.0",
-     "watchify": "^3.9.0",
-     "yargs": "^7.1.0"
+     "@babel/core": "^7.0.0-beta.40",
+     "@babel/preset-env": "^7.0.0-beta.40",
+     "babel-loader": "^8.0.0-beta.0",
+     "babel-polyfill": "^6.26.0",
+     "autoprefixer": "^8.1.0",
+     "css-loader": "^0.28.10",
+     "extract-loader": "^1.0.2",
+     "file-loader": "^1.1.11",
+     "livereload": "^0.7.0",
+     "node-sass": "^4.7.2",
+     "npm-run-all": "^4.1.2",
+     "postcss-loader": "^2.1.1",
+     "sass-loader": "^6.0.7",
+     "style-loader": "^0.20.3",
+     "uglifyjs-webpack-plugin": "^1.2.3",
+     "webpack": "^4.1.1",
+     "webpack-cli": "^2.0.11"
    },
    "dependencies": {
-     "axios": "^0.16.1",
-     "clipboard": "^1.7.1",
+     "axios": "^0.18.0",
+     "clipboard": "^2.0.0",
      "codemirror": "^5.26.0",
-     "dropzone": "^4.0.1",
+     "dropzone": "^5.4.0",
      "markdown-it": "^8.3.1",
      "markdown-it-task-lists": "^2.0.0",
 -    "moment": "^2.12.0",
 +    "moment": "^2.21.0",
      "vue": "^2.2.6",
      "vuedraggable": "^2.14.1"
    },
Morty Proxy This is a proxified and sanitized view of the page, visit original site.