Skip to content

Commit

Permalink
Versions bumps + deps update + internal refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
Guillaume Chau committed Jan 28, 2018
1 parent 41228c4 commit d7a5d09
Show file tree
Hide file tree
Showing 19 changed files with 248 additions and 474 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ module.exports = {
// Global vars
globals: {
'Package': true,
'Npm': true,
'Meteor': true,
'Tracker': true,
},
Expand Down
1 change: 0 additions & 1 deletion packages/npm-check/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,5 @@ Package.registerBuildPlugin({
})

Package.onUse(function (api) {
api.versionsFrom('1.6')
api.use('isobuild:[email protected]')
})
2 changes: 1 addition & 1 deletion packages/vue-coffee/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Package.describe({

Package.registerBuildPlugin({
name: 'vue-component-coffee',
use: ['[email protected]', '[email protected].3_1'],
use: ['[email protected]', '[email protected].3_4'],
sources: ['vue-coffee.js'],
})

Expand Down
162 changes: 63 additions & 99 deletions packages/vue-component-dev-client/.npm/package/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion packages/vue-component-dev-client/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Package.describe({
})

Package.onUse(function (api) {
api.versionsFrom('1.6')
api.use('ecmascript')
api.use('reload')
api.use('autoupdate')
Expand Down
1 change: 0 additions & 1 deletion packages/vue-component-dev-server/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Package.describe({
})

Package.onUse(function (api) {
api.versionsFrom('1.6')
api.use('ecmascript')
api.use('webapp')
api.mainModule('server/main.js', 'server')
Expand Down
15 changes: 6 additions & 9 deletions packages/vue-component/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Package.registerBuildPlugin({
name: 'vue-component',
use: [
'[email protected]',
'[email protected].9',
'[email protected].11',
'[email protected]',
'[email protected]',
],
Expand All @@ -19,33 +19,30 @@ Package.registerBuildPlugin({
'plugin/utils.js',
'plugin/dev-server.js',
'plugin/post-css.js',
'plugin/tag-scanner.js',
'plugin/tag-handler.js',
'plugin/vue-compiler.js',
'plugin/plugin.js',
],
npmDependencies: {
'postcss': '5.2.17',
'postcss': '6.0.16',
'postcss-load-config': '1.2.0',
'postcss-selector-parser': '2.2.3',
'postcss-modules': '0.6.4',
'postcss-modules': '1.1.0',
'socket.io': '2.0.4',
'async': '2.5.0',
'async': '2.6.0',
'lodash': '4.17.4',
'hash-sum': '1.0.2',
'source-map': '0.6.1',
'source-map': '0.7.0',
'source-map-merger': '0.2.0',
'generate-source-map': '0.0.5',
'autoprefixer': '6.7.7',
'autoprefixer': '7.2.5',
'vue-template-compiler': '2.5.13',
'vue-template-es2015-compiler': '1.6.0',
'parse5': '3.0.2',
'colors': '1.1.2',
},
})

Package.onUse(function (api) {
api.versionsFrom('1.6')
api.use('isobuild:[email protected]')
api.use('akryum:[email protected]')
api.use('akryum:[email protected]')
Expand Down
15 changes: 8 additions & 7 deletions packages/vue-component/plugin/post-css.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ scopeId = postcss.plugin('add-id', ({ id }) => root => {
}
// /deep/ alias for >>>, since >>> doesn't work in SASS
if (n.type === 'tag' && n.value === '/deep/') {
const next = n.next()
if (next.type === 'combinator' && next.value === ' ') {
next.remove()
const prev = n.prev()
if (prev && prev.type === 'combinator' && prev.value === ' ') {
prev.remove()
}
n.remove()
return false
Expand Down Expand Up @@ -99,10 +99,11 @@ scopeId = postcss.plugin('add-id', ({ id }) => root => {
if (/-?animation$/.test(decl.prop)) {
decl.value = decl.value.split(',')
.map(v => {
const vals = v.split(/\s+/)
const name = vals[0]
if (keyframes[name]) {
return [keyframes[name]].concat(vals.slice(1)).join(' ')
const vals = v.trim().split(/\s+/)
const i = vals.findIndex(val => keyframes[val])
if (i !== -1) {
vals.splice(i, 1, keyframes[vals[i]])
return vals.join(' ')
} else {
return v
}
Expand Down
Loading

0 comments on commit d7a5d09

Please sign in to comment.