Skip to content

Commit bc22d0e

Browse files
authored
Merge pull request #348 from ocaml/extends-ts
Rewrite extends in TypeScript
2 parents 83b53c0 + 0b2987a commit bc22d0e

40 files changed

+17053
-1369
lines changed

.gitattributes

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
11
* text=auto
2-
dist/** -diff linguist-generated
2+
/dist/*.js -diff linguist-generated
3+
/dist/*.txt -diff linguist-generated
4+
/dist/post/*.js -diff linguist-generated
5+
/dist/post/*.txt -diff linguist-generated
6+
/lint-doc/*.js -diff linguist-generated
7+
/lint-doc/*.txt -diff linguist-generated
8+
/lint-fmt/*.js -diff linguist-generated
9+
/lint-fmt/*.txt -diff linguist-generated
10+
/lint-opam/*.js -diff linguist-generated
11+
/lint-opam/*.txt -diff linguist-generated

.github/workflows/workflow.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
- windows-latest
1919
ocaml-compiler:
2020
- 4.13.x
21-
- ">=4.13.0 <4.14.0"
2221
cache:
2322
- true
2423
- false
@@ -35,23 +34,17 @@ jobs:
3534
multicore: https://github.com/ocaml-multicore/multicore-opam.git
3635
default: https://github.com/ocaml/opam-repository.git
3736
cache: true
38-
- os: ubuntu-latest
39-
ocaml-compiler: ocaml-variants.4.12.0+domains+effects
40-
opam-repositories: |
41-
multicore: https://github.com/ocaml-multicore/multicore-opam.git
42-
default: https://github.com/ocaml/opam-repository.git
43-
cache: true
4437

4538
runs-on: ${{ matrix.os }}
4639

4740
steps:
4841
- name: Checkout code
4942
uses: actions/checkout@v2
5043

51-
- name: Use Node.js 12.x
44+
- name: Use Node.js 16.x
5245
uses: actions/setup-node@v2
5346
with:
54-
node-version: 12.x
47+
node-version: 16.x
5548

5649
- name: Install npm packages
5750
if: runner.os == 'Linux'

.prettierignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
dist/
1+
/deploy-doc/*
2+
/dist/*
3+
/lint-doc/*
4+
/lint-fmt/*
5+
/lint-opam/*

deploy-doc/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
steps:
1919
- run: opam install . --deps-only --with-doc
2020
shell: bash
21-
- run: opam depext --install doc
21+
- run: opam depext --install odoc
2222
shell: bash
2323
- run: opam exec -- dune build @doc
2424
shell: bash

dist/index.js

Lines changed: 1539 additions & 732 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/post/index.js

Lines changed: 1225 additions & 596 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lint-doc/LICENSE.txt

Lines changed: 84 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lint-doc/action.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,5 @@ branding:
55
icon: package
66
color: orange
77
runs:
8-
using: composite
9-
steps:
10-
- run: opam depext --install conf-m4 dune 'odoc>=1.5.0'
11-
shell: bash
12-
- run: opam exec -- dune build @doc || (echo "dune build @doc failed"; exit 2)
13-
shell: bash
14-
env:
15-
ODOC_WARN_ERROR: true
8+
using: node12
9+
main: index.js

0 commit comments

Comments
 (0)