vuejs/vue-cli-plugin-vue-nextPublic

NotificationsYou must be signed in to change notification settings
Fork23
Star338

Commit82b6dbc

authored

fix(router): pass the base option as an argument (#15)

* fix(router): pass the base option as an argumentClose#14* test: remove redundant cases

1 parent90b4f26 commit82b6dbcCopy full SHA for 82b6dbc

File tree

5 files changed

+45

-13

lines changed

generator/codemods/router
- __testfixtures__
- index.js

5 files changed

+45

-13

lines changed

`‎generator/codemods/router/testfixtures/create-history.input.js`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,9 @@ const router = new VueRouter({`
`20`	`20`	`routes`
`21`	`21`	`});`
`22`	`22`
	`23`	`+newVueRouter({`
	`24`	`+mode:'history',`
	`25`	`+ routes`
	`26`	`+});`
	`27`	`+`
`23`	`28`	`exportdefaultrouter;`

`‎generator/codemods/router/testfixtures/create-history.output.js`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,12 @@ const routes = [`
`15`	`15`	`];`
`16`	`16`
`17`	`17`	`constrouter=createRouter({`
	`18`	`+history:createWebHistory(process.env.BASE_URL),`
	`19`	`+ routes`
	`20`	`+});`
	`21`	`+`
	`22`	`+createRouter({`
`18`	`23`	`history:createWebHistory(),`
`19`		`-base:process.env.BASE_URL,`
`20`	`24`	`routes`
`21`	`25`	`});`
`22`	`26`

`‎generator/codemods/router/testfixtures/create-router.input.js`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,8 @@ const router = new VueRouter({`
`19`	`19`	`routes`
`20`	`20`	`});`
`21`	`21`
	`22`	`+newVueRouter({`
	`23`	`+ routes`
	`24`	`+});`
	`25`	`+`
`22`	`26`	`exportdefaultrouter;`

`‎generator/codemods/router/testfixtures/create-router.output.js`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import{createRouter}from'vue-router';`
	`1`	`+import{createRouter,createWebHashHistory}from'vue-router';`
`2`	`2`	`importHomefrom'../views/Home.vue';`
`3`	`3`
`4`	`4`	`constroutes=[`
`@@ -15,7 +15,12 @@ const routes = [`
`15`	`15`	`];`
`16`	`16`
`17`	`17`	`constrouter=createRouter({`
`18`		`-base:process.env.BASE_URL,`
	`18`	`+history:createWebHashHistory(process.env.BASE_URL),`
	`19`	`+ routes`
	`20`	`+});`
	`21`	`+`
	`22`	`+createRouter({`
	`23`	`+history:createWebHashHistory(),`
`19`	`24`	`routes`
`20`	`25`	`});`
`21`	`26`

`‎generator/codemods/router/index.js`

Lines changed: 24 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,33 +28,47 @@ module.exports = function(fileInfo, api) {`
`28`	`28`	`addImport(context,{imported:'createRouter'},'vue-router')`
`29`	`29`	`newVueRouter.replaceWith(({ node})=>{`
`30`	`30`	`// mode: 'history' -> history: createWebHistory(), etc`
	`31`	`+lethistoryMode='createWebHashHistory'`
	`32`	`+letbaseValue`
`31`	`33`	`node.arguments[0].properties=node.arguments[0].properties.map(p=>{`
`32`	`34`	`if(p.key.name==='mode'){`
`33`	`35`	`constmode=p.value.value`
`34`		`-letinitializer`
`35`	`36`	`if(mode==='hash'){`
`36`		`-initializer='createWebHashHistory'`
	`37`	`+historyMode='createWebHashHistory'`
`37`	`38`	`}elseif(mode==='history'){`
`38`		`-initializer='createWebHistory'`
	`39`	`+historyMode='createWebHistory'`
`39`	`40`	`}elseif(mode==='abstract'){`
`40`		`-initializer='createMemoryHistory'`
	`41`	`+historyMode='createMemoryHistory'`
`41`	`42`	`}else{`
`42`	`43`	`console.error(`
`43`	`44`	`mode must be one of 'hash', 'history', or 'abstract'`
`44`	`45`	`)`
`45`	`46`	`returnp`
`46`	`47`	`}`
`47`		`-`
`48`		`-addImport(context,{imported:initializer},'vue-router')`
`49`		`-returnj.objectProperty(`
`50`		`-j.identifier('history'),`
`51`		`-j.callExpression(j.identifier(initializer),[])`
`52`		`-)`
	`48`	`+return`
	`49`	`+}elseif(p.key.name==='base'){`
	`50`	`+baseValue=p.value`
	`51`	`+return`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`returnp`
`56`	`55`	`})`
`57`	`56`
	`57`	`+// add the default mode with a hash history`
	`58`	`+addImport(context,{imported:historyMode},'vue-router')`
	`59`	`+node.arguments[0].properties=node.arguments[0].properties.filter(`
	`60`	`+p=>!!p`
	`61`	`+)`
	`62`	`+node.arguments[0].properties.unshift(`
	`63`	`+j.objectProperty(`
	`64`	`+j.identifier('history'),`
	`65`	`+j.callExpression(`
	`66`	`+j.identifier(historyMode),`
	`67`	`+baseValue ?[baseValue] :[]`
	`68`	`+)`
	`69`	`+)`
	`70`	`+)`
	`71`	`+`
`58`	`72`	`returnj.callExpression(j.identifier('createRouter'),node.arguments)`
`59`	`73`	`})`
`60`	`74`	`removeExtraneousImport(context,localVueRouter)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit82b6dbc

File tree

5 files changed

5 files changed

`‎generator/codemods/router/testfixtures/create-history.input.js`

`‎generator/codemods/router/testfixtures/create-history.output.js`

`‎generator/codemods/router/testfixtures/create-router.input.js`

`‎generator/codemods/router/testfixtures/create-router.output.js`

`‎generator/codemods/router/index.js`

0 commit comments

Movatterモバイル変換

File tree

5 files changed

5 files changed

‎generator/codemods/router/__testfixtures__/create-history.input.js

‎generator/codemods/router/__testfixtures__/create-history.output.js

‎generator/codemods/router/__testfixtures__/create-router.input.js

‎generator/codemods/router/__testfixtures__/create-router.output.js

‎generator/codemods/router/index.js

0 commit comments

`‎generator/codemods/router/testfixtures/create-history.input.js`

`‎generator/codemods/router/testfixtures/create-history.output.js`

`‎generator/codemods/router/testfixtures/create-router.input.js`

`‎generator/codemods/router/testfixtures/create-router.output.js`

`‎generator/codemods/router/index.js`