upgrade configs
This commit is contained in:
parent
608045ef6c
commit
25f2766ec2
|
@ -1,6 +1,9 @@
|
||||||
// svelte adapter
|
// svelte adapter
|
||||||
import adapterAuto from '@sveltejs/adapter-auto'
|
|
||||||
import adapterNode from '@sveltejs/adapter-node'
|
import adapterNode from '@sveltejs/adapter-node'
|
||||||
|
import adapterVercel from '@sveltejs/adapter-vercel'
|
||||||
|
import adapterNetlify from '@sveltejs/adapter-netlify'
|
||||||
|
import adapterCloudflare from '@sveltejs/adapter-cloudflare'
|
||||||
import adapterStatic from '@sveltejs/adapter-static'
|
import adapterStatic from '@sveltejs/adapter-static'
|
||||||
// svelte preprocessor
|
// svelte preprocessor
|
||||||
import { mdsvex } from 'mdsvex'
|
import { mdsvex } from 'mdsvex'
|
||||||
|
@ -8,51 +11,59 @@ import mdsvexConfig from './mdsvex.config.js'
|
||||||
// import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
|
// import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
|
||||||
import preprocess from 'svelte-preprocess'
|
import preprocess from 'svelte-preprocess'
|
||||||
|
|
||||||
const adapter = {
|
function getAdapter() {
|
||||||
auto: adapterAuto(),
|
if (Object.keys(process.env).some(key => key.includes('VERCEL'))) {
|
||||||
node: adapterNode(),
|
return adapterVercel()
|
||||||
static: adapterStatic({
|
} else if (Object.keys(process.env).some(key => key.includes('NETLIFY'))) {
|
||||||
pages: 'build',
|
return adapterNetlify()
|
||||||
assets: 'build',
|
} else if (Object.keys(process.env).some(key => key.includes('CF_PAGES'))) {
|
||||||
fallback: undefined
|
return adapterCloudflare()
|
||||||
})
|
} else {
|
||||||
|
return process.env.ADAPTER === 'node'
|
||||||
|
? adapterNode({ out: 'build' })
|
||||||
|
: adapterStatic({
|
||||||
|
pages: 'build',
|
||||||
|
assets: 'build',
|
||||||
|
fallback: undefined
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @type {import("@svletejs/kit".Config)} */
|
/** @type {import("@svletejs/kit".Config)} */
|
||||||
export default {
|
export default {
|
||||||
extensions: ['.svelte', ...(mdsvexConfig.extensions || [])],
|
extensions: ['.svelte', ...(mdsvexConfig.extensions || [])],
|
||||||
preprocess: [preprocess({ postcss: true }), mdsvex(mdsvexConfig) /*, vitePreprocess()*/],
|
preprocess: [preprocess({ postcss: true }), mdsvex(mdsvexConfig) /*, vitePreprocess()*/],
|
||||||
vitePlugin: {
|
vitePlugin: {
|
||||||
inspector: true
|
inspector: true
|
||||||
},
|
|
||||||
kit: {
|
|
||||||
adapter: process.env.ADAPTER
|
|
||||||
? adapter[process.env.ADAPTER.toLowerCase()]
|
|
||||||
: Object.keys(process.env).some(key => ['VERCEL', 'NETLIFY'].includes(key))
|
|
||||||
? adapter['auto']
|
|
||||||
: adapter['static'],
|
|
||||||
alias: {
|
|
||||||
$lib: './src/lib',
|
|
||||||
$root: './',
|
|
||||||
$src: './src',
|
|
||||||
$routes: './src/routes',
|
|
||||||
$content: './content'
|
|
||||||
},
|
},
|
||||||
csrf: {
|
kit: {
|
||||||
checkOrigin: process.env.NODE_ENV === 'development' ? false : true
|
adapter: getAdapter(),
|
||||||
},
|
alias: {
|
||||||
prerender: {
|
$lib: './src/lib',
|
||||||
crawl: true,
|
$root: './',
|
||||||
handleMissingId: 'warn',
|
$src: './src',
|
||||||
handleHttpError: details => {
|
$routes: './src/routes',
|
||||||
// Handle blog trying to prerender relative links that it can't
|
$content: './content'
|
||||||
if (details.status == 404 && details.path.startsWith('/blog' && '/projects') && details.referenceType == 'linked') {
|
},
|
||||||
console.warn(`PRERENDER ignored route ${details.path}`)
|
csrf: {
|
||||||
return
|
checkOrigin: process.env.NODE_ENV === 'development' ? false : true
|
||||||
}
|
},
|
||||||
|
prerender: {
|
||||||
|
crawl: true,
|
||||||
|
handleMissingId: 'warn',
|
||||||
|
handleHttpError: ({ status, path, referrer, referenceType, message }) => {
|
||||||
|
// Handle blog trying to prerender relative links that it can't
|
||||||
|
if (
|
||||||
|
(status == 404 && path.startsWith('/blog')) ||
|
||||||
|
path.startsWith('/projects') ||
|
||||||
|
(path.startsWith('/') && referenceType == 'linked')
|
||||||
|
) {
|
||||||
|
console.warn(`PRERENDER ignored route ${path}`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
throw new Error(`${details.status} ${details.path} from ${details.referrer}`)
|
throw new Error(`${status} ${path} from ${referrer}, ~~~~~~~~~ message: ${message}~~~~~~~~~`)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,28 @@
|
||||||
{
|
{
|
||||||
"extends": "./.svelte-kit/tsconfig.json",
|
"extends": "./.svelte-kit/tsconfig.json",
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"allowJs": true,
|
"outDir": "build",
|
||||||
"checkJs": true,
|
"allowJs": true,
|
||||||
"esModuleInterop": true,
|
"checkJs": true,
|
||||||
"forceConsistentCasingInFileNames": false,
|
"esModuleInterop": true,
|
||||||
"resolveJsonModule": true,
|
"forceConsistentCasingInFileNames": true,
|
||||||
"skipLibCheck": true,
|
"resolveJsonModule": true,
|
||||||
"sourceMap": true,
|
"skipLibCheck": true,
|
||||||
"strict": true,
|
"sourceMap": true,
|
||||||
"types": ["vite/client", "vite-plugin-pwa/client"]
|
"strict": true,
|
||||||
}
|
"types": ["vite/client"]
|
||||||
|
},
|
||||||
|
"include": [
|
||||||
|
"./types/**/$types.d.ts",
|
||||||
|
"./svelte.config.js",
|
||||||
|
"./vite.config.js",
|
||||||
|
"./vite.config.ts",
|
||||||
|
"./src/**/*.js",
|
||||||
|
"./src/**/*.ts",
|
||||||
|
"./src/**/*.svelte",
|
||||||
|
"./tests/**/*.js",
|
||||||
|
"./tests/**/*.ts",
|
||||||
|
"./tests/**/*.svelte"
|
||||||
|
],
|
||||||
|
"exclude": ["node_modules", "build/**/*", "src/lib/template/**/*", "src/generated/**/*"]
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,8 +91,8 @@ export default defineConfig({
|
||||||
manifest: false,
|
manifest: false,
|
||||||
scope: '/',
|
scope: '/',
|
||||||
workbox: {
|
workbox: {
|
||||||
globPatterns: ['posts.json', '**/*.{js,css,html,svg,ico,png,webp,avif}'],
|
globPatterns: ['robots.txt', 'posts.json', '**/*.{js,css,html,svg,ico,png,webp,avif}', 'prerendered/**/*.html'],
|
||||||
globIgnores: ['**/sw*', '**/workbox-*']
|
globIgnores: ['**/sw*', '**/workbox-*', '*.xml', 'feed.json', 'tags.json']
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue