From b4c4de6f62fee60cbb6110a9b8224033ee0b2a1d Mon Sep 17 00:00:00 2001 From: NGPixel Date: Thu, 20 Jul 2017 19:03:51 -0400 Subject: [PATCH 01/10] chore: update dependencies --- package.json | 16 ++++++++-------- yarn.lock | Bin 247656 -> 249251 bytes 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 619731d9..d2df70b3 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "node": ">=4.6" }, "dependencies": { - "auto-load": "~2.1.0", + "auto-load": "~3.0.0", "axios": "~0.16.2", "bcryptjs-then": "~1.0.1", "bluebird": "~3.5.0", @@ -46,7 +46,7 @@ "cheerio": "~1.0.0-rc.2", "child-process-promise": "~2.2.1", "chokidar": "~1.7.0", - "compression": "~1.6.2", + "compression": "~1.7.0", "connect-flash": "~0.1.1", "connect-mongo": "~1.3.2", "cookie-parser": "~1.4.3", @@ -60,7 +60,7 @@ "file-type": "~5.2.0", "filesize.js": "~1.0.2", "follow-redirects": "~1.2.4", - "fs-extra": "~3.0.1", + "fs-extra": "~4.0.0", "git-wrapper2-promise": "~0.2.9", "highlight.js": "~9.12.0", "i18next": "~8.4.3", @@ -104,7 +104,7 @@ "passport-slack": "0.0.7", "passport-windowslive": "~1.0.2", "passport.socketio": "~3.7.0", - "pm2": "~2.5.0", + "pm2": "~2.6.1", "pug": "~2.0.0-rc.2", "read-chunk": "~2.0.0", "remove-markdown": "~0.2.0", @@ -125,7 +125,7 @@ "yargs": "~8.0.1" }, "devDependencies": { - "@glimpse/glimpse": "~0.21.5", + "@glimpse/glimpse": "~0.22.13", "@panter/vue-i18next": "~0.5.0", "babel-cli": "~6.24.1", "babel-jest": "~20.0.3", @@ -133,7 +133,7 @@ "brace": "~0.10.0", "colors": "~1.1.2", "consolidate": "~0.14.5", - "eslint": "~4.1.1", + "eslint": "~4.2.0", "eslint-config-standard": "~10.2.1", "eslint-plugin-import": "~2.7.0", "eslint-plugin-node": "~5.1.0", @@ -158,11 +158,11 @@ "uglify-es": "~3.0.24", "uglify-js": "~3.0.24", "vee-validate": "~2.0.0-rc.6", - "vue": "~2.3.4", + "vue": "~2.4.1", "vue-clipboards": "~1.0.2", "vue-lodash": "~1.0.3", "vue-resource": "~1.3.4", - "vue-template-compiler": "~2.3.4", + "vue-template-compiler": "~2.4.1", "vue-template-es2015-compiler": "~1.5.3", "vuex": "~2.3.1" }, diff --git a/yarn.lock b/yarn.lock index cab63c12dbd64b0df543807f0ad9ba3669c6fe4a..8ba9d6793f837e8ec5f0ac87a1d26c54974a7590 100644 GIT binary patch delta 6357 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 Date: Thu, 20 Jul 2017 21:28:11 -0400 Subject: [PATCH 02/10] fix: re-generate yarn.lock --- package.json | 16 ++++++++-------- yarn.lock | Bin 247038 -> 249017 bytes 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index b74fdc56..8cc9eca6 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "node": ">=4.6" }, "dependencies": { - "auto-load": "~2.1.0", + "auto-load": "~3.0.0", "axios": "~0.16.2", "bcryptjs-then": "~1.0.1", "bluebird": "~3.5.0", @@ -46,7 +46,7 @@ "cheerio": "~1.0.0-rc.2", "child-process-promise": "~2.2.1", "chokidar": "~1.7.0", - "compression": "~1.6.2", + "compression": "~1.7.0", "connect-flash": "~0.1.1", "connect-mongo": "~1.3.2", "cookie-parser": "~1.4.3", @@ -60,7 +60,7 @@ "file-type": "~5.2.0", "filesize.js": "~1.0.2", "follow-redirects": "~1.2.4", - "fs-extra": "~3.0.1", + "fs-extra": "~4.0.0", "git-wrapper2-promise": "~0.2.9", "highlight.js": "~9.12.0", "i18next": "~8.4.3", @@ -104,7 +104,7 @@ "passport-slack": "0.0.7", "passport-windowslive": "~1.0.2", "passport.socketio": "~3.7.0", - "pm2": "~2.5.0", + "pm2": "~2.6.1", "pug": "~2.0.0-rc.2", "read-chunk": "~2.0.0", "remove-markdown": "~0.2.0", @@ -125,7 +125,7 @@ "yargs": "~8.0.1" }, "devDependencies": { - "@glimpse/glimpse": "~0.21.5", + "@glimpse/glimpse": "~0.22.13", "@panter/vue-i18next": "~0.5.0", "babel-cli": "~6.24.1", "babel-jest": "~20.0.3", @@ -133,7 +133,7 @@ "brace": "~0.10.0", "colors": "~1.1.2", "consolidate": "~0.14.5", - "eslint": "~4.1.1", + "eslint": "~4.2.0", "eslint-config-standard": "~10.2.1", "eslint-plugin-import": "~2.7.0", "eslint-plugin-node": "~5.1.0", @@ -156,11 +156,11 @@ "typescript": "~2.4.1", "uglify-es": "~3.0.24", "vee-validate": "~2.0.0-rc.6", - "vue": "~2.3.4", + "vue": "~2.4.1", "vue-clipboards": "~1.0.2", "vue-lodash": "~1.0.3", "vue-resource": "~1.3.4", - "vue-template-compiler": "~2.3.4", + "vue-template-compiler": "~2.4.1", "vue-template-es2015-compiler": "~1.5.3", "vuex": "~2.3.1" }, diff --git a/yarn.lock b/yarn.lock index 1163b817a7836cc652e52b6c45b17380fd83c6ad..17872dfe9cd271a956a56dbc1ef9a3360ebe9960 100644 GIT binary patch delta 6290 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 delta 5487 zcmaJ_3v?aDc|NnN2a=5>+d`7DV_j@Qz`6H&W_M?H#?)8_l5pxC!U^f&IDld2v91YN zLY7TUT7whfn77H643Ch4F(je1#Zh3vX+j{7);2HGv`IOI0BLhd32jK=qzw)3w^u>| z=L8)cJ?`E6&&>aS-}it2JalvK+gJAP+*V0OD9nX1^FiW|zY045IL@HCA#)-&Xad2R;c)o2>h|f)) zMK+Q5U!pz}Kb1O@QJ%y}5{WE|8I#&Eo^mA<%{0TC*n;(YQZiV4E}Y-Sn@kpGkz?j; z7`3jkY14XJTfCMvlV)1H6b_K?;_{B6`6JbN-uH~fXWACbY$AyzQ`#6CYh_eMMQpS- zGEI$D&e|NCGs?(f+siYDEDp8Z*jvNbMWf^EGGq{YD6Vf``2OeaD-N~y%q+`no+GU; zRaqWIk&(=#NP`waizISb-1F5MaG<*w>*#2!4pvYy*t^kR8ei z)N93m%sQ#KBdr(rb#)fqvt~zWlQ!eHRnE-ChR2zu%%)CR5t%ecj=AA^$|<#6X=Ni` zoHlDINsBw`GeKg3AgO8v;VyTnO)_DnNqB4!$z?g`R>dq&vM9A(uMpK&_$GMO$k#_R6r5#Ud<4!`xAcJu96lp}5Q^&rSL|{F~PXy~Wxc&EkC3 zGx^x^{=hf?k_`BLkB0T)=oJG|)MU-5bzYYxnNpeMQDz0tO&S6GxymF>1h-Pgd7@n= zqDj5t_K(lXHm)~~Y}3S_jBG8o{d<4$^WNqk>X{dpHJ1JMp9aGkw6#Wp%`@kcNad+> z%yAlX?c$s>9>+N|Hn)+IGMRk)n#}|L7uNvB2>z0n$lwZo!3o%cK3gFO;mkS!{6gsQ}40Oy46BHHTHU%}U z6R8ryMM6-+vWWYOJHx@r=7YBqf?a&@LoGYg_OJtIAlPhT#cXv<49I0|0*K3pi`siR#?0NkA zMfmtY(e?P{{qvUL#nw3tlE|=WW0a-J zROkYgOdNCSG8J2Efn9B?bNG{1klB8CIq52%+22Lt;<^0`i1e5JeK6k>MTTZ?&c?UY z7H@4KU~=_=Z_V>B50Lr_gTq%@#IHuwlt^Kfz{KRKbj(I^9H}f#l+aObpc!04q%y8G zcUn?^@I``^i(t;A|M5>|6+2%2@Z=+}evqgc_2pAQkuMTu=*TRX|UqjM!XBV~_3dj$^ zE0-QimiAOK=(j~=QFBV7&;n)ZC`L@buWA?hmac{VjEvN=uxoB#*H@Av{a^|E#Du$KYV z-+2wVrPHz`B;?kmhC+BXT82|p#c`a9B+X2!azSmbU7CQSGhs&c1Pj--1x+n z5j0j1x79rSwX1_}PkGpMzwhyPZ|JZ{P}^!}6~vXHjsejzg)Rcqd6LRlzC3Szs7f74GY6n?5qsLsrF$oo= zF3SL6B{KB0D1odBh@D75UhR@x`hVL&>cz@K&8ZkCUrCM!L#H+g#>W=8jj>sy5*9m^ zQqUajPylKfb1bIZkE{-d{C!uF`6Mp)Ur8o=D>`=FLXIVgrymJV@{4XJAMiiAnVjsK zw~(Il3^pXRY9%t0;4(8RR~95; zlxlFXwuj9B(%P`y|Ltzl?YG}e=J_XflQaA)cayvPxA%u#-hY)G>35zLcKV0z!gAmH zD%sZe!S`^slD3Mn?=cy8sW|3|<{zVi?|B#?Is7Gnw)%Jr9XVKyqwCyePH^WU8p|wm z64GL%$TS$^V&StNkfBe`;P4%yzzMeSzZmwqR-1YIFf6wGB49oBR3$xQqw6Ua%<-i@6f>CaB*J0C^jf}(cwswzFRoI3}O40=G6_$W1#aJE* z4Ihz!@)klOyZ08rpoBFB?h=?DYCknjB*KD%f?x!jY3q`&;eesWhZCw@^93yNZJC3e8371DsO36_Wq{3WQPlrwqOQpjTD^p0Zt zDLv(qr^t$4fA0%~`5T@mwMNp)h~Tl)9Q&2Z!2i;S<*7!CQE?v83@#JS(B`yi+vS_j zlOG-J@AKHvTmM6bXfmBu*eFKfmEouI1RlV$goDa9NpemlbX360z$BKZ{4cqzn*sxB z{4QwVG<3SlCAn3Rfs#847q4T3lSv3TGQt^*Zqm~gH_1Lb2iw3U!PhRe8`WvpsTwz$5q`% z_`NY%xoT>#LkXt-z;bdL3n^@oNiq1kB*XlZDI?%xWo5t>{8DD&q#eB@-EsfMS+u%mwf@ z8AqRD0@G?1m%q9o_}LNuzE?osu`NNnAD9T{(8_*S38MILMOh?5!$ZdK9Ema+OEFm> z1c%|OlrAgJnh3^^SWr#WRTeN%A4b%qIQVL#wZJLWL&(g`2#)iZOo_7mxH4<)b`Nht@LBDxH_!s`Fqr<1m?uFrK=&u^N%%D0Ez-bv$ise(WGLU$=DyWE*L6*eq8uwK%(-e zCxnd!3!{2%Pg+!7z&Qi4tz%=6S`vd!ZEPhHZX$O}KDc^kI~Q zfZ(y*;Nk~n1a&Z}h0Nq|H9SpVn<{@^`K9u*HQ`mHc<{tI#Tcu%LY3Ls;VYfR_r5;Y z?>rvLdMFEPmnUY@f(+|^zjnpgKruL*0@XvA!Z-U@?`dCC}( zQjCHLZctJVJ;iXQwGwHX%JNUI34hr`XnEeP;Ty#N;x-84w%fubn7JyF@HA2sgSJGI z!xWJ4%7$BP5I#MU;7Dd*O=(;{ds}!gEY4q6_fOvu9t)GwVswJ*fefxt;C$E$ZV8NK zK&HW^0Rll97&g|TM7k^NY0c2(X}iKLWKP^n-b3riUtTB6{9C)jBYn^AaLF<}FttV4 z;LKq7bAUZAikNgFL#sy_K)_t18mUxCmBB%O$?ov~eoyE>*u1H_7Qj#JekQmxv6gAZ z6hqUY3KHaUE_8~Ht}Qw;&Mu))<$vE5KG9RvW!3#*&7Zd+tov*4hu`hHKRmIRJn`h} zzy4A@5bim$Mc`uTi6{9FJr>TT6`flLNpP)ZARgRgX^d+sg>RNqqtF#_pCk-w2YcF@ z2z}qLNN;)FV_{FHZ#)ss_m8XrG+#In_Q$fxrm`=Qbxv{Zr7*LZNL3daxB!AEbKI&4 Nm1Gnb4_Yto{(p~{qEG+; From c51d26a02dddd3e1054e374980cd287a05780037 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Thu, 20 Jul 2017 21:20:40 -0400 Subject: [PATCH 03/10] fix: search results href siteRoot undefined --- client/js/components/search.vue | 9 ++++++--- npm/package-lock.json | Bin 44207 -> 44207 bytes npm/package.json | 2 +- package.json | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/client/js/components/search.vue b/client/js/components/search.vue index cb6c45f0..5c97ce38 100644 --- a/client/js/components/search.vue +++ b/client/js/components/search.vue @@ -10,7 +10,7 @@ li(v-if='searchres.length === 0') a: em {{ $t('search.nomatch') }} li(v-for='sres in searchres', v-bind:class='{ "is-active": searchmovekey === "res." + sres.entryPath }') - a(v-bind:href='siteRoot + "/" + sres.entryPath') {{ sres.title }} + a(v-bind:href='sres.entryPath') {{ sres.title }} p.searchresults-label(v-if='searchsuggest.length > 0') {{ $t('search.didyoumean') }} ul.searchresults-list(v-if='searchsuggest.length > 0') li(v-for='sug in searchsuggest', v-bind:class='{ "is-active": searchmovekey === "sug." + sug }') @@ -39,7 +39,10 @@ export default { self.searchactive = true self.searchload++ socket.emit('search', { terms: val }, (data) => { - self.searchres = data.match + self.searchres = self._.map(data.match, m => { + m.entryPath = `${siteRoot}/${m.entryPath}` + return m + }) self.searchsuggest = data.suggest self.searchmovearr = self._.concat([], self.searchres, self.searchsuggest) if (self.searchload > 0) { self.searchload-- } @@ -74,7 +77,7 @@ export default { let i = this.searchmoveidx - 1 if (this.searchmovearr[i]) { - window.location.assign(siteRoot + '/' + this.searchmovearr[i].entryPath) + window.location.assign(this.searchmovearr[i].entryPath) } else { this.searchq = this.searchmovearr[i] } diff --git a/npm/package-lock.json b/npm/package-lock.json index 824f14975dd11e1b59e9b447e7c2066df5beb91a..e23c24d1ff5a920c881a2c226b1d389b36f5c7df 100644 GIT binary patch delta 14 WcmZ2~lWF};rU{0OCL4`v*8l)8uLc(Y delta 14 WcmZ2~lWF};rU{0O#v6@l*8l)8ss Date: Fri, 21 Jul 2017 17:31:21 -0400 Subject: [PATCH 04/10] refactor: use yarn during npm install process --- CHANGELOG.md | 3 +++ npm/install.js | 17 ++++++++++++++++- tsconfig.json | 5 ++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e9d31d5..1ac5f540 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). - **Security**: Optional Two-Factor Authentication (2FA) protection ## [v1.0.0-beta.14] - Unreleased +### Changed +- **Misc**: Switch to Yarn for npm dependencies installation + ### Fixed - **Misc**: JS/CSS is now loading properly in Safari (macOS/iOS) - **Misc**: Process termination handling diff --git a/npm/install.js b/npm/install.js index 2c4de41a..19df66f0 100644 --- a/npm/install.js +++ b/npm/install.js @@ -138,12 +138,24 @@ const tasks = { } }) }, + /** + * Install Yarn + */ + installYarn() { + ora.text = 'Installing Yarn...' + return exec.stdout('npm', ['install', '-g', 'yarn'], { + cwd: installDir + }).then(results => { + ora.text = 'Yarn installed successfully.' + return true + }) + }, /** * Install npm dependencies */ installDependencies() { ora.text = 'Installing Wiki.js npm dependencies...' - return exec.stdout('npm', ['install', '--only=production', '--no-optional'], { + return exec.stdout('yarn', ['install', '--production', '--ignore-optional'], { cwd: installDir }).then(results => { ora.text = 'Wiki.js npm dependencies installed successfully.' @@ -247,6 +259,9 @@ Promise.join( }).then(() => { isContainerBased && console.info('>> Creating config file...') return tasks.ensureConfigFile() +}).then(() => { + isContainerBased && console.info('>> Installing Yarn...') + return tasks.installYarn() }).then(() => { isContainerBased && console.info('>> Installing dependencies...') return tasks.installDependencies() diff --git a/tsconfig.json b/tsconfig.json index 68aba21a..dc25199f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,5 +11,8 @@ "strictNullChecks": true, "suppressImplicitAnyIndexErrors": true, "target": "es5" - } + }, + "exclude": [ + "node_modules" + ] } From 246ac5e726c8977c624dbf131baeb2802829f661 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Fri, 21 Jul 2017 17:40:26 -0400 Subject: [PATCH 05/10] fix: package.json entry point --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f111dec0..8cdb0d10 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "wiki", "version": "1.0.0-beta.14", "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown", - "main": "server.js", + "main": "wiki.js", "scripts": { "start": "node wiki start", "stop": "node wiki stop", From 2dbb37a690812b717b6b0f936052c4997f9c3c1d Mon Sep 17 00:00:00 2001 From: NGPixel Date: Fri, 21 Jul 2017 17:47:01 -0400 Subject: [PATCH 06/10] fix: update dependencies --- package.json | 12 ++++++------ yarn.lock | Bin 249017 -> 249124 bytes 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8cdb0d10..091f7db2 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "moment": "~2.18.1", "moment-timezone": "~0.5.13", "mongodb": "~2.2.30", - "mongoose": "^4.11.1", + "mongoose": "~4.11.1", "multer": "~1.3.0", "node-2fa": "~1.1.2", "node-graceful": "~0.2.3", @@ -110,7 +110,7 @@ "remove-markdown": "~0.2.0", "request": "~2.81.0", "search-index-adder": "~0.3.9", - "search-index-searcher": "~0.2.8", + "search-index-searcher": "~0.2.10", "semver": "~5.3.0", "serve-favicon": "~2.4.3", "simplemde": "~1.11.2", @@ -133,13 +133,13 @@ "brace": "~0.10.0", "colors": "~1.1.2", "consolidate": "~0.14.5", - "eslint": "~4.2.0", + "eslint": "~4.3.0", "eslint-config-standard": "~10.2.1", "eslint-plugin-import": "~2.7.0", "eslint-plugin-node": "~5.1.0", "eslint-plugin-promise": "~3.5.0", "eslint-plugin-standard": "~3.0.1", - "fuse-box": "~2.2.0", + "fuse-box": "~2.2.1", "i18next-xhr-backend": "~1.4.2", "jest": "~20.0.4", "jquery": "~3.2.1", @@ -156,11 +156,11 @@ "typescript": "~2.4.1", "uglify-es": "~3.0.24", "vee-validate": "~2.0.0-rc.6", - "vue": "~2.4.1", + "vue": "~2.4.2", "vue-clipboards": "~1.0.2", "vue-lodash": "~1.0.3", "vue-resource": "~1.3.4", - "vue-template-compiler": "~2.4.1", + "vue-template-compiler": "~2.4.2", "vue-template-es2015-compiler": "~1.5.3", "vuex": "~2.3.1" }, diff --git a/yarn.lock b/yarn.lock index 17872dfe9cd271a956a56dbc1ef9a3360ebe9960..52a14f18f6e4253a72e1ab4f75630c7d1d9847ad 100644 GIT binary patch delta 473 zcmYk$J8KkC7zSX@oUo?QY!TPp#-LfUf;y9PpL6iGsMu)XFBmwNIg-ZPszDJ=s&pYZ zkPp)dn^K5a3|3a#*ogiB!B}WzDhsi3+{)(T`d-JJpL`2G35S78Hxd$6~N3b;nl9Fo=6)uZs`IGTqueY68VZzQMcNgusN)ek%m zyWf)zJpYx<)|*RcYY3ND@D;ET^-?+=6+#5hT_Dto+-V{Nqa@_K>5cTZG%Ro%IlS6V zy4B6j?8YRbdJ>a+?++CuV;LpY>2nw1@c{qJQ<6K$oOVtLPL$M|8BnHgsf!2~5oiV&`~6;2pq zlN5(_g2iH`g^d=1SXtPJf~6K}VdLsG)(<|P&-XR=x(#5C|Jf#(&(=A`jZi| z?C%H3pkEjzd;axD(4LQsktXq%Pr*R`TqfHyh4A>Q5T0hFFKQ`Lt_>#AT9#1-R%zil zIBIoDg*8Ye%a}95>y@ClG2hd+6;(+dRfEl=Qk@o|(*M~Y)BbBY?C=lcVL4JClp$wQ39aa=6_!$MrBsqBE*g)OzI Date: Fri, 21 Jul 2017 17:49:07 -0400 Subject: [PATCH 07/10] docs: updated milestones --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index e4ba5dd7..84c17746 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,10 @@ Current and upcoming milestones *(major features only, see the [changelog](https - [x] New Localization: German ### Beta 14 + +- [x] Bug fixes release + +### Beta 15 > *Planned for August release* ![Progress](http://progressed.io/bar/20) From b1ffda0155bcf49c30f9b6479996a74ac7de7a45 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Fri, 21 Jul 2017 17:51:39 -0400 Subject: [PATCH 08/10] docs: updated semver to 1.0.0 release --- CHANGELOG.md | 4 ++-- npm/package.json | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ac5f540..674ea891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,12 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [v1.0.0-beta.15] - Unreleased +## [v1.0.1] - Unreleased ### Added - **History**: History section to list all changes - **Security**: Optional Two-Factor Authentication (2FA) protection -## [v1.0.0-beta.14] - Unreleased +## [v1.0.0] - Unreleased ### Changed - **Misc**: Switch to Yarn for npm dependencies installation diff --git a/npm/package.json b/npm/package.json index 76ee5344..840b26e6 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "wiki.js", - "version": "1.0.0-beta.14.1", + "version": "1.0.0", "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown", "main": "install.js", "scripts": { diff --git a/package.json b/package.json index 091f7db2..e9390304 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wiki", - "version": "1.0.0-beta.14", + "version": "1.0.0", "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown", "main": "wiki.js", "scripts": { From 44b5a2e0cbb56f975db6724ffc43aeffcadc7fac Mon Sep 17 00:00:00 2001 From: NGPixel Date: Fri, 21 Jul 2017 17:52:45 -0400 Subject: [PATCH 09/10] docs: Updated milestones --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 84c17746..cecddceb 100644 --- a/README.md +++ b/README.md @@ -58,11 +58,11 @@ Current and upcoming milestones *(major features only, see the [changelog](https - [x] Render line breaks by default (GitHub style) - [x] New Localization: German -### Beta 14 +### 1.0.0 - [x] Bug fixes release -### Beta 15 +### 1.1.0 > *Planned for August release* ![Progress](http://progressed.io/bar/20) From 6a45e1ee5157f7ee658b1753c7068e79fbdf383f Mon Sep 17 00:00:00 2001 From: NGPixel Date: Sat, 22 Jul 2017 10:33:31 -0400 Subject: [PATCH 10/10] fix: Safari/iOS const redefinition --- fuse.js | 47 ++++++++++++++++++++++++++++++++++++++++-- npm/package-lock.json | Bin 44207 -> 44197 bytes npm/package.json | 2 +- package.json | 3 ++- tsconfig.json | 5 ++++- yarn.lock | Bin 249124 -> 249404 bytes 6 files changed, 52 insertions(+), 5 deletions(-) diff --git a/fuse.js b/fuse.js index ea6a7309..76143cbd 100644 --- a/fuse.js +++ b/fuse.js @@ -9,6 +9,9 @@ const colors = require('colors/safe') const fsbx = require('fuse-box') const nodemon = require('nodemon') +const babel = require('babel-core') +const uglify = require('uglify-es') +const fs = require('fs-extra') // ====================================================== // Parse cmd arguments @@ -90,7 +93,7 @@ globalTasks.then(() => { fsbx.VuePlugin(), ['.scss', fsbx.SassPlugin({ outputStyle: (dev) ? 'nested' : 'compressed' }), fsbx.CSSPlugin()], fsbx.BabelPlugin({ comments: false, presets: ['es2015'] }), - fsbx.JSONPlugin(), + fsbx.JSONPlugin() /* !dev && fsbx.QuantumPlugin({ target: 'browser', uglify: true, @@ -109,7 +112,7 @@ globalTasks.then(() => { }) } }) */ - !dev && fsbx.UglifyESPlugin() + // !dev && fsbx.UglifyESPlugin() ], debug: false, log: true @@ -140,6 +143,46 @@ globalTasks.then(() => { watch: (args.d) ? ['server'] : ['server/configure.js'], env: { 'NODE_ENV': 'development' } }) + } else { + console.info(colors.yellow.bold('\nTranspiling vendor bundle...')) + let appCode = babel.transform(fs.readFileSync('./assets/js/app.js', 'utf8'), { + babelrc: false, + compact: false, + filename: 'app.js', + plugins: ['transform-object-assign'] + }).code + let vendorCode = babel.transform(fs.readFileSync('./assets/js/vendor.js', 'utf8'), { + babelrc: false, + comments: false, + compact: false, + filename: 'vendor.js', + plugins: [ + 'transform-es2015-arrow-functions', + 'transform-es2015-block-scoped-functions', + 'transform-es2015-block-scoping', + 'transform-es2015-classes', + 'transform-es2015-computed-properties', + 'transform-es2015-destructuring', + 'transform-es2015-duplicate-keys', + 'transform-es2015-for-of', + 'transform-es2015-function-name', + 'transform-es2015-literals', + 'transform-es2015-object-super', + 'transform-es2015-parameters', + 'transform-es2015-shorthand-properties', + 'transform-es2015-spread', + 'transform-es2015-sticky-regex', + 'transform-es2015-template-literals', + 'transform-es2015-typeof-symbol', + 'transform-es2015-unicode-regex' + ] + }).code + console.info(colors.yellow.bold('Minifing bundles...')) + fs.writeFileSync('./assets/js/vendor.js', uglify.minify(vendorCode).code, 'utf8') + fs.writeFileSync('./assets/js/app.js', uglify.minify(appCode).code, 'utf8') + fs.writeFileSync('./assets/js/configure.js', uglify.minify(fs.readFileSync('./assets/js/configure.js', 'utf8')).code, 'utf8') + console.info(colors.green.bold('\nBUILD SUCCEEDED.')) + return true } }).catch(err => { console.error(colors.red(' X Bundle compilation failed! ' + err.message)) diff --git a/npm/package-lock.json b/npm/package-lock.json index e23c24d1ff5a920c881a2c226b1d389b36f5c7df..568100e2733536f80704633534064a0f51591962 100644 GIT binary patch delta 12 UcmZ2~lWFNqrU{xGjce8b04I0_&;S4c delta 22 ecmZ2_lWF};rU{yy2D(Y9C5d{5CL1+s*8l)yod{b1 diff --git a/npm/package.json b/npm/package.json index 840b26e6..af5d0c70 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "wiki.js", - "version": "1.0.0", + "version": "1.0.1", "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown", "main": "install.js", "scripts": { diff --git a/package.json b/package.json index e9390304..b47b4a0a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wiki", - "version": "1.0.0", + "version": "1.0.1", "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown", "main": "wiki.js", "scripts": { @@ -129,6 +129,7 @@ "@panter/vue-i18next": "~0.5.0", "babel-cli": "~6.24.1", "babel-jest": "~20.0.3", + "babel-plugin-transform-object-assign": "~6.22.0", "babel-preset-es2015": "~6.24.1", "brace": "~0.10.0", "colors": "~1.1.2", diff --git a/tsconfig.json b/tsconfig.json index dc25199f..20c43b30 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,6 +13,9 @@ "target": "es5" }, "exclude": [ - "node_modules" + ".fusebox", + "data", + "node_modules", + "repo" ] } diff --git a/yarn.lock b/yarn.lock index 52a14f18f6e4253a72e1ab4f75630c7d1d9847ad..60ff1355a3152f218ebf19dc81f34e2f63bffb72 100644 GIT binary patch delta 188 zcmZ27i+|4?{tf#|`SX*qQj<$`6N`&8)AJnaCL4xF^P-4NHY}5JKoQY3(=#&CGtetZ zuToC4v`jHdGc!vwOf*O`NHMXrNHsPwOExt&wKTIZF*h+tPE0g1NSZEK&nQ0G!B1kc zL5{@ceWlrJrr#@P6yNTk#OUTS`TZv6?I+V1`~EW4ZI4J{ayta1=c_Sy)iTyizq6Ft Rb$k92<{U<#Aduss4gkZQL*xJe delta 74 zcmdlphkwZ|{tf#|C)<^CZ+=*oux7f@24>OiVakjiE{t*8=chAX_zR>9QkmQi0qO1P b%w4sNanrvnV|Lx%zLYtK5hw`cc&Gyaoe&;b