Merge remote-tracking branch 'upstream/main'

frontend/node_modules/@vue/cli-plugin-router/generator/template-vue3/src/App.vue

@@ -0,0 +1,63 @@
+---
+extend: '@vue/cli-service/generator/template/src/App.vue'
+replace:
+  - !!js/regexp /<template>[^]*?<\/template>/
+  - !!js/regexp /\n<script>[^]*?<\/script>\n/
+  - !!js/regexp /  margin-top[^]*?<\/style>/
+---
+
+<%# REPLACE %>
+<template>
+  <div id="nav">
+    <router-link to="/">Home</router-link> |
+    <router-link to="/about">About</router-link>
+  </div>
+  <router-view/>
+</template>
+<%# END_REPLACE %>
+
+<%# REPLACE %>
+<%# END_REPLACE %>
+
+<%# REPLACE %>
+}
+
+<%_ if (rootOptions.cssPreprocessor !== 'stylus') { _%>
+  <%_ if (!rootOptions.cssPreprocessor) { _%>
+#nav {
+  padding: 30px;
+}
+
+#nav a {
+  font-weight: bold;
+  color: #2c3e50;
+}
+
+#nav a.router-link-exact-active {
+  color: #42b983;
+}
+  <%_ } else { _%>
+#nav {
+  padding: 30px;
+
+  a {
+    font-weight: bold;
+    color: #2c3e50;
+
+    &.router-link-exact-active {
+      color: #42b983;
+    }
+  }
+}
+  <%_ } _%>
+<%_ } else { _%>
+#nav
+  padding 30px
+  a
+    font-weight bold
+    color #2c3e50
+    &.router-link-exact-active
+      color #42b983
+<%_ } _%>
+</style>
+<%# END_REPLACE %>

frontend/node_modules/@vue/cli-plugin-router/generator/template-vue3/src/router/index.js

@@ -0,0 +1,45 @@
+import { createRouter<%
+  if (historyMode) {
+    %>, createWebHistory<%
+  } else {
+    %>, createWebHashHistory<%
+  }
+
+  if (hasTypeScript) {
+    %>, RouteRecordRaw<%
+  }
+  %> } from 'vue-router'
+import Home from '../views/Home.vue'
+
+const routes<% if (hasTypeScript) { %>: Array<RouteRecordRaw><% } %> = [
+  {
+    path: '/',
+    name: 'Home',
+    component: Home
+  },
+  {
+    path: '/about',
+    name: 'About',
+    // route level code-splitting
+    // this generates a separate chunk (about.[hash].js) for this route
+    // which is lazy-loaded when the route is visited.
+    <%_ if (doesCompile) { _%>
+    component: () => import(/* webpackChunkName: "about" */ '../views/About.vue')
+    <%_ } else { _%>
+    component: function () {
+      return import(/* webpackChunkName: "about" */ '../views/About.vue')
+    }
+    <%_ } _%>
+  }
+]
+
+const router = createRouter({
+  <%_ if (historyMode) { _%>
+  history: createWebHistory(process.env.BASE_URL),
+  <%_ } else { _%>
+  history: createWebHashHistory(),
+  <%_ } _%>
+  routes
+})
+
+export default router