fix(gir): correct name of astal4 types
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-12-19 20:54:26 -05:00
parent 229018ec9f
commit 93547b18fa
5 changed files with 15 additions and 9 deletions

View file

@ -61,8 +61,7 @@ export default async() => {
for (const path of packages) { for (const path of packages) {
if ( if (
path.name === 'package.json' && path.name === 'package.json' &&
!path.parentPath.includes('node_modules') && !path.parentPath.includes('node_modules')
!path.parentPath.includes('mk-types') // FIXME: latest breaks
) { ) {
await updatePackageJson(path.parentPath, updates); await updatePackageJson(path.parentPath, updates);

View file

@ -42,6 +42,8 @@ in {
then "AstalIO-0.1" then "AstalIO-0.1"
else if package.name == "astal-3.0.0" else if package.name == "astal-3.0.0"
then "Astal-3.0" then "Astal-3.0"
else if package.name == "astal-4.0.0"
then "Astal-4.0"
else (concatMapStrings capitalise (splitString "-" package.pname)) + "-0.1"; else (concatMapStrings capitalise (splitString "-" package.pname)) + "-0.1";
}) })
packages; packages;

View file

@ -7,15 +7,6 @@
... ...
}: let }: let
inherit (lib) concatMapStringsSep; inherit (lib) concatMapStringsSep;
in
buildNpmPackage {
pname = "${pname}-types";
version = "0.0.0";
npmDepsHash = "sha256-3ll4Xd5F8ZH/7q/gOF0jgerM6QRk71d93XIwtDssfxU=";
src = ./.;
dontNpmBuild = true;
buildPhase = '' buildPhase = ''
npx @ts-for-gir/cli generate ${concatMapStringsSep " " (p: p.girName) withGirNames} \ npx @ts-for-gir/cli generate ${concatMapStringsSep " " (p: p.girName) withGirNames} \
@ -24,6 +15,20 @@ in
--ignoreVersionConflicts \ --ignoreVersionConflicts \
-o ./types -o ./types
''; '';
in
buildNpmPackage {
pname = "${pname}-types";
version = "0.0.0";
npmDepsHash = "sha256-QqLwPJJbAeiGMKUwhpUL1LME0DYm/rIgu8pAyt98KVI=";
src = ./.;
dontNpmBuild = true;
buildPhase = ''
echo -e '\n${buildPhase}\n'
${buildPhase}
'';
installPhase = '' installPhase = ''
cp -r ./types $out cp -r ./types $out

Binary file not shown.

View file

@ -1,5 +1,5 @@
{ {
"dependencies": { "dependencies": {
"@ts-for-gir/cli": "4.0.0-beta.16" "@ts-for-gir/cli": "4.0.0-beta.19"
} }
} }