Skip to content
This repository was archived by the owner on Mar 9, 2024. It is now read-only.

Commit 1134f29

Browse files
authored
Develop (#319)
Develop
2 parents 1f07ede + 118ce5a commit 1134f29

File tree

5 files changed

+3043
-255
lines changed

5 files changed

+3043
-255
lines changed

.releaserc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "@kocal/semantic-release-preset"
3+
}

.travis.yml

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,37 @@
1-
sudo: false
2-
dist: trusty
1+
dist: bionic
32

43
language: node_js
5-
node_js:
4+
node_js:
5+
- lts/*
6+
- node
7+
8+
branches:
9+
except:
10+
- /^v\d+\.\d+\.\d+$/
611

712
cache:
813
yarn: true
14+
directories:
15+
- node_modules
16+
- ~/.npm
17+
- ~/.cache
18+
19+
stages:
20+
- test
21+
- deploy
922

10-
before_install:
11-
- curl -o- -L https://yarnpkg.com/install.sh | bash
12-
- export PATH="$HOME/.yarn/bin:$PATH"
13-
# - yarn global add codecov
23+
install:
24+
- yarn install --frozen-lockfile
1425

1526
script:
1627
- yarn lint
1728
- yarn docs:build
18-
# - yarn test && codecov
29+
30+
jobs:
31+
include:
32+
- if: branch = master AND type = push
33+
stage: deploy
34+
name: Deploy
35+
node_js: node
36+
script:
37+
- yarn semantic-release

package.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vuetify-algolia-places",
3-
"version": "1.0.0-beta.3",
3+
"version": "0.0.0-development",
44
"description": "Algolia places for Vuetify",
55
"main": "src/index.js",
66
"repository": "https://github.com/Kocal/vuetify-algolia-places.git",
@@ -11,11 +11,12 @@
1111
],
1212
"scripts": {
1313
"dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",
14-
"docs:build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
14+
"docs:build": "cross-env NODE_ENV=production webpack --hide-modules",
1515
"lint": "eslint --ext .js,.vue src",
1616
"lint:fix": "eslint --ext .js,.vue src --fix",
1717
"prettier": "prettier '{src,docs}/**/*.{js,vue}'",
18-
"prettier:write": "npm run prettier -- --write"
18+
"prettier:write": "npm run prettier -- --write",
19+
"semantic-release": "semantic-release"
1920
},
2021
"husky": {
2122
"hooks": {
@@ -33,6 +34,7 @@
3334
"devDependencies": {
3435
"@babel/core": "^7.2.2",
3536
"@babel/preset-env": "^7.3.1",
37+
"@kocal/semantic-release-preset": "^1.1.14",
3638
"algoliasearch": "^3.32.0",
3739
"babel-core": "^6.26.3",
3840
"babel-eslint": "^10.0.1",
@@ -42,10 +44,10 @@
4244
"css-loader": "^3.0.0",
4345
"deepmerge": "^4.1.1",
4446
"eslint": "^5.13.0",
45-
"eslint-config-airbnb-base": "^13.1.0",
47+
"eslint-config-airbnb-base": "^14.0.0",
4648
"eslint-config-prettier": "^6.0.0",
4749
"eslint-friendly-formatter": "^4.0.1",
48-
"eslint-loader": "^2.1.1",
50+
"eslint-loader": "^3.0.2",
4951
"eslint-plugin-import": "^2.16.0",
5052
"eslint-plugin-prettier": "^3.0.1",
5153
"eslint-plugin-vue": "^5.1.0",
@@ -54,10 +56,11 @@
5456
"husky": "^3.0.0",
5557
"places.js": "^1.15.4",
5658
"prettier": "^1.16.3",
57-
"pretty-quick": "^1.10.0",
59+
"pretty-quick": "^2.0.0",
5860
"sass": "^1.23.0",
5961
"sass-loader": "^8.0.0",
60-
"style-loader": "^0.23.1",
62+
"semantic-release": "^15.13.24",
63+
"style-loader": "^1.0.0",
6164
"stylus": "^0.54.5",
6265
"stylus-loader": "^3.0.2",
6366
"vue": "^2.5.0",

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const defaultOptions = {
1010
};
1111

1212
const install = (Vue, options = {}) => {
13-
options = Object.assign({}, defaultOptions, options);
13+
options = { ...defaultOptions, ...options };
1414

1515
Vue.$vuetifyAlgoliaPlacesOptions = options;
1616
Vue.mixin({

0 commit comments

Comments
 (0)