Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove mel #546

Merged
merged 6 commits into from
Apr 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/esy-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
if: ${{ matrix.system == 'ubuntu' }}
working-directory: melange-basic-template
run: |
sed -i 's@"installConfig"@"resolutions": { "\@opam/dune": "ocaml/dune:dune.opam#258058c6803525261df9d330d9eca2a4b0a8adc2", "\@opam/melange-compiler-libs": "melange-re/melange-compiler-libs:melange-compiler-libs.opam#7263bea2285499f5da857f2bb374345a5178791e", "\@opam/reactjs-jsx-ppx": "melange-re/melange:reactjs-jsx-ppx.opam#'"$GITHUB_SHA"'","\@opam/melange": "melange-re/melange:melange.opam#'"$GITHUB_SHA"'", "\@opam/mel": "melange-re/melange:mel.opam#'"$GITHUB_SHA"'"},"installConfig"@' esy.json
sed -i 's@"installConfig"@"resolutions": { "\@opam/dune": "ocaml/dune:dune.opam#258058c6803525261df9d330d9eca2a4b0a8adc2", "\@opam/melange-compiler-libs": "melange-re/melange-compiler-libs:melange-compiler-libs.opam#7263bea2285499f5da857f2bb374345a5178791e", "\@opam/reactjs-jsx-ppx": "melange-re/melange:reactjs-jsx-ppx.opam#'"$GITHUB_SHA"'","\@opam/melange": "melange-re/melange:melange.opam#'"$GITHUB_SHA"'"},"installConfig"@' esy.json

- name: Build basic template
if: ${{ matrix.system == 'ubuntu' }}
Expand Down
3 changes: 3 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ Unreleased
([#525](https://github.com/melange-re/melange/pull/525))
- melange: add `melpp` executable to preprocess `#if` conditionals with the
melange parser ([#539](https://github.com/melange-re/melange/pull/539))
- mel: delete the `mel` package. The dune integration is now the only
officially supported workflow for orchestrating melange builds
([#546](https://github.com/melange-re/melange/pull/546))

0.3.2 2022-11-19
---------------
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ opam-install-test: ## Install test dependencies
opam pin -y add melange-compiler-libs.dev https://github.com/melange-re/melange-compiler-libs.git#7263bea2285499f5da857f2bb374345a5178791e
opam pin add reactjs-jsx-ppx.dev . --with-test -y
opam pin add melange.dev . --with-test -y
opam pin add mel.dev . --with-test -y
opam pin add rescript-syntax.dev . --with-test -y

.PHONY: opam-install-dev
Expand Down
20 changes: 0 additions & 20 deletions dune
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,3 @@
(CPPO_FLAGS -D=BS_RELEASE_BUILD))
(ocamlopt_flags
(:standard -O3 -unbox-closures))))

(install
(package melange)
(dirs
(lib/es6 as mel_runtime/lib/es6)
(lib/js as mel_runtime/lib/js))
(files
(package.json as mel_runtime/package.json)
(bsconfig.json as mel_runtime/bsconfig.json)
;; while we wait for https://github.com/ocaml/dune/pull/6250
;; dune build lib/artifacts.sexp
;; cp ./_build/default/lib/artifacts.sexp lib/checked-in-artifacts.sexp
(include ./lib/checked-in-artifacts.sexp))
(section lib))

;;;;{BSB GENERATED: NO EDIT

(include dune.mel)

;;;;BSB GENERATED: NO EDIT}
17 changes: 0 additions & 17 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

(using melange 0.1)

(using directory-targets 0.1)

(executables_implicit_empty_intf true)

(cram enable)
Expand Down Expand Up @@ -49,21 +47,6 @@
(reason :with-test)
(reactjs-jsx-ppx :with-test)))

(package
(name mel)
(synopsis
"Build system for Melange that defers to Dune for build orchestration")
(depends
ocaml
(melange
(= :version))
reactjs-jsx-ppx
(cmdliner
(>= "1.1.0"))
(luv
(>= "0.5.11"))
(ounit :with-test)))

(package
(name rescript-syntax)
(synopsis "ReScript syntax packaged as an opam library")
Expand Down
5,228 changes: 0 additions & 5,228 deletions dune.mel

This file was deleted.

29 changes: 0 additions & 29 deletions jscomp/build_tests/bs_dependencies_node_path_override/.gitignore

This file was deleted.

16 changes: 0 additions & 16 deletions jscomp/build_tests/bs_dependencies_node_path_override/README.md

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

16 changes: 0 additions & 16 deletions jscomp/build_tests/bs_dependencies_node_path_override/package.json

This file was deleted.

This file was deleted.

This file was deleted.

8 changes: 0 additions & 8 deletions jscomp/build_tests/bucklescript-tea/.gitignore

This file was deleted.

5 changes: 0 additions & 5 deletions jscomp/build_tests/bucklescript-tea/.npmignore

This file was deleted.

10 changes: 0 additions & 10 deletions jscomp/build_tests/bucklescript-tea/.travis.yml

This file was deleted.

17 changes: 0 additions & 17 deletions jscomp/build_tests/bucklescript-tea/CONTRIBUTING.md

This file was deleted.

22 changes: 0 additions & 22 deletions jscomp/build_tests/bucklescript-tea/CONTRIBUTORS.md

This file was deleted.

Loading