Skip to content

Commit 17c5309

Browse files
caiobioderecaiobiodere
committed
2.3.9 Update fontawesome version to 5 and fix to build release application
1 parent 4059b28 commit 17c5309

File tree

11 files changed

+44
-41
lines changed

11 files changed

+44
-41
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ You can start your new cordova project perfectly with this template.
2626

2727
This template uses:
2828
* [Framework7 4](https://framework7.io)
29-
* [Vuejs 2](https://vuejs.org/)
29+
* [Vue 2](https://vuejs.org/)
3030
* [Vuex](https://github.com/vuejs/vuex)
3131
* [Webpack 4](https://webpack.github.io/)
3232
* [Cordova](https://cordova.apache.org/)
33-
* [FontAwesome](http://fontawesome.io/)
33+
* [FontAwesome 5](http://fontawesome.io/)
3434
* [Babel Loader 7](https://github.com/babel/babel-loader)
3535

3636

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cordova-template-framework7-vue-webpack",
3-
"version": "2.3.8",
3+
"version": "2.3.9",
44
"description": "Cordova template with framework7, vue 2 and webpack 2.",
55
"main": "index.js",
66
"scripts": {

‎template_src/.jshintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"esversion": 6
3+
}

‎template_src/package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"babel-plugin-transform-object-rest-spread": "^6.26.0",
1616
"babel-plugin-transform-runtime": "^6.23.0",
1717
"babel-preset-env": "^1.6.1",
18-
"cheerio": "^1.0.0-rc.2",
19-
"chokidar": "^2.1.5",
18+
"cheerio": "^1.0.0-rc.3",
19+
"chokidar": "^3.0.0",
2020
"clean-webpack-plugin": "^1.0.0",
2121
"css-loader": "^2.1.1",
2222
"current-device": "^0.8.0",
@@ -25,33 +25,33 @@
2525
"file-loader": "^3.0.1",
2626
"html-loader": "^0.5.1",
2727
"html-webpack-plugin": "^3.2.0",
28-
"node-sass": "^4.5.0",
28+
"node-sass": "^4.12.0",
2929
"path": "^0.12.7",
3030
"sass-loader": "^7.1.0",
3131
"style-loader": "^0.23.1",
3232
"svg-url-loader": "^2.0.2",
33-
"uglify-js": "^3.5.3",
34-
"uglifyjs-webpack-plugin": "^2.0.1",
33+
"uglify-js": "^3.5.13",
34+
"uglifyjs-webpack-plugin": "^2.1.3",
3535
"url-loader": "^1.1.2",
3636
"vue-hot-reload-api": "^2.0.11",
3737
"vue-html-loader": "^1.2.4",
3838
"vue-loader": "^15.4.2",
3939
"vue-style-loader": "^4.1.2",
4040
"vue-template-compiler": "^2.6.10",
41-
"webpack": "^4.20.2",
42-
"webpack-cli": "^3.3.0",
43-
"webpack-dev-server": "^3.1.9",
41+
"webpack": "^4.31.0",
42+
"webpack-cli": "^3.3.2",
43+
"webpack-dev-server": "^3.4.1",
4444
"webpack-merge": "^4.2.1"
4545
},
4646
"dependencies": {
47-
"font-awesome": "^4.7.0",
48-
"framework7": "^4.2.0",
49-
"framework7-icons": "^2.3.0",
50-
"framework7-vue": "^4.2.0",
47+
"@fortawesome/fontawesome-free": "^5.8.2",
48+
"framework7": "^4.4.0",
49+
"framework7-icons": "^2.3.1",
50+
"framework7-vue": "^4.4.0",
5151
"loglevel": "^1.4.1",
5252
"material-design-icons": "^3.0.1",
5353
"vue": "^2.6.10",
54-
"vuex": "^3.1.0",
54+
"vuex": "^3.1.1",
5555
"fastclick": "^1.0.6"
5656
}
5757
}

‎template_src/src/assets/vue/pages/home.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,34 @@
22
<f7-page>
33
<f7-navbar>
44
<f7-nav-left>
5-
<f7-link class="panel-open" open-panel="left" icon="fa fa-bars"></f7-link>
5+
<f7-link class="panel-open" open-panel="left" icon="fas fa-bars"></f7-link>
66
</f7-nav-left>
77
<div class="title">Framework7-Vue</div>
88
<f7-nav-right>
9-
<f7-link class="searchbar-enable" data-searchbar=".searchbar-components" icon="fa fa-search"></f7-link>
9+
<f7-link class="searchbar-enable" data-searchbar=".searchbar-components" icon="fas fa-search"></f7-link>
1010
</f7-nav-right>
1111
<f7-searchbar class="searchbar-components" search-container=".components-list" search-in="a" expandable></f7-searchbar>
1212
</f7-navbar>
1313
<f7-block-title>Introduction</f7-block-title>
1414
<f7-block inner>
15-
<p>This is template for Framework7 v2, Vue and Phonegap.</p>
15+
<p>This is template for Framework7 v4, Vue and Phonegap.</p>
1616
</f7-block>
1717
<f7-block-title class="searchbar-found">Links</f7-block-title>
1818
<f7-list class="components-list searchbar-found">
1919
<f7-list-item link="/about/" title="About" panel-close>
2020
<f7-icon slot="media" ios="f7:info" md="material:info"></f7-icon>
2121
</f7-list-item>
2222
<f7-list-item link="/form/" title="Form" panel-close>
23-
<f7-icon slot="media" icon="fa fa-vcard-o fa-fw"></f7-icon>
23+
<f7-icon slot="media" icon="fas fa-id-card-alt fa-fw"></f7-icon>
2424
</f7-list-item>
2525
<f7-list-item link="/dynamic-route/blog/11/post/23/" title="Dynamic Route" panel-close>
26-
<f7-icon slot="media" icon="fa fa-rss fa-fw"></f7-icon>
26+
<f7-icon slot="media" icon="fas fa-rss fa-fw"></f7-icon>
2727
</f7-list-item>
2828
<f7-list-item link="/chat/" title="Chat" panel-close>
29-
<f7-icon slot="media" icon="fa fa-user fa-fw"></f7-icon>
29+
<f7-icon slot="media" icon="fas fa-user fa-fw"></f7-icon>
3030
</f7-list-item>
3131
<f7-list-item link="/vuex/" title="Vuex" panel-close>
32-
<f7-icon slot="media" icon="fa fa-battery fa-fw"></f7-icon>
32+
<f7-icon slot="media" icon="fas fa-battery-empty fa-fw"></f7-icon>
3333
</f7-list-item>
3434
</f7-list>
3535
<f7-list class="searchbar-not-found">

‎template_src/src/assets/vue/pages/vuex.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</f7-page>
1515
</template>
1616
<script>
17-
import { mapState, mapActions } from 'vuex'
17+
import { mapState, mapActions } from 'vuex';
1818
import { f7Page, f7Navbar, f7BlockTitle, f7List, f7ListGroup, f7ListItem, f7ListButton } from "framework7-vue";
1919
2020
export default {

‎template_src/src/assets/vuex/storage.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import Vue from 'vue'
2-
import Vuex from 'vuex'
1+
import Vue from 'vue';
2+
import Vuex from 'vuex';
33

44
Vue.use(Vuex);
55

@@ -10,13 +10,13 @@ export default new Vuex.Store({
1010

1111
actions: {
1212
userLogged ({commit}, user) {
13-
commit('USER_LOGGED', user)
13+
commit('USER_LOGGED', user);
1414
}
1515
},
1616

1717
mutations: {
1818
USER_LOGGED (state, user) {
19-
state.user = user
19+
state.user = user;
2020
}
2121
},
2222
});

‎template_src/src/main.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Import Vue
2-
import Vue from 'vue'
2+
import Vue from 'vue';
33

44
// Import Framework7
55
import Framework7 from 'framework7/framework7.esm.bundle';
@@ -8,16 +8,16 @@ import Framework7 from 'framework7/framework7.esm.bundle';
88
import Framework7Vue from 'framework7-vue';
99

1010
// Import F7 Style
11-
import Framework7CSS from 'framework7/css/framework7.bundle.min.css'
11+
import Framework7CSS from 'framework7/css/framework7.bundle.min.css';
1212

1313
// Import F7 iOS Icons
14-
import Framework7Icons from 'framework7-icons/css/framework7-icons.css'
14+
import Framework7Icons from 'framework7-icons/css/framework7-icons.css';
1515

1616
// Import Material Icons
17-
import MaterialIcons from 'material-design-icons/iconfont/material-icons.css'
17+
import MaterialIcons from 'material-design-icons/iconfont/material-icons.css';
1818

1919
// Import Fontawesome Theme Styles
20-
import FontAwesome from 'font-awesome/css/font-awesome.css'
20+
import FontAwesome from '@fortawesome/fontawesome-free/css/all.min.css';
2121

2222
// Import fastClick
2323
import FastClick from 'fastclick';
@@ -26,15 +26,15 @@ import FastClick from 'fastclick';
2626
// import AppStyles from './assets/sass/main.scss'
2727

2828
// Import App Component
29-
import app from './main.vue'
29+
import app from './main.vue';
3030

3131

3232
// Import Vuex Storage
33-
import store from './assets/vuex/storage.js'
33+
import store from './assets/vuex/storage.js';
3434

3535

3636
// Different F7-Vue plugin initialization with f7 v3.0
37-
Framework7.use(Framework7Vue)
37+
Framework7.use(Framework7Vue);
3838

3939

4040
// Init Vue App
@@ -50,6 +50,6 @@ export default new Vue({
5050
window.addEventListener('load', () => {
5151
// run after everything is in-place
5252
FastClick.attach(document.body);
53-
})
53+
});
5454
},
5555
});

‎template_src/src/main.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<script>
1212
// Import Routes...
1313
import { f7App, f7Panel, f7View, f7Statusbar } from 'framework7-vue';
14-
import routes from './routes.js'
14+
import routes from './routes.js';
1515
1616
let theme = 'auto';
1717
if (document.location.search.indexOf('theme=') >= 0) {

‎template_src/src/routes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ export default [
4141
path: '/vuex/',
4242
component: Vuex
4343
},
44-
]
44+
];

‎template_src/webpack.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module.exports = function (env) {
2-
if (typeof env === 'undefined' || typeof env.devserver === 'undefined') {
2+
if (typeof env === 'undefined') {
33
return require('./config/webpack.dev')();
44
} else if (typeof env.devserver !== 'undefined' && env.devserver) {
55
return require('./config/webpack.server')();
6-
} else if (typeof env.release !== 'undefined' && env.release) {
6+
} else if (typeof env.release !== 'undefined' && env.release) {
77
return require('./config/webpack.release')();
88
}
99
};

0 commit comments

Comments
 (0)