Merge branch 'ThatGuySam:master' into kicad-v7

astro.config.mjs

@@ -20,7 +20,7 @@ console.log( 'Running Astro Config File' )
 export default defineConfig({
     output: 'server',
     publicDir: './static',
-    site: 'https://doesitarm.com',
+    site: 'https://doesitarm.com/',
     adapter: netlify({
         dist: new URL('./dist/', import.meta.url)
     }),

components/search-stork.vue

@@ -45,7 +45,7 @@
         </div>
 
         <div class="slot-wrapper">
-            <slot name="ad-inline">
+            <slot>
                 <AdInline
                     v-once
                     :name="isSSR ? 'placeholder' : 'default'"

helpers/api/youtube/build.js

@@ -1,5 +1,6 @@
 import fs from 'fs-extra'
 import { google } from 'googleapis'
+import axios from 'axios'
 
 import { playlists, benchmarksPlaylistId } from './playlists.js'
 
@@ -161,10 +162,14 @@ async function getYouTubeVideos ( options = {} ) {
 
 
 export async function saveYouTubeVideos () {
-    //
-    const youtubeVideos = await getYouTubeVideos()
+    // We'll need to lean up this function to work with 10k API Requests
+    // before we can use it again
+    // const youtubeVideos = await getYouTubeVideos()
+
+    // Locked previously sucessful YouTube API data for now
+    const youtubeVideos = await axios( process.env.VIDEO_SOURCE )
+        .then( response => response.data )
 
-    //
 
     // Save to JSON
     await fs.outputJson( youtubeVideoPath, youtubeVideos )

helpers/stork/config.js

@@ -2,7 +2,10 @@ import { config } from '~/package.json'
 
 
 export const storkOptions = config.stork
-export const storkVersion = '1.4.2'
+export const storkVersion = '1.6.0'
+
+// Stork 2.0
+// export const storkVersion = '2.0.0-beta.1'
 
 export const storkExecutableName = storkOptions.executable
 export const storkExecutablePath = `./${ storkExecutableName }`

helpers/stork/executable.js

@@ -15,6 +15,10 @@ import {
 const execDownloadUrls = {
     darwin: `https://files.stork-search.net/releases/v${ storkVersion }/stork-macos-10-15`,
     default: `https://files.stork-search.net/releases/v${ storkVersion }/stork-ubuntu-20-04`
+
+    // Stork 2.0
+    // darwin: `https://files.stork-search.net/releases/v${ storkVersion }/stork-macos-12`,
+
     // default: `https://files.stork-search.net/releases/v${ storkVersion }/stork-amazon-linux`
 }
 
@@ -33,7 +37,7 @@ export async function downloadStorkExecutable () {
 
     const execDownloadUrl = execDownloadUrls[ envKey ]
 
-    // console.log( 'execDownloadUrl', execDownloadUrl )
+    // console.log( { execDownloadUrl } )
 
     // Delete any existing executable
     // so we don't get write errors

package.json

@@ -54,9 +54,9 @@
     "netlify-and-vercel-build": "run-s netlify-build vercel-build"
   },
   "dependencies": {
-    "@astrojs/netlify": "^0.5.0",
-    "@astrojs/partytown": "^0.1.4",
-    "@astrojs/vue": "^1.0.0",
+    "@astrojs/netlify": "^2.1.2",
+    "@astrojs/partytown": "^1.0.3",
+    "@astrojs/vue": "^2.0.1",
     "@esbuild-plugins/node-globals-polyfill": "^0.1.1",
     "@esbuild-plugins/node-modules-polyfill": "^0.1.4",
     "@fontsource/inter": "^4.0.1",
@@ -66,7 +66,7 @@
     "@supercharge/promise-pool": "^2.1.0",
     "@zip.js/zip.js": "^2.5.25",
     "7z-wasm": "^1.0.0-beta.5",
-    "astro": "^1.1.5",
+    "astro": "^2.0.10",
     "axios": "^0.21.0",
     "buffer": "^6.0.3",
     "can-autoplay": "^3.0.0",
@@ -96,6 +96,7 @@
     "memoize-getters": "^1.1.0",
     "node-html-parser": "^2.0.0",
     "observe-element-in-viewport": "0.0.15",
+    "ofetch": "^1.0.0",
     "plist": "^3.0.1",
     "pretty-bytes": "^5.5.0",
     "rollup-plugin-node-polyfills": "^0.2.1",
@@ -103,17 +104,17 @@
     "semver": "^7.3.7",
     "sitemap": "^7.1.1",
     "slugify": "^1.4.6",
-    "stork-search": "^1.0.4",
+    "std-env": "^3.3.2",
     "terser": "^4.8.0",
     "uuid": "^8.3.2",
-    "vite-node": "^0.23.0",
+    "vite-node": "^0.28.4",
     "vue": "^3.2.30",
     "workerpool": "^6.2.1",
     "zip-lib": "^0.7.3"
   },
   "devDependencies": {
-    "@astrojs/sitemap": "^0.1.0",
-    "@astrojs/tailwind": "^0.2.0",
+    "@astrojs/sitemap": "^1.0.1",
+    "@astrojs/tailwind": "^3.0.1",
     "@vitest/web-worker": "^0.20.3",
     "autoprefixer": "^10.0.2",
     "ava": "^3.15.0",
@@ -132,7 +133,7 @@
     "postcss-cli": "^8.3.1",
     "replace-css-url": "^1.2.6",
     "structured-data-testing-tool": "^4.5.0",
-    "tailwindcss": "^1.9.6",
+    "tailwindcss": "^3.2.6",
     "tsconfig-paths": "^3.14.1",
     "vite-tsconfig-paths": "^3.5.0",
     "vitest": "^0.18.1"

scripts/vercel-post-deploy/index.js

@@ -1,7 +1,15 @@
+import { isMacOS } from 'std-env'
+
 import axios from 'axios'
 
 ;(async () => {
 
+    if ( !isMacOS ) {
+        console.log('Not on macOS, skipping')
+
+        process.exit()
+    }
+
     const { data } = await axios.get(`https://master--doesitarm.netlify.app/apple-silicon-app-test`)
 
     console.log( data.slice(0, 100) )

src/components/default-listing.astro

@@ -37,13 +37,13 @@ const adName = (() => {
     // if ( details.isGame ) return 'new-world-1'
 
     // Developer Tools
-    if ( listing?.category?.slug === 'developer-tools' ) return 'jotform-for-developers-1'
+    // if ( listing?.category?.slug === 'developer-tools' ) return 'jotform-for-developers-1'
 
     // Productivity Apps
-    if ( listing?.category?.slug === 'productivity-tools' ) return 'codeable-1'
+    // if ( listing?.category?.slug === 'productivity-tools' ) return 'codeable-1'
 
     // Video and Motion Tools
-    if ( listing?.category?.slug === 'video-and-motion-tools' ) return 'wondershare-arm-1'
+    // if ( listing?.category?.slug === 'video-and-motion-tools' ) return 'wondershare-arm-1'
 
     // VPNs, Security, and Privacy
     // if ( listing?.category?.slug === 'vpns-security-and-privacy' ) return 'expressvpn-bounty'

src/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="astro/client" />

src/pages/categories.astro

@@ -17,6 +17,10 @@ import SimpleList from '../components/simple-list.astro'
 
 applyResponseDefaults( Astro )
 
+// Prerender page so it serves statically
+export const prerender = true
+
+
 const kindIndex = await DoesItAPI.kind.index.get()
 
 const kinds = Object.values( kindIndex ).map( category => {
@@ -30,7 +34,7 @@ const kinds = Object.values( kindIndex ).map( category => {
 <Layout
 	headOptions={ {
         title: 'Categories of App Support lists for Apple Silicon',
-        description: `List of compatibility apps and games for Apple Silicon and the ${ this.$config.processorsVerbiage } Processors including performance reports and benchmarks`,
+        description: `List of compatibility apps and games for Apple Silicon and the ${ global.$config.processorsVerbiage } Processors including performance reports and benchmarks`,
         // meta,
         // link,
         // structuredData: this.structuredData,

src/pages/devices.astro

@@ -44,7 +44,7 @@ const kinds = deviceIndex.items.map( device => {
     <main class="container py-24">
         <div class="flex flex-col">
             <h1 class="title text-2xl leading-tight mb-6">
-                Categories
+                Devices
             </h1>
 
             <div class="line-separator border-white border-t-2 mb-12" />

src/pages/games.astro

@@ -19,7 +19,6 @@ import Search from '~/components/search-stork.vue'
 import ThomasCredit from '~/components/thomas-credit.vue'
 import AdInline from '~/components/ad-inline.vue'
 
-
 // Get type and slug from the request path
 // so that we don't have extra parts for
 // urls like /:type/:slug/benchmarks
@@ -38,6 +37,9 @@ if ( redirectResponse !== null ) {
 
 applyResponseDefaults( Astro )
 
+// Prerender page so it serves statically
+export const prerender = true
+
 const rawKindPage = await DoesItAPI.kind( 'game' )( 1 ).get()
 
 // Clean up unused kind data

src/pages/index.astro

@@ -18,6 +18,8 @@ import Search from '~/components/search-stork.vue'
 // import ListEndButtons from '~/components/list-end-buttons.vue'
 import CarbonInline from '~/components/carbon-inline.vue'
 
+export const prerender = true
+
 applyResponseDefaults( Astro )
 
 const homePageKindPage = await DoesItAPI.kind.app(1).get()