Skip to content

Commit

Permalink
Update vue-jsx to use babel 7 preset
Browse files Browse the repository at this point in the history 
* Update the vue.jsx preset to use https://github.com/vuejs/jsx
* Remove the merge-props helper (I think it's included in the above)
* Update babel to a compatible version (beta 41)

This fixes the error in egoist#85 but, I'm not sure what other impact
it would have...
  • Loading branch information
@byrney
byrney committed Dec 9, 2019
1 parent 621983c commit e973e3e
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 5 deletions.
3 changes: 2 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,9 @@
"license": "MIT",
"dependencies": {
"@babel/core": "^7.0.0-beta.32",
"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
"@vue/babel-preset-jsx": "^1.1.2",
"axios": "^0.16.2",
"babel-preset-vue": "^2.0.0",
"cm-highlight": "^0.1.1",
"codemirror": "^5.28.0",
"codemirror-emmet": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion poi.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const repoLatestCommit = require('repo-latest-commit')
const pkg = require('./package')

const cdns = {
BABEL_CDN: 'https://cdn.jsdelivr.net/npm/@babel/[email protected].32/babel.min.js',
BABEL_CDN: 'https://cdn.jsdelivr.net/npm/@babel/[email protected].41/babel.min.js',
PUG_CDN: 'https://cdn.jsdelivr.net/npm/[email protected]/index.js',
CSSNEXT_CDN: 'https://cdn.jsdelivr.net/npm/[email protected]/index.js',
POSTCSS_CDN: 'https://cdn.jsdelivr.net/npm/[email protected]/index.js',
Expand Down
3 changes: 1 addition & 2 deletions src/utils/transformer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ async function loadBabel() {
progress.start()
const [, VuePreset, VueJSXMergeProps] = await Promise.all([
asyncLoad(process.env.BABEL_CDN, 'babel'),
import(/* webpackChunkName: "babel-stuffs" */ 'babel-preset-vue/dist/babel-preset-vue'), // use umd bundle since we don't want to parse `require`
import(/* webpackChunkName: "babel-stuffs" */ '!raw-loader!./vue-jsx-merge-props')
import(/* webpackChunkName: "babel-stuffs" */ '@vue/babel-preset-jsx/dist/plugin.cjs.js')
])
transformers.set('VuePreset', VuePreset)
transformers.set('VueJSXMergeProps', VueJSXMergeProps)
Expand Down
91 changes: 90 additions & 1 deletion yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,16 @@
dependencies:
"@babel/types" "7.0.0-beta.36"

"@babel/helper-module-imports@^7.0.0":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91"
dependencies:
"@babel/types" "^7.7.4"

"@babel/helper-plugin-utils@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"

"@babel/[email protected]":
version "7.0.0-beta.36"
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-beta.36.tgz#045399c7e7889d36e5ec237ca845a75fddbe0020"
Expand All @@ -61,6 +71,12 @@
"@babel/traverse" "7.0.0-beta.36"
"@babel/types" "7.0.0-beta.36"

"@babel/plugin-syntax-jsx@^7.2.0":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.7.4.tgz#dab2b56a36fb6c3c222a1fbc71f7bf97f327a9ec"
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"

"@babel/[email protected]":
version "7.0.0-beta.36"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.36.tgz#02e903de5d68bd7899bce3c5b5447e59529abb00"
Expand Down Expand Up @@ -91,6 +107,71 @@
lodash "^4.2.0"
to-fast-properties "^2.0.0"

"@babel/types@^7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
dependencies:
esutils "^2.0.2"
lodash "^4.17.13"
to-fast-properties "^2.0.0"

"@vue/babel-helper-vue-jsx-merge-props@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz#048fe579958da408fb7a8b2a3ec050b50a661040"

"@vue/babel-plugin-transform-vue-jsx@^1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.1.2.tgz#c0a3e6efc022e75e4247b448a8fc6b86f03e91c0"
dependencies:
"@babel/helper-module-imports" "^7.0.0"
"@babel/plugin-syntax-jsx" "^7.2.0"
"@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
html-tags "^2.0.0"
lodash.kebabcase "^4.1.1"
svg-tags "^1.0.0"

"@vue/babel-preset-jsx@^1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.2.tgz#2e169eb4c204ea37ca66c2ea85a880bfc99d4f20"
dependencies:
"@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
"@vue/babel-plugin-transform-vue-jsx" "^1.1.2"
"@vue/babel-sugar-functional-vue" "^1.1.2"
"@vue/babel-sugar-inject-h" "^1.1.2"
"@vue/babel-sugar-v-model" "^1.1.2"
"@vue/babel-sugar-v-on" "^1.1.2"

"@vue/babel-sugar-functional-vue@^1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.1.2.tgz#f7e24fba09e6f1ee70104560a8808057555f1a9a"
dependencies:
"@babel/plugin-syntax-jsx" "^7.2.0"

"@vue/babel-sugar-inject-h@^1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.1.2.tgz#8a5276b6d8e2ed16ffc8078aad94236274e6edf0"
dependencies:
"@babel/plugin-syntax-jsx" "^7.2.0"

"@vue/babel-sugar-v-model@^1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.1.2.tgz#1ff6fd1b800223fc9cb1e84dceb5e52d737a8192"
dependencies:
"@babel/plugin-syntax-jsx" "^7.2.0"
"@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
"@vue/babel-plugin-transform-vue-jsx" "^1.1.2"
camelcase "^5.0.0"
html-tags "^2.0.0"
svg-tags "^1.0.0"

"@vue/babel-sugar-v-on@^1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.1.2.tgz#b2ef99b8f2fab09fbead25aad70ef42e1cf5b13b"
dependencies:
"@babel/plugin-syntax-jsx" "^7.2.0"
"@vue/babel-plugin-transform-vue-jsx" "^1.1.2"
camelcase "^5.0.0"

abbrev@1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
Expand Down Expand Up @@ -1650,6 +1731,10 @@ camelcase@^4.0.0, camelcase@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"

camelcase@^5.0.0:
version "5.3.1"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"

caniuse-api@^1.5.2:
version "1.6.1"
resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
Expand Down Expand Up @@ -4390,7 +4475,7 @@ lodash.isplainobject@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"

lodash.kebabcase@^4.0.1:
lodash.kebabcase@^4.0.1, lodash.kebabcase@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"

Expand Down Expand Up @@ -4418,6 +4503,10 @@ lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, l
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

lodash@^4.17.13:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"

log-symbols@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.1.0.tgz#f35fa60e278832b538dc4dddcbb478a45d3e3be6"
Expand Down

0 comments on commit e973e3e

Please sign in to comment.