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

Update deps #160

Merged
merged 3 commits into from
Dec 1, 2017
Merged

Update deps #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9772485
Update Rollup and other deps
jonataswalker Nov 30, 2017
b46e548
Add keepClosingSlash to options
jonataswalker Nov 30, 2017
5254a25
Tests
jonataswalker Nov 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 59 additions & 61 deletions config/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,66 @@
"use strict";
'use strict'

const babel = require('rollup-plugin-babel');
const rollup = require('rollup');
const replace = require('rollup-plugin-replace');
const zlib = require('zlib');
const fs = require('fs');
const pack = require('../package.json');
const banner = require('./banner');
const babel = require('rollup-plugin-babel')
const rollup = require('rollup')
const replace = require('rollup-plugin-replace')
const zlib = require('zlib')
const fs = require('fs')
const pack = require('../package.json')
const banner = require('./banner')

let main = fs
const main = fs
.readFileSync('src/index.js', 'utf-8')
.replace(/plugin\.version = '[\d\.]+'/, `plugin.version = '${pack.version}'`);
.replace(/plugin\.version = '[\d\.]+'/, `plugin.version = '${pack.version}'`)

fs.writeFileSync('src/index.js', main);
fs.writeFileSync('src/index.js', main)

rollup.rollup({
entry: 'src/index.js',
plugins: [
babel({ runtimeHelpers: true })
],
external (id) {
if (/babel-runtime\/.*/i.test(id)) {
return true
}
input: 'src/index.js',
plugins: [
babel({ runtimeHelpers: true })
],
external (id) {
if (/babel-runtime\/.*/i.test(id)) {
return true
}

return [
'camelcase',
'coffeescript-compiler',
'de-indent',
'debug',
'fs',
'hash-sum',
'html-minifier',
'less',
'magic-string',
'merge-options',
'node-sass',
'parse5',
'path',
'postcss',
'postcss-load-config',
'postcss-modules',
'postcss-selector-parser',
'posthtml',
'posthtml-attrs-parser',
'pug',
'rollup-pluginutils',
'stylus',
'vue-template-es2015-compiler',
'vue-template-validator',
'typescript'
].indexOf(id) > -1
}
})
.then(function (bundle) {
bundle.write({
format: 'cjs',
dest: 'dist/' + pack.name + '.common.js',
});
bundle.write({
format: 'es',
dest: 'dist/' + pack.name + '.js',
});
})
.catch(function logError(e) {
console.log(e)
});
return [
'camelcase',
'coffeescript-compiler',
'de-indent',
'debug',
'fs',
'hash-sum',
'html-minifier',
'less',
'magic-string',
'merge-options',
'node-sass',
'parse5',
'path',
'postcss',
'postcss-load-config',
'postcss-modules',
'postcss-selector-parser',
'posthtml',
'posthtml-attrs-parser',
'pug',
'rollup-pluginutils',
'stylus',
'vue-template-es2015-compiler',
'vue-template-validator',
'typescript'
].indexOf(id) > -1
}
}).then(function (bundle) {
bundle.write({
format: 'cjs',
file: 'dist/' + pack.name + '.common.js'
})
bundle.write({
format: 'es',
file: 'dist/' + pack.name + '.js'
})
}).catch(function logError (e) {
console.log(e)
})
22 changes: 11 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@
"babel-runtime": "^6.22.0",
"camelcase": "^4.0.0",
"de-indent": "^1.0.2",
"debug": "^2.6.0",
"debug": "^3.1.0",
"hash-sum": "^1.0.2",
"html-minifier": "^3.2.3",
"magic-string": "^0.19.0",
"merge-options": "0.0.64",
"parse5": "^2.1.0",
"magic-string": "^0.22.4",
"merge-options": "^1.0.0",
"parse5": "^3.0.3",
"postcss": "^5.2.11",
"postcss-load-config": "^1.2.0",
"postcss-modules": "^0.6.4",
"postcss-selector-parser": "^2.2.3",
"posthtml": "^0.9.2",
"posthtml": "^0.10.1",
"posthtml-attrs-parser": "^0.1.1",
"rollup-pluginutils": "^2.0.1",
"typescript": "^2.4.1",
"vue-template-es2015-compiler": "^1.5.0",
"vue-template-es2015-compiler": "^1.6.0",
"vue-template-validator": "^1.1.5"
},
"devDependencies": {
Expand All @@ -68,14 +68,14 @@
"eslint-plugin-promise": "^3.4.0",
"eslint-plugin-standard": "^2.0.1",
"istanbul": "^0.4.5",
"mocha": "^3.2.0",
"rollup": "^0.41.4",
"mocha": "^4.0.1",
"rollup": "^0.52.0",
"rollup-plugin-babel": "^2.7.1",
"rollup-plugin-buble": "^0.15.0",
"rollup-plugin-buble": "^0.18.0",
"rollup-plugin-css-only": "^0.2.0",
"rollup-plugin-replace": "^1.1.1",
"rollup-plugin-replace": "^2.0.0",
"uglify-js": "^2.7.5",
"vue-template-compiler": "^2.4.4"
"vue-template-compiler": "^2.5.9"
},
"optionalDependencies": {
"coffee-script": "^1.12.4",
Expand Down
1 change: 1 addition & 0 deletions src/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export default {
customAttrSurround: [[/@/, new RegExp('')], [/:/, new RegExp('')]],
collapseWhitespace: true,
conservativeCollapse: true,
keepClosingSlash: true,
removeComments: true
},

Expand Down
15 changes: 15 additions & 0 deletions test/expects/selfClosingComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
var evens = [2,4,6,8];
var odds = evens.map(v => v + 1);
var Basic = { template: "<h1 :id=\"id\" @click=\"hi\">hello</h1> <input type=\"text\">",
data() {
return odds
}
};

var selfClosingComponent = { template: "<main> <basic/> <h1>Hey</h1> </main>",
components: {
Basic
}
};

export default selfClosingComponent;
16 changes: 16 additions & 0 deletions test/fixtures/selfClosingComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<template>
<main>
<basic />
<h1>Hey</h1>
</main>
</template>

<script>
import Basic from './basic.vue'

export default {
components: {
Basic
}
}
</script>
24 changes: 12 additions & 12 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ var autoprefixer = require('autoprefixer')

process.chdir(__dirname)

function read(file) {
function read (file) {
return fs.readFileSync(path.resolve(__dirname, file), 'utf-8')
}

function test(name) {
function test (name) {
it('should rollup ' + name + '.vue', function () {

var entry = './fixtures/' + name + '.vue'
var expected = read('expects/' + name + '.js').replace(/\r/g, '')
var actualCss
Expand All @@ -28,7 +27,7 @@ function test(name) {
}

return rollup.rollup({
entry: entry,
input: entry,
plugins: [vuePlugin({
css: ['no-css-extract'].indexOf(name) > -1 ? true : cssHandler,
modules: {
Expand All @@ -45,7 +44,8 @@ function test(name) {
autoStyles: ['scoped-css-with-no-auto-style'].indexOf(name) < 0
})]
}).then(function (bundle) {
var result = bundle.generate({ format: 'es' })
return bundle.generate({ format: 'es' })
}).then(function (result) {
var code = result.code
assert.equal(code.trim(), expected.trim(), 'should compile code correctly')

Expand Down Expand Up @@ -98,20 +98,20 @@ describe('styleToImports', function () {

return rollup.rollup({
format: 'cjs',
entry: entry,
input: entry,
plugins: [
vuePlugin({
styleToImports: true,
styleToImports: true
}),
cssPlugin({
output: function (css) {
actualCss = css
},
}),
],
}
})
]
}).then(function (bundle) {
bundle.generate({ format: 'es' })

return bundle.generate({ format: 'es' })
}).then(function () {
assert.equal(expectedCss.trim(), actualCss.trim(), 'should import style')
}).catch(function (error) {
throw error
Expand Down