From 8d74c48b7b416fa487e33a66a55fba57ef26a48a Mon Sep 17 00:00:00 2001 From: NGPixel Date: Sun, 28 Jan 2018 13:34:37 -0500 Subject: [PATCH] refactor: move setup view to vue component --- client/js/app.js | 9 +- client/js/components/setup.component.js | 258 ---------- client/js/components/setup.vue | 625 ++++++++++++++++++++++++ dev/fuse/index.js | 1 - dev/webpack/webpack.dev.js | 2 + package.json | 4 +- server/views/setup.pug | 351 +------------ yarn.lock | 289 +---------- 8 files changed, 656 insertions(+), 883 deletions(-) delete mode 100644 client/js/components/setup.component.js create mode 100644 client/js/components/setup.vue diff --git a/client/js/app.js b/client/js/app.js index 03a5cb27..2932be56 100644 --- a/client/js/app.js +++ b/client/js/app.js @@ -154,7 +154,7 @@ Vue.component('modalUpgradeSystem', modalUpgradeSystemComponent) Vue.component('navigator', navigatorComponent) Vue.component('pageLoader', pageLoaderComponent) Vue.component('search', searchComponent) -Vue.component('setup', () => import(/* webpackChunkName: "setup" */ './components/setup.component.js')) +Vue.component('setup', () => import(/* webpackChunkName: "setup" */ './components/setup.vue')) Vue.component('sourceView', sourceViewComponent) Vue.component('toggle', toggleComponent) Vue.component('tree', treeComponent) @@ -174,20 +174,17 @@ document.addEventListener('DOMContentLoaded', ev => { const i18n = localization.init() window.wiki = new Vue({ - mixins: [helpers], + el: '#app', components: {}, + mixins: [helpers], store, i18n, - el: '#app', methods: { changeTheme(opts) { this.$el.className = `has-stickynav is-primary-${opts.primary} is-alternate-${opts.alt}` this.$refs.header.className = `nav is-${opts.primary}` this.$refs.footer.className = `footer is-${opts.footer}` } - }, - mounted() { - } }) diff --git a/client/js/components/setup.component.js b/client/js/components/setup.component.js deleted file mode 100644 index ea686ad5..00000000 --- a/client/js/components/setup.component.js +++ /dev/null @@ -1,258 +0,0 @@ -/* global siteConfig */ - -import axios from 'axios' - -export default { - name: 'configManager', - data() { - return { - loading: false, - state: 'welcome', - syscheck: { - ok: false, - error: '', - results: [] - }, - dbcheck: { - ok: false, - error: '' - }, - gitcheck: { - ok: false, - error: '' - }, - final: { - ok: false, - error: '', - redirectUrl: '' - }, - conf: { - adminEmail: '', - adminPassword: '', - adminPasswordConfirm: '', - gitAuthPass: '', - gitAuthSSHKey: '', - gitAuthSSHKeyEnv: '', - gitAuthSSHKeyDB: '', - gitAuthSSL: true, - gitAuthType: 'ssh', - gitAuthUser: '', - gitBranch: 'master', - gitServerEmail: '', - gitShowUserEmail: true, - gitUrl: '', - gitUseRemote: (siteConfig.git !== false), - lang: siteConfig.lang || 'en', - path: siteConfig.path || '/', - pathRepo: './repo', - port: siteConfig.port || 80, - public: (siteConfig.public === true), - selfRegister: (siteConfig.selfRegister === true), - telemetry: true, - title: siteConfig.title || 'Wiki', - upgrade: false, - upgMongo: 'mongodb://' - }, - considerations: { - https: false, - port: false, - localhost: false - } - } - }, - computed: { - currentProgress: function () { - let perc = '0%' - switch (this.state) { - case 'welcome': - perc = '0%' - break - case 'syscheck': - perc = (this.syscheck.ok) ? '15%' : '5%' - break - case 'general': - perc = '25%' - break - case 'considerations': - perc = '30%' - break - case 'git': - perc = '50%' - break - case 'gitcheck': - perc = (this.gitcheck.ok) ? '70%' : '55%' - break - case 'admin': - perc = '75%' - break - case 'upgrade': - perc = '85%' - break - } - return perc - } - }, - mounted: function () { - /* if (appconfig.paths) { - this.conf.pathData = appconfig.paths.data || './data' - this.conf.pathRepo = appconfig.paths.repo || './repo' - } - if (appconfig.git !== false && _.isPlainObject(appconfig.git)) { - this.conf.gitUrl = appconfig.git.url || '' - this.conf.gitBranch = appconfig.git.branch || 'master' - this.conf.gitShowUserEmail = (appconfig.git.showUserEmail !== false) - this.conf.gitServerEmail = appconfig.git.serverEmail || '' - if (_.isPlainObject(appconfig.git.auth)) { - this.conf.gitAuthType = appconfig.git.auth.type || 'ssh' - this.conf.gitAuthSSHKey = appconfig.git.auth.privateKey || '' - this.conf.gitAuthUser = appconfig.git.auth.username || '' - this.conf.gitAuthPass = appconfig.git.auth.password || '' - this.conf.gitAuthSSL = (appconfig.git.auth.sslVerify !== false) - } - } */ - }, - methods: { - proceedToWelcome: function (ev) { - this.state = 'welcome' - this.loading = false - }, - proceedToSyscheck: function (ev) { - let self = this - this.state = 'syscheck' - this.loading = true - self.syscheck = { - ok: false, - error: '', - results: [] - } - - this.$helpers._.delay(() => { - axios.post('/syscheck', self.conf).then(resp => { - if (resp.data.ok === true) { - self.syscheck.ok = true - self.syscheck.results = resp.data.results - } else { - self.syscheck.ok = false - self.syscheck.error = resp.data.error - } - self.loading = false - self.$nextTick() - }).catch(err => { - window.alert(err.message) - }) - }, 1000) - }, - proceedToGeneral: function (ev) { - let self = this - self.state = 'general' - self.loading = false - self.$nextTick(() => { - self.$validator.validateAll('general') - }) - }, - proceedToConsiderations: function (ev) { - this.considerations = { - https: !this.$helpers._.startsWith(this.conf.host, 'https'), - port: false, // TODO - localhost: this.$helpers._.includes(this.conf.host, 'localhost') - } - this.state = 'considerations' - this.loading = false - }, - proceedToGit: function (ev) { - let self = this - self.state = 'git' - self.loading = false - self.$nextTick(() => { - self.$validator.validateAll('git') - }) - }, - proceedToGitCheck: function (ev) { - let self = this - this.state = 'gitcheck' - this.loading = true - self.gitcheck = { - ok: false, - results: [], - error: '' - } - - this.$helpers._.delay(() => { - axios.post('/gitcheck', self.conf).then(resp => { - if (resp.data.ok === true) { - self.gitcheck.ok = true - self.gitcheck.results = resp.data.results - } else { - self.gitcheck.ok = false - self.gitcheck.error = resp.data.error - } - self.loading = false - self.$nextTick() - }).catch(err => { - window.alert(err.message) - }) - }, 1000) - }, - proceedToAdmin: function (ev) { - let self = this - self.state = 'admin' - self.loading = false - self.$nextTick(() => { - self.$validator.validateAll('admin') - }) - }, - proceedToUpgrade: function (ev) { - if (this.conf.upgrade) { - this.state = 'upgrade' - this.loading = false - this.$nextTick(() => { - this.$validator.validateAll('upgrade') - }) - } else { - this.proceedToFinal() - } - }, - proceedToFinal: function (ev) { - let self = this - self.state = 'final' - self.loading = true - self.final = { - ok: false, - error: '', - redirectUrl: '' - } - - this.$helpers._.delay(() => { - axios.post('/finalize', self.conf).then(resp => { - if (resp.data.ok === true) { - self.$helpers._.delay(() => { - self.final.ok = true - switch (resp.data.redirectPort) { - case 80: - self.final.redirectUrl = `http://${window.location.hostname}${resp.data.redirectPath}/login` - break - case 443: - self.final.redirectUrl = `https://${window.location.hostname}${resp.data.redirectPath}/login` - break - default: - self.final.redirectUrl = `http://${window.location.hostname}:${resp.data.redirectPort}${resp.data.redirectPath}/login` - break - } - self.loading = false - }, 5000) - } else { - self.final.ok = false - self.final.error = resp.data.error - self.loading = false - } - self.$nextTick() - }).catch(err => { - window.alert(err.message) - }) - }, 1000) - }, - finish: function (ev) { - window.location.assign(this.final.redirectUrl) - } - } -} diff --git a/client/js/components/setup.vue b/client/js/components/setup.vue new file mode 100644 index 00000000..6101479d --- /dev/null +++ b/client/js/components/setup.vue @@ -0,0 +1,625 @@ + + + diff --git a/dev/fuse/index.js b/dev/fuse/index.js index 644269fa..a298fb13 100644 --- a/dev/fuse/index.js +++ b/dev/fuse/index.js @@ -10,7 +10,6 @@ const Promise = require('bluebird') const autoprefixer = require('autoprefixer') const colors = require('colors/safe') const fsbx = require('fuse-box') -const nodemon = require('nodemon') const fs = require('fs-extra') const yargs = require('yargs') const yaml = require('js-yaml') diff --git a/dev/webpack/webpack.dev.js b/dev/webpack/webpack.dev.js index dfef1a18..8a3c1e89 100644 --- a/dev/webpack/webpack.dev.js +++ b/dev/webpack/webpack.dev.js @@ -2,6 +2,7 @@ const webpack = require('webpack') const merge = require('webpack-merge') const ExtractTextPlugin = require('extract-text-webpack-plugin') +const WriteFilePlugin = require('write-file-webpack-plugin') const common = require('./webpack.common.js') @@ -18,6 +19,7 @@ module.exports = merge(common, { 'process.env.NODE_ENV': JSON.stringify('development') }), new ExtractTextPlugin({ disable: true }), + new WriteFilePlugin(), new webpack.HotModuleReplacementPlugin(), new webpack.WatchIgnorePlugin([ /node_modules/ diff --git a/package.json b/package.json index 88a15ba1..03485323 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,6 @@ "name-all-modules-plugin": "1.0.1", "node-dev": "3.1.3", "node-sass": "4.7.2", - "nodemon": "1.14.11", "offline-plugin": "4.9.0", "postcss-loader": "2.0.10", "postcss-selector-parser": "3.1.1", @@ -212,7 +211,8 @@ "webpack-dev-middleware": "2.0.4", "webpack-hot-middleware": "2.21.0", "webpack-merge": "4.1.1", - "whatwg-fetch": "2.0.3" + "whatwg-fetch": "2.0.3", + "write-file-webpack-plugin": "4.2.0" }, "browserslist": [ "> 1%", diff --git a/server/views/setup.pug b/server/views/setup.pug index e05c2bcd..9407bd17 100644 --- a/server/views/setup.pug +++ b/server/views/setup.pug @@ -2,353 +2,4 @@ extends master.pug block body body - #app.setup - setup(inline-template) - div - .container - .content(v-cloak) - - //- ============================================== - //- WELCOME - //- ============================================== - - template(v-if='state === "welcome"') - .panel - h2.panel-title.is-featured - span Welcome! - i(v-if='loading') - .panel-content.is-text - .welcome - img(src='svg/logo-wikijs.svg', alt='Wiki.js Logo') - h2 A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown - p This installation wizard will guide you through the steps needed to get your wiki up and running in no time! - p Detailed information about installation and usage can be found on the #[a(href='https://wiki.requarks.io/docs') official documentation site]. #[br] Should you have any question or would like to report something that doesn't look right, feel free to create a new issue on the #[a(href='https://github.com/Requarks/wiki/issues') GitHub project]. - .panel-content.form-sections - section - p - svg.icons.is-18.is-outlined.has-right-pad.is-text: use(xlink:href='#nc-cd-reader') - span You are about to install Wiki.js #[strong= packageObj.version]. - section - p.control.is-fullwidth - input#ipt-telemetry(type='checkbox', v-model='conf.telemetry', name='ipt-telemetry') - label.label(for='ipt-telemetry') Allow Telemetry - span.desc Help Wiki.js developers improve this app with anonymized #[a(href='https://wiki.requarks.io/docs/telemetry') telemetry]. - p.control.is-fullwidth - input#ipt-upgrade(type='checkbox', v-model='conf.upgrade', name='ipt-upgrade') - label.label(for='ipt-upgrade') Upgrade from Wiki.js 1.x - span.desc Check this box if you are upgrading from Wiki.js 1.x and wish to migrate your existing data. - .panel-footer - .progress-bar: div(v-bind:style='{width: currentProgress}') - button.button.is-small.is-light-blue(v-on:click='proceedToSyscheck', v-bind:disabled='loading') Start - - //- ============================================== - //- SYSTEM CHECK - //- ============================================== - - template(v-else-if='state === "syscheck"') - .panel - h2.panel-title.is-featured - span Wiki.js - i(v-if='loading') - .panel-content.is-text - .is-logo - svg.icons.is-64: use(xlink:href='#nc-metrics') - h4 System Check - p(v-if='loading') #[svg.icons.is-24.is-text: use(xlink:href='#wk-msdots')] Checking your system for compatibility... - p(v-if='!loading && syscheck.ok') - ul - li(v-for='rs in syscheck.results') #[svg.icons.is-18.is-text: use(xlink:href='#nc-check-bold')] {{rs}} - p(v-if='!loading && syscheck.ok') - svg.icons.is-18.is-text: use(xlink:href='#nc-check-bold') - strong Looks good! No issues so far. - p(v-if='!loading && !syscheck.ok') #[svg.icons.is-18.is-text: use(xlink:href='#nc-square-remove-12')] Error: {{ syscheck.error }} - .panel-footer - .progress-bar: div(v-bind:style='{width: currentProgress}') - button.button.is-small.is-light-blue.is-outlined(v-on:click='proceedToWelcome', v-bind:disabled='loading') Back - button.button.is-small.is-teal(v-on:click='proceedToSyscheck', v-if='!loading && !syscheck.ok') Check Again - button.button.is-small.is-red.is-outlined(v-on:click='proceedToGeneral', v-if='!loading && !syscheck.ok') Continue Anyway - button.button.is-small.is-light-blue(v-on:click='proceedToGeneral', v-if='loading || syscheck.ok', v-bind:disabled='loading') Continue - - //- ============================================== - //- GENERAL - //- ============================================== - - template(v-else-if='state === "general"') - .panel - h2.panel-title.is-featured - span Wiki.js - i(v-if='loading') - .panel-content.form-sections - section - .is-logo - svg.icons.is-64: use(xlink:href='#nc-webpage') - h4 General Information - p.control.is-fullwidth - label.label Site Title - input(type='text', placeholder='e.g. Wiki', v-model='conf.title', data-vv-scope='general', name='ipt-title', v-validate='{ required: true, min: 2 }') - span.desc The site title will appear in the top left corner on every page and within the window title bar. - section.columns - .column.is-half - p.control - label.label Site UI Language - select(v-model='conf.lang') - each lg in data.langs - option(value=lg.id)= lg.name - span.desc The language in which navigation, help and other UI elements will be displayed. - .column.is-half - p.control.is-fullwidth - label.label Site Relative URL Path - input(type='text', placeholder='/', v-model='conf.path', data-vv-scope='general', name='ipt-path', v-validate='{ required: true, min: 1 }') - span.desc The relative path to your wiki. Unless you configure a reverse proxy in front of Wiki.js to handle requests made to a sub-directory, #[strong it is recommended to leave the default value]. - section.columns - .column.is-half - p.control - label.label Server Port - input(type='text', placeholder='e.g. 80', v-model.number='conf.port', data-vv-scope='general', name='ipt-port', v-validate='{ required: true }') - span.desc The port on which Wiki.js will listen to. Usually port 80 if connecting directly, or a random port (e.g. 3000) if using a web server in front of it. Set #[strong $(PORT)] to use the PORT environment variable. - .column.is-half - p.control.is-fullwidth - input#ipt-public(type='checkbox', v-model='conf.public', data-vv-scope='general', name='ipt-public') - label.label(for='ipt-public') Public Access - span.desc Should the site be accessible (read only) without login. - p.control.is-fullwidth - input#ipt-selfregister(type='checkbox', v-model='conf.selfRegister', data-vv-scope='general', name='ipt-selfregister') - label.label(for='ipt-selfregister') Allow Self-Registration - span.desc Can users create their own account to gain access? - section - p.control.is-fullwidth - label.label Local Server Repository Path - input(type='text', placeholder='e.g. ./repo', v-model='conf.pathRepo', data-vv-scope='general', name='ipt-repopath', v-validate='{ required: true, min: 2 }') - span.desc The path where the local git repository will be created, used to store content in markdown files and uploads.#[br] #[strong It is recommended to leave the default value]. - .panel-footer - .progress-bar: div(v-bind:style='{width: currentProgress}') - button.button.is-small.is-light-blue.is-outlined(v-on:click='proceedToSyscheck', v-bind:disabled='loading') Back - button.button.is-small.is-light-blue(v-on:click='proceedToConsiderations', v-bind:disabled='loading || errors.any("general")') Continue - - //- ============================================== - //- CONSIDERATIONS - //- ============================================== - - template(v-else-if='state === "considerations"') - .panel - h2.panel-title.is-featured - span Wiki.js - i(v-if='loading') - .panel-content.is-text - .is-logo - svg.icons.is-64: use(xlink:href='#nc-radar') - h4 Important Considerations - h3 Is Wiki.js going to be behind a web server (e.g. nginx / apache / IIS) or proxy? - p - ul - li - Make sure the upload limit is sufficient. Most web servers have a low limit (e.g. 2 MB) by default. - li - Do not rewrite URLs after the domain. This can cause unexpected issues in Wiki.js navigation. - li - Do not remove or alter the client IP when proxying the requests. This can cause the authentication brute force protection to engage unexpectedly. - template(v-if='considerations.https') - h3 The site will not be using HTTPS? #[svg.icons.is-20.is-outlined.animated.fadeOut.infinite: use(xlink:href='#nc-alert')] - p The host URL you specified is not HTTPS. It is highly recommended to use HTTPS. You must use a web server / proxy (e.g. nginx / apache / IIS) in front of Wiki.js to use HTTPS. Wiki.js does not provide HTTPS handling by itself. - template(v-if='considerations.port') - h3 You are using a non-standard port. - p If you are not planning on using a web server / proxy in front of Wiki.js, be aware that users will need to specify the port when accessing the wiki. Make sure this is the intended behavior. Otherwise set a standard HTTP port such as 80. - .panel-footer - .progress-bar: div(v-bind:style='{width: currentProgress}') - button.button.is-small.is-light-blue.is-outlined(v-on:click='proceedToGeneral', v-bind:disabled='loading') Back - button.button.is-small.is-light-blue(v-on:click='proceedToGit', v-bind:disabled='loading') Continue - - //- ============================================== - //- GIT - //- ============================================== - - template(v-else-if='state === "git"') - .panel - h2.panel-title.is-featured - span Wiki.js - i(v-if='loading') - .panel-content.is-text - .is-logo - img(src='svg/logo-git.svg', alt='Git Logo') - h4 Git Repository - p Wiki.js stores article content and uploads locally on disk. All content is then regularly kept in sync with a remote git repository. This acts a backup protection and provides history / revert features. While optional, it is HIGHLY recommended to setup the remote git repository connection. - .panel-content.form-sections - section.columns - .column.is-two-thirds - p.control.is-fullwidth - label.label Repository URL - input(type='text', placeholder='e.g. git@github.com/org/repo.git or https://github.com/org/repo', v-model='conf.gitUrl', data-vv-scope='git', name='ipt-giturl', v-validate='{ required: true, min: 5 }') - span.desc The full git repository URL to connect to. - .column - p.control.is-fullwidth - label.label Branch - input(type='text', placeholder='e.g. master', v-model='conf.gitBranch', data-vv-scope='git', name='ipt-gitbranch', v-validate='{ required: true, min: 2 }') - span.desc The git branch to use when synchronizing changes. - section.columns - .column.is-one-third - p.control.is-fullwidth - label.label Authentication - select(v-model='conf.gitAuthType') - option(value='ssh') SSH using Private Key file (recommended) - option(value='sshenv') SSH using Private Key in environment variable - option(value='sshdb') SSH using Private Key in database - option(value='basic') Basic Credentials - span.desc The authentication method used to connect to your remote Git repository. - p.control.is-fullwidth - input#ipt-git-verify-ssl(type='checkbox', v-model='conf.gitAuthSSL') - label.label(for='ipt-git-verify-ssl') Verify SSL - .column(v-show='conf.gitAuthType === "basic"') - p.control.is-fullwidth - label.label Username - input(type='text', v-model='conf.gitAuthUser') - span.desc The username for the remote git connection. - .column(v-show='conf.gitAuthType === "basic"') - p.control.is-fullwidth - label.label Password - input(type='password', v-model='conf.gitAuthPass') - span.desc The password for the remote git connection. - .column(v-show='conf.gitAuthType === "ssh"') - p.control.is-fullwidth - label.label Private Key location - input(type='text', placeholder='e.g. /etc/wiki/keys/git.pem', v-model='conf.gitAuthSSHKey') - span.desc The full path to the #[strong unencrypted] private key on disk. - .column(v-show='conf.gitAuthType === "sshenv"') - p.control.is-fullwidth - label.label Private Key Environment Variable - input(type='text', placeholder='e.g. GIT_PRIVATE_KEY', v-model='conf.gitAuthSSHKeyEnv') - span.desc The environment variable containing the private key. - .column(v-show='conf.gitAuthType === "sshdb"') - p.control.is-fullwidth - label.label Private Key Contents - textarea(v-model='conf.gitAuthSSHKeyDB') - span.desc Paste the contents of the private key in the above field - section.columns - .column.is-one-third - p.control.is-fullwidth - input#ipt-git-show-user-email(type='checkbox', v-model='conf.gitShowUserEmail') - label.label(for='ipt-git-show-user-email') Commit using User Email - span.desc When enabled, commits are made as the current user name and email. If unchecked, the current user name will still be used but the default commit author email will be used instead. - .column - p.control.is-fullwidth - label.label Default Commit Author Email - input(type='text', placeholder='e.g. user@example.com', v-model.number='conf.gitServerEmail', data-vv-scope='git', name='ipt-gitsrvemail', v-validate='{ required: true, email: true }') - span.desc The default/fallback email to use when creating commits to the git repository. - .panel-footer - .progress-bar: div(v-bind:style='{width: currentProgress}') - button.button.is-small.is-light-blue.is-outlined(v-on:click='proceedToGeneral', v-bind:disabled='loading') Back - button.button.is-small.is-light-blue.is-outlined(v-on:click='conf.gitUseRemote = false; proceedToGitCheck()', v-bind:disabled='loading') Skip this step - button.button.is-small.is-light-blue(v-on:click='conf.gitUseRemote = true; proceedToGitCheck()', v-bind:disabled='loading || errors.any("git")') Continue - - //- ============================================== - //- GIT CHECK - //- ============================================== - - template(v-else-if='state === "gitcheck"') - .panel - h2.panel-title.is-featured - span Wiki.js - i(v-if='loading') - .panel-content.is-text - .is-logo - img(src='svg/logo-git.svg', alt='Git Logo') - h4 Git Repository Check - p(v-if='loading') #[svg.icons.is-24.is-text: use(xlink:href='#wk-msdots')] Verifying Git repository settings... - p(v-if='!loading && gitcheck.ok') - ul - li(v-for='rs in gitcheck.results') #[svg.icons.is-18.is-text: use(xlink:href='#nc-check-bold')] {{rs}} - p(v-if='!loading && gitcheck.ok') - svg.icons.is-18.is-text: use(xlink:href='#nc-check-bold') - strong Git settings are correct! - p(v-if='!loading && !gitcheck.ok') #[svg.icons.is-18.is-text: use(xlink:href='#nc-square-remove')] Error: {{ gitcheck.error }} - .panel-footer - .progress-bar: div(v-bind:style='{width: currentProgress}') - button.button.is-small.is-light-blue.is-outlined(v-on:click='proceedToGit', v-bind:disabled='loading') Back - button.button.is-small.is-teal(v-on:click='proceedToGitCheck', v-if='!loading && !gitcheck.ok') Try Again - button.button.is-small.is-light-blue(v-on:click='proceedToAdmin', v-if='loading || gitcheck.ok', v-bind:disabled='loading') Continue - - //- ============================================== - //- ADMINISTRATOR ACCOUNT - //- ============================================== - - template(v-else-if='state === "admin"') - .panel - h2.panel-title.is-featured - span Wiki.js - i(v-if='loading') - .panel-content.is-text - .is-logo - svg.icons.is-64: use(xlink:href='#nc-man-black') - h4 Administrator Account - p A root administrator account will be created for local authentication. From this account, you can create or authorize more users. - .panel-content.form-sections - section - p.control.is-fullwidth - label.label Administrator Email - input(type='text', placeholder='e.g. admin@example.com', v-model='conf.adminEmail', data-vv-scope='admin', name='ipt-adminemail', v-validate='{ required: true, email: true }') - span.desc The email address of the administrator account - section.columns - .column - p.control.is-fullwidth - label.label Password - input(type='password', v-model='conf.adminPassword', data-vv-scope='admin', name='ipt-adminpwd', v-validate='{ required: true, min: 8 }') - span.desc At least 8 characters long. - .column - p.control.is-fullwidth - label.label Confirm Password - input(type='password', v-model='conf.adminPasswordConfirm', data-vv-scope='admin', name='ipt-adminpwd2', v-validate='{ required: true, confirmed: "ipt-adminpwd" }') - span.desc Verify your password again. - .panel-footer - .progress-bar: div(v-bind:style='{width: currentProgress}') - button.button.is-small.is-light-blue.is-outlined(v-on:click='proceedToGit', v-bind:disabled='loading') Back - button.button.is-small.is-light-blue(v-on:click='proceedToUpgrade', v-bind:disabled='loading || errors.any("admin")') Continue - - //- ============================================== - //- UPGRADE FROM 1.x - //- ============================================== - - template(v-else-if='state === "upgrade"') - .panel - h2.panel-title.is-featured - span Wiki.js - i(v-if='loading') - .panel-content.is-text - .is-logo - svg.icons.is-64: use(xlink:href='#nc-spaceship') - h4 Upgrade from Wiki.js 1.x - p Migrating from a Wiki.js 1.x installation is quick and simple. - .panel-content.form-sections - section - p.control.is-fullwidth - label.label Connection String to Wiki.js 1.x MongoDB database - input(type='text', placeholder='mongodb://', v-model='conf.upgMongo', data-vv-scope='upgrade', name='ipt-mongo', v-validate='{ required: true, min: 2 }') - span.desc A MongoDB database connection string where a Wiki.js 1.x installation is located. #[strong No alterations will be made to this database. ] - .panel-footer - .progress-bar: div(v-bind:style='{width: currentProgress}') - button.button.is-small.is-light-blue.is-outlined(v-on:click='proceedToAdmin', v-bind:disabled='loading') Back - button.button.is-small.is-light-blue(v-on:click='proceedToFinal', v-bind:disabled='loading || errors.any("general")') Continue - - //- ============================================== - //- FINAL - //- ============================================== - - template(v-else-if='state === "final"') - .panel - h2.panel-title.is-featured - span Wiki.js - i(v-if='loading') - .panel-content.is-text - .is-logo(v-if='loading') - svg.icons.is-64: use(xlink:href='#wk-msdots') - h4 Finalizing your installation... - .is-logo(v-if='!loading && final.ok') - svg.icons.is-64: use(xlink:href='#nc-check-bold') - h4 Installation complete! - p(v-if='!loading && final.ok'): strong Wiki.js was configured successfully and is now ready for use. - p(v-if='!loading && final.ok') Click the #[strong Start] button below to access your newly configured wiki. - p(v-if='!loading && !final.ok') #[svg.icons.is-18.is-text: use(xlink:href='#nc-square-remove')] Error: {{ final.error }} - .panel-footer - .progress-bar: div(v-bind:style='{width: currentProgress}') - button.button.is-small.is-light-blue.is-outlined(v-on:click='proceedToAdmin', v-if='!loading && !final.ok', v-bind:disabled='loading') Back - button.button.is-small.is-teal(v-on:click='proceedToFinal', v-if='!loading && !final.ok') Try Again - button.button.is-small.is-green(v-on:click='finish', v-if='loading || final.ok', v-bind:disabled='loading') Start - - footer - small Wiki.js Installation Wizard - small(v-if='conf.telemetry') Telemetry Client ID: !{telemetryClientID} + #app.setup: setup(telemetry-id=telemetryClientID, wiki-version=packageObj.version, :langs!=JSON.stringify(data.langs).replace(/"/g, "'")) diff --git a/yarn.lock b/yarn.lock index 8607530c..e7858416 100644 --- a/yarn.lock +++ b/yarn.lock @@ -318,12 +318,6 @@ amp@0.3.1, amp@~0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/amp/-/amp-0.3.1.tgz#6adf8d58a74f361e82c1fa8d389c079e139fc47d" -ansi-align@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" - dependencies: - string-width "^2.0.0" - ansi-escape-sequences@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-escape-sequences/-/ansi-escape-sequences-3.0.0.tgz#1c18394b6af9b76ff9a63509fa497669fd2ce53e" @@ -1677,18 +1671,6 @@ boom@5.x.x: dependencies: hoek "4.x.x" -boxen@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" - dependencies: - ansi-align "^2.0.0" - camelcase "^4.0.0" - chalk "^2.0.1" - cli-boxes "^1.0.0" - string-width "^2.0.0" - term-size "^1.2.0" - widest-line "^2.0.0" - brace-expansion@^1.1.7: version "1.1.8" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" @@ -1987,7 +1969,7 @@ camelcase@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" -camelcase@^4.0.0, camelcase@^4.1.0: +camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" @@ -2021,10 +2003,6 @@ caniuse-lite@^1.0.30000744: version "1.0.30000744" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000744.tgz#860fa5c83ba34fe619397d607f30bb474821671b" -capture-stack-trace@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d" - cardinal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9" @@ -2116,7 +2094,7 @@ child-process-promise@^1.1.0: dependencies: q "^1.1.2" -chokidar@2.0.0, chokidar@^2.0.0: +chokidar@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.0.tgz#6686313c541d3274b2a5c01233342037948c911b" dependencies: @@ -2195,10 +2173,6 @@ clean-webpack-plugin@0.1.18: dependencies: rimraf "^2.6.1" -cli-boxes@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" - cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" @@ -2469,17 +2443,6 @@ config-chain@^1.1.10: ini "^1.3.4" proto-list "~1.2.1" -configstore@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90" - dependencies: - dot-prop "^4.1.0" - graceful-fs "^4.1.2" - make-dir "^1.0.0" - unique-string "^1.0.0" - write-file-atomic "^2.0.0" - xdg-basedir "^3.0.0" - connect-flash@0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/connect-flash/-/connect-flash-0.1.1.tgz#d8630f26d95a7f851f9956b1e8cc6732f3b6aa30" @@ -2669,12 +2632,6 @@ create-ecdh@^4.0.0: bn.js "^4.1.0" elliptic "^6.0.0" -create-error-class@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" - dependencies: - capture-stack-trace "^1.0.0" - create-hash@^1.1.0, create-hash@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd" @@ -2765,10 +2722,6 @@ crypto-browserify@^3.11.0: randombytes "^2.0.0" randomfill "^1.0.3" -crypto-random-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" - css-color-names@0.0.4, css-color-names@^0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" @@ -3275,7 +3228,7 @@ domutils@^1.5.1: dom-serializer "0" domelementtype "1" -dot-prop@^4.1.0, dot-prop@^4.1.1: +dot-prop@^4.1.1: version "4.2.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" dependencies: @@ -3309,7 +3262,7 @@ duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" -duplexer@^0.1.1, duplexer@~0.1.1: +duplexer@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" @@ -3743,18 +3696,6 @@ event-emitter@~0.3.5: d "1" es5-ext "~0.10.14" -event-stream@~3.3.0: - version "3.3.4" - resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" - dependencies: - duplexer "~0.1.1" - from "~0" - map-stream "~0.1.0" - pause-stream "0.0.11" - split "0.3" - stream-combiner "~0.0.4" - through "~2.3.1" - eventemitter2@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-1.0.5.tgz#f983610517b1737c0b9dc643beca93893c04df18" @@ -3804,18 +3745,6 @@ execa@^0.5.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - exif-parser@^0.1.9: version "0.1.12" resolved "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz#58a9d2d72c02c1f6f02a0ef4a9166272b7760922" @@ -4112,7 +4041,7 @@ filesize.js@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/filesize.js/-/filesize.js-1.0.2.tgz#934c013395a71804875cf11e6f1ffe211c3f2192" -filesize@^3.5.9: +filesize@^3.2.1, filesize@^3.5.9: version "3.5.11" resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee" @@ -4313,10 +4242,6 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -from@~0: - version "0.1.7" - resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" - fs-extra@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" @@ -4511,12 +4436,6 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: once "^1.3.0" path-is-absolute "^1.0.0" -global-dirs@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" - dependencies: - ini "^1.3.4" - global@~4.3.0: version "4.3.2" resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" @@ -4568,22 +4487,6 @@ good-listener@^1.2.2: dependencies: delegate "^3.1.2" -got@^6.7.1: - version "6.7.1" - resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" - dependencies: - create-error-class "^3.0.0" - duplexer3 "^0.1.4" - get-stream "^3.0.0" - is-redirect "^1.0.0" - is-retry-allowed "^1.0.0" - is-stream "^1.0.0" - lowercase-keys "^1.0.0" - safe-buffer "^5.0.1" - timed-out "^4.0.0" - unzip-response "^2.0.1" - url-parse-lax "^1.0.0" - got@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a" @@ -5003,10 +4906,6 @@ iferr@^0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" -ignore-by-default@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" - ignore@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d" @@ -5023,10 +4922,6 @@ image-size@^0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - import-local@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc" @@ -5373,13 +5268,6 @@ is-glob@^4.0.0: dependencies: is-extglob "^2.1.1" -is-installed-globally@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" - dependencies: - global-dirs "^0.1.0" - is-path-inside "^1.0.0" - is-my-json-valid@^2.12.4: version "2.16.1" resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11" @@ -5395,10 +5283,6 @@ is-nan@^1.2.1: dependencies: define-properties "^1.1.1" -is-npm@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" - is-number@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" @@ -5471,10 +5355,6 @@ is-property@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" -is-redirect@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" - is-regex@^1.0.3, is-regex@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" @@ -6184,12 +6064,6 @@ klaw@2.1.1: dependencies: graceful-fs "^4.1.9" -latest-version@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" - dependencies: - package-json "^4.0.0" - lazy-cache@^0.2.3: version "0.2.7" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65" @@ -6535,7 +6409,7 @@ lodash.values@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" -lodash@4.17.4, lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.1, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.4: +lodash@4.17.4, lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.1, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.1, lodash@~4.17.4: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -6619,10 +6493,6 @@ map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" -map-stream@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" - map-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" @@ -7001,7 +6871,7 @@ moment-timezone@^0.5.0, moment-timezone@^0.5.4, moment-timezone@^0.5.x: dependencies: moment ">= 2.9.0" -moment@2.20.1: +moment@2.20.1, moment@^2.11.2: version "2.20.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd" @@ -7273,21 +7143,7 @@ node-version@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.0.0.tgz#1b9b9584a9a7f7a6123f215cd14a652bf21ab19e" -nodemon@1.14.11: - version "1.14.11" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.14.11.tgz#cc0009dd8d82f126f3aba50ace7e753827a8cebc" - dependencies: - chokidar "^2.0.0" - debug "^3.1.0" - ignore-by-default "^1.0.1" - minimatch "^3.0.4" - pstree.remy "^1.1.0" - semver "^5.4.1" - touch "^3.1.0" - undefsafe "^2.0.1" - update-notifier "^2.3.0" - -nopt@1.0.10, nopt@~1.0.10: +nopt@1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" dependencies: @@ -7601,15 +7457,6 @@ p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" -package-json@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" - dependencies: - got "^6.7.1" - registry-auth-token "^3.0.1" - registry-url "^3.0.3" - semver "^5.1.0" - packet-reader@0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27" @@ -7889,12 +7736,6 @@ path-type@^3.0.0: dependencies: pify "^3.0.0" -pause-stream@0.0.11: - version "0.0.11" - resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" - dependencies: - through "~2.3" - pause@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d" @@ -8808,22 +8649,10 @@ prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" -ps-tree@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014" - dependencies: - event-stream "~3.3.0" - pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" -pstree.remy@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.0.tgz#f2af27265bd3e5b32bbfcc10e80bac55ba78688b" - dependencies: - ps-tree "^1.1.0" - public-encrypt@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6" @@ -9079,7 +8908,7 @@ raw-loader@0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" -rc@^1.0.1, rc@^1.1.6, rc@^1.1.7: +rc@^1.1.7: version "1.2.1" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95" dependencies: @@ -9298,19 +9127,6 @@ regexpu-core@^2.0.0: regjsgen "^0.2.0" regjsparser "^0.1.4" -registry-auth-token@^3.0.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.1.tgz#fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006" - dependencies: - rc "^1.1.6" - safe-buffer "^5.0.1" - -registry-url@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" - dependencies: - rc "^1.0.1" - regjsgen@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" @@ -9666,13 +9482,7 @@ select@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" -semver-diff@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" - dependencies: - semver "^5.0.3" - -"semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3, semver@^5.3.0, semver@~5.3.0: +"semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.0.1, semver@^5.1.0, semver@^5.3, semver@^5.3.0, semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -10044,12 +9854,6 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" -split@0.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" - dependencies: - through "2" - split@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/split/-/split-1.0.0.tgz#c4395ce683abcd254bc28fe1dabb6e5c27dcffae" @@ -10124,12 +9928,6 @@ stream-browserify@^2.0.1: inherits "~2.0.1" readable-stream "^2.0.2" -stream-combiner@~0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" - dependencies: - duplexer "~0.1.1" - stream-each@^1.1.0: version "1.2.2" resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd" @@ -10418,12 +10216,6 @@ tar@^2.0.0, tar@^2.2.1: fstream "^1.0.2" inherits "2" -term-size@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" - dependencies: - execa "^0.7.0" - terraformer-wkt-parser@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/terraformer-wkt-parser/-/terraformer-wkt-parser-1.1.2.tgz#336a0c8fc82094a5aff83288f69aedecd369bf0c" @@ -10472,7 +10264,7 @@ through2@2.0.3, through2@^2.0.0: readable-stream "^2.1.5" xtend "~4.0.1" -through@2, through@^2.3.6, through@~2.3, through@~2.3.1: +through@2, through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -10549,12 +10341,6 @@ toposort-class@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988" -touch@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" - dependencies: - nopt "~1.0.10" - tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561" @@ -10734,12 +10520,6 @@ ultron@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" -undefsafe@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.1.tgz#03b2f2a16c94556e14b2edef326cd66aaf82707a" - dependencies: - debug "^2.2.0" - underscore@^1.7.0, underscore@~1.8.3: version "1.8.3" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" @@ -10787,12 +10567,6 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" -unique-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" - dependencies: - crypto-random-string "^1.0.0" - universalify@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" @@ -10808,24 +10582,6 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" -unzip-response@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" - -update-notifier@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451" - dependencies: - boxen "^1.2.1" - chalk "^2.0.1" - configstore "^3.0.0" - import-lazy "^2.1.0" - is-installed-globally "^0.1.0" - is-npm "^1.0.0" - latest-version "^3.0.0" - semver-diff "^2.0.0" - xdg-basedir "^3.0.0" - urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" @@ -11303,12 +11059,6 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2" -widest-line@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273" - dependencies: - string-width "^2.1.1" - window-size@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" @@ -11376,7 +11126,7 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" -write-file-atomic@^2.0.0, write-file-atomic@^2.1.0: +write-file-atomic@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" dependencies: @@ -11388,6 +11138,17 @@ write-file-stdout@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1" +write-file-webpack-plugin@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/write-file-webpack-plugin/-/write-file-webpack-plugin-4.2.0.tgz#7bd18547eaa0ea0b23992fb1e0322e5431d339ef" + dependencies: + chalk "^1.1.1" + debug "^2.6.8" + filesize "^3.2.1" + lodash "^4.5.1" + mkdirp "^0.5.1" + moment "^2.11.2" + write@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" @@ -11402,10 +11163,6 @@ ws@^4.0.0: safe-buffer "~5.1.0" ultron "~1.1.0" -xdg-basedir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" - xhr@^2.0.1: version "2.4.0" resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.0.tgz#e16e66a45f869861eeefab416d5eff722dc40993"