Skip to content

Commit

Permalink
updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcelCoding committed Jun 10, 2024
1 parent e453c83 commit c2cab4e
Show file tree
Hide file tree
Showing 11 changed files with 2,088 additions and 1,737 deletions.
31 changes: 17 additions & 14 deletions derivation.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
{ domain, mkPnpmPackage }:
{ lib
, mkPnpmPackage
, domain ? "tlm.solutions"
}:

mkPnpmPackage {
src = ./.;
src = lib.cleanSource ./.;

installInPlace = true;
installInPlace = true;

postPatch = ''
substituteInPlace src/app/data/api.domain.ts \
--replace 'staging.tlm.solutions' '${domain}'
'';
postPatch = ''
substituteInPlace src/app/data/api.domain.ts \
--replace 'staging.tlm.solutions' '${domain}'
'';

script = "build:ci";
script = "build:ci";

installPhase = ''
mkdir -p $out/en
mkdir -p $out/de
cp -r ./dist/browser/en-US/* $out/en/
cp -r ./dist/browser/de-DE/* $out/de/
'';
installPhase = ''
mkdir -p $out/en
mkdir -p $out/de
cp -r ./dist/browser/en-US/* $out/en/
cp -r ./dist/browser/de-DE/* $out/de/
'';
}
44 changes: 37 additions & 7 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 8 additions & 20 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,42 +1,30 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
pnpm2nix = {
url = "github:nzbr/pnpm2nix-nzbr";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};

flake-utils.url = "github:numtide/flake-utils";
};

outputs = { self, nixpkgs, pnpm2nix, flake-utils, ... }:
flake-utils.lib.eachDefaultSystem
(system:
let
pkgs = nixpkgs.legacyPackages.${system};
package-production = pkgs.callPackage ./derivation.nix {
domain = "tlm.solutions";
mkPnpmPackage = pnpm2nix.packages."${system}".mkPnpmPackage;
};
package-staging = pkgs.callPackage ./derivation.nix {
domain = "staging.tlm.solutions";
mkPnpmPackage = pnpm2nix.packages."${system}".mkPnpmPackage;
};
in
rec {
checks = packages;
packages = {
kindergarten = package-production;
kindergarten-staging = package-staging;
default = package-production;
{
packages = rec {
kindergarten = pkgs.callPackage ./derivation.nix {
mkPnpmPackage = pnpm2nix.packages."${system}".mkPnpmPackage;
};
default = kindergarten;
};
}
) // {
overlays.default = final: prev: {
inherit (self.packages.${prev.system})
kindergarten
kindergarten-staging;
kindergarten;
};
};
}
44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,36 +17,36 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^17.3.9",
"@angular/common": "^17.3.9",
"@angular/compiler": "^17.3.9",
"@angular/core": "^17.3.9",
"@angular/forms": "^17.3.9",
"@angular/platform-browser": "^17.3.9",
"@angular/platform-browser-dynamic": "^17.3.9",
"@angular/router": "^17.3.9",
"@angular/animations": "^18.0.2",
"@angular/common": "^18.0.2",
"@angular/compiler": "^18.0.2",
"@angular/core": "^18.0.2",
"@angular/forms": "^18.0.2",
"@angular/platform-browser": "^18.0.2",
"@angular/platform-browser-dynamic": "^18.0.2",
"@angular/router": "^18.0.2",
"@feel/form": "^0.0.24",
"@feel/notification": "^0.0.24",
"@feel/style": "^0.0.24",
"@fontsource/dm-sans": "^5.0.21",
"ol": "^9.2.2",
"ol": "^9.1.0",
"rxjs": "~7.8.1",
"tslib": "^2.6.2",
"zone.js": "~0.14.6"
"tslib": "^2.6.3",
"zone.js": "~0.14.7"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.3.7",
"@angular-eslint/builder": "17.4.1",
"@angular-eslint/eslint-plugin": "17.4.1",
"@angular-eslint/eslint-plugin-template": "17.4.1",
"@angular-eslint/schematics": "17.4.1",
"@angular-eslint/template-parser": "17.4.1",
"@angular/cli": "^17.3.7",
"@angular/compiler-cli": "^17.3.9",
"@angular/localize": "^17.3.9",
"@angular-devkit/build-angular": "^18.0.3",
"@angular-eslint/builder": "18.0.1",
"@angular-eslint/eslint-plugin": "18.0.1",
"@angular-eslint/eslint-plugin-template": "18.0.1",
"@angular-eslint/schematics": "18.0.1",
"@angular-eslint/template-parser": "18.0.1",
"@angular/cli": "^18.0.3",
"@angular/compiler-cli": "^18.0.2",
"@angular/localize": "^18.0.2",
"@types/jasmine": "~5.1.4",
"@typescript-eslint/eslint-plugin": "^7.10.0",
"@typescript-eslint/parser": "^7.10.0",
"@typescript-eslint/eslint-plugin": "^7.12.0",
"@typescript-eslint/parser": "^7.12.0",
"eslint": "^8.57.0",
"jasmine-core": "~5.1.2",
"karma": "~6.4.3",
Expand Down
Loading

0 comments on commit c2cab4e

Please sign in to comment.