Upgrade Vuepress, Flow, and misc (#1646)

AtofStryker · web-flow · commit 39be102165f9 · 2020-08-18T08:52:54.000+10:00
* improvement(vuepress): upgrade VuePress to version 1.x Upgrade vuepress docs server to 1.x to gain recent features and bugfixes * improvement(corejs): upgrade core-js to version 3.x Upgrade core-js to version 3.x to gain new featurs and bugfixes. Version 2.x is no longer maintained. * chore(chalk): upgrade Chalk Upgrade Chalk to latest major release * build(flow): upgrade flow from 66 to 133 Removed suppress comment option as it is removed from flow 133. $FlowIgnore is now a supported suppressed comment. See https://flow.org/en/docs/config/options/#toc-suppress-comment-regex for more details. * refactor(typescript): pin Typescript to ^3.9.7 * chore(cross-env): upgrade cross-env to v 7.x Major change includes environment deprecations, which drops support for Node < 10.x
diff --git a/.flowconfig b/.flowconfig
@@ -4,6 +4,3 @@
 
 [libs]
 flow
-
-[options]
-suppress_comment= \\(.\\|\n\\)*\\$FlowIgnore
diff --git a/babel.config.js b/babel.config.js
@@ -29,8 +29,7 @@ module.exports = api => {
         [
           '@babel/preset-env',
           {
-            // currently, there are dependency resolution issues with older versions of vuepress. Once vuepress is upgraded, core-js can be moved to version 3
-            corejs: 2,
+            corejs: 3,
             useBuiltIns: 'entry'
           }
         ],
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -21,12 +21,12 @@ module.exports = {
       description: 'Библиотека для тестирования Vue-компонентов'
     }
   },
-  serviceWorker: true,
+  plugins: ['@vuepress/pwa'],
   head: [
     ['link', { rel: 'icon', href: '/favicon.png' }],
     ['link', { rel: 'stylesheet', href: '/vueschool.css' }]
   ],
-  theme: 'vue',
+  theme: '@vuepress/vue',
   themeConfig: {
     algolia: {
       apiKey: 'ee1b8516c9e5a5be9b6c25684eafc42f',
@@ -143,10 +143,8 @@ module.exports = {
       }
     }
   },
-  markdown: {
-    config: md => {
-      // use more markdown-it plugins!
-      md.use(require('markdown-it-include'))
-    }
+  extendMarkdown: md => {
+    // use more markdown-it plugins!
+    md.use(require('markdown-it-include'))
   }
 }
diff --git a/package.json b/package.json
@@ -26,11 +26,11 @@
     "test:types": "tsc -p packages/test-utils/types && tsc -p packages/server-test-utils/types"
   },
   "dependencies": {
-    "chalk": "^2.4.2",
+    "chalk": "^4.1.0",
     "conditional-specs": "^1.0.1",
     "conventional-changelog": "^3.1.12",
-    "cross-env": "^5.0.0",
-    "flow-bin": "^0.66.0",
+    "cross-env": "^7.0.2",
+    "flow-bin": "^0.131.0",
     "lerna": "^3.20.2",
     "markdown-it-include": "^1.0.0",
     "rollup": "1",
@@ -40,15 +40,16 @@
     "rollup-plugin-json": "4",
     "rollup-plugin-node-resolve": "5",
     "semver": "^6.3.0",
-    "typescript": "3",
+    "typescript": "^3.9.7",
     "vee-validate": "^2.1.3",
     "vue": "^2.6.11",
     "vue-class-component": "^7.2.3",
     "vue-router": "^3.0.1",
     "vue-server-renderer": "^2.6.11",
     "vue-template-compiler": "^2.6.11",
-    "vuepress": "^0.14.8",
-    "vuepress-theme-vue": "^1.0.3",
+    "vuepress": "^1.5.2",
+    "@vuepress/theme-vue": "^1.5.2",
+    "@vuepress/plugin-pwa": "^1.5.2",
     "vuex": "^3.0.1"
   },
   "devDependencies": {
@@ -68,7 +69,7 @@
     "babel-jest": "^26.0.1",
     "babel-loader": "^8.1.0",
     "commitizen": "^4.0.3",
-    "core-js": "2",
+    "core-js": "^3.6.5",
     "css-loader": "^4.2.0",
     "cz-conventional-changelog": "^3.0.2",
     "eslint": "^7.6.0",
diff --git a/packages/shared/util.js b/packages/shared/util.js
@@ -39,6 +39,7 @@ function hasOwnProperty(obj, prop) {
 }
 
 export function keys<T: string>(obj: any): Array<T> {
+  // $FlowIgnore
   return Object.keys(obj)
 }
 
diff --git a/packages/test-utils/src/wrapper.js b/packages/test-utils/src/wrapper.js
@@ -378,7 +378,9 @@ export default class Wrapper implements BaseWrapper {
     let element = this.element
     while (element) {
       if (
+        // $FlowIgnore
         element.hidden ||
+        // $FlowIgnore
         (element.style &&
           (element.style.visibility === 'hidden' ||
             element.style.display === 'none'))
@@ -541,6 +543,7 @@ export default class Wrapper implements BaseWrapper {
     const event = getCheckedEvent()
 
     if (tagName === 'INPUT' && type === 'checkbox') {
+      // $FlowIgnore
       if (this.element.checked === checked) {
         return nextTick()
       }
@@ -559,6 +562,7 @@ export default class Wrapper implements BaseWrapper {
         )
       }
 
+      // $FlowIgnore
       if (this.element.checked === checked) {
         return nextTick()
       }
@@ -592,6 +596,7 @@ export default class Wrapper implements BaseWrapper {
       throwError(`wrapper.setSelected() cannot be called on this element`)
     }
 
+    // $FlowIgnore
     if (this.element.selected) {
       return nextTick()
     }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ module.exports = api => {`
`29`	`29`	`[`
`30`	`30`	`'@babel/preset-env',`
`31`	`31`	`{`
`32`		`- // currently, there are dependency resolution issues with older versions of vuepress. Once vuepress is upgraded, core-js can be moved to version 3`
`33`		`- corejs: 2,`
	`32`	`+ corejs: 3,`
`34`	`33`	`useBuiltIns: 'entry'`
`35`	`34`	`}`
`36`	`35`	`],`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ module.exports = {`
`21`	`21`	`description: 'Библиотека для тестирования Vue-компонентов'`
`22`	`22`	`}`
`23`	`23`	`},`
`24`		`- serviceWorker: true,`
	`24`	`+ plugins: ['@vuepress/pwa'],`
`25`	`25`	`head: [`
`26`	`26`	`['link', { rel: 'icon', href: '/favicon.png' }],`
`27`	`27`	`['link', { rel: 'stylesheet', href: '/vueschool.css' }]`
`28`	`28`	`],`
`29`		`- theme: 'vue',`
	`29`	`+ theme: '@vuepress/vue',`
`30`	`30`	`themeConfig: {`
`31`	`31`	`algolia: {`
`32`	`32`	`apiKey: 'ee1b8516c9e5a5be9b6c25684eafc42f',`
`@@ -143,10 +143,8 @@ module.exports = {`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`	`},`
`146`		`- markdown: {`
`147`		`- config: md => {`
`148`		`- // use more markdown-it plugins!`
`149`		`- md.use(require('markdown-it-include'))`
`150`		`- }`
	`146`	`+ extendMarkdown: md => {`
	`147`	`+ // use more markdown-it plugins!`
	`148`	`+ md.use(require('markdown-it-include'))`
`151`	`149`	`}`
`152`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ function hasOwnProperty(obj, prop) {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`export function keys<T: string>(obj: any): Array<T> {`
	`42`	`+ // $FlowIgnore`
`42`	`43`	`return Object.keys(obj)`
`43`	`44`	`}`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,9 @@ export default class Wrapper implements BaseWrapper {`
`378`	`378`	`let element = this.element`
`379`	`379`	`while (element) {`
`380`	`380`	`if (`
	`381`	`+ // $FlowIgnore`
`381`	`382`	`element.hidden \|\|`
	`383`	`+ // $FlowIgnore`
`382`	`384`	`(element.style &&`
`383`	`385`	`(element.style.visibility === 'hidden' \|\|`
`384`	`386`	`element.style.display === 'none'))`
`@@ -541,6 +543,7 @@ export default class Wrapper implements BaseWrapper {`
`541`	`543`	`const event = getCheckedEvent()`
`542`	`544`
`543`	`545`	`if (tagName === 'INPUT' && type === 'checkbox') {`
	`546`	`+ // $FlowIgnore`
`544`	`547`	`if (this.element.checked === checked) {`
`545`	`548`	`return nextTick()`
`546`	`549`	`}`
`@@ -559,6 +562,7 @@ export default class Wrapper implements BaseWrapper {`
`559`	`562`	`)`
`560`	`563`	`}`
`561`	`564`
	`565`	`+ // $FlowIgnore`
`562`	`566`	`if (this.element.checked === checked) {`
`563`	`567`	`return nextTick()`
`564`	`568`	`}`
`@@ -592,6 +596,7 @@ export default class Wrapper implements BaseWrapper {`
`592`	`596`	throwError(`wrapper.setSelected() cannot be called on this element`)
`593`	`597`	`}`
`594`	`598`
	`599`	`+ // $FlowIgnore`
`595`	`600`	`if (this.element.selected) {`
`596`	`601`	`return nextTick()`
`597`	`602`	`}`