Skip to content
This repository was archived by the owner on Dec 1, 2023. It is now read-only.

Commit 3bbc799

Browse files
author
Steffan
committed
update dependencies
1 parent e25df44 commit 3bbc799

File tree

7 files changed

+2230
-1296
lines changed

7 files changed

+2230
-1296
lines changed

.babelrc.js

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module.exports = {
2+
3+
presets: [
4+
['@babel/preset-env', {
5+
loose: true,
6+
modules: false
7+
}]
8+
]
9+
10+
};

.circleci/config.yml

+6-9
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,21 @@ jobs:
1111
build:
1212
<<: *defaults
1313
steps:
14-
- run:
15-
name: Update Environment
16-
command: echo 'export PATH=$CIRCLE_WORKING_DIRECTORY/node_modules/.bin:$PATH' >> $BASH_ENV
1714
- checkout
1815
- restore_cache:
1916
key: yarn-{{ checksum "yarn.lock" }}
2017
- run:
2118
name: Install Dependencies
22-
command: yarn install --pure-lockfile --cache-folder ~/.yarn
23-
- save_cache:
24-
key: yarn-{{ checksum "yarn.lock" }}
25-
paths:
26-
- ~/.yarn
19+
command: yarn --pure-lockfile
2720
- run:
2821
name: Run Tests
2922
command: |
3023
yarn test
31-
karma start test/karma.conf.js --single-run --browsers Chrome,Firefox
24+
yarn karma --browsers Chrome,Firefox
3225
- run:
3326
name: Build Release
3427
command: yarn build
28+
- save_cache:
29+
key: yarn-{{ checksum "yarn.lock" }}
30+
paths:
31+
- ./node_modules

build/build.js

+38-33
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,62 @@
11
/* eslint-env node */
22

3-
var fs = require('fs');
4-
var rollup = require('rollup');
5-
var uglify = require('uglify-js');
6-
var buble = require('rollup-plugin-buble');
7-
var {version} = require('../package.json');
8-
var banner =
9-
'/*!\n' +
10-
' * vue-resource v' + version + '\n' +
11-
' * https://github.com/pagekit/vue-resource\n' +
12-
' * Released under the MIT License.\n' +
13-
' */\n';
3+
const fs = require('fs');
4+
const zlib = require('zlib');
5+
const rollup = require('rollup');
6+
const uglify = require('uglify-js');
7+
const babel = require('rollup-plugin-babel');
8+
const replace = require('rollup-plugin-replace');
9+
const {name, version, homepage} = require('../package.json');
10+
const banner = `/*!\n * ${name} v${version}\n * ${homepage}\n * Released under the MIT License.\n */\n`;
1411

1512
rollup.rollup({
1613
input: 'src/index.js',
17-
plugins: [buble()]
14+
plugins: [babel(), replace({__VERSION__: version})]
1815
})
1916
.then(bundle =>
20-
bundle.generate({
21-
format: 'umd',
22-
banner: banner,
23-
name: 'VueResource'
24-
}).then(({code}) => write('dist/vue-resource.js', code, bundle))
17+
bundle.generate({
18+
banner,
19+
format: 'umd',
20+
name: 'VueResource'
21+
}).then(({code}) => write(`dist/${name}.js`, code, bundle))
2522
)
2623
.then(bundle =>
27-
write('dist/vue-resource.min.js', banner + '\n' +
28-
uglify.minify(read('dist/vue-resource.js')).code,
29-
bundle)
24+
write(`dist/${name}.min.js`, banner + '\n' +
25+
uglify.minify(read(`dist/${name}.js`)).code, bundle, true)
3026
)
3127
.then(bundle =>
32-
bundle.generate({
33-
format: 'es',
34-
banner: banner,
35-
footer: 'export { Url, Http, Resource };'
36-
}).then(({code}) => write('dist/vue-resource.esm.js', code, bundle))
28+
bundle.generate({
29+
banner,
30+
format: 'es',
31+
footer: 'export { Url, Http, Resource };'
32+
}).then(({code}) => write(`dist/${name}.esm.js`, code, bundle))
3733
)
3834
.then(bundle =>
39-
bundle.generate({
40-
format: 'cjs',
41-
banner: banner
42-
}).then(({code}) => write('dist/vue-resource.common.js', code, bundle))
35+
bundle.generate({
36+
banner,
37+
format: 'cjs'
38+
}).then(({code}) => write(`dist/${name}.common.js`, code, bundle))
4339
)
4440
.catch(logError);
4541

4642
function read(path) {
4743
return fs.readFileSync(path, 'utf8');
4844
}
4945

