Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

✨ Upgrade to astro 4.12 #176

Merged
merged 27 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
635cac0
Create draft PR for #175
create-issue-branch[bot] Jul 20, 2024
3fa5f40
initial start to update
Adammatthiesen Jul 20, 2024
e24ddfa
chore: update import statement for studioCMS in astro.config.mjs
Adammatthiesen Jul 20, 2024
6d747ad
test
Adammatthiesen Jul 20, 2024
39d62cf
remove extra line
Adammatthiesen Jul 20, 2024
f30b041
update analytic id's for the new analytic deployment
Adammatthiesen Jul 21, 2024
9c40945
test fix for shoelace
Adammatthiesen Jul 21, 2024
5dc6625
test
Adammatthiesen Jul 21, 2024
bbac48a
working in dev... will it work in prod?
Adammatthiesen Jul 21, 2024
60163f0
apply a new fix for htmx
Adammatthiesen Jul 21, 2024
1b5bbe7
update icons
Adammatthiesen Jul 21, 2024
d60ac37
more local icons
Adammatthiesen Jul 21, 2024
61708b9
cleanup
Adammatthiesen Jul 21, 2024
ee526d3
fix
Adammatthiesen Jul 21, 2024
b576d2b
update footer
Adammatthiesen Jul 21, 2024
894f432
re-enable studiocmsblog
Adammatthiesen Jul 21, 2024
80a2af6
blog package broken... disabled for now
Adammatthiesen Jul 21, 2024
fe35496
fix icons
Adammatthiesen Jul 21, 2024
f8cd61b
turn off dbStartpage
Adammatthiesen Jul 21, 2024
a48a248
Fix user creation inside `firstTimeSetup`
BryceRussell Jul 21, 2024
98cb623
Enable blog package inside playground
BryceRussell Jul 21, 2024
1ab0b92
Temporarily add empty `public` directory to prevent error
BryceRussell Jul 21, 2024
af723b9
cleanup
Adammatthiesen Jul 22, 2024
ad7b6bb
missed a `;`
Adammatthiesen Jul 22, 2024
5f367be
update ATP
Adammatthiesen Jul 22, 2024
2677bef
async is not needed
Adammatthiesen Jul 22, 2024
97e7c22
update renovate config
Adammatthiesen Jul 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,33 +33,6 @@
],
"enabled": false
},
{
"matchPackagePatterns": [
"@biomejs/"
],
"labels": [
"linting",
"dependencies"
]
},
{
"matchPackagePatterns": [
"^astro"
],
"labels": [
"astroDependencies",
"dependencies"
]
},
{
"matchPackagePatterns": [
"^@astrojs"
],
"labels": [
"astroDependencies",
"dependencies"
]
},
{
"matchDepTypes": [
"packageManager",
Expand All @@ -69,33 +42,6 @@
"dependencies"
],
"enabled": false
},
{
"matchFileNames": [
"www/**"
],
"labels": [
"websiteDeps",
"dependencies"
]
},
{
"matchFileNames": [
"packages/**"
],
"labels": [
"packageDeps",
"dependencies"
]
},
{
"matchFileNames": [
"playgrounds/**"
],
"labels": [
"playgroundDeps",
"dependencies"
]
}
]
}
4 changes: 2 additions & 2 deletions packages/studioCMS/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Your `astro.config.mjs` should look like the following

```mjs
import { defineConfig } from "astro/config";
import astroStudioCMS from "@astrolicious/studiocms";
import studioCMS from "@astrolicious/studiocms";
import db from '@astrojs/db';
import node from "@astrojs/node";

Expand All @@ -111,7 +111,7 @@ export default defineConfig({
adapter: node({ mode: 'standalone' }),
integrations: [
db(),
astroStudioCMS({
studioCMS({
dbStartPage: true // DEFAULT - This injects a start page to setup your DB data.
})
],
Expand Down
3 changes: 1 addition & 2 deletions packages/studioCMS/src/coreIntegration.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// <reference types="@astrojs/db" />
import { checkAstroConfig, studioLogger, studioLoggerOptsResolver, makeFrontend, addIntegrationArray, addIntegrationArrayWithCheck } from './utils';
import { studioCMSRobotsTXT, studioCMSImageHandler, studioCMSDashboard } from './integrations';
import { addDts, addVirtualImports, addVitePlugin, createResolver, defineIntegration } from 'astro-integration-kit';
import 'astro-integration-kit/types/db';
import { optionsResolver, vResolver } from './resolvers';
// import inoxsitemap from '@inox-tools/sitemap-ext';
import { studioCMSPluginList } from '.';
Expand All @@ -17,7 +17,6 @@ export default defineIntegration({
name: '@astrolicious/studiocms',
optionsSchema,
setup({ name, options }) {

// Register StudioCMS Core as First Plugin
studioCMSPluginList.set('@astrolicious/studiocms', { name: '@astrolicious/studiocms', label: 'StudioCMS' });

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading