init

ccqgithub · Jun 25, 2019 · a00c24d · a00c24d
1 parent 30e066c
commit a00c24d
Show file tree

Hide file tree

Showing 11 changed files with 681 additions and 681 deletions.
diff --git a/dist/router.common.js b/dist/router.common.js
diff --git a/dist/router.common.js.map b/dist/router.common.js.map
diff --git a/dist/router.esm.js b/dist/router.esm.js
diff --git a/dist/router.esm.js.map b/dist/router.esm.js.map
diff --git a/examples/auth-flow/components/App.vue b/examples/auth-flow/components/App.vue
@@ -22,7  22,7 @@
       </li>
     </ul>
 
-    <match-first>
     <route-switch>
       <route path="/dashboard" v-slot:default="{ match, location, history }">
         <check-login :logged-in="loggedIn">
           <dashboard :match="match" :location="location" :history="history" />
@@ -45,12  45,12 @@
       <route>
         <p>You are logged {{ loggedIn ? 'in' : 'out' }}</p>
       </route>
-    </match-first>
     </route-switch>
   </div>
 </template>
 
 <script>
-import { Route, RouterLink, MatchFirst, Redirect } from 'vue-router-lite'
 import { Route, RouterLink, RouteSwitch, Redirect } from 'vue-router-lite'
 import auth from '../auth'
 import About from './About.vue'
 import Dashboard from './Dashboard.vue'
@@ -64,7  64,7 @@ export default {
     About,
     Dashboard,
     Login,
-    MatchFirst,
     RouteSwitch,
     CheckLogin,
     Redirect
   },

diff --git a/examples/keep-alive/app.js b/examples/keep-alive/app.js
@@ -1,5  1,5 @@
 import Vue from 'vue'
