chore(frontend): migrate from npm to yarn, pipeline excluded (wip)

This commit is contained in:
Sarah Vaupel 2024-01-14 01:01:54 +01:00
parent 97b6cd83bd
commit 8062c89fc1
7 changed files with 10129 additions and 33479 deletions

View File

@ -107,7 +107,7 @@
(final: prev: let (final: prev: let
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
in { in {
inherit (pkgs) dockerTools node2nix glibcLocalesUtf8 tzdata chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot; inherit (pkgs) dockerTools node2nix yarn glibcLocalesUtf8 tzdata chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot;
stack = pkgs.symlinkJoin { stack = pkgs.symlinkJoin {
inherit (pkgs.stack) name; inherit (pkgs.stack) name;
paths = [pkgs.stack]; paths = [pkgs.stack];

View File

@ -1,10 +1,8 @@
# SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor@kleen.consulting>, Sarah Vaupel <sarah.vaupel@ifi.lmu.de> # This file has been generated by node2nix 1.11.1. Do not edit!
#
# SPDX-License-Identifier: AGPL-3.0-or-later
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_21"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {
@ -14,6 +12,6 @@ let
}; };
in in
import ./node-packages.nix { import ./node-packages.nix {
inherit (pkgs) fetchurl fetchurlBoot nix-gitignore stdenv lib fetchgit; inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv; inherit nodeEnv;
} }

File diff suppressed because it is too large Load Diff

21752
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@
"author": "", "author": "",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"scripts": { "scripts": {
"start": "npm-run-all frontend:build --parallel \"frontend:build:watch\" \"yesod:start\"", "start": "run-s frontend:build --parallel \"frontend:build:watch\" \"yesod:start\"",
"test": "run-s frontend:test yesod:test i18n:test", "test": "run-s frontend:test yesod:test i18n:test",
"lint": "run-s frontend:lint yesod:lint", "lint": "run-s frontend:lint yesod:lint",
"build": "run-s frontend:build yesod:build", "build": "run-s frontend:build yesod:build",

View File

@ -273,7 +273,7 @@ in pkgs.mkShell {
''; '';
nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] nativeBuildInputs = [develop inDevelop killallUni2work diffRunning]
++ (with pkgs; ++ (with pkgs;
[ stack nodejs_21 postgresql_12 openldap exiftool expat memcached minio minio-client [ stack nodejs_21 yarn postgresql_12 openldap exiftool expat memcached minio minio-client
gup reuse pre-commit gup reuse pre-commit
node2nix node2nix
# busybox # for print services, but interferes with build commands in develop-shell # busybox # for print services, but interferes with build commands in develop-shell

10118
yarn.lock Normal file

File diff suppressed because it is too large Load Diff