Merge pull request #336 from redwoodjs/pp-reverse-route-order

peterp · web-flow · commit c776b1764aff · 2020-03-26T00:07:18.000+01:00
Fix route insertion order
diff --git a/packages/cli/src/lib/index.js b/packages/cli/src/lib/index.js
@@ -144,7 +144,7 @@ export const writeFilesTask = (files, options) => {
 export const addRoutesToRouterTask = (routes) => {
   const redwoodPaths = getPaths()
   const routesContent = readFile(redwoodPaths.web.routes).toString()
-  const newRoutesContent = routes.reduce((content, route) => {
+  const newRoutesContent = routes.reverse().reduce((content, route) => {
     if (content.includes(route)) {
       return content
     }

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ export const writeFilesTask = (files, options) => {`
`144`	`144`	`export const addRoutesToRouterTask = (routes) => {`
`145`	`145`	`const redwoodPaths = getPaths()`
`146`	`146`	`const routesContent = readFile(redwoodPaths.web.routes).toString()`
`147`		`- const newRoutesContent = routes.reduce((content, route) => {`
	`147`	`+ const newRoutesContent = routes.reverse().reduce((content, route) => {`
`148`	`148`	`if (content.includes(route)) {`
`149`	`149`	`return content`
`150`	`150`	`}`