-import { BrowserRouter as Router, Route, RouterLink, MatchFirst } from 'vue-router-lite'
 import { BrowserRouter as Router, Route, RouterLink, RouteSwitch } from 'vue-router-lite'
 
 const Home = { 
   template: `
@@ -110,7  110,7 @@ const App = {
   components: {
     Route, 
     RouterLink,
-    MatchFirst,
     RouteSwitch,
     Home,
     Alive,
     NestAlive
@@ -136,7  136,7 @@ const App = {
       <hr />
       
       <keep-alive>
-        <match-first>
         <route-switch>
           <route exact path="/" v-slot="props">
             <home v-bind="props"/>
           </route>
@@ -148,7  148,7 @@ const App = {
           <route path="/nest-alive" v-slot="props">
             <nest-alive v-bind="props" />
           </route>
-        </match-first>
         </route-switch>
       </keep-alive>
     </div>
   `,

diff --git a/examples/no-match/app.js b/examples/no-match/app.js
@@ -1,10  1,10 @@
 import Vue from 'vue'
-import { BrowserRouter as Router, Route, RouterLink, Redirect, MatchFirst } from 'vue-router-lite'
 import { BrowserRouter as Router, Route, RouterLink, Redirect, RouteSwitch } from 'vue-router-lite'
 
 const Home = { 
   template: `
     <p>
-      A <code>&lt;match-first></code> renders the first child <code>&lt;route></code>{{" "}}
       A <code>&lt;route-switch></code> renders the first child <code>&lt;route></code>{{" "}}
       that matches. A <code>&lt;route></code> with no <code>path</code> always
       matches.
     </p>
@@ -38,7  38,7 @@ const App = {
     Route, 
     RouterLink,
     Redirect,
-    MatchFirst,
     RouteSwitch,
     Home,
     WillMatch,
     NoMatch,
@@ -64,7  64,7 @@ const App = {
             <router-link to="/also/will/not/match">Also Will Not Match</router-link>
           </li>
         </ul>
-        <match-first>
         <route-switch>
           <route path="/" exact>
             <home />
           </route>
@@ -77,7  77,7 @@ const App = {
           <route v-slot:default="{ location }">
             <no-match :location="location" />
           </route>
-        </match-first>
         </route-switch>
       </div>
     </div>
   `,

diff --git a/examples/transitions/app.js b/examples/transitions/app.js
@@ -1,5  1,5 @@
 import Vue from 'vue'
-import { BrowserRouter as Router, Route, RouterLink, MatchFirst } from 'vue-router-lite'
 import { BrowserRouter as Router, Route, RouterLink, RouteSwitch } from 'vue-router-lite'
 
 const Home = {
   template: `
@@ -23,7  23,7 @@ const Parent = {
   components: {
     RouterLink,
     Route,
-    MatchFirst,
     RouteSwitch,
     Default,
     Foo,
     Bar
@@ -51,7  51,7 @@ const Parent = {
     <div class="parent">
       <h2>Parent</h2>
       <transition :name="transitionName">
-        <match-first>
         <route-switch>
           <route :path="match.url" exact key="default" v-slot="props">
             <default class="child-view" v-bind="props"/>
           </route>
@@ -61,7  61,7 @@ const Parent = {
           <route :path="match.url   '/bar'" key="bar" v-slot="props">
             <bar class="child-view" v-bind="props"/>
           </route>
-        </match-first>
         </route-switch>
       </transition>
     </div>
   `
@@ -71,7  71,7 @@ const App = {
   components: {
     RouterLink,
     Route,
-    MatchFirst,
     RouteSwitch,
     Home,
     Parent
   },
@@ -91,14  91,14 @@ const App = {
 
       </div>
       <transition name="fade" mode="out-in">
-        <match-first>
         <route-switch>
           <route path="/" key="home" exact v-slot="props">
             <home class="page" v-bind="props"/>
           </route>
           <route path="/parent" key="parent" v-slot="props">
             <parent class="page" v-bind="props"/>
           </route>
-        </match-first>
         </route-switch>
       </transition>
     </div>
   `

diff --git a/src/component/RouterRef.vue → src/component/RouteContext.vue b/src/component/RouterRef.vue → src/component/RouteContext.vue
@@ -1,6  1,6 @@
 <script>
 export default {
-  name: 'router-ref',
   name: 'router-context',
   inject: ['router', 'route'],
   data() {
     return {

diff --git a/src/component/MatchFirst.vue → src/component/RouteSwitch.vue b/src/component/MatchFirst.vue → src/component/RouteSwitch.vue
@@ -3,7  3,7 @@ import { assert, isNotTextNode } from '../util/utils';
 import matchPath from "../util/matchPath";
 
 export default {
-  name: 'match-first',
   name: 'route-switch',
   functional: true,
   props: {
     location: Object
@@ -14,7  14,7 @@ export default {
 
     assert(
       router, 
-      `You should not use <match-first> outside a <router>'`
       `You should not use <route-switch> outside a <router>'`
     );
 
     let vnodeKey = '';

diff --git a/src/index.js b/src/index.js
@@ -1,14  1,14 @@
-import Router from './component/Router.vue';
 import MemoryRouter from './component/MemoryRouter.vue';
 import HashRouter from './component/HashRouter.vue';
 import BrowserRouter from './component/BrowserRouter.vue';
 import StaticRouter from './component/StaticRouter.vue';
-import Route from './component/Route.vue';
 import Router from './component/Router.vue';
 import RouterLink from './component/RouterLink.vue';
 import Prompt from './component/Prompt.vue';
 import Redirect from './component/Redirect.vue';
-import RouterLink from './component/RouterLink.vue';
-import RouterRef from './component/RouterRef.vue';
-import MatchFirst from './component/MatchFirst.vue';
 import Route from './component/Route.vue';
 import RouteContext from './component/RouteContext.vue';
 import RouteSwitch from './component/RouteSwitch.vue';
 
 import generatePath from './util/generatePath';
 import matchPath from './util/matchPath';
@@ -18,17  18,17 @@ import createMemoryHistory from './util/createMemoryHistory';
 import createStaticHistory from './util/createStaticHistory';
 
 export {
-  Router,
   MemoryRouter,
   HashRouter,
   BrowserRouter,
   StaticRouter,
   Router,
   RouterLink,
   Prompt,
   Redirect,
   Route,
-  RouterLink,
-  RouterRef,
-  MatchFirst,
   RouteContext,
   RouteSwitch,
 
   generatePath,
   matchPath,