50-
function write(dest, code, bundle) {
51-
return new Promise(function (resolve, reject) {
52-
fs.writeFile(dest, code, function (err) {
46+
function write(dest, code, bundle, zip) {
47+
return new Promise((resolve, reject) => {
48+
fs.writeFile(dest, code, err => {
5349
if (err) return reject(err);
54-
console.log(blue(dest) + ' ' + getSize(code));
50+
51+
if (zip) {
52+
zlib.gzip(code, (err, zipped) => {
53+
if (err) return reject(err);
54+
console.log(blue(dest) + ' ' + getSize(code) + ' (' + getSize(zipped) + ' gzipped)');
55+
});
56+
} else {
57+
console.log(blue(dest) + ' ' + getSize(code));
58+
}
59+
5560
resolve(bundle);
5661
});
5762
});

package.json

+17-13
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"jsdelivr": "dist/vue-resource.min.js",
88
"typings": "types/index.d.ts",
99
"description": "The HTTP client for Vue.js",
10-
"homepage": "https://github.com/pagekit/vue-resource#readme",
10+
"homepage": "https://github.com/pagekit/vue-resource",
1111
"license": "MIT",
1212
"keywords": [
1313
"vue",
@@ -23,6 +23,7 @@
2323
"url": "git+https://github.com/pagekit/vue-resource.git"
2424
},
2525
"scripts": {
26+
"up": "yarn upgrade-interactive --latest",
2627
"test": "jest --env=node",
2728
"karma": "karma start test/karma.conf.js --single-run",
2829
"build": "node build/build.js",
@@ -36,24 +37,27 @@
3637
"got": "^8.0.3"
3738
},
3839
"devDependencies": {
39-
"buble": "^0.19.1",
40-
"buble-loader": "^0.5.1",
41-
"eslint": "^4.17.0",
40+
"@babel/core": "^7.2.2",
41+
"@babel/preset-env": "^7.2.0",
42+
"babel-loader": "^8.0.4",
43+
"eslint": "^5.11.1",
4244
"generate-release": "^1.1.1",
43-
"jasmine": "^3.2.0",
44-
"jasmine-core": "^3.2.1",
45-
"jest": "^22.2.2",
46-
"karma": "^2.0.0",
45+
"jasmine": "^3.3.1",
46+
"jasmine-core": "^3.3.0",
47+
"jest": "^23.6.0",
48+
"karma": "^3.1.4",
4749
"karma-chrome-launcher": "^2.2.0",
4850
"karma-firefox-launcher": "^1.1.0",
49-
"karma-jasmine": "^1.1.1",
51+
"karma-jasmine": "^2.0.1",
5052
"karma-safari-launcher": "^1.0.0",
51-
"karma-webpack": "^2.0.9",
53+
"karma-webpack": "^3.0.5",
5254
"replace-in-file": "^3.4.2",
5355
"rollup": "^0.66.0",
54-
"rollup-plugin-buble": "^0.19.1",
56+
"rollup-plugin-babel": "^4.1.0",
57+
"rollup-plugin-replace": "^2.1.0",
5558
"uglify-js": "^3.4.9",
56-
"vue": "^2.5.17",
57-
"webpack": "^3.11.0"
59+
"vue": "^2.5.21",
60+
"webpack": "^4.28.3",
61+
"webpack-cli": "^3.1.2"
5862
}
5963
}

test/karma.conf.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ module.exports = config => {
99
browsers: ['Chrome', 'Safari', 'Firefox'],
1010

1111
files: [
12-
'index.js',
13-
{pattern: 'data/*', included: false},
12+
'index.js', {
13+
pattern: 'data/*',
14+
included: false
15+
},
1416
],
1517

1618
preprocessors: {
@@ -21,6 +23,10 @@ module.exports = config => {
2123
'/data/': '/base/data/'
2224
},
2325

26+
webpack: {
27+
mode: 'development'
28+
},
29+
2430
});
2531

2632
};

test/webpack.config.js

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
1-
var webpack = require('webpack');
2-
31
module.exports = {
2+
3+
mode: 'development',
4+
45
entry: __dirname + '/index.js',
6+
57
output: {
68
path: __dirname + '/',
79
filename: 'specs.js'
810
},
11+
912
module: {
10-
loaders: [
11-
{test: /\.js$/, loader: 'buble-loader', exclude: /node_modules/}
13+
rules: [
14+
{
15+
test: /\.js$/,
16+
exclude: /node_modules/,
17+
use: 'babel-loader'
18+
}
1219
]
13-
},
14-
plugins: [
15-
new webpack.optimize.ModuleConcatenationPlugin()
16-
]
20+
}
21+
1722
};

0 commit comments

Comments
 (0)