Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

chore: update frankenphp and fix cs #588

Merged
merged 11 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: 'current'
-
name: Setup npm
uses: bahmutov/npm-install@v1
with:
install-command: yarn --immutable
-
name: Enable corepack
run: corepack enable
-
name: Install dependencies
run: yarn install
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ FROM node_upstream AS base
WORKDIR /srv/app

RUN corepack enable && \
corepack prepare --activate yarn@*
corepack prepare --activate yarn@4

ENV HOSTNAME localhost
EXPOSE 3000
Expand Down
2 changes: 1 addition & 1 deletion api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# Versions
# hadolint ignore=DL3007
FROM dunglas/frankenphp:latest-alpine AS frankenphp_upstream
FROM dunglas/frankenphp:1-php8.3-alpine AS frankenphp_upstream


# The different stages of this Dockerfile are meant to be built into separate images
Expand Down
1 change: 0 additions & 1 deletion api/config/packages/api_platform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ api_platform:
stateless: true
cache_headers:
vary: ['Content-Type', 'Authorization', 'Origin']
extra_properties:
4 changes: 2 additions & 2 deletions api/migrations/Version20210930074739.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ public function getDescription(): string
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SEQUENCE greeting_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
$this->addSql('CREATE TABLE greeting (id INT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id))');
$this->addSql('CREATE SEQUENCE greeting_seq INCREMENT BY 100 MINVALUE 1 START 1');
}

public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SCHEMA public');
$this->addSql('DROP SEQUENCE greeting_id_seq CASCADE');
$this->addSql('DROP SEQUENCE greeting_seq CASCADE');
$this->addSql('DROP TABLE greeting');
}
}
34 changes: 0 additions & 34 deletions api/migrations/Version20240305143335.php

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,5 @@
"storybook:serve": "serve storybook-static",
"storybook:test": "test-storybook"
},
"packageManager": "[email protected]"
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
1 change: 1 addition & 0 deletions src/create/CreateGuesser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export const IntrospectedCreateGuesser = ({
mutationOptions,
transform,
redirectTo,
children: [],
});

const displayOverrideCode = useDisplayOverrideCode();
Expand Down
1 change: 1 addition & 0 deletions src/edit/EditGuesser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export const IntrospectedEditGuesser = ({
mutationOptions,
transform,
redirectTo,
children: [],
});
useMercureSubscription(resource, id);

Expand Down
2 changes: 1 addition & 1 deletion src/hydra/fetchHydra.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function fetchHydra(
Promise.reject(
new HttpError(
(
json[0][
json[0]?.[
'http://www.w3.org/ns/hydra/core#description'
] as JsonLdObj[]
)?.[0]?.['@value'],
Expand Down
2 changes: 1 addition & 1 deletion src/introspection/Introspecter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ const Introspecter = ({

return (
<ResourcesIntrospecter
{...rest}
component={component}
schemaAnalyzer={schemaAnalyzerProxy}
includeDeprecated={includeDeprecated}
resource={resource}
resources={resources ?? []}
loading={isPending}
error={error}
{...rest}
/>
);
};
Expand Down
1 change: 1 addition & 0 deletions src/useOnSubmit.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const onSubmitProps = {
fields: API_FIELDS_DATA,
resource: 'books',
schemaAnalyzer: schemaAnalyzer(),
children: [],
};

jest.mock('./getIdentifierValue.js');
Expand Down
Loading
Loading