Skip to content

Commit 199d24b

Browse files
authored
feat: add support for framework7@5 (#99)
2 parents 37765be + ac392c5 commit 199d24b

File tree

9 files changed

+39
-29
lines changed

9 files changed

+39
-29
lines changed

Diff for: README.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ to rapidly create efficient and feature-reach [PWA](https://developers.google.co
3232

3333
## ✨ Features
3434

35-
* Fully compatible with framework7 2.x
35+
* Fully compatible with Framework7 5.x
3636
* Development mode with hot reloading
3737
* Optimized production builds suitable for 100% static hosting
3838
* Fully PWA compatible out of the box
@@ -150,6 +150,13 @@ Enable RTL Layout.
150150

151151
Enable darkTheme support.
152152

153+
### `lightTheme`
154+
155+
- Type: `boolean`
156+
- Default: `true`
157+
158+
Enable lightTheme support.
159+
153160
### `colors`
154161

155162
- Type: `object`

Diff for: examples/kitchen-sink/layouts/default.vue

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<template>
22
<div>
3-
<f7-statusbar></f7-statusbar>
43
<f7-panel left cover>
54
<f7-view url="/panel-left/" links-view=".view-main"></f7-view>
65
</f7-panel>

Diff for: lib/build-config.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Source: https://github.com/framework7io/framework7/blob/master/scripts/build-config.js
22

33
const config = {
4-
target: 'universal',
54
rtl: false,
65
components: [
76
// Appbar
@@ -108,16 +107,20 @@ const config = {
108107
// Tree View
109108
'treeview',
110109

111-
// VI Video Ads
112-
'vi',
110+
// WYSIWYG Editor
111+
'text-editor',
113112

114113
// Elevation
115114
'elevation',
116115

117116
// Typography
118-
'typography'
117+
'typography',
118+
119+
// VI Video Ads
120+
'vi'
119121
],
120122
darkTheme: true,
123+
lightTheme: true,
121124
themes: [
122125
'ios',
123126
'md',

Diff for: lib/defaults.js

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module.exports = {
1818

1919
themeColor,
2020
themes,
21+
lightTheme: true,
2122
darkTheme: true,
2223
colors,
2324

Diff for: lib/module.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function prepareBuild (_options) {
2929

3030
// Transpile framework7
3131
this.options.build.transpile.push(
32-
/framework7[\\/](?!less)/,
32+
/framework7[\\/](?!less)(?!components\/swiper\/swiper-src\/less)/,
3333
'framework7-vue',
3434
'template7',
3535
'dom7'

Diff for: lib/templates/framework7/styles.less

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@import (reference) '~framework7/less/mixins.less';
2+
@import (reference) '~framework7/less/vars.less';
23

34
@includeIosTheme: <%= options.themes.indexOf('ios') >= 0 %>;
45
@includeMdTheme: <%= options.themes.indexOf('md') >= 0 %>;
56
@includeAuroraTheme: <%= options.themes.indexOf('aurora') >= 0 %>;
67

8+
@includeLightTheme: <%= options.lightTheme %>;
79
@includeDarkTheme: <%= options.darkTheme %>;
810

911
@themeColor: <%= options.themeColor %>;

Diff for: lib/templates/layouts/default.vue

-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<script>
2-
import { f7Statusbar } from 'framework7-vue'
32
43
export default {
54
render (h) {
65
return h('div',[
7-
h(f7Statusbar),
86
h('nuxt')
97
])
108
},

Diff for: package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
},
1919
"dependencies": {
2020
"defu": "^0.0.1",
21-
"framework7": "^4.4.0",
22-
"framework7-vue": "^4.4.0",
21+
"framework7": "^5.7.0",
22+
"framework7-vue": "^5.7.0",
2323
"less": "^3.9.0",
2424
"less-loader": "^5.0.0"
2525
},

Diff for: yarn.lock

+18-18
Original file line numberDiff line numberDiff line change
@@ -4086,20 +4086,20 @@ fragment-cache@^0.2.1:
40864086
dependencies:
40874087
map-cache "^0.2.2"
40884088

4089-
framework7-vue@^4.4.0:
4090-
version "4.4.0"
4091-
resolved "https://registry.yarnpkg.com/framework7-vue/-/framework7-vue-4.4.0.tgz#56b02b553666eb0141238da620b5747c74c705a9"
4092-
integrity sha512-LMuplgsGWRHKdlwcuqD07R2FZxe09ExTxUTLJ1p91vy3tm8zL+dTMhFYDmRQd0UwvnoDlQQsqscyDKnJR7wHGA==
4089+
framework7-vue@^5.7.0:
4090+
version "5.7.1"
4091+
resolved "https://registry.yarnpkg.com/framework7-vue/-/framework7-vue-5.7.1.tgz#5ab940e5c9a8fc5567707b87d649735a15cc2a96"
4092+
integrity sha512-2gAncfli6asgm7+KqIHyoOyx2GRAa6Oplrx8Ul/y9TQMUMkaI4sCPhcJQaWiyJ7iM1rvvy5kHMfgZFmlqxNC8g==
40934093

4094-
framework7@^4.4.0:
4095-
version "4.4.0"
4096-
resolved "https://registry.yarnpkg.com/framework7/-/framework7-4.4.0.tgz#141a3686f58c0905760c3a2243a19fa44a6a4b90"
4097-
integrity sha512-x23Kmux2HuhFiYINUoTOlw0YjDapSdj1xmlwcgz8kTu1ZgnCXIqxv1UyOUrvHPosoKQmaIY8WgfL3uXCZYWvFA==
4094+
framework7@^5.7.0:
4095+
version "5.7.1"
4096+
resolved "https://registry.yarnpkg.com/framework7/-/framework7-5.7.1.tgz#048e34c5b5f72b94bd2e4ba2e62f394ed003720a"
4097+
integrity sha512-o45wa7lx6sW4GEYZORRUfx/yJq1crj2niPXjvn9XNjicZUymeHm9OE0NSaShKvLWpZ90U+joAbMHceZH0+PUJw==
40984098
dependencies:
40994099
dom7 "^2.1.3"
4100-
path-to-regexp "^3.0.0"
4100+
path-to-regexp "^6.1.0"
41014101
ssr-window "^1.0.1"
4102-
template7 "^1.4.1"
4102+
template7 "^1.4.2"
41034103

41044104
[email protected], fresh@^0.5.2:
41054105
version "0.5.2"
@@ -6385,10 +6385,10 @@ [email protected]:
63856385
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
63866386
integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
63876387

6388-
path-to-regexp@^3.0.0:
6389-
version "3.0.0"
6390-
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.0.0.tgz#c981a218f3df543fa28696be2f88e0c58d2e012a"
6391-
integrity sha512-ZOtfhPttCrqp2M1PBBH4X13XlvnfhIwD7yCLx+GoGoXRPQyxGOTdQMpIzPSPKXAJT/JQrdfFrgdJOyAzvgpQ9A==
6388+
path-to-regexp@^6.1.0:
6389+
version "6.1.0"
6390+
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.1.0.tgz#0b18f88b7a0ce0bfae6a25990c909ab86f512427"
6391+
integrity sha512-h9DqehX3zZZDCEm+xbfU0ZmwCGFCAAraPJWMXJ4+v32NjZJilVg3k1TcKsRgIb8IQ/izZSaydDc1OhJCZvs2Dw==
63926392

63936393
path-type@^1.0.0:
63946394
version "1.1.0"
@@ -8434,10 +8434,10 @@ [email protected]:
84348434
fstream "^1.0.2"
84358435
inherits "2"
84368436

8437-
template7@^1.4.1:
8438-
version "1.4.1"
8439-
resolved "https://registry.yarnpkg.com/template7/-/template7-1.4.1.tgz#c3b2b03d6879e1c5f8a79067c961c8896ffaeec6"
8440-
integrity sha512-sYZ9Wl5kFuNSvLcMPq8z4oenG7rDho6KnB2vWyvMJCdI1guJhxTEU0TCwr6Nd1Jx34kSOmrpJakMGxJgCc55yg==
8437+
template7@^1.4.2:
8438+
version "1.4.2"
8439+
resolved "https://registry.yarnpkg.com/template7/-/template7-1.4.2.tgz#62f32959361e455ec171ef9ef33d29ca7130e009"
8440+
integrity sha512-eoKnScBMDk7lyj7+iCzKbxGiSLLlQk0DNvmclyJuMCUKxy9JrFuAB+GD5iplF4WiQPtMdI06CHHks3avL22JXA==
84418441

84428442
term-size@^1.2.0:
84438443
version "1.2.0"

0 commit comments

Comments
 (0)