Skip to content

Commit 46dcc3f

Browse files
grgurgrgur
committed
Merge branch 'master' of github.com:ModusCreateOrg/ionic-vue
2 parents f5c1628 + c8d507f commit 46dcc3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+3070
-3110
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
command: |
2121
npm i -ci
2222
# Peer dependencies
23-
npm i vue vue-router vue-template-compiler
23+
npm run install.peer
2424
2525
- save_cache:
2626
paths:
@@ -37,7 +37,7 @@ jobs:
3737
- run: unzip sonar-scanner-cli-3.2.0.1227-linux.zip
3838
- run: echo "sonar.host.url=https://sonarcloud.io" > sonar-scanner-3.2.0.1227-linux/conf/sonar-scanner.properties
3939
- run: echo "sonar.login=$sonarqubekey" >> sonar-project.properties
40-
- run: echo "sonar.organization=$sonarorg" >> sonar-project.properties
40+
- run: echo "sonar.organization=$sonarorg" >> sonar-project.properties
4141
- run: sonar-scanner-3.2.0.1227-linux/bin/sonar-scanner
4242
- run: echo "Scan complete, data sent to sonarcloud"
4343

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ end_of_line = lf
44
insert_final_newline = true
55
trim_trailing_whitespace = true
66

7-
[*.{js,vue}]
7+
[*.{js,vue,ts}]
88
charset = utf-8
99
indent_style = space
1010
indent_size = 2

‎.eslintrc.js‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ dist/
55
node_modules/
66
coverage/
77
reports/
8+
src/**/*.js
9+
types/**/*.map
810

911
# ignore log files
1012
*.log

‎.prettierrc‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎README.md‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Now you can use it during the initialization step of your Vue app.
3333

3434
```js
3535
import Vue from 'vue'
36-
import { IonicVueRouter, IonicAPI } from '@modus/ionic-vue'
36+
import { Ionic, IonicVueRouter, IonicAPI } from '@modus/ionic-vue'
3737
import Home from './Home.vue'
3838
import Page from './Page.vue'
3939

@@ -55,13 +55,13 @@ IonicVueRouter requires `ion-vue-router` element in order to render the componen
5555
```html
5656
<!DOCTYPE html>
5757
<html lang="en">
58-
<head>...</head>
58+
<head>...</head>
5959

60-
<body>
61-
<ion-app>
62-
<ion-vue-router/>
63-
</ion-app>
64-
</body>
60+
<body>
61+
<ion-app>
62+
<ion-vue-router/>
63+
</ion-app>
64+
</body>
6565
</html>
6666
```
6767

@@ -110,6 +110,7 @@ It is an extension of the Vue Router thus it can be used as a drop-in replacemen
110110
- [Named views with transitions](cookbook/named-views-transitions.html)
111111
- [Custom transitions](cookbook/custom-transitions.html)
112112
- [Mix Ionic and custom transitions](cookbook/mixed-transitions.html)
113+
- [Ionic tabs](cookbook/tabs.html)
113114
- [Ionic controllers](cookbook/ionic-controllers.html)
114115

115116
## Developing

‎build/rollup.config.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import path from 'path'
2-
import buble from 'rollup-plugin-buble'
32
import vue from 'rollup-plugin-vue'
43
import { terser } from 'rollup-plugin-terser'
4+
import typescript from 'rollup-plugin-typescript2'
55
import { version as packageVersion } from '../package.json'
66

77
const version = process.env.VERSION || packageVersion
88

9-
const banner = `
10-
/*!
11-
* ionic-vue v${version}
9+
const banner = `/*!
10+
* @modus/ionic-vue v${version}
1211
* ${new Date().getFullYear()} Michael Tintiuc - Modus Create
1312
* @license MIT
1413
*/
@@ -31,28 +30,29 @@ function outputConfig(suffix, format, opts = {}) {
3130

3231
function baseConfig() {
3332
return {
34-
input: resolve('./src/index.js'),
33+
input: resolve('./src/index.ts'),
3534
output: [
36-
outputConfig('', 'umd', { globals: {} }),
35+
outputConfig('', 'umd', {
36+
globals: {
37+
vue: 'Vue',
38+
'vue-class-component': 'VueClassComponent',
39+
'vue-property-decorator': 'vue-property-decorator',
40+
},
41+
}),
3742
outputConfig('.esm', 'esm'),
3843
outputConfig('.common', 'cjs'),
3944
],
4045
external: [
4146
'vue',
4247
'vue-router',
48+
'vue-class-component',
49+
'vue-property-decorator',
4350
'@ionic/core/loader',
4451
'@ionic/core/css/ionic.bundle.css',
4552
'@ionic/core/dist/ionic/svg',
4653
'ionicons/dist/collection/icon/icon.css',
4754
],
48-
plugins: [
49-
vue(),
50-
buble({
51-
transforms: {
52-
dangerousForOf: true,
53-
},
54-
}),
55-
],
55+
plugins: [vue(), typescript({ useTsconfigDeclarationDir: true })],
5656
}
5757
}
5858

‎cookbook/custom-transitions.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<script>window.disableIonicTransitions = true</script>
1111
<script src="https://unpkg.com/vue"></script>
1212
<script src="https://unpkg.com/vue-router/dist/vue-router.js"></script>
13+
<script src="https://unpkg.com/vue-class-component@latest/dist/vue-class-component.js"></script>
14+
<script src="https://unpkg.com/vue-property-decorator@latest/lib/vue-property-decorator.umd.js"></script>
1315
<script src="https://unpkg.com/@modus/ionic-vue@latest/dist/ionic-vue.js"></script>
1416
<script src="https://unpkg.com/@ionic/core@latest/dist/ionic.js"></script>
1517
<link rel="stylesheet" href="https://unpkg.com/@ionic/core@latest/css/ionic.bundle.css"/>

‎cookbook/index.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<meta name="msapplication-tap-highlight" content="no">
99
<script src="https://unpkg.com/vue"></script>
1010
<script src="https://unpkg.com/vue-router/dist/vue-router.js"></script>
11+
<script src="https://unpkg.com/vue-class-component@latest/dist/vue-class-component.js"></script>
12+
<script src="https://unpkg.com/vue-property-decorator@latest/lib/vue-property-decorator.umd.js"></script>
1113
<script src="https://unpkg.com/@modus/ionic-vue@latest/dist/ionic-vue.js"></script>
1214
<script src="https://unpkg.com/@ionic/core@latest/dist/ionic.js"></script>
1315
<link rel="stylesheet" href="https://unpkg.com/@ionic/core@latest/css/ionic.bundle.css"/>

‎cookbook/ionic-controllers.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<meta name="msapplication-tap-highlight" content="no">
99
<script src="https://unpkg.com/vue"></script>
1010
<script src="https://unpkg.com/vue-router/dist/vue-router.js"></script>
11+
<script src="https://unpkg.com/vue-class-component@latest/dist/vue-class-component.js"></script>
12+
<script src="https://unpkg.com/vue-property-decorator@latest/lib/vue-property-decorator.umd.js"></script>
1113
<script src="https://unpkg.com/@modus/ionic-vue@latest/dist/ionic-vue.js"></script>
1214
<script src="https://unpkg.com/@ionic/core@latest/dist/ionic.js"></script>
1315
<link rel="stylesheet" href="https://unpkg.com/@ionic/core@latest/css/ionic.bundle.css"/>

0 commit comments

Comments
 (0)