Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  v1.5.1
  update-deps
  fix(docs): correct examples
  beta.1 - forgot to build, Jesus!
  fix docs tpoe, add beta version tag
  tests: make tests pass, add note to docs about caveat
  fix: remove wrapperKey tht forced unnessessary recreations
  lockfile
  Update README.md
  Update README.md
  remove babel config from package.json and exclude it from npm publish
  docs: correct current version & remove deprecation warning
  • Loading branch information
LinusBorg committed Dec 30, 2018
2 parents dbc33c7 + 108e2fa commit 165be6a
Show file tree
Hide file tree
Showing 19 changed files with 3,533 additions and 2,225 deletions.
19 changes: 19 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"presets": [
[
"es2015",
{
"modules": false
}
],
"stage-3"
],
"plugins": ["transform-vue-jsx"],
"comments": true,
"env": {
"jest": true,
"test": {
"presets": ["es2015", "stage-3"]
}
}
}
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ example/
test/

logo.xcf

.babelrc
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@
<img src="http://linusborg.github.io/portal-vue/assets/logo.png" alt="PortalVue Logo">
</p>

> This branch is currently representing v1.4.0-beta.1
> Install with `npm install portal-vue@next`
> Install with `npm install portal-vue`
For more detailed documentation and additional Information, please visit <a href="http://linusborg.github.io/portal-vue">the docs</a>

## Installation

```
npm i portal-vue // v1.3.0 (stable)
npm i portal-vue@next // v1.4.0-beta.1 (current beta)
```bash
npm i portal-vue

# or

yarn add portal-vue
```

```javascript
Expand Down
9 changes: 2 additions & 7 deletions dist/portal-vue.js

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

2 changes: 1 addition & 1 deletion dist/portal-vue.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/portal-vue.min.js

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

2 changes: 1 addition & 1 deletion docs/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ docute.init({
title: 'Documentation',
type: 'dropdown',
items: [
{ title: 'Current: v1.4.0-beta.1', path: '#' },
{ title: 'Current: v1.5.0', path: '#' },
{ title: 'Installation Instructions', type: 'label' },
{ title: 'Installation', path: '/docs/installation' },
{ type: 'sep' },
Expand Down
10 changes: 4 additions & 6 deletions docs/docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ This is the recommended way to install this Plugin.
Install with npm as a dependency:

```bash
npm i portal-vue # v1.3.0 (stable)
npm i portal-vue@next # v1.4.0-beta.1 (current beta)
npm i portal-vue

# or with yarn, respectively:
yarn add portal-vue
yarn add portal-vue@next
```

Then include the package in your application and register it with Vue:
Expand Down Expand Up @@ -78,12 +76,12 @@ If you don't want to register the components globally, don't do `Vue.use('Portal
Instead, import the component(s) in those components that you need them in and register them locally:

```javascript
import { Portal, PortalTarget } from 'portal-vue'
import PortalVue from 'portal-vue'

export default {
components: {
Portal,
PortalTarget,
Portal: PortalVue.Portal,
PortalTarget: PortalVue.PortalTarget,
},
}
```
Loading

0 comments on commit 165be6a

Please sign in to comment.