Unverified Commit 0d9f4215 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #281245 from berberman/typst-preview 

typst-preview: 0.9.2 -> 0.10.5
parents a48d8eaf d9097c0a

pkgs/applications/editors/vscode/extensions/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2306,14 +2306,14 @@ let 
        };

      };



      # Keep pkgs/tools/typesetting/typst-preview/default.nix in sync with this

      # Keep pkgs/by-name/ty/typst-preview/package.nix in sync with this

      # extension

      mgt19937.typst-preview = buildVscodeMarketplaceExtension {

        mktplcRef = {

          name = "typst-preview";

          publisher = "mgt19937";

          version = "0.9.2";

          sha256 = "sha256-/2ZD5LOQ1vTIKab2qX+5AqNqaRs90MNz1jUMDaV1wUY=";

          version = "0.10.5";

          sha256 = "sha256-cR5Pyokzmf8dNlsUkcwwfPx3jtJCQHRwTpYk78ovgrM=";

        };



        buildInputs = [

pkgs/by-name/ty/typst-preview/Cargo.lock

+583 −558

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/ty/typst-preview/dom.json

0 → 100644
+31 −0
Original line number Diff line number Diff line 
{

  "name": "typst-dom",

  "private": true,

  "version": "0.0.0",

  "type": "module",

  "scripts": {

    "dev": "vite",

    "build": "vite build && tsc",

    "preview": "vite preview",

    "test": "vitest",

    "coverage": "vitest run --coverage",

    "link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"

  },

  "peerDependencies": {

    "@myriaddreamin/typst-ts-renderer": "0.4.2-rc5",

    "@myriaddreamin/typst.ts": "0.4.2-rc5"

  },

  "devDependencies": {

    "@myriaddreamin/typst-ts-renderer": "0.4.2-rc5",

    "@myriaddreamin/typst.ts": "0.4.2-rc5",

    "typescript": "^5.0.2",

    "vite": "^4.3.9",

    "vite-plugin-singlefile": "^0.13.5",

    "vite-plugin-wasm": "^3.2.2",

    "vitest": "^0.32.2"

  },

  "exports": {

    ".": "./dist/esm/index.mjs",

    "./*": "./dist/esm/*"

  }

}

pkgs/by-name/ty/typst-preview/package.json→pkgs/by-name/ty/typst-preview/frontend.json

+3 −2
Original line number Diff line number Diff line
@@ -12,8 +12,9 @@ 
    "link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"

  },

  "dependencies": {

    "@myriaddreamin/typst-ts-renderer": "0.4.0-rc11",

    "@myriaddreamin/typst.ts": "0.4.0-rc11",

    "@myriaddreamin/typst-ts-renderer": "0.4.2-rc5",

    "@myriaddreamin/typst.ts": "0.4.2-rc5",

    "typst-dom": "file:../typst-dom",

    "rxjs": "^7.8.1"

  },

  "devDependencies": {

pkgs/by-name/ty/typst-preview/package.nix

+38 −7
Original line number Diff line number Diff line
@@ -14,28 +14,58 @@ 
let

  # Keep the vscode "mgt19937.typst-preview" extension in sync when updating

  # this package at pkgs/applications/editors/vscode/extensions/default.nix

  version = "0.9.2";

  version = "0.10.5";



  src = fetchFromGitHub {

    owner = "Enter-tainer";

    repo = "typst-preview";

    rev = "v${version}";

    hash = "sha256-P11Nkn9Md5xsB9Z7v9O+CRvP18vPEC0Y973Or7i0y/4=";

    hash = "sha256-BebOwlY2hm/SGYCtmsQICbo1V8sbUMYVWSM773Qmh04=";

    fetchSubmodules = true;

  };



  frontendSrc = "${src}/addons/frontend";

  domSrc = "${src}/addons/typst-dom";



  typst-dom = mkYarnPackage {

    inherit version;

    pname = "typst-dom";

    src = domSrc;

    packageJSON = ./dom.json;



    offlineCache = fetchYarnDeps {

      yarnLock = "${domSrc}/yarn.lock";

      hash = "sha256-SxOQ/RABUkiqE7dLaDS0kETGiir4SMWJ2w7i7zMEl7U=";

    };



    buildPhase = ''

      runHook preBuild

      yarn --offline build

      runHook postBuild

    '';



    installPhase = ''

      runHook preInstall

      cp -R deps/typst-dom $out

      runHook postInstall

    '';



    doDist = false;

  };



  frontend = mkYarnPackage {

    inherit version;

    pname = "typst-preview-frontend";

    src = frontendSrc;

    packageJSON = ./package.json;

    packageJSON = ./frontend.json;



    offlineCache = fetchYarnDeps {

      yarnLock = "${frontendSrc}/yarn.lock";

      hash = "sha256-7a7/UOfau84nLIAKj6Tn9rTUmeBJ7rYDFAdr55ZDLgA=";

      hash = "sha256-6e3UNd8gIBnTtllpo/1AC1XzeZ88rdUiechoQfo5V1Y=";

    };



    packageResolutions = { inherit typst-dom; };



    buildPhase = ''

      runHook preBuild

      yarn --offline build
@@ -50,6 +80,7 @@ let 


    doDist = false;

  };



in

rustPlatform.buildRustPackage {

  pname = "typst-preview";
@@ -58,9 +89,9 @@ rustPlatform.buildRustPackage { 
  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "hayagriva-0.4.0" = "sha256-377lXL3+TO8U91OopMYEI0NrWWwzy6+O7B65bLhP+X4=";

      "typst-0.9.0" = "sha256-+rnsUSGi3QZlbC4i8racsM4U6+l8oA9YjjUOtQAIWOk=";

      "typst-ts-compiler-0.4.0-rc9" = "sha256-NVmbAodDRJBJlGGDRjaEcTHGoCeN4hNjIynIDKqvNbM=";

      "typst-0.10.0" = "sha256-/Oy4KigXu1E/S9myd+eigqlNvk5x+Ld9gTL9dtpoyqk=";

      "typst-ts-compiler-0.4.2-rc5" =

        "sha256-fhwTaAK19Nb7AKNJ9QBZgK1MO7g7s5AdSDqaBjLxT3w=";

    };

  };