upstream #1

Merged
jblu merged 1007 commits from upstream into main 2024-11-04 22:35:57 -06:00
5 changed files with 23 additions and 14 deletions
Showing only changes of commit 343e1a921a - Show all commits

View File

@ -21,12 +21,21 @@ const siteMetadata = {
analytics: { analytics: {
// If you want to use an analytics provider you have to add it to the // If you want to use an analytics provider you have to add it to the
// content security policy in the `next.config.js` file. // content security policy in the `next.config.js` file.
// supports plausible, simpleAnalytics, umami or googleAnalytics // supports Plausible, Simple Analytics, Umami, Posthog or Google Analytics.
plausibleAnalytics: {
plausibleDataDomain: '', // e.g. tailwind-nextjs-starter-blog.vercel.app plausibleDataDomain: '', // e.g. tailwind-nextjs-starter-blog.vercel.app
simpleAnalytics: false, // true or false },
umamiWebsiteId: '', // e.g. 123e4567-e89b-12d3-a456-426614174000 simpleAnalytics: {},
posthogProjectApiKey: '', // e.g. AhnJK8392ndPOav87as450xd umamiAnalytics: {
googleAnalyticsId: '', // e.g. UA-000000-2 or G-XXXXXXX // We use an env variable for this site to avoid other users cloning our analytics ID
umamiWebsiteId: process.env.NEXT_UMAMI_ID, // e.g. 123e4567-e89b-12d3-a456-426614174000
},
posthogAnalytics: {
posthogProjectApiKey: '', // e.g. 123e4567-e89b-12d3-a456-426614174000
},
googleAnalytics: {
googleAnalyticsId: '', // e.g. G-XXXXXXX
},
}, },
newsletter: { newsletter: {
// supports mailchimp, buttondown, convertkit, klaviyo, revue, emailoctopus // supports mailchimp, buttondown, convertkit, klaviyo, revue, emailoctopus

View File

@ -7,7 +7,7 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({
// You might need to insert additional domains in script-src if you are using external services // You might need to insert additional domains in script-src if you are using external services
const ContentSecurityPolicy = ` const ContentSecurityPolicy = `
default-src 'self'; default-src 'self';
script-src 'self' 'unsafe-eval' 'unsafe-inline' giscus.app; script-src 'self' 'unsafe-eval' 'unsafe-inline' giscus.app umami.is;
style-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline';
img-src * blob: data:; img-src * blob: data:;
media-src 'none'; media-src 'none';

View File

@ -24,7 +24,7 @@
"next": "13.4.12", "next": "13.4.12",
"next-contentlayer": "0.3.4", "next-contentlayer": "0.3.4",
"next-themes": "^0.2.1", "next-themes": "^0.2.1",
"pliny": "0.1.0-beta.10", "pliny": "0.1.0-beta.11",
"postcss": "^8.4.24", "postcss": "^8.4.24",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",

View File

@ -5,7 +5,7 @@ const colors = require('tailwindcss/colors')
/** @type {import("tailwindcss/types").Config } */ /** @type {import("tailwindcss/types").Config } */
module.exports = { module.exports = {
content: [ content: [
'./node_modules/pliny/**/*.{js,ts,tsx}', './node_modules/pliny/**/*.js',
'./app/**/*.{js,ts,jsx,tsx}', './app/**/*.{js,ts,jsx,tsx}',
'./pages/**/*.{js,ts,tsx}', './pages/**/*.{js,ts,tsx}',
'./components/**/*.{js,ts,tsx}', './components/**/*.{js,ts,tsx}',

View File

@ -8951,9 +8951,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"pliny@npm:0.1.0-beta.10": "pliny@npm:0.1.0-beta.11":
version: 0.1.0-beta.10 version: 0.1.0-beta.11
resolution: "pliny@npm:0.1.0-beta.10" resolution: "pliny@npm:0.1.0-beta.11"
dependencies: dependencies:
"@docsearch/react": ^3.5.0 "@docsearch/react": ^3.5.0
"@giscus/react": ^2.3.0 "@giscus/react": ^2.3.0
@ -8972,7 +8972,7 @@ __metadata:
next: ">=13.0.0" next: ">=13.0.0"
react: ^17.0.2 || ^18.0.0 react: ^17.0.2 || ^18.0.0
react-dom: ^17.0.2 || ^18.0.0 react-dom: ^17.0.2 || ^18.0.0
checksum: 81d6c504bd4b44ec86b67bda7f06b99e059224b7652abb8123846ba76f4df91e56748ac0235db0d408ab2cf82a5ccc061be5299533c616fd7c90519e570faf0a checksum: 74d183bdf60b59793cf915c22a5b0153f650f2802d62c1db563dd4ac365ce4086ab705090333f1af4b8da53d62b28897fd5b75cefaeef3cbce03fc2f2145d1a4
languageName: node languageName: node
linkType: hard linkType: hard
@ -10728,7 +10728,7 @@ __metadata:
next: 13.4.12 next: 13.4.12
next-contentlayer: 0.3.4 next-contentlayer: 0.3.4
next-themes: ^0.2.1 next-themes: ^0.2.1
pliny: 0.1.0-beta.10 pliny: 0.1.0-beta.11
postcss: ^8.4.24 postcss: ^8.4.24
prettier: ^3.0.0 prettier: ^3.0.0
prettier-plugin-tailwindcss: ^0.4.1 prettier-plugin-tailwindcss: ^0.4.1