From b6c511a6da820e3544b00bf632563a5406c5a33f Mon Sep 17 00:00:00 2001 From: Jikkai Xiao Date: Wed, 14 Aug 2019 12:06:14 +0800 Subject: [PATCH] feat: support svelte3 --- .eslintrc | 7 + README.md | 78 +- babel.config.js | 2 +- example/{app.html => App.svelte} | 38 +- example/components/button.html | 13 - example/components/button.svelte | 12 + .../components/{header.html => header.svelte} | 12 +- example/components/{menu.html => menu.svelte} | 18 +- example/docs/component/Link.md | 12 + example/docs/component/RouterLink.md | 34 - example/docs/guide/API.md | 57 +- example/docs/guide/BasicUsage.md | 62 +- example/main.js | 2 +- example/pages/Installation.html | 15 - example/pages/Installation.svelte | 7 + example/pages/Introduction.html | 27 - example/pages/Introduction.svelte | 15 + example/pages/NotFound.html | 18 - example/pages/NotFound.svelte | 11 + example/pages/component/Link.svelte | 7 + example/pages/component/RouterLink.html | 15 - example/pages/guide/API.html | 15 - example/pages/guide/API.svelte | 7 + example/pages/guide/BasicUsage.html | 15 - example/pages/guide/BasicUsage.svelte | 7 + example/routes.js | 42 +- package-lock.json | 8342 ++++++++--------- package.json | 60 +- rollup.config.js | 23 +- src/components/Link.svelte | 40 + src/components/RouterLink.html | 81 - src/history.js | 13 - src/index.js | 5 +- src/router.js | 99 +- src/utils.js | 44 - 35 files changed, 4347 insertions(+), 4908 deletions(-) rename example/{app.html => App.svelte} (64%) delete mode 100644 example/components/button.html create mode 100644 example/components/button.svelte rename example/components/{header.html => header.svelte} (66%) rename example/components/{menu.html => menu.svelte} (71%) create mode 100644 example/docs/component/Link.md delete mode 100644 example/docs/component/RouterLink.md delete mode 100644 example/pages/Installation.html create mode 100644 example/pages/Installation.svelte delete mode 100644 example/pages/Introduction.html create mode 100644 example/pages/Introduction.svelte delete mode 100644 example/pages/NotFound.html create mode 100644 example/pages/NotFound.svelte create mode 100644 example/pages/component/Link.svelte delete mode 100644 example/pages/component/RouterLink.html delete mode 100644 example/pages/guide/API.html create mode 100644 example/pages/guide/API.svelte delete mode 100644 example/pages/guide/BasicUsage.html create mode 100644 example/pages/guide/BasicUsage.svelte create mode 100644 src/components/Link.svelte delete mode 100644 src/components/RouterLink.html delete mode 100644 src/history.js delete mode 100644 src/utils.js diff --git a/.eslintrc b/.eslintrc index 61b8c43..bf1a677 100644 --- a/.eslintrc +++ b/.eslintrc @@ -8,6 +8,13 @@ "browser": true, "node": true }, + "plugins": [ + "svelte3" + ], + "overrides": [{ + "files": ["**/*.svelte"], + "processor": "svelte3/svelte3" + }], "extends": "standard", "parser": "babel-eslint", "rules": { diff --git a/README.md b/README.md index 7c8538e..dd79c30 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ > Router component for Svelte -This branch is for Svelte v1.8.1+. For usage with Svelte v1.8.0-, see the [0.1.x branch](https://github.com/jikkai/svelte-router/tree/0.1.x). +This branch is for Svelte v3.0.0+. For usage with Svelte v1.8.0+, see the [v2 branch](https://github.com/jikkai/svelte-router/tree/v2). For usage with Svelte v1.8.0-, see the [0.1.x branch](https://github.com/jikkai/svelte-router/tree/0.1.x). ## Installation @@ -25,54 +25,36 @@ yarn add svelte-router ```html
- Home - Welcome -
+ Home + Welcome +
@@ -90,12 +72,16 @@ yarn add svelte-router * `push(path: string)` * `replace(path: string)` * `go(n: number)` +* `goBack()` +* `goForward()` * `listen(fn: function)` -### RouterLink +### Link +* `to`: string * `replace`: boolean -* `match`: string +* `className`: string +* `activeClassName`: string ## Contributors diff --git a/babel.config.js b/babel.config.js index 4749455..85f6e4c 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,6 +1,6 @@ module.exports = { presets: [ - [ '@babel/preset-env', { + ['@babel/preset-env', { modules: false, targets: { browsers: [ diff --git a/example/app.html b/example/App.svelte similarity index 64% rename from example/app.html rename to example/App.svelte index 9f582b6..64d49c2 100644 --- a/example/app.html +++ b/example/App.svelte @@ -1,37 +1,39 @@
+
-
+
diff --git a/example/components/button.html b/example/components/button.html deleted file mode 100644 index 46d1813..0000000 --- a/example/components/button.html +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/example/components/button.svelte b/example/components/button.svelte new file mode 100644 index 0000000..b4dd290 --- /dev/null +++ b/example/components/button.svelte @@ -0,0 +1,12 @@ + + + diff --git a/example/components/header.html b/example/components/header.svelte similarity index 66% rename from example/components/header.html rename to example/components/header.svelte index 9850bd9..b907fe3 100644 --- a/example/components/header.html +++ b/example/components/header.svelte @@ -1,17 +1,11 @@
- +

Svelte Router

-
+