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

Commit

Permalink
Merge branch 'release/1.5.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
janschoenherr committed Jun 14, 2021
2 parents 46f757a + 15352ef commit bdc36e7
Show file tree
Hide file tree
Showing 9 changed files with 241 additions and 293 deletions.
52 changes: 26 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
version: 2

defaults: &defaults
docker:
- image: circleci/node:10-browsers
environment:
CHROME_BIN: /usr/bin/google-chrome
working_directory: ~/vue-resource
docker:
- image: circleci/node:14-browsers
environment:
CHROME_BIN: /usr/bin/google-chrome
working_directory: ~/vue-resource

jobs:
build:
<<: *defaults
steps:
- checkout
- restore_cache:
key: yarn-{{ checksum "yarn.lock" }}
- run:
name: Install Dependencies
command: yarn --pure-lockfile
- run:
name: Run Tests
command: |
yarn test
yarn karma --browsers Chrome
- run:
name: Build Release
command: yarn build
- save_cache:
key: yarn-{{ checksum "yarn.lock" }}
paths:
- ./node_modules
build:
<<: *defaults
steps:
- checkout
- restore_cache:
key: yarn-{{ checksum "yarn.lock" }}
- run:
name: Install Dependencies
command: yarn --pure-lockfile
- run:
name: Run Tests
command: |
yarn test
yarn karma --browsers Chrome
- run:
name: Build Release
command: yarn build
- save_cache:
key: yarn-{{ checksum "yarn.lock" }}
paths:
- ./node_modules
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ $ npm install vue-resource
```

### CDN
Available on [jsdelivr](https://cdn.jsdelivr.net/npm/[email protected].2), [unpkg](https://unpkg.com/[email protected].2) or [cdnjs](https://cdnjs.com/libraries/vue-resource).
Available on [jsdelivr](https://cdn.jsdelivr.net/npm/[email protected].3), [unpkg](https://unpkg.com/[email protected].3) or [cdnjs](https://cdnjs.com/libraries/vue-resource).
```html
<script src="https://cdn.jsdelivr.net/npm/[email protected].2"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected].3"></script>
```

## Example
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vue-resource",
"main": "dist/vue-resource.js",
"version": "1.5.2",
"version": "1.5.3",
"description": "The HTTP client for Vue.js",
"homepage": "https://github.com/pagekit/vue-resource",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion dist/vue-resource.common.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* vue-resource v1.5.2
* vue-resource v1.5.3
* https://github.com/pagekit/vue-resource
* Released under the MIT License.
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/vue-resource.esm.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* vue-resource v1.5.2
* vue-resource v1.5.3
* https://github.com/pagekit/vue-resource
* Released under the MIT License.
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/vue-resource.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* vue-resource v1.5.2
* vue-resource v1.5.3
* https://github.com/pagekit/vue-resource
* Released under the MIT License.
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/vue-resource.min.js

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

122 changes: 61 additions & 61 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
{
"name": "vue-resource",
"version": "1.5.2",
"main": "dist/vue-resource.common.js",
"module": "dist/vue-resource.esm.js",
"unpkg": "dist/vue-resource.min.js",
"jsdelivr": "dist/vue-resource.min.js",
"typings": "types/index.d.ts",
"description": "The HTTP client for Vue.js",
"homepage": "https://github.com/pagekit/vue-resource",
"license": "MIT",
"keywords": [
"vue",
"xhr",
"http",
"ajax"
],
"bugs": {
"url": "https://github.com/pagekit/vue-resource/issues"
},
"repository": {
"type": "git",
"url": "git+https://github.com/pagekit/vue-resource.git"
},
"scripts": {
"up": "yarn upgrade-interactive --latest",
"test": "jest --env=node",
"karma": "karma start test/karma.conf.js --single-run",
"build": "node build/build.js",
"release": "node build/release.js",
"webpack": "webpack --config test/webpack.config.js"
},
"browser": {
"got": false
},
"dependencies": {
"got": "^8.0.3"
},
"devDependencies": {
"@babel/core": "^7.2.2",
"@babel/preset-env": "^7.2.0",
"babel-loader": "^8.0.4",
"eslint": "^5.11.1",
"generate-release": "^1.1.1",
"jasmine": "^3.3.1",
"jasmine-core": "^3.3.0",
"jest": "^23.6.0",
"karma": "^3.1.4",
"karma-chrome-launcher": "^2.2.0",
"karma-firefox-launcher": "^1.1.0",
"karma-jasmine": "^2.0.1",
"karma-safari-launcher": "^1.0.0",
"karma-webpack": "^3.0.5",
"replace-in-file": "^3.4.2",
"rollup": "^0.66.0",
"rollup-plugin-babel": "^4.1.0",
"rollup-plugin-replace": "^2.1.0",
"uglify-js": "^3.4.9",
"vue": "^2.5.21",
"webpack": "^4.28.3",
"webpack-cli": "^3.1.2"
}
"name": "vue-resource",
"version": "1.5.3",
"main": "dist/vue-resource.common.js",
"module": "dist/vue-resource.esm.js",
"unpkg": "dist/vue-resource.min.js",
"jsdelivr": "dist/vue-resource.min.js",
"typings": "types/index.d.ts",
"description": "The HTTP client for Vue.js",
"homepage": "https://github.com/pagekit/vue-resource",
"license": "MIT",
"keywords": [
"vue",
"xhr",
"http",
"ajax"
],
"bugs": {
"url": "https://github.com/pagekit/vue-resource/issues"
},
"repository": {
"type": "git",
"url": "git+https://github.com/pagekit/vue-resource.git"
},
"scripts": {
"up": "yarn upgrade-interactive --latest",
"test": "jest --env=node",
"karma": "karma start test/karma.conf.js --single-run",
"build": "node build/build.js",
"release": "node build/release.js",
"webpack": "webpack --config test/webpack.config.js"
},
"browser": {
"got": false
},
"dependencies": {
"got": ">=8.0 <12.0"
},
"devDependencies": {
"@babel/core": "^7.2.2",
"@babel/preset-env": "^7.2.0",
"babel-loader": "^8.0.4",
"eslint": "^5.11.1",
"generate-release": "^1.1.1",
"jasmine": "^3.3.1",
"jasmine-core": "^3.3.0",
"jest": "^23.6.0",
"karma": "^3.1.4",
"karma-chrome-launcher": "^2.2.0",
"karma-firefox-launcher": "^1.1.0",
"karma-jasmine": "^2.0.1",
"karma-safari-launcher": "^1.0.0",
"karma-webpack": "^3.0.5",
"replace-in-file": "^3.4.2",
"rollup": "^0.66.0",
"rollup-plugin-babel": "^4.1.0",
"rollup-plugin-replace": "^2.1.0",
"uglify-js": "^3.4.9",
"vue": "^2.5.21",
"webpack": "^4.28.3",
"webpack-cli": "^3.1.2"
}
}
Loading

0 comments on commit bdc36e7

Please sign in to comment.