Skip to content
This repository was archived by the owner on Jan 18, 2022. It is now read-only.

Commit 8cdda56

Browse files
committed
feat: use @vue/component-compiler
1 parent 89a5b33 commit 8cdda56

35 files changed

+2180
-249
lines changed

.circleci/config.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
version: 2
22
jobs:
33
build:
4-
working_directory: ~/rollup-plugin-vue
4+
working_directory: ~/project
55
docker:
6-
- image: circleci/node:8.5.0
6+
- image: alekzonder/puppeteer # base image: node/8-slim
77
steps:
88
- checkout
9-
- run:
10-
name: Install yarn
9+
- run:
10+
name: Install yarn if required
1111
command: curl -o- -s -L https://yarnpkg.com/install.sh | bash
1212
- restore_cache:
1313
key: dependency-cache-{{ checksum "package.json" }}
1414
- run:
1515
name: Install package dependencies
16-
command: yarn --no-progress
17-
- run:
18-
name: Rebuild node-sass
19-
command: npm rebuild node-sass
16+
command: yarn --no-progress install --pure-lockfile
2017
- save_cache:
2118
key: dependency-cache-{{ checksum "package.json" }}
2219
paths:

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
dist/
22
/.github/sereno/public
33
/_cache
4+
output/
45

56
test/target/
67

config/build.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
const babel = require('rollup-plugin-babel')
44
const rollup = require('rollup')
5-
const fs = require('fs')
65
const pack = require('../package.json')
76

87
const dependencies = Object.keys(pack.dependencies).concat('path')
98

109
rollup
1110
.rollup({
12-
entry: 'src/index.js',
11+
input: 'src/index.js',
1312
external(id) {
1413
return dependencies.some(it => it === id || id.startsWith(it))
1514
},
@@ -34,16 +33,16 @@ rollup
3433
})
3534
]
3635
})
37-
.then(function(bundle) {
36+
.then(bundle => {
3837
bundle.write({
3938
format: 'cjs',
40-
dest: 'dist/' + pack.name + '.common.js'
39+
file: 'dist/' + pack.name + '.common.js',
40+
sourcemap: true
4141
})
4242
bundle.write({
4343
format: 'es',
44-
dest: 'dist/' + pack.name + '.js'
44+
file: 'dist/' + pack.name + '.js',
45+
sourcemap: true
4546
})
4647
})
47-
.catch(function logError(e) {
48-
console.log(e)
49-
})
48+
.catch(console.error)

example/package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"vue-style-loader": "^3.0.3"
99
},
1010
"dependencies": {
11+
"@vue/component-compiler-utils": "^1.2.1",
1112
"resolve": "^1.4.0",
12-
"rollup-plugin-buble": "^0.19.2"
13+
"rollup-plugin-buble": "^0.19.2",
14+
"vue-runtime-helpers": "^0.1.0"
1315
}
1416
}

example/yarn.lock

+97-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22
# yarn lockfile v1
33

44

5+
"@vue/component-compiler-utils@^1.2.1":
6+
version "1.2.1"
7+
resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-1.2.1.tgz#3d543baa75cfe5dab96e29415b78366450156ef6"
8+
dependencies:
9+
consolidate "^0.15.1"
10+
hash-sum "^1.0.2"
11+
lru-cache "^4.1.2"
12+
merge-source-map "^1.1.0"
13+
postcss "^6.0.20"
14+
postcss-selector-parser "^3.1.1"
15+
prettier "^1.11.1"
16+
source-map "^0.5.6"
17+
vue-template-es2015-compiler "^1.6.0"
18+
519
acorn-dynamic-import@^3.0.0:
620
version "3.0.0"
721
resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
@@ -200,6 +214,10 @@ big.js@^3.1.3:
200214
version "3.2.0"
201215
resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
202216

217+
bluebird@^3.1.1:
218+
version "3.5.1"
219+
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
220+
203221
brace-expansion@^1.1.7:
204222
version "1.1.8"
205223
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
@@ -248,7 +266,7 @@ chalk@^1.1.3:
248266
strip-ansi "^3.0.0"
249267
supports-color "^2.0.0"
250268

