Skip to content

Commit d7a5d09

Browse files
author
Guillaume Chau
committed
Versions bumps + deps update + internal refactoring
1 parent 41228c4 commit d7a5d09

File tree

19 files changed

+248
-474
lines changed

19 files changed

+248
-474
lines changed

.eslintrc.js

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ module.exports = {
1616
// Global vars
1717
globals: {
1818
'Package': true,
19+
'Npm': true,
1920
'Meteor': true,
2021
'Tracker': true,
2122
},

packages/npm-check/package.js

-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ Package.registerBuildPlugin({
1818
})
1919

2020
Package.onUse(function (api) {
21-
api.versionsFrom('1.6')
2221
api.use('isobuild:[email protected]')
2322
})

packages/vue-coffee/package.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Package.describe({
88

99
Package.registerBuildPlugin({
1010
name: 'vue-component-coffee',
11-
11+
1212
sources: ['vue-coffee.js'],
1313
})
1414

packages/vue-component-dev-client/.npm/package/npm-shrinkwrap.json

+63-99
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/vue-component-dev-client/package.js

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Package.describe({
88
})
99

1010
Package.onUse(function (api) {
11-
api.versionsFrom('1.6')
1211
api.use('ecmascript')
1312
api.use('reload')
1413
api.use('autoupdate')

packages/vue-component-dev-server/package.js

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Package.describe({
88
})
99

1010
Package.onUse(function (api) {
11-
api.versionsFrom('1.6')
1211
api.use('ecmascript')
1312
api.use('webapp')
1413
api.mainModule('server/main.js', 'server')

packages/vue-component/package.js

+6-9
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Package.registerBuildPlugin({
1010
name: 'vue-component',
1111
use: [
1212
13-
13+
1414
1515
1616
],
@@ -19,33 +19,30 @@ Package.registerBuildPlugin({
1919
'plugin/utils.js',
2020
'plugin/dev-server.js',
2121
'plugin/post-css.js',
22-
'plugin/tag-scanner.js',
2322
'plugin/tag-handler.js',
2423
'plugin/vue-compiler.js',
2524
'plugin/plugin.js',
2625
],
2726
npmDependencies: {
28-
'postcss': '5.2.17',
27+
'postcss': '6.0.16',
2928
'postcss-load-config': '1.2.0',
3029
'postcss-selector-parser': '2.2.3',
31-
'postcss-modules': '0.6.4',
30+
'postcss-modules': '1.1.0',
3231
'socket.io': '2.0.4',
33-
'async': '2.5.0',
32+
'async': '2.6.0',
3433
'lodash': '4.17.4',
3534
'hash-sum': '1.0.2',
36-
'source-map': '0.6.1',
35+
'source-map': '0.7.0',
3736
'source-map-merger': '0.2.0',
3837
'generate-source-map': '0.0.5',
39-
'autoprefixer': '6.7.7',
38+
'autoprefixer': '7.2.5',
4039
'vue-template-compiler': '2.5.13',
4140
'vue-template-es2015-compiler': '1.6.0',
42-
'parse5': '3.0.2',
4341
'colors': '1.1.2',
4442
},
4543
})
4644

4745
Package.onUse(function (api) {
48-
api.versionsFrom('1.6')
4946
api.use('isobuild:[email protected]')
5047
api.use('akryum:[email protected]')
5148
api.use('akryum:[email protected]')

packages/vue-component/plugin/post-css.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ scopeId = postcss.plugin('add-id', ({ id }) => root => {
6565
}
6666
// /deep/ alias for >>>, since >>> doesn't work in SASS
6767
if (n.type === 'tag' && n.value === '/deep/') {
68-
const next = n.next()
69-
if (next.type === 'combinator' && next.value === ' ') {
70-
next.remove()
68+
const prev = n.prev()
69+
if (prev && prev.type === 'combinator' && prev.value === ' ') {
70+
prev.remove()
7171
}
7272
n.remove()
7373
return false
@@ -99,10 +99,11 @@ scopeId = postcss.plugin('add-id', ({ id }) => root => {
9999
if (/-?animation$/.test(decl.prop)) {
100100
decl.value = decl.value.split(',')
101101
.map(v => {
102-
const vals = v.split(/\s+/)
103-
const name = vals[0]
104-
if (keyframes[name]) {
105-
return [keyframes[name]].concat(vals.slice(1)).join(' ')
102+
const vals = v.trim().split(/\s+/)
103+
const i = vals.findIndex(val => keyframes[val])
104+
if (i !== -1) {
105+
vals.splice(i, 1, keyframes[vals[i]])
106+
return vals.join(' ')
106107
} else {
107108
return v
108109
}

0 commit comments

Comments
 (0)