From 2bc880d335dc0f6227a8549a38a8a28bca454547 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Wed, 31 Oct 2018 21:11:06 +0800 Subject: [PATCH] fix: ssr package dep, fixed #605 --- build/build.js | 12 +- package-lock.json | 116 ------------------ package.json | 1 - packages/docsify-server-renderer/package.json | 1 + src/core/config.js | 2 - 5 files changed, 6 insertions(+), 126 deletions(-) diff --git a/build/build.js b/build/build.js index 1cc841a34..b9068b91d 100644 --- a/build/build.js +++ b/build/build.js @@ -8,14 +8,12 @@ const isProd = process.env.NODE_ENV === 'production' const version = process.env.VERSION || require('../package.json').version const chokidar = require('chokidar') const path = require('path') -const json = require('rollup-plugin-json') -const build = function(opts) { +const build = function (opts) { rollup .rollup({ input: opts.input, plugins: (opts.plugins || []).concat([ - json(), buble(), commonjs(), nodeResolve(), @@ -25,7 +23,7 @@ const build = function(opts) { }) ]) }) - .then(function(bundle) { + .then(function (bundle) { var dest = 'lib/' + (opts.output || opts.input) console.log(dest) @@ -35,11 +33,11 @@ const build = function(opts) { strict: false }) }) - .catch(function(err) { + .catch(function (err) { console.error(err) }) } -const buildCore = function() { +const buildCore = function () { build({ input: 'src/core/index.js', output: 'docsify.js' @@ -53,7 +51,7 @@ const buildCore = function() { }) } } -const buildAllPlugin = function() { +const buildAllPlugin = function () { var plugins = [ {name: 'search', input: 'search/index.js'}, {name: 'ga', input: 'ga.js'}, diff --git a/package-lock.json b/package-lock.json index 662980ec6..ee4dfe7a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6811,122 +6811,6 @@ } } }, - "rollup-plugin-json": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-json/-/rollup-plugin-json-3.1.0.tgz", - "integrity": "sha512-BlYk5VspvGpjz7lAwArVzBXR60JK+4EKtPkCHouAWg39obk9S61hZYJDBfMK+oitPdoe11i69TlxKlMQNFC/Uw==", - "dev": true, - "requires": { - "rollup-pluginutils": "^2.3.1" - }, - "dependencies": { - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "^1.0.1" - } - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, - "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" - } - }, - "estree-walker": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.2.tgz", - "integrity": "sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==", - "dev": true - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "^0.1.0" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" - } - }, - "rollup-pluginutils": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz", - "integrity": "sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==", - "dev": true, - "requires": { - "estree-walker": "^0.5.2", - "micromatch": "^2.3.11" - } - } - } - }, "rollup-plugin-node-resolve": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz", diff --git a/package.json b/package.json index 39d7ba8c5..b259834e2 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,6 @@ "rollup-plugin-async": "^1.2.0", "rollup-plugin-buble": "^0.18.0", "rollup-plugin-commonjs": "^8.2.6", - "rollup-plugin-json": "^3.1.0", "rollup-plugin-node-resolve": "^3.0.0", "rollup-plugin-replace": "^2.0.0", "rollup-plugin-uglify": "^2.0.1", diff --git a/packages/docsify-server-renderer/package.json b/packages/docsify-server-renderer/package.json index fff687a99..e6de0a481 100644 --- a/packages/docsify-server-renderer/package.json +++ b/packages/docsify-server-renderer/package.json @@ -16,6 +16,7 @@ }, "dependencies": { "debug": "^2.6.8", + "docsify": "^4.8.0", "node-fetch": "^1.7.0", "resolve-pathname": "^2.1.0" } diff --git a/src/core/config.js b/src/core/config.js index 01a0bb706..0a8763a85 100644 --- a/src/core/config.js +++ b/src/core/config.js @@ -1,5 +1,4 @@ import {merge, hyphenate, isPrimitive, hasOwn} from './util/core' -import {version as pkgVersion} from './../../package.json' export default function () { const config = merge( @@ -65,7 +64,6 @@ export default function () { } } - config.version = pkgVersion window.$docsify = config return config