fix merge conflict

Author: danielkellyio

.vitepress/config.ts

@@ -642,21 +642,7 @@ export default defineConfigWithTheme<Config>({
     },
     build: {
       minify: 'terser',
-      chunkSizeWarningLimit: Infinity,
-      rollupOptions: {
-        output: {
-          chunkFileNames: 'assets/chunks/[name].[hash].js',
-          manualChunks(id, ctx) {
-            if (id.includes('gsap')) {
-              return 'gsap'
-            }
-            if (id.includes('dynamics.js')) {
-              return 'dynamics'
-            }
-            return moveToVendor(id, ctx)
-          }
-        }
-      }
+      chunkSizeWarningLimit: Infinity
     },
     json: {
       stringify: true
@@ -667,59 +653,3 @@ export default defineConfigWithTheme<Config>({
     reactivityTransform: true
   }
 })
-
-const cache = new Map<string, boolean>()
-
-/**
- * This is temporarily copied from Vite - which should be exported in a
- * future release.
- *
- * @TODO when this is exported by Vite, VitePress should ship a better
- * manual chunk strategy to split chunks for deps that are imported by
- * multiple pages but not all.
- */
-function moveToVendor(id: string, { getModuleInfo }: any) {
-  if (
-    id.includes('node_modules') &&
-    !/\.css($|\\?)/.test(id) &&
-    staticImportedByEntry(id, getModuleInfo, cache)
-  ) {
-    return 'vendor'
-  }
-}
-
-function staticImportedByEntry(
-  id: string,
-  getModuleInfo: any,
-  cache: Map<string, boolean>,
-  importStack: string[] = []
-): boolean {
-  if (cache.has(id)) {
-    return cache.get(id) as boolean
-  }
-  if (importStack.includes(id)) {
-    // circular deps!
-    cache.set(id, false)
-    return false
-  }
-  const mod = getModuleInfo(id)
-  if (!mod) {
-    cache.set(id, false)
-    return false
-  }
-
-  if (mod.isEntry) {
-    cache.set(id, true)
-    return true
-  }
-  const someImporterIs = mod.importers.some((importer: string) =>
-    staticImportedByEntry(
-      importer,
-      getModuleInfo,
-      cache,
-      importStack.concat(id)
-    )
-  )
-  cache.set(id, someImporterIs)
-  return someImporterIs
-}

.vitepress/theme/components/SponsorsGroup.vue

@@ -1,12 +1,4 @@
 <script lang="ts">
-// shared data across instances so we load only once
-let data = $ref<SponsorData>()
-const base = `https://sponsors.vuejs.org`
-</script>
-
-<script setup lang="ts">
-import { onMounted, onUnmounted } from 'vue'
-
 interface Sponsor {
   url: string
   img: string
@@ -22,6 +14,16 @@ interface SponsorData {
   bronze: Sponsor[]
 }
 
+// shared data across instances so we load only once
+let data = $ref<SponsorData>()
+let pending = false
+
+const base = `https://sponsors.vuejs.org`
+</script>
+
+<script setup lang="ts">
+import { onMounted, onUnmounted } from 'vue'
+
 const { tier, placement = 'aside' } = defineProps<{
   tier: keyof SponsorData
   placement?: 'aside' | 'page' | 'landing'
@@ -32,17 +34,21 @@ let visible = $ref(false)
 
 onMounted(async () => {
   // only render when entering view
-  const observer = new IntersectionObserver((entries) => {
-    if (entries[0].isIntersecting) {
-      visible = true
-      observer.disconnect()
-    }
-  }, { rootMargin: '0px 0px 300px 0px' })
+  const observer = new IntersectionObserver(
+    (entries) => {
+      if (entries[0].isIntersecting) {
+        visible = true
+        observer.disconnect()
+      }
+    },
+    { rootMargin: '0px 0px 300px 0px' }
+  )
   observer.observe(container)
   onUnmounted(() => observer.disconnect())
 
   // load data
-  if (!data) {
+  if (!pending) {
+    pending = true
     data = await (await fetch(`${base}/data.json`)).json()
   }
 })
@@ -76,7 +82,8 @@ onMounted(async () => {
       v-if="placement !== 'page' && tier !== 'special'"
       href="/sponsor/"
       class="sponsor-item action"
-    >Your logo</a>
+      >Your logo</a
+    >
   </div>
 </template>
 

.vitepress/theme/components/VueJobs.vue

@@ -42,31 +42,20 @@ onMounted(async () => {
     <div class="vuejobs-container" v-if="openings.length">
       <div class="vj-item" v-for="(job, n) in openings" :key="n">
         <a class="vj-job-title" :href="job.link" target="_blank">
-          <p>
-            {{ job.title }}
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              aria-hidden="true"
-              focusable="false"
-              height="24px"
-              viewBox="0 0 24 24"
-              width="24px"
-              class="vt-link-icon"
-            >
-              <path d="M0 0h24v24H0V0z" fill="none"></path>
-              <path
-                d="M9 5v2h6.59L4 18.59 5.41 20 17 8.41V15h2V5H9z"
-              ></path>
-            </svg>
-          </p>
+          <img :src="job.company_logo" alt="" class="vj-company-logo" />
+          <div>
+            <p>
+              {{ job.title }}
+            </p>
 
-          <p class="vj-job-info">
-            {{ job.company }}
-            <span v-if="job.salary">·</span>
-            {{ job.salary }}
-            <span>·</span>
-            {{ job.location }}
-          </p>
+            <p class="vj-job-info">
+              {{ job.company }}
+              <!-- <span v-if="job.salary">·</span> -->
+              <!-- {{ job.salary }} -->
+              <span>·</span>
+              {{ job.location }}
+            </p>
+          </div>
         </a>
       </div>
     </div>
@@ -75,9 +64,9 @@ onMounted(async () => {
 
 <style scoped>
 .vuejobs-container {
-  background-color: var(--vt-c-bg-soft);
-  padding: 5px 15px;
   border-radius: 2px;
+  background-color: var(--vt-c-bg-soft);
+  padding: 3px 10px;
 }
 .vj-item {
   padding: 10px 0 10px 0;
@@ -92,19 +81,26 @@ onMounted(async () => {
 .vuejobs-container a {
   line-height: 16px;
   transition: color 0.2s ease;
-  display: inline-block;
 }
 .vuejobs-container a:hover {
   color: var(--vt-c-brand);
 }
 .vj-job-title {
   font-size: 12px;
   color: var(--vt-c-text-1);
+  display: flex;
+  flex-direction: row;
 }
 .vj-job-info {
   font-size: 11px;
   color: var(--vt-c-text-2);
   margin-top: 2px;
   line-height: 12px;
 }
+.vj-company-logo {
+  width: 30px;
+  height: 30px;
+  margin-bottom: 10px;
+  margin-right: 10px;
+}
 </style>

.vitepress/theme/styles/inline-demo.css

@@ -1,5 +1,6 @@
-.vt-doc a[href^="https://sfc.vuejs.org"]:before {
-  content: "▶";
+.vt-doc a[href^="https://sfc.vuejs.org"]:before
+{
+  content: '▶';
   width: 20px;
   height: 20px;
   display: inline-block;
@@ -11,8 +12,8 @@
   border: 2px solid var(--vt-c-green);
   margin-right: 8px;
   margin-left: 4px;
-  line-height: 16px;
-  padding-left: 4px;
+  line-height: 15px;
+  padding-left: 4.5px;
   font-size: 11px;
 }
 

README.md

@@ -1,7 +1,5 @@
 # vuejs.org
 
-This is the WIP branch of the brand new vuejs.org. **The content is under heavy updates and re-organization so please refrain from submitting PRs to this branch until we have removed this notice.**
-
 ## Contributing
 
 This site is built with [VitePress](https://github.com/vuejs/vitepress) and depends on [@vue/theme](https://github.com/vuejs/vue-theme). Site content is written in Markdown format located in `src`. For simple edits, you can directly edit the file on GitHub and generate a Pull Request.

package.json

@@ -10,8 +10,8 @@
     "@vue/theme": "^1.0.1",
     "dynamics.js": "^1.1.5",
     "gsap": "^3.9.0",
-    "vitepress": "^0.21.6",
-    "vue": "^3.2.28"
+    "vitepress": "^0.22.2",
+    "vue": "^3.2.31"
   },
   "devDependencies": {
     "@types/markdown-it": "^12.2.3",