diff --git a/Justfile b/Justfile index 9349a06f..f228032c 100644 --- a/Justfile +++ b/Justfile @@ -23,6 +23,20 @@ default: dev echo "> Production build completed 🛳" +check-versions: + #!/usr/bin/env node + console.log("> Checking version numbers 🧮") + const pwd = "{{invocation_directory()}}" + + const package = require(`${pwd}/package.json`) + const manifest = require(`${pwd}/src/Static/Manifests/manifest.json`) + + if (package.version !== manifest.version) { + console.error(`The version from package.json doesn't match the one from the app manifest. The package version is '${package.version}' and the manifest version is '${manifest.version}'.`) + process.exit(1) + } + + @clean: echo "> Cleaning build directory" rm -rf {{BUILD_DIR}} || true @@ -180,7 +194,7 @@ default: dev cargo install tauri-cli --version "^1.0.0-rc.6" --root ./src-tauri -@quality: +@quality: check-versions echo "> Running es-lint" {{NPM_DIR}}/.bin/eslint src/Javascript/** echo "> Running elm-review" diff --git a/nix/sources.json b/nix/sources.json index ebf1ef1a..7f106d43 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "9cb7ef336bb71fd1ca84fc7f2dff15ef4b033f2a", - "sha256": "1ajyqr8zka1zlb25jx1v4xys3zqmdy3prbm1vxlid6ah27a8qnzh", + "rev": "82e5cd1ad3c387863f0545d7591512e76ab0fc41", + "sha256": "090l219mzc0gi33i3psgph6s2pwsc8qy4lyrqjdj4qzkvmaj65a7", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/9cb7ef336bb71fd1ca84fc7f2dff15ef4b033f2a.tar.gz", + "url": "https://github.com/nmattia/niv/archive/82e5cd1ad3c387863f0545d7591512e76ab0fc41.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -17,10 +17,10 @@ "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", - "sha256": "0zg7ak2mcmwzi2kg29g4v9fvbvs0viykjsg2pwaphm1fi13s7s0i", + "rev": "17b62c338f2a0862a58bb6951556beecd98ccda9", + "sha256": "1yzbc85m9vbhsfprljzjkkskh9sxchid9m28wkgwsckqnf47r911", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/1882c6b7368fd284ad01b0a5b5601ef136321292.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/17b62c338f2a0862a58bb6951556beecd98ccda9.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "old-packages": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00", - "sha256": "1mr2qgv5r2nmf6s3gqpcjj76zpsca6r61grzmqngwm0xlh958smx", + "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", + "sha256": "11d9m0c4r4kpr3jx3cqblw6ld4d8dwcfv1lk68ipp4c87knwv7fb", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/530a53dcbc9437363471167a5e4762c5fcfa34a1.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/shell.nix b/shell.nix index 9a09de3a..4e24463e 100644 --- a/shell.nix +++ b/shell.nix @@ -21,7 +21,7 @@ let pkgs.elmPackages.elm pkgs.elmPackages.elm-format pkgs.haskellPackages.stack - pkgs.nodejs-14_x + pkgs.nodejs-18_x pkgs.nodePackages.pnpm pkgs.rust-bin.stable.latest.default diff --git a/src/Javascript/Workers/service.js b/src/Javascript/Workers/service.js index e441ca5a..53d1f9f2 100644 --- a/src/Javascript/Workers/service.js +++ b/src/Javascript/Workers/service.js @@ -21,7 +21,7 @@ const EXCLUDE = // 📣 -self.addEventListener("activate", event => { +self.addEventListener("activate", _event => { // Remove all caches except the one with the currently used `KEY` caches.keys().then(keys => { keys.forEach(k => {