Publish standard library for jsoo

Author: cannorin

.github/workflows/publish.yml

@@ -16,6 +16,8 @@ jobs:
           - 5.0.x
         node-version:
           - 14.x
+        ocaml-compiler:
+          - 4.12.x
 
     runs-on: ${{ matrix.os }}
 
@@ -34,15 +36,36 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
+      - name: Use OCaml ${{ matrix.ocaml-compiler }}
+        uses: ocaml/setup-ocaml@v2
+        with:
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+          dune-cache: true
+
       - name: Install .NET Dependencies
         run: dotnet restore
            | dotnet tool restore
 
+      - name: Install OCaml Dependencies
+        run: opam install js_of_ocaml-compiler js_of_ocaml-ppx ojs
+
       - name: Run FAKE
-        run: dotnet fake build target Build
+        run: dotnet fake build target All
+
+      - name: Push js_of_ocaml standard library to jsoo-stdlib
+        if: success()
+        uses: s0/git-publish-subdir-action@develop
+        env:
+          REPO: self
+          BRANCH: jsoo-stdlib
+          FOLDER: dist_jsoo
+          TAG: ${{ github.ref }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MESSAGE: "Build {sha}:\n{msg}"
 
       - name: NPM Publish
+        if: success()
         uses: JS-DevTools/npm-publish@v1
         with:
           token: ${{ secrets.NPM_TOKEN }}
-          check-version: true
+          check-version: true

CHANGELOG.md

@@ -6,5 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.2] - 2021-11-02
+Testing if package is published correctly when we create an release on GitHub.
+Also created an OPAM package for js_of_ocaml.
+
+## [0.0.1] - 2021-10-22
+Test publishing to npm.
+
 ## [0.0.0] - 2021-10-21
 In development.

build.fsx

@@ -21,11 +21,17 @@ open Fake.IO.Globbing.Operators
 open Fake.IO.FileSystemOperators
 open Fake.JavaScript
 
+let rootDir = Path.getFullName "."
 let srcDir = "./src"
 let outputDir = "./output"
 let distDir = "./dist"
 let testDir = "./test"
 
+let inDirectory dirName action =
+  Shell.cd dirName
+  action ()
+  Shell.cd rootDir
+
 let run cmd dir args =
   let result =
     CreateProcess.fromRawCommandLine cmd args
@@ -131,8 +137,7 @@ module Test =
     let build () =
       for file in outputDir |> Shell.copyRecursiveTo true srcDir do
         printfn "* copied to %s" file
-      Shell.cd testDir
-      dune "build"
+      inDirectory testDir <| fun () -> dune "build"
 
 Target.create "TestJsooGenerateBindings" <| fun _ -> Test.Jsoo.generateBindings ()
 Target.create "TestJsooBuild" <| fun _ -> Test.Jsoo.build ()
@@ -170,30 +175,33 @@ module Deploy =
     let copyArtifacts () =
       let mliDir = outputDir </> "test_jsoo"
       let mlDir  = testDir </> "jsoo/_build/default/src"
-      let targets = ["ts2ocaml_es"; "ts2ocaml_dom"; "ts2ocaml_webworker"]
+      let targets = ["ts2ocaml_min"; "ts2ocaml_es"; "ts2ocaml_dom"; "ts2ocaml_webworker"]
       let targetDir = targetDir </> "src"
       for target in targets do
+        Shell.rm (targetDir </> $"{target}.mli")
         Shell.copyFile targetDir (mliDir </> $"{target}.mli")
+        Shell.rm (targetDir </> $"{target}.ml")
         Shell.copyFile targetDir (mlDir </> $"{target}.ml")
 
     let versionRegex =
       String.getRegEx "\\(version ((?>\\w\\.)*\\w)\\)"
 
     let updateVersion () =
-      File.read duneProject
-      |> Seq.map (fun line ->
-        let result = versionRegex.Match line
+      duneProject |> File.applyReplace (fun content ->
+        let result = versionRegex.Match content
         if result.Success then
           let oldVersion = result.Groups.[1].Value
           if oldVersion <> newVersion then
             printfn $"* updating version in dist_jsoo/dune-project from '{oldVersion}' to '{newVersion}'."
-            "(version ${newVersion})"
+            content |> String.replace result.Value $"(version {newVersion})"
           else
             printfn $"* version in dist_jsoo/dune-project not updated ('{newVersion}')."
-            line
-        else
-          line)
-      |> File.write false duneProject
+            content
+        else content
+      )
+
+    let testBuild () =
+      inDirectory targetDir <| fun () -> dune "build"
 
 Target.create "Deploy" <| fun _ -> ()
 Target.create "DeployOnly" <| fun _ -> ()
@@ -204,14 +212,24 @@ Target.create "DeployNpm" <| fun _ ->
 Target.create "DeployJsoo" <| fun _ ->
   Deploy.Jsoo.copyArtifacts ()
   Deploy.Jsoo.updateVersion ()
+  Deploy.Jsoo.testBuild ()
 
 "BuildOnly"
   ==> "DeployNpm"
   ==> "DeployJsoo"
   ==> "DeployOnly"
   ==> "Deploy"
 
+"TestJsoo" ==> "DeployJsoo"
+
 "Build" ==> "Deploy"
 
+Target.create "All" ignore
+
+"Build"
+  ==> "Test"
+  ==> "Deploy"
+  ==> "All"
+
 // start build
 Target.runOrDefault "Build"

dist_jsoo/dune-project

@@ -1,6 +1,6 @@
 (lang dune 2.7)
-(name ts2ocaml-stdlib)
-(version 0.0.0)
+(name ts2ocaml-jsoo-stdlib)
+(version 0.0.2)
 
 (maintainers "[email protected]")
 (authors
@@ -13,8 +13,8 @@
 (license Apache-2.0)
 
 (package
-  (name ts2ocaml-stdlib)
-  (synopsis "Standard Library for ts2ocaml generated bindings")
+  (name ts2ocaml-jsoo-stdlib)
+  (synopsis "Standard library for ts2ocaml generated bindings (js_of_ocaml target)")
   (description "You can choose not to use this standard library. See the documents in the repository.")
   (depends
     (ocaml (>= 4.08))

dist_jsoo/src/dune

@@ -1,6 +1,6 @@
 (library
   (name ts2ocaml)
-  (public_name ts2ocaml-stdlib)
+  (public_name ts2ocaml-jsoo-stdlib)
   (libraries ojs)
   (wrapped false)
   (modes byte)

dist_jsoo/ts2ocaml-stdlib.opam renamed to dist_jsoo/ts2ocaml-jsoo-stdlib.opam

@@ -1,7 +1,8 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.0.0"
-synopsis: "Standard Library for ts2ocaml generated bindings"
+version: "0.0.2"
+synopsis:
+  "Standard library for ts2ocaml generated bindings (js_of_ocaml target)"
 description:
   "You can choose not to use this standard library. See the documents in the repository."
 maintainer: ["[email protected]"]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ocsigen/ts2ocaml",
-  "version": "0.0.1-1",
+  "version": "0.0.2",
   "description": "Generate OCaml bindings from TypeScript definitions via the TypeScript compiler API",
   "repository": {
     "type": "git",