Unverified Commit dbcd3523 authored by Maciej Krüger's avatar Maciej Krüger Committed by GitHub
Browse files

synapse-admin: 0.8.7 -> 0.10.0 (#307995) 

0.10.1 is newest but it's using yarn v4 which our yarn fetcher doesn't 
understand yet
parent 4ca7f021

pkgs/tools/admin/synapse-admin/default.nix

+9 −10
Original line number Diff line number Diff line
@@ -3,16 +3,17 @@ 
, fetchYarnDeps

, mkYarnPackage

, baseUrl ? null

, writeShellScriptBin

}:



mkYarnPackage rec {

  pname = "synapse-admin";

  version = "0.8.7";

  version = "0.10.0";

  src = fetchFromGitHub {

    owner = "Awesome-Technologies";

    repo = pname;

    rev = version;

    sha256 = "sha256-kvQBzrCu1sgDccKhr0i2DgDmO5z6u6s+vw5KymttoK4=";

    sha256 = "sha256-3MC5PCEwYfZzJy9AW9nHTpvU49Lk6wbYC4Rcv9J9MEg=";

  };



  yarnLock = ./yarn.lock;
@@ -20,9 +21,13 @@ mkYarnPackage rec { 


  offlineCache = fetchYarnDeps {

    inherit yarnLock;

    hash = "sha256-f0ilsF3lA+134qUaX96mdntjpR4gRlmtRIh/xEFhtXQ=";

    hash = "sha256-vpCwPL1B+hbIaVSHtlkGjPAteu9BFNNmCTE66CSyFkg=";

  };



  nativeBuildInputs = [

    (writeShellScriptBin "git" "echo ${version}")

  ];



  NODE_ENV = "production";

  ${if baseUrl != null then "REACT_APP_SERVER" else null} = baseUrl;
@@ -33,12 +38,7 @@ mkYarnPackage rec { 
    runHook preBuild



    export HOME=$(mktemp -d)

    pushd deps/synapse-admin

    mv node_modules node_modules.bak

    cp -r $(readlink -f node_modules.bak) node_modules

    chmod +w node_modules

    yarn --offline run build

    popd



    runHook postBuild

  '';
@@ -46,8 +46,7 @@ mkYarnPackage rec { 
  distPhase = ''

    runHook preDist



    mkdir -p $out

    cp -r deps/synapse-admin/build/* $out

    cp -r deps/synapse-admin/dist $out



    runHook postDist

  '';

pkgs/tools/admin/synapse-admin/package.json

+51 −27
Original line number Diff line number Diff line 
{

  "name": "synapse-admin",

  "version": "0.8.5",

  "version": "0.10.0",

  "description": "Admin GUI for the Matrix.org server Synapse",

  "type": "module",

  "author": "Awesome Technologies Innovationslabor GmbH",

  "license": "Apache-2.0",

  "homepage": ".",
@@ -10,48 +11,71 @@ 
    "url": "https://github.com/Awesome-Technologies/synapse-admin"

  },

  "devDependencies": {

    "@testing-library/jest-dom": "^5.16.5",

    "@testing-library/react": "^11.2.6",

    "@testing-library/user-event": "^14.4.3",

    "eslint": "^8.32.0",

    "eslint-config-prettier": "^8.3.0",

    "@babel/preset-env": "^7.24.4",

    "@babel/preset-react": "^7.24.1",

    "@testing-library/jest-dom": "^6.0.0",

    "@testing-library/react": "^15.0.2",

    "@testing-library/user-event": "^14.5.2",

    "@vitejs/plugin-react": "^4.0.0",

    "babel-jest": "^29.7.0",

    "eslint": "^8.57.0",

    "eslint-config-prettier": "^9.1.0",

    "eslint-config-react-app": "^7.0.1",

    "eslint-plugin-prettier": "^4.2.1",

    "eslint-plugin-prettier": "^5.1.3",

    "jest": "^29.7.0",

    "jest-environment-jsdom": "^29.7.0",

    "jest-fetch-mock": "^3.0.3",

    "prettier": "^2.2.0",

    "ra-test": "^3.15.0"

    "prettier": "^3.2.5",

    "react-test-renderer": "^18.2.0",

    "vite": "^5.0.0",

    "vite-plugin-version-mark": "^0.0.13"

  },

  "dependencies": {

    "@emotion/react": "^11.7.1",

    "@emotion/styled": "^11.6.0",

    "@mui/icons-material": "^5.3.1",

    "@mui/material": "^5.4.0",

    "papaparse": "^5.2.0",

    "prop-types": "^15.7.2",

    "ra-language-chinese": "^2.0.10",

    "ra-language-french": "^4.2.0",

    "ra-language-german": "^3.13.4",

    "react": "^17.0.0",

    "react-admin": "^3.19.7",

    "react-dom": "^17.0.2",

    "react-scripts": "^5.0.1"

    "@haleos/ra-language-german": "^1.0.0",

    "@haxqer/ra-language-chinese": "^4.16.2",

    "@mui/icons-material": "^5.15.15",

    "@mui/material": "^5.15.15",

    "@mui/styles": "^5.15.15",

    "papaparse": "^5.4.1",

    "ra-language-farsi": "^4.2.0",

    "ra-language-french": "^4.16.15",

    "ra-language-italian": "^3.13.1",

    "react": "^18.0.0",

    "react-admin": "^4.16.15",

    "react-dom": "^18.0.0"

  },

  "scripts": {

    "start": "REACT_APP_VERSION=$(git describe --tags) react-scripts start",

    "build": "REACT_APP_VERSION=$(git describe --tags) react-scripts build",

    "start": "vite serve",

    "build": "vite build",

    "fix:other": "yarn prettier --write",

    "fix:code": "yarn test:lint --fix",

    "fix": "yarn fix:code && yarn fix:other",

    "prettier": "prettier --ignore-path .gitignore \"**/*.{js,jsx,json,md,scss,yaml,yml}\"",

    "test:code": "react-scripts test",

    "test:code": "jest",

    "test:lint": "eslint --ignore-path .gitignore --ext .js,.jsx .",

    "test:style": "yarn prettier --list-different",

    "test": "yarn test:style && yarn test:lint && yarn test:code",

    "eject": "react-scripts eject"

    "test": "yarn test:style && yarn test:lint && yarn test:code"

  },

  "babel": {

    "presets": [

      "@babel/preset-env",

      [

        "@babel/preset-react",

        {

          "runtime": "automatic"

        }

      ]

    ]

  },

  "eslintConfig": {

    "extends": "react-app"

  },

  "jest": {

    "testEnvironment": "jsdom",

    "setupFilesAfterEnv": [

      "<rootDir>/src/setupTests.js"

    ]

  },

  "browserslist": {

    "production": [

      ">0.2%",

pkgs/tools/admin/synapse-admin/yarn.lock

+3708 −8337

File changed.

Preview size limit exceeded, changes collapsed.