251-
chalk@^2.3.1:
269+
chalk@^2.3.1, chalk@^2.4.1:
252270
version "2.4.1"
253271
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
254272
dependencies:
@@ -290,6 +308,12 @@ [email protected]:
290308
version "0.0.1"
291309
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
292310

311+
consolidate@^0.15.1:
312+
version "0.15.1"
313+
resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
314+
dependencies:
315+
bluebird "^3.1.1"
316+
293317
convert-source-map@^1.5.0:
294318
version "1.5.0"
295319
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
@@ -314,6 +338,12 @@ detect-indent@^4.0.0:
314338
dependencies:
315339
repeating "^2.0.0"
316340

341+
dot-prop@^4.1.1:
342+
version "4.2.0"
343+
resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
344+
dependencies:
345+
is-obj "^1.0.0"
346+
317347
emojis-list@^2.0.0:
318348
version "2.1.0"
319349
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -422,6 +452,10 @@ home-or-tmp@^2.0.0:
422452
os-homedir "^1.0.0"
423453
os-tmpdir "^1.0.1"
424454

455+
indexes-of@^1.0.1:
456+
version "1.0.1"
457+
resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
458+
425459
inherits@^2.0.1, inherits@~2.0.3:
426460
version "2.0.3"
427461
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
@@ -482,6 +516,10 @@ is-number@^3.0.0:
482516
dependencies:
483517
kind-of "^3.0.2"
484518

519+
is-obj@^1.0.0:
520+
version "1.0.1"
521+
resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
522+
485523
is-posix-bracket@^0.1.0:
486524
version "0.1.1"
487525
resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
@@ -542,12 +580,25 @@ loose-envify@^1.0.0:
542580
dependencies:
543581
js-tokens "^3.0.0"
544582

583+
lru-cache@^4.1.2:
584+
version "4.1.2"
585+
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
586+
dependencies:
587+
pseudomap "^1.0.2"
588+
yallist "^2.1.2"
589+
545590
magic-string@^0.22.4:
546591
version "0.22.4"
547592
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.4.tgz#31039b4e40366395618c1d6cf8193c53917475ff"
548593
dependencies:
549594
vlq "^0.2.1"
550595

596+
merge-source-map@^1.1.0:
597+
version "1.1.0"
598+
resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
599+
dependencies:
600+
source-map "^0.6.1"
601+
551602
micromatch@^2.3.11:
552603
version "2.3.11"
553604
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
@@ -632,6 +683,22 @@ path-parse@^1.0.5:
632683
version "1.0.5"
633684
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
634685

686+
postcss-selector-parser@^3.1.1:
687+
version "3.1.1"
688+
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
689+
dependencies:
690+
dot-prop "^4.1.1"
691+
indexes-of "^1.0.1"
692+
uniq "^1.0.1"
693+
694+
postcss@^6.0.20:
695+
version "6.0.22"
696+
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.22.tgz#e23b78314905c3b90cbd61702121e7a78848f2a3"
697+
dependencies:
698+
chalk "^2.4.1"
699+
source-map "^0.6.1"
700+
supports-color "^5.4.0"
701+
635702
prepack@^0.2.0:
636703
version "0.2.10"
637704
resolved "https://registry.yarnpkg.com/prepack/-/prepack-0.2.10.tgz#f43537be98857e1e0bd56dc68f72216ea2eeda25"
@@ -651,6 +718,10 @@ preserve@^0.2.0:
651718
version "0.2.0"
652719
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
653720

721+
prettier@^1.11.1:
722+
version "1.12.1"
723+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"
724+
654725
private@^0.1.7:
655726
version "0.1.8"
656727
resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -659,6 +730,10 @@ process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
659730
version "1.0.7"
660731
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
661732

733+
pseudomap@^1.0.2:
734+
version "1.0.2"
735+
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
736+
662737
randomatic@^1.1.3:
663738
version "1.1.7"
664739
resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
@@ -792,6 +867,10 @@ source-map@^0.5.6:
792867
version "0.5.7"
793868
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
794869

870+
source-map@^0.6.1:
871+
version "0.6.1"
872+
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
873+
795874
source-map@~0.4.1:
796875
version "0.4.4"
797876
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
@@ -814,7 +893,7 @@ supports-color@^2.0.0:
814893
version "2.0.0"
815894
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
816895

817-
supports-color@^5.3.0:
896+
supports-color@^5.3.0, supports-color@^5.4.0:
818897
version "5.4.0"
819898
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
820899
dependencies:
@@ -835,6 +914,10 @@ trim-right@^1.0.1:
835914
version "1.0.1"
836915
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
837916

917+
uniq@^1.0.1:
918+
version "1.0.1"
919+
resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
920+
838921
util-deprecate@~1.0.1:
839922
version "1.0.2"
840923
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -858,13 +941,21 @@ vlq@^1.0.0:
858941
version "1.0.0"
859942
resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.0.tgz#8101be90843422954c2b13eb27f2f3122bdcc806"
860943

944+
vue-runtime-helpers@^0.1.0:
945+
version "0.1.0"
946+
resolved "https://registry.yarnpkg.com/vue-runtime-helpers/-/vue-runtime-helpers-0.1.0.tgz#8518646c1ea27e3d0729fa3dcb9eb6b1d481052d"
947+
861948
vue-style-loader@^3.0.3:
862949
version "3.0.3"
863950
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.3.tgz#623658f81506aef9d121cdc113a4f5c9cac32df7"
864951
dependencies:
865952
hash-sum "^1.0.2"
866953
loader-utils "^1.0.2"
867954

955+
vue-template-es2015-compiler@^1.6.0:
956+
version "1.6.0"
957+
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
958+
868959
webpack-core@^0.6.8:
869960
version "0.6.9"
870961
resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
@@ -875,3 +966,7 @@ webpack-core@^0.6.8:
875966
xtend@~4.0.1:
876967
version "4.0.1"
877968
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
969+
970+
yallist@^2.1.2:
971+
version "2.1.2"
972+
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"

package.json

+24-9
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,33 @@
3333
"homepage": "https://github.com/znck/rollup-plugin-vue#readme",
3434
"dependencies": {
3535
"@babel/runtime": "^7.0.0-beta.39",
36+
"@vue/component-compiler": "^3.1.0",
37+
"@vue/component-compiler-utils": "^1.2.1",
3638
"debug": "^2.6.0",
37-
"rollup-pluginutils": "^2.0.1",
38-
"vue-component-compiler": "git+https://github.com/vuejs/vue-component-compiler.git"
39+
"hash-sum": "^1.0.2",
40+
"rollup-pluginutils": "^2.0.1"
3941
},
4042
"devDependencies": {
41-
"@babel/core": "^7.0.0-beta.39",
42-
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.39",
43-
"@babel/plugin-transform-runtime": "^7.0.0-beta.39",
44-
"@babel/preset-env": "^7.0.0-beta.39",
43+
"@babel/core": "^7.0.0-beta.46",
44+
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.46",
45+
"@babel/plugin-transform-runtime": "^7.0.0-beta.46",
46+
"@babel/preset-env": "^7.0.0-beta.46",
47+
"babel-core": "7.0.0-bridge.0",
48+
"conventional-changelog": "^1.1.24",
4549
"jest": "^22.4.2",
46-
"prettier": "^1.10.2",
47-
"rollup": "^0.41.4",
48-
"rollup-plugin-babel": "^4.0.0-beta.0"
50+
"node-sass": "^4.9.0",
51+
"pug": "^2.0.3",
52+
"puppeteer": "^1.3.0",
53+
"rollup": "^0.58.2",
54+
"rollup-plugin-babel": "^4.0.0-beta.4",
55+
"rollup-plugin-commonjs": "^9.1.0",
56+
"rollup-plugin-image": "^1.0.2",
57+
"rollup-plugin-md": "^0.0.7",
58+
"rollup-plugin-node-resolve": "^3.3.0",
59+
"vue": "^2.5.16",
60+
"vue-template-compiler": "^2.5.16"
61+
},
62+
"peerDependencies": {
63+
"vue-template-compiler": "*"
4964
}
5065
}

0 commit comments

Comments
 (0)