install fixes

[ci skip]

client/js/configure.js

@@ -297,7 +297,7 @@ jQuery(document).ready(function ($) {
           axios.post('/restart', {}).then(resp => {
             _.delay(() => {
               window.location.assign(self.conf.host)
-            }, 10000)
+            }, 30000)
           }).catch(err => {
             window.alert(err.message)
           })

client/scss/components/markdown-content.scss

@@ -240,8 +240,6 @@
 	pre {
 		background-color: mc('blue-grey', '900');
 		border-left: 7px solid mc('indigo', '500');
-    border-top-left-radius: 5px;
-    border-bottom-left-radius: 5px;
 		padding: 20px 20px 20px 13px;
 		font-family: $core-font-monospace;
 		white-space: pre;

configure.js

@@ -92,9 +92,9 @@ module.exports = (port, spinner) => {
             }
             let gitver = _.chain(stdout.replace(/[^\d.]/g, '')).split('.').take(3).join('.').value()
             if (!semver.satisfies(semver.clean(gitver), '>=2.11.0')) {
-              reject(new Error('Git version is too old. Minimum is v2.11.0.'))
+              reject(new Error('Git version is too old. Minimum is v2.7.4.'))
             }
-            resolve('Git v' + gitver + ' detected. Minimum is v2.11.0.')
+            resolve('Git v' + gitver + ' detected. Minimum is v2.7.4.')
           })
         })
       },

fuse.js

@@ -53,7 +53,7 @@ const ALIASES = {
   'brace-ext-modelist': 'brace/ext/modelist.js',
   'simplemde': 'simplemde/dist/simplemde.min.js',
   'socket.io-client': 'socket.io-client/dist/socket.io.min.js',
-  'vue': 'vue/dist/vue.js'
+  'vue': 'vue/dist/vue.min.js'
 }
 const SHIMS = {
   jquery: {
@@ -184,6 +184,7 @@ globalTasks.then(() => {
         alias: ALIASES,
         shim: SHIMS,
         plugins: [
+          fsbx.EnvPlugin({ NODE_ENV: 'production' }),
           [ fsbx.SassPlugin({ outputStyle: 'compressed', includePaths: ['./node_modules/requarks-core'] }), fsbx.CSSPlugin() ],
           fsbx.BabelPlugin({
             config: {

npm/install.js

@@ -78,6 +78,9 @@ pm2.connectAsync().then(() => {
      * Upgrade mode
      */
     ora.succeed('Upgrade completed.')
+    console.info(colors.yellow('\n!!! IMPORTANT !!!'))
+    console.info(colors.yellow('Running the configuration wizard is optional but recommended after an upgrade to ensure your config file is using the latest available settings.'))
+    console.info(colors.yellow('Note that the contents of your config file will be displayed during the configuration wizard. It is therefor highly recommended to run the wizard on a non-publicly accessible port or skip this step completely.\n'))
     return false
   }).catch(err => {
     /**
@@ -135,10 +138,10 @@ pm2.connectAsync().then(() => {
             return process.exit(0)
         }
       }).then(() => {
-        ora.succeed(colors.bold.green('Wiki.js has been configured and is now running!'))
+        ora.succeed(colors.bold.green('Wiki.js has been configured successfully. It is now starting up and should be accessible very soon!'))
       })
     } else {
-      console.info('[!] Non-interactive terminal detected. You may now manually edit config.yml and start Wiki.js by running: node wiki start')
+      console.info(colors.cyan('[!] Non-interactive terminal detected. You may now manually edit config.yml and start Wiki.js by running: node wiki start'))
     }
   })
 }).catch(err => {

views/configure/index.pug

@@ -367,7 +367,7 @@ html(data-logic='configure')
                   i
                 .panel-content.is-text
                   p #[i.icon-loader.animated.rotateIn.infinite] Restarting Wiki.js in normal mode...
-                  p You'll automatically be redirected to the homepage when ready. Please be patient...
+                  p You'll automatically be redirected to the homepage when ready. This usually takes about 30 seconds.
                 .panel-footer
                   button.button.is-green(disabled='disabled') Start