diff --git a/.gitignore b/.gitignore index fc98af049a..f346b88f91 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,6 @@ seahub/thumbnail/thumb/* .pytest_cache/ tags -frontend/config/webpack.config.dev.js frontend/webpack-stats.dev.json frontend/node_modules frontend/package-lock.json diff --git a/frontend/config/webpack.config.dev.js.template b/frontend/config/webpack.config.dev.js similarity index 96% rename from frontend/config/webpack.config.dev.js.template rename to frontend/config/webpack.config.dev.js index f6037a59ee..ffd44e4b6e 100644 --- a/frontend/config/webpack.config.dev.js.template +++ b/frontend/config/webpack.config.dev.js @@ -59,11 +59,21 @@ module.exports = { require.resolve('react-dev-utils/webpackHotDevClient'), paths.appSrc + "/wiki.js", ], - fileHistory: [ - require.resolve('./polyfills'), - require.resolve('react-dev-utils/webpackHotDevClient'), - paths.appSrc + '/fileHistory.js', - ], + dashboard: [ + require.resolve('./polyfills'), + require.resolve('react-dev-utils/webpackHotDevClient'), + paths.appSrc + "/dashboard.js", + ], + repoview: [ + require.resolve('./polyfills'), + require.resolve('react-dev-utils/webpackHotDevClient'), + paths.appSrc + "/repo-wiki-mode.js", + ], + fileHistory: [ + require.resolve('./polyfills'), + require.resolve('react-dev-utils/webpackHotDevClient'), + paths.appSrc + "/file-history.js", + ] }, output: { @@ -267,7 +277,7 @@ module.exports = { // solution that requires the user to opt into importing specific locales. // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack // You can remove this if you don't use Moment.js: - new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/), + //new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/), new BundleTracker({filename: './webpack-stats.dev.json'}), ], @@ -305,4 +315,4 @@ module.exports = { // }, }, -}; \ No newline at end of file +}; diff --git a/frontend/config/webpack.config.prod.js b/frontend/config/webpack.config.prod.js index e462071fe7..a86e0fcb8f 100644 --- a/frontend/config/webpack.config.prod.js +++ b/frontend/config/webpack.config.prod.js @@ -61,6 +61,8 @@ module.exports = { main: [require.resolve('./polyfills'), paths.appIndexJs], wiki: [require.resolve('./polyfills'), paths.appSrc + "/wiki.js"], repoview: [require.resolve('./polyfills'), paths.appSrc + "/repo-wiki-mode.js"], + dashboard: [require.resolve('./polyfills'), paths.appSrc + "/dashboard.js"], + fileHistory: [require.resolve('./polyfills'), paths.appSrc + "/file-history.js"], }, output: { diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 0b317a7fd5..ae53b14914 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -48,7 +48,7 @@ "remark-parse": "5.0.0", "remark-rehype": "3.0.0", "remark-slug": "5.0.0", - "seafile-js": "0.2.13", + "seafile-js": "0.2.14", "seafile-ui": "0.1.10", "slate": "0.34.2", "slate-drop-or-paste-images": "0.8.3", @@ -471,7 +471,7 @@ }, "axios": { "version": "0.18.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", + "resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "requires": { "follow-redirects": "1.5.7", @@ -2098,11 +2098,6 @@ } } }, - "change-emitter": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/change-emitter/-/change-emitter-0.1.6.tgz", - "integrity": "sha1-6LL+PX8at9aaMhma/5HqaTFAlRU=" - }, "character-entities": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz", @@ -5409,7 +5404,8 @@ "hoist-non-react-statics": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz", - "integrity": "sha512-6Bl6XsDT1ntE0lHbIhr4Kp2PGcleGZ66qu5Jqk8lc0Xc/IeG6gVLmwUGs/K0Us+L8VWoKgj0uWdPMataOsm31w==" + "integrity": "sha512-6Bl6XsDT1ntE0lHbIhr4Kp2PGcleGZ66qu5Jqk8lc0Xc/IeG6gVLmwUGs/K0Us+L8VWoKgj0uWdPMataOsm31w==", + "dev": true }, "home-or-tmp": { "version": "2.0.0", @@ -9795,19 +9791,6 @@ "set-immediate-shim": "1.0.1" } }, - "recompose": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.27.1.tgz", - "integrity": "sha512-p7xsyi/rfNjHfdP7vPU02uSFa+Q1eHhjKrvO+3+kRP4Ortj+MxEmpmd+UQtBGM2D2iNAjzNI5rCyBKp9Ob5McA==", - "requires": { - "babel-runtime": "6.26.0", - "change-emitter": "0.1.6", - "fbjs": "0.8.16", - "hoist-non-react-statics": "2.5.0", - "react-lifecycles-compat": "3.0.4", - "symbol-observable": "1.2.0" - } - }, "recursive-readdir": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.1.tgz", @@ -10344,9 +10327,9 @@ } }, "seafile-js": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.13.tgz", - "integrity": "sha512-NANdpSi75zaGANvrgCcdiamoFKzkyUyTmwhM/sp/oQt0+1zr+p57/oOduCRvL1+MvKQC0nK0Qf/Z/WdQqri/mA==", + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.14.tgz", + "integrity": "sha512-iWk+oB9bBroOGq6hLWnePgF14+OTcG+F9ADPNkqTjolMstKzoNfPFFHTAxqNmengwEEtD44stsMkcZxOyHGBXw==", "requires": { "axios": "0.18.0", "form-data": "2.3.2" @@ -11135,11 +11118,6 @@ "serviceworker-cache-polyfill": "4.0.0" } }, - "symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" - }, "symbol-tree": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz", diff --git a/frontend/package.json b/frontend/package.json index 3e63d6e171..6c58f7096f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -44,7 +44,7 @@ "remark-parse": "^5.0.0", "remark-rehype": "^3.0.0", "remark-slug": "^5.0.0", - "seafile-js": "^0.2.13", + "seafile-js": "^0.2.14", "seafile-ui": "^0.1.10", "sw-precache-webpack-plugin": "0.11.4", "unified": "^6.1.6", diff --git a/frontend/webpack-stats.pro.json b/frontend/webpack-stats.pro.json index da5c29e79b..74f0fb3cca 100644 --- a/frontend/webpack-stats.pro.json +++ b/frontend/webpack-stats.pro.json @@ -1 +1 @@ -{"status":"done","chunks":{"main":[{"name":"js/main.js","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/main.js"},{"name":"css/main.css","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/main.css"},{"name":"js/main.js.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/main.js.map"},{"name":"css/main.css.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/main.css.map"}],"wiki":[{"name":"js/wiki.js","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/wiki.js"},{"name":"css/wiki.css","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/wiki.css"},{"name":"js/wiki.js.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/wiki.js.map"},{"name":"css/wiki.css.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/wiki.css.map"}],"repoview":[{"name":"js/repoview.js","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/repoview.js"},{"name":"css/repoview.css","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/repoview.css"},{"name":"js/repoview.js.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/repoview.js.map"},{"name":"css/repoview.css.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/repoview.css.map"}]}} \ No newline at end of file +{"status":"done","chunks":{"main":[{"name":"js/main.js","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/main.js"},{"name":"css/main.css","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/main.css"},{"name":"js/main.js.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/main.js.map"},{"name":"css/main.css.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/main.css.map"}],"wiki":[{"name":"js/wiki.js","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/wiki.js"},{"name":"css/wiki.css","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/wiki.css"},{"name":"js/wiki.js.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/wiki.js.map"},{"name":"css/wiki.css.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/wiki.css.map"}],"repoview":[{"name":"js/repoview.js","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/repoview.js"},{"name":"css/repoview.css","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/repoview.css"},{"name":"js/repoview.js.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/repoview.js.map"},{"name":"css/repoview.css.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/repoview.css.map"}],"fileHistory":[{"name":"js/fileHistory.js","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/fileHistory.js"},{"name":"css/fileHistory.css","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/fileHistory.css"},{"name":"js/fileHistory.js.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/fileHistory.js.map"},{"name":"css/fileHistory.css.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/fileHistory.css.map"}],"dashboard":[{"name":"js/dashboard.js","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/dashboard.js"},{"name":"css/dashboard.css","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/dashboard.css"},{"name":"js/dashboard.js.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/js/dashboard.js.map"},{"name":"css/dashboard.css.map","path":"/home/yxzhang/dev/seahub/frontend/build/frontend/css/dashboard.css.map"}]}} \ No newline at end of file