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

Commit

Permalink
Develop (#319)
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Kocal authored Oct 16, 2019
2 parents 1f07ede + 118ce5a commit 1134f29
Show file tree
Hide file tree
Showing 5 changed files with 3,043 additions and 255 deletions.
3 changes: 3 additions & 0 deletions .releaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "@kocal/semantic-release-preset"
}
35 changes: 27 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,37 @@
sudo: false
dist: trusty
dist: bionic

language: node_js
node_js:
node_js:
- lts/*
- node

branches:
except:
- /^v\d+\.\d+\.\d+$/

cache:
yarn: true
directories:
- node_modules
- ~/.npm
- ~/.cache

stages:
- test
- deploy

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH="$HOME/.yarn/bin:$PATH"
# - yarn global add codecov
install:
- yarn install --frozen-lockfile

script:
- yarn lint
- yarn docs:build
# - yarn test && codecov

jobs:
include:
- if: branch = master AND type = push
stage: deploy
name: Deploy
node_js: node
script:
- yarn semantic-release
17 changes: 10 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vuetify-algolia-places",
"version": "1.0.0-beta.3",
"version": "0.0.0-development",
"description": "Algolia places for Vuetify",
"main": "src/index.js",
"repository": "https://github.com/Kocal/vuetify-algolia-places.git",
Expand All @@ -11,11 +11,12 @@
],
"scripts": {
"dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",
"docs:build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
"docs:build": "cross-env NODE_ENV=production webpack --hide-modules",
"lint": "eslint --ext .js,.vue src",
"lint:fix": "eslint --ext .js,.vue src --fix",
"prettier": "prettier '{src,docs}/**/*.{js,vue}'",
"prettier:write": "npm run prettier -- --write"
"prettier:write": "npm run prettier -- --write",
"semantic-release": "semantic-release"
},
"husky": {
"hooks": {
Expand All @@ -33,6 +34,7 @@
"devDependencies": {
"@babel/core": "^7.2.2",
"@babel/preset-env": "^7.3.1",
"@kocal/semantic-release-preset": "^1.1.14",
"algoliasearch": "^3.32.0",
"babel-core": "^6.26.3",
"babel-eslint": "^10.0.1",
Expand All @@ -42,10 +44,10 @@
"css-loader": "^3.0.0",
"deepmerge": "^4.1.1",
"eslint": "^5.13.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-config-prettier": "^6.0.0",
"eslint-friendly-formatter": "^4.0.1",
"eslint-loader": "^2.1.1",
"eslint-loader": "^3.0.2",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-prettier": "^3.0.1",
"eslint-plugin-vue": "^5.1.0",
Expand All @@ -54,10 +56,11 @@
"husky": "^3.0.0",
"places.js": "^1.15.4",
"prettier": "^1.16.3",
"pretty-quick": "^1.10.0",
"pretty-quick": "^2.0.0",
"sass": "^1.23.0",
"sass-loader": "^8.0.0",
"style-loader": "^0.23.1",
"semantic-release": "^15.13.24",
"style-loader": "^1.0.0",
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2",
"vue": "^2.5.0",
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const defaultOptions = {
};

const install = (Vue, options = {}) => {
options = Object.assign({}, defaultOptions, options);
options = { ...defaultOptions, ...options };

Vue.$vuetifyAlgoliaPlacesOptions = options;
Vue.mixin({
Expand Down
Loading

0 comments on commit 1134f29

Please sign in to comment.