diff --git a/.ci/checksum.js b/.ci/checksum.js index 09c86bf3..40bfc173 100644 --- a/.ci/checksum.js +++ b/.ci/checksum.js @@ -8,7 +8,11 @@ let algorithm = "sha1", let cwd = process.cwd(); let pkg = require(path.join(cwd, "package.json")), s = fs.ReadStream( - path.join(cwd, "_release", `${pkg.name}-${pkg.version}.tgz`) + path.join( + cwd, + "_release", + `${pkg.name.replace("@", "").replace("/", "-")}-${pkg.version}.tgz` + ) ); s.on("data", function(data) { diff --git a/.ci/cross-release.yml b/.ci/cross-release.yml index f0b3436a..91610cde 100644 --- a/.ci/cross-release.yml +++ b/.ci/cross-release.yml @@ -27,7 +27,7 @@ steps: displayName: "npm pack" workingDirectory: "_release" - - bash: "node .ci/checksum.js _release/pesy-0.5.0-alpha.2.tgz" + - bash: "node .ci/checksum.js _release/pesy-0.5.0-alpha.6.tgz" displayName: "Calculating sha1" - task: PublishBuildArtifacts@1 diff --git a/assets/azure-pipeline-templates/pesy-azure-pipelines.yml b/assets/azure-pipeline-templates/pesy-azure-pipelines.yml deleted file mode 100644 index 820a1994..00000000 --- a/assets/azure-pipeline-templates/pesy-azure-pipelines.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Starter pipeline -# Start with a minimal pipeline that you can customize to build and deploy your code. -# Add steps that build, run tests, deploy, and more: -# https://aka.ms/yaml - -name: $(Build.SourceVersion) -jobs: -- job: Linux - timeoutInMinutes: 0 - pool: - vmImage: 'Ubuntu 16.04' - - variables: - ESY__CACHE_INSTALL_PATH: /home/vsts/.esy/3_____________________________________________________________________/i/ - ESY__CACHE_SOURCE_TARBALL_PATH: /home/vsts/.esy/source/i - - steps: - # TODO: Uncomment both this and 'publish-build-cache' below to enable build caching for Linux. - # - template: .ci/restore-build-cache.yml - - template: .ci/esy-build-steps.yml - # - template: .ci/publish-build-cache.yml - -- job: MacOS - timeoutInMinutes: 0 - pool: - vmImage: 'macOS 10.13' - - variables: - ESY__CACHE_INSTALL_PATH: /Users/vsts/.esy/3____________________________________________________________________/i/ - ESY__CACHE_SOURCE_TARBALL_PATH: /Users/vsts/.esy/source/i - - steps: - # TODO: Uncomment both this and 'publish-build-cache' below to enable build caching for Mac. - # - template: .ci/restore-build-cache.yml - - template: .ci/esy-build-steps.yml - # - template: .ci/publish-build-cache.yml - -- job: Windows - timeoutInMinutes: 0 - pool: - vmImage: 'vs2017-win2016' - - variables: - ESY__CACHE_INSTALL_PATH: C:\Users\VssAdministrator\.esy\3_\i - ESY__CACHE_SOURCE_TARBALL_PATH: C:\Users\VssAdministrator\.esy\source\i - - steps: - - template: .ci/restore-build-cache.yml - - template: .ci/esy-build-steps.yml - - template: .ci/publish-build-cache.yml - -- job: Release - timeoutInMinutes: 0 - displayName: Release - dependsOn: - - Linux - - MacOS - - Windows - condition: succeeded() - pool: - vmImage: ubuntu-16.04 - steps: - - task: PublishBuildArtifacts@1 - displayName: 'Release Package' - inputs: - PathtoPublish: '.' - ArtifactName: npm-package diff --git a/assets/azure-pipeline-templates/pesy-esy-build-steps.template.yml b/assets/azure-pipeline-templates/pesy-esy-build-steps.template.yml deleted file mode 100644 index f03a4b1b..00000000 --- a/assets/azure-pipeline-templates/pesy-esy-build-steps.template.yml +++ /dev/null @@ -1,24 +0,0 @@ -# Cross-platform set of build steps for building esy projects - -steps: - - task: NodeTool@0 - inputs: - versionSpec: '8.9' - - script: npm install -g esy@0.4.3 - displayName: 'npm install -g esy@0.4.3' - - script: esy install - displayName: 'esy install' - - script: esy pesy - displayName: 'esy pesy' - - script: esy build - displayName: 'esy build' - - script: esy test - displayName: 'esy test' - - script: esy x App.exe - displayName: 'Run the main binary' - - script: esy ls-libs - continueOnError: true - displayName: 'Show all libraries including this package lib' - - script: esy release - displayName: 'Test Creation of Prebuilt Binary Releases' - continueOnError: true diff --git a/assets/azure-pipeline-templates/pesy-publish-build-cache.yml b/assets/azure-pipeline-templates/pesy-publish-build-cache.yml deleted file mode 100644 index faeb3f8a..00000000 --- a/assets/azure-pipeline-templates/pesy-publish-build-cache.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Steps for publishing project cache - -steps: - - task: PublishBuildArtifacts@1 - displayName: 'Cache: Upload install folder' - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) - inputs: - pathToPublish: '$(ESY__CACHE_INSTALL_PATH)' - artifactName: 'cache-$(Agent.OS)-install' - parallel: true - parallelCount: 8 diff --git a/assets/azure-pipeline-templates/pesy-restore-build-cache.yml b/assets/azure-pipeline-templates/pesy-restore-build-cache.yml deleted file mode 100644 index 41bd5c83..00000000 --- a/assets/azure-pipeline-templates/pesy-restore-build-cache.yml +++ /dev/null @@ -1,23 +0,0 @@ -# Steps for restoring project cache - -steps: - - task: DownloadBuildArtifacts@0 - condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/master')) - displayName: 'Cache: Restore install' - inputs: - buildType: 'specific' - project: '$(System.TeamProject)' - pipeline: '$(Build.DefinitionName)' - branchName: 'refs/heads/master' - buildVersionToDownload: 'latestFromBranch' - downloadType: 'single' - artifactName: 'cache-$(Agent.OS)-install' - downloadPath: '$(System.ArtifactsDirectory)' - continueOnError: true - - - task: CopyFiles@2 - condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/master')) - inputs: - sourceFolder: '$(System.ArtifactsDirectory)\cache-$(Agent.OS)-install' - targetFolder: '$(ESY__CACHE_INSTALL_PATH)' - continueOnError: true diff --git a/assets/dune b/assets/dune deleted file mode 100644 index a2f0991e..00000000 --- a/assets/dune +++ /dev/null @@ -1,20 +0,0 @@ -(library - (name PesyAssets) - (public_name pesy.assets) -) - -(install - (section share_root) - (files - (pesy-package.template.json as template-repo/pesy-package.template.json) - (pesy-gitignore.template as template-repo/pesy-gitignore.template) - (pesy-Util.template.re as template-repo/pesy-Util.template.re) - (pesy-README.template.md as template-repo/pesy-README.template.md) - (pesy-Test.template.re as template-repo/pesy-Test.template.re) - (pesy-TestFramework.template.re as template-repo/pesy-TestFramework.template.re) - (pesy-RunTests.template.re as template-repo/pesy-RunTests.template.re) - (pesy-App.template.re as template-repo/pesy-App.template.re) - (azure-pipeline-templates/pesy-azure-pipelines.yml as template-repo/azure-pipeline-templates/pesy-azure-pipelines.yml) - (azure-pipeline-templates/pesy-esy-build-steps.template.yml as template-repo/azure-pipeline-templates/pesy-esy-build-steps.template.yml) - (azure-pipeline-templates/pesy-publish-build-cache.yml as template-repo/azure-pipeline-templates/pesy-publish-build-cache.yml) - (azure-pipeline-templates/pesy-restore-build-cache.yml as template-repo/azure-pipeline-templates/pesy-restore-build-cache.yml))) diff --git a/assets/pesy-App.template.re b/assets/pesy-App.template.re deleted file mode 100644 index 43dd0176..00000000 --- a/assets/pesy-App.template.re +++ /dev/null @@ -1 +0,0 @@ -Library.Util.foo(); diff --git a/assets/pesy-README.template.md b/assets/pesy-README.template.md deleted file mode 100644 index 47191317..00000000 --- a/assets/pesy-README.template.md +++ /dev/null @@ -1,47 +0,0 @@ -# - - -[![CircleCI](https://circleci.com/gh/yourgithubhandle//tree/master.svg?style=svg)](https://circleci.com/gh/yourgithubhandle//tree/master) - - -**Contains the following libraries and executables:** - -``` -@0.0.0 -│ -├─test/ -│ name: Test.exe -│ require: -│ -├─library/ -│ library name: -│ require: -│ -└─executable/ - name: App.exe - require: -``` - -## Developing: - -``` -npm install -g esy -git clone -esy install -esy build -``` - -## Running Binary: - -After building the project, you can run the main binary that is produced. - -``` -esy x App.exe -``` - -## Running Tests: - -``` -# Runs the "test" command in `package.json`. -esy test -``` diff --git a/assets/pesy-RunTests.template.re b/assets/pesy-RunTests.template.re deleted file mode 100644 index 338aef21..00000000 --- a/assets/pesy-RunTests.template.re +++ /dev/null @@ -1 +0,0 @@ -Test.TestFramework.cli(); diff --git a/assets/pesy-Test.template.re b/assets/pesy-Test.template.re deleted file mode 100644 index fac8aecf..00000000 --- a/assets/pesy-Test.template.re +++ /dev/null @@ -1,7 +0,0 @@ -open TestFramework; - -describe("my first test suite", ({test, _}) => - test("1 + 1 should equal 2", ({expect}) => - expect.int(1 + 1).toBe(2) - ) -); diff --git a/assets/pesy-TestFramework.template.re b/assets/pesy-TestFramework.template.re deleted file mode 100644 index cd957ba8..00000000 --- a/assets/pesy-TestFramework.template.re +++ /dev/null @@ -1,7 +0,0 @@ -include Rely.Make({ - let config = - Rely.TestFrameworkConfig.initialize({ - snapshotDir: "test/_snapshots", - projectDir: "", - }); - }); diff --git a/assets/pesy-Util.template.re b/assets/pesy-Util.template.re deleted file mode 100644 index 0e752684..00000000 --- a/assets/pesy-Util.template.re +++ /dev/null @@ -1 +0,0 @@ -let foo = () => print_endline("Hello"); diff --git a/assets/pesy-gitignore.template b/assets/pesy-gitignore.template deleted file mode 100644 index 0238ec63..00000000 --- a/assets/pesy-gitignore.template +++ /dev/null @@ -1,10 +0,0 @@ -npm-debug.log -.merlin -yarn-error.log -node_modules/ -_build -_release -_esy -.install -.DS_Store -*.install diff --git a/assets/pesy-package.template.json b/assets/pesy-package.template.json deleted file mode 100644 index 7e092742..00000000 --- a/assets/pesy-package.template.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "name": "", - "version": "0.0.0", - "description": "My Project", - "esy": { - "build": "dune build -p #{self.name}", - "release": { - "releasedBinaries": ["App.exe"] - } - }, - "buildDirs": { - "test": { - "require": ["", "rely.lib"], - "flags": ["-linkall", "-g"] - }, - "testExe": { - "require": [""], - "bin": { - "RunTests.exe": "RunTests.re" - } - }, - "library": {}, - "executable": { - "require": [""], - "bin": { - "App.exe": "App.re" - } - } - }, - "scripts": { - "test": "esy x RunTests.exe" - }, - "dependencies": { - "@opam/dune": "*", - "@esy-ocaml/reason": "*", - "ocaml": "4.7.x", - "@reason-native/rely": "*" - }, - "devDependencies": { - "refmterr": "*", - "pesy": "*", - "@opam/merlin": "*" - }, - "resolutions": { - "pesy": "esy/pesy#ba6359f25621280a8105d2ffc99d75d849c0d95a" - } -} diff --git a/bin/Pesy.re b/bin/Pesy.re index e2462642..4e694c65 100644 --- a/bin/Pesy.re +++ b/bin/Pesy.re @@ -226,7 +226,7 @@ let pesy_build = () => ) ); -let version = "0.5.0-alpha.5"; +let version = "0.5.0-alpha.6"; let cmd = () => { open Cmdliner.Term; diff --git a/bin/dune b/bin/dune index 2339f0e2..65946d59 100644 --- a/bin/dune +++ b/bin/dune @@ -1,2 +1,3 @@ (executable (name Pesy) (public_name pesy) - (libraries pesy.lib pesy.utils cmdliner findlib)) \ No newline at end of file + (libraries pesy--esy-pesy.lib + pesy--esy-pesy.utils cmdliner findlib)) diff --git a/e2e-tests/Runner.re b/e2e-tests/Runner.re index 0da3f09a..4b44fe8b 100644 --- a/e2e-tests/Runner.re +++ b/e2e-tests/Runner.re @@ -28,9 +28,11 @@ let run = (~env=?, c, args) => { chdir(Path.(cwd / "npm-cli")); print_endline("Installing pesy globally.."); +run(makeCommand("npm"), [|"install"|]); +run(makeCommand("npm"), [|"run", "build"|]); run(makeCommand("npm"), [|"run", "rollup"|]); run(makeCommand("npm"), [|"pack"|]); -run(makeCommand("npm"), [|"i", "-g", "./pesy-0.5.0-alpha.5.tgz"|]); +run(makeCommand("npm"), [|"i", "-g", "./pesy-0.5.0-alpha.6.tgz"|]); chdir(cwd); let testBootstrapperExe = diff --git a/e2e-tests/dune b/e2e-tests/dune index b1a83b13..d2839884 100644 --- a/e2e-tests/dune +++ b/e2e-tests/dune @@ -1,6 +1,6 @@ (executables (names Runner TestBootstrapper TestPesyConfigure) (public_names Runner.exe TestBootstrapper.exe TestPesyConfigure.exe) -(libraries unix pesy.lib)) +(libraries unix pesy--esy-pesy.lib)) (data_only_dirs pesy-configure-test-projects) diff --git a/esy.lock/index.json b/esy.lock/index.json index 621c9fd5..9d6b506f 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,6 +1,6 @@ { "checksum": "2ebe20f411cb3a24ea6f2939a0dd4b59", - "root": "pesy@link-dev:./package.json", + "root": "pesy--esy-pesy@link-dev:./package.json", "node": { "refmterr@3.2.2@d41d8cd9": { "id": "refmterr@3.2.2@d41d8cd9", @@ -30,7 +30,7 @@ "version": "github:esy/pesy#75d62cfc", "source": { "type": "install", - "source": [ "github:esy/pesy#75d62cfc" ] + "source": ["github:esy/pesy#75d62cfc"] }, "overrides": [], "dependencies": [ @@ -44,9 +44,9 @@ ], "devDependencies": [] }, - "pesy@link-dev:./package.json": { - "id": "pesy@link-dev:./package.json", - "name": "pesy", + "pesy--esy-pesy@link-dev:./package.json": { + "id": "pesy--esy-pesy@link-dev:./package.json", + "name": "pesy--esy-pesy", "version": "link-dev:./package.json", "source": { "type": "link-dev", @@ -95,11 +95,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", + "ocaml@4.7.1004@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@link:vendor/dune/dune.opam", "@esy-ocaml/reason@3.5.0@d41d8cd9" ], - "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] + "devDependencies": ["ocaml@4.7.1004@d41d8cd9"] }, "@reason-native/console@0.1.0@d41d8cd9": { "id": "@reason-native/console@0.1.0@d41d8cd9", @@ -113,7 +114,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam", + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam", "@esy-ocaml/reason@3.5.0@d41d8cd9" ], "devDependencies": [] @@ -129,13 +131,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "ocaml@4.7.1004@d41d8cd9", + "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@link:vendor/dune/dune.opam", - "@opam/cppo@opam:1.6.6@f4f83858", "@opam/biniou@opam:1.2.1@d7570399", + "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "ocaml@4.7.1004@d41d8cd9", + "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/biniou@opam:1.2.1@d7570399" ] }, @@ -157,11 +162,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam", + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam" + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam" ] }, "@opam/sexplib@link:vendor/sexplib/sexplib.opam": { @@ -175,14 +182,18 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/sexplib0@opam:v0.12.0@e432406d", - "@opam/parsexp@opam:v0.12.0@a23b4f78", "@opam/num@opam:1.2@e81de836", + "ocaml@4.7.1004@d41d8cd9", + "@opam/sexplib0@opam:v0.12.0@e432406d", + "@opam/parsexp@opam:v0.12.0@a23b4f78", + "@opam/num@opam:1.2@e81de836", "@opam/dune@link:vendor/dune/dune.opam", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/sexplib0@opam:v0.12.0@e432406d", - "@opam/parsexp@opam:v0.12.0@a23b4f78", "@opam/num@opam:1.2@e81de836" + "ocaml@4.7.1004@d41d8cd9", + "@opam/sexplib0@opam:v0.12.0@e432406d", + "@opam/parsexp@opam:v0.12.0@a23b4f78", + "@opam/num@opam:1.2@e81de836" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -191,7 +202,7 @@ "version": "opam:base", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "seq", "version": "base", @@ -200,9 +211,10 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.7.1004@d41d8cd9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] + "devDependencies": ["ocaml@4.7.1004@d41d8cd9"] }, "@opam/result@opam:1.4@dc720aef": { "id": "@opam/result@opam:1.4@dc720aef", @@ -222,11 +234,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam", + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam" + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam" ] }, "@opam/re@opam:1.9.0@d4d5e13d": { @@ -247,12 +261,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "ocaml@4.7.1004@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", "@opam/dune@link:vendor/dune/dune.opam", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "ocaml@4.7.1004@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", "@opam/dune@link:vendor/dune/dune.opam" ] }, @@ -274,11 +290,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam", + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam" + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam" ] }, "@opam/parsexp@opam:v0.12.0@a23b4f78": { @@ -299,13 +317,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/sexplib0@opam:v0.12.0@e432406d", + "ocaml@4.7.1004@d41d8cd9", + "@opam/sexplib0@opam:v0.12.0@e432406d", "@opam/dune@link:vendor/dune/dune.opam", "@opam/base@opam:v0.12.2@4eee02b5", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/sexplib0@opam:v0.12.0@e432406d", + "ocaml@4.7.1004@d41d8cd9", + "@opam/sexplib0@opam:v0.12.0@e432406d", "@opam/dune@link:vendor/dune/dune.opam", "@opam/base@opam:v0.12.2@4eee02b5" ] @@ -329,15 +349,15 @@ }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override" } ], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a", + "ocaml@4.7.1004@d41d8cd9", + "@opam/conf-m4@opam:1@3b2b148a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] + "devDependencies": ["ocaml@4.7.1004@d41d8cd9"] }, "@opam/ocamlbuild@opam:0.14.0@6ac75d03": { "id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03", @@ -357,14 +377,14 @@ }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override" } ], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.7.1004@d41d8cd9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] + "devDependencies": ["ocaml@4.7.1004@d41d8cd9"] }, "@opam/ocaml-migrate-parsetree@opam:1.4.0@0c4ec62d": { "id": "@opam/ocaml-migrate-parsetree@opam:1.4.0@0c4ec62d", @@ -384,13 +404,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "ocaml@4.7.1004@d41d8cd9", + "@opam/result@opam:1.4@dc720aef", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/dune@link:vendor/dune/dune.opam", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "ocaml@4.7.1004@d41d8cd9", + "@opam/result@opam:1.4@dc720aef", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/dune@link:vendor/dune/dune.opam" ] @@ -413,15 +435,15 @@ }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__num_opam__c__1.2_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__num_opam__c__1.2_opam_override" } ], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.7.1004@d41d8cd9", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] + "devDependencies": ["ocaml@4.7.1004@d41d8cd9"] }, "@opam/merlin-extend@opam:0.5@a5dd7d4b": { "id": "@opam/merlin-extend@opam:0.5@a5dd7d4b", @@ -441,11 +463,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam", - "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam", + "@opam/cppo@opam:1.6.6@f4f83858", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam" + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam" ] }, "@opam/merlin@opam:3.3.2@7a364181": { @@ -497,11 +522,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.7.1004@d41d8cd9", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] + "devDependencies": ["ocaml@4.7.1004@d41d8cd9"] }, "@opam/jbuilder@opam:transition@58bdfe0a": { "id": "@opam/jbuilder@opam:transition@58bdfe0a", @@ -509,7 +535,7 @@ "version": "opam:transition", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "jbuilder", "version": "transition", @@ -518,11 +544,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam", + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam" + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam" ] }, "@opam/easy-format@opam:1.3.2@0484b3c4": { @@ -543,11 +571,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam", + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam" + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam" ] }, "@opam/dune@link:vendor/dune/dune.opam": { @@ -561,12 +591,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.7.1004@d41d8cd9", + "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.7.1004@d41d8cd9", + "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ] }, @@ -588,12 +620,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam", + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@link:vendor/dune/dune.opam", + "ocaml@4.7.1004@d41d8cd9", + "@opam/dune@link:vendor/dune/dune.opam", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -603,7 +637,7 @@ "version": "opam:1", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "conf-m4", "version": "1", @@ -611,7 +645,7 @@ } }, "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "dependencies": ["@esy-ocaml/substs@0.0.1@d41d8cd9"], "devDependencies": [] }, "@opam/cmdliner@link:vendor/cmdliner/cmdliner.opam": { @@ -625,9 +659,10 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.7.1004@d41d8cd9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] + "devDependencies": ["ocaml@4.7.1004@d41d8cd9"] }, "@opam/biniou@opam:1.2.1@d7570399": { "id": "@opam/biniou@opam:1.2.1@d7570399", @@ -647,12 +682,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "ocaml@4.7.1004@d41d8cd9", + "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@link:vendor/dune/dune.opam", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "ocaml@4.7.1004@d41d8cd9", + "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@link:vendor/dune/dune.opam" ] }, @@ -662,7 +699,7 @@ "version": "opam:base", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "base-unix", "version": "base", @@ -670,7 +707,7 @@ } }, "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "dependencies": ["@esy-ocaml/substs@0.0.1@d41d8cd9"], "devDependencies": [] }, "@opam/base-threads@opam:base@36803084": { @@ -679,7 +716,7 @@ "version": "opam:base", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "base-threads", "version": "base", @@ -687,7 +724,7 @@ } }, "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "dependencies": ["@esy-ocaml/substs@0.0.1@d41d8cd9"], "devDependencies": [] }, "@opam/base@opam:v0.12.2@4eee02b5": { @@ -708,12 +745,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/sexplib0@opam:v0.12.0@e432406d", + "ocaml@4.7.1004@d41d8cd9", + "@opam/sexplib0@opam:v0.12.0@e432406d", "@opam/dune@link:vendor/dune/dune.opam", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/sexplib0@opam:v0.12.0@e432406d", + "ocaml@4.7.1004@d41d8cd9", + "@opam/sexplib0@opam:v0.12.0@e432406d", "@opam/dune@link:vendor/dune/dune.opam" ] }, @@ -770,7 +809,8 @@ "@opam/jbuilder@opam:transition@58bdfe0a", "@opam/biniou@opam:1.2.1@d7570399", "@opam/atdgen-runtime@opam:2.0.0@8a75c3bb", - "@opam/atd@opam:2.0.0@087614b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/atd@opam:2.0.0@087614b7", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", @@ -798,13 +838,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/menhir@opam:20190626@bbeb8953", + "ocaml@4.7.1004@d41d8cd9", + "@opam/menhir@opam:20190626@bbeb8953", "@opam/jbuilder@opam:transition@58bdfe0a", "@opam/easy-format@opam:1.3.2@0484b3c4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4" + "ocaml@4.7.1004@d41d8cd9", + "@opam/easy-format@opam:1.3.2@0484b3c4" ] }, "@esy-ocaml/substs@0.0.1@d41d8cd9": { @@ -833,7 +875,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "ocaml@4.7.1004@d41d8cd9", + "@opam/result@opam:1.4@dc720aef", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.4.0@0c4ec62d", "@opam/merlin-extend@opam:0.5@a5dd7d4b", @@ -843,4 +886,4 @@ "devDependencies": [] } } -} \ No newline at end of file +} diff --git a/lib/dune b/lib/dune index 0d4c163c..cc805eb8 100644 --- a/lib/dune +++ b/lib/dune @@ -1,4 +1,5 @@ -(library (name Lib) (public_name pesy.lib) - (libraries str sexplib yojson findlib pesy.utils)) (rule (targets Lexer.ml) (deps Lexer.mll) +(library (name Lib) (public_name pesy--esy-pesy.lib) + (libraries str sexplib yojson findlib + pesy--esy-pesy.utils)) (rule (targets Lexer.ml) (deps Lexer.mll) (action (run %{bin:ocamllex} -q -o %{targets} %{deps}))) (rule (targets Parser.ml Parser.mli) (deps Parser.mly) - (action (run %{bin:ocamlyacc} %{deps}))) \ No newline at end of file + (action (run %{bin:ocamlyacc} %{deps}))) diff --git a/npm-cli/package-lock.json b/npm-cli/package-lock.json index d641c175..4573b69c 100644 --- a/npm-cli/package-lock.json +++ b/npm-cli/package-lock.json @@ -1,6 +1,6 @@ { "name": "pesy", - "version": "0.5.0-alpha.5", + "version": "0.5.0-alpha.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/npm-cli/package.json b/npm-cli/package.json index 10361b05..74bdee65 100644 --- a/npm-cli/package.json +++ b/npm-cli/package.json @@ -1,6 +1,6 @@ { "name": "pesy", - "version": "0.5.0-alpha.5", + "version": "0.5.0-alpha.6", "bin": { "pesy": "pesy" }, @@ -19,7 +19,6 @@ "files": [ "package.json", "pesy", - "share", "pesy.bundle.js" ], "license": "MIT", diff --git a/npm-cli/share/template-repo/azure-pipeline-templates/pesy-azure-pipelines.yml b/npm-cli/share/template-repo/azure-pipeline-templates/pesy-azure-pipelines.yml deleted file mode 100644 index 820a1994..00000000 --- a/npm-cli/share/template-repo/azure-pipeline-templates/pesy-azure-pipelines.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Starter pipeline -# Start with a minimal pipeline that you can customize to build and deploy your code. -# Add steps that build, run tests, deploy, and more: -# https://aka.ms/yaml - -name: $(Build.SourceVersion) -jobs: -- job: Linux - timeoutInMinutes: 0 - pool: - vmImage: 'Ubuntu 16.04' - - variables: - ESY__CACHE_INSTALL_PATH: /home/vsts/.esy/3_____________________________________________________________________/i/ - ESY__CACHE_SOURCE_TARBALL_PATH: /home/vsts/.esy/source/i - - steps: - # TODO: Uncomment both this and 'publish-build-cache' below to enable build caching for Linux. - # - template: .ci/restore-build-cache.yml - - template: .ci/esy-build-steps.yml - # - template: .ci/publish-build-cache.yml - -- job: MacOS - timeoutInMinutes: 0 - pool: - vmImage: 'macOS 10.13' - - variables: - ESY__CACHE_INSTALL_PATH: /Users/vsts/.esy/3____________________________________________________________________/i/ - ESY__CACHE_SOURCE_TARBALL_PATH: /Users/vsts/.esy/source/i - - steps: - # TODO: Uncomment both this and 'publish-build-cache' below to enable build caching for Mac. - # - template: .ci/restore-build-cache.yml - - template: .ci/esy-build-steps.yml - # - template: .ci/publish-build-cache.yml - -- job: Windows - timeoutInMinutes: 0 - pool: - vmImage: 'vs2017-win2016' - - variables: - ESY__CACHE_INSTALL_PATH: C:\Users\VssAdministrator\.esy\3_\i - ESY__CACHE_SOURCE_TARBALL_PATH: C:\Users\VssAdministrator\.esy\source\i - - steps: - - template: .ci/restore-build-cache.yml - - template: .ci/esy-build-steps.yml - - template: .ci/publish-build-cache.yml - -- job: Release - timeoutInMinutes: 0 - displayName: Release - dependsOn: - - Linux - - MacOS - - Windows - condition: succeeded() - pool: - vmImage: ubuntu-16.04 - steps: - - task: PublishBuildArtifacts@1 - displayName: 'Release Package' - inputs: - PathtoPublish: '.' - ArtifactName: npm-package diff --git a/npm-cli/share/template-repo/azure-pipeline-templates/pesy-esy-build-steps.template.yml b/npm-cli/share/template-repo/azure-pipeline-templates/pesy-esy-build-steps.template.yml deleted file mode 100644 index f03a4b1b..00000000 --- a/npm-cli/share/template-repo/azure-pipeline-templates/pesy-esy-build-steps.template.yml +++ /dev/null @@ -1,24 +0,0 @@ -# Cross-platform set of build steps for building esy projects - -steps: - - task: NodeTool@0 - inputs: - versionSpec: '8.9' - - script: npm install -g esy@0.4.3 - displayName: 'npm install -g esy@0.4.3' - - script: esy install - displayName: 'esy install' - - script: esy pesy - displayName: 'esy pesy' - - script: esy build - displayName: 'esy build' - - script: esy test - displayName: 'esy test' - - script: esy x App.exe - displayName: 'Run the main binary' - - script: esy ls-libs - continueOnError: true - displayName: 'Show all libraries including this package lib' - - script: esy release - displayName: 'Test Creation of Prebuilt Binary Releases' - continueOnError: true diff --git a/npm-cli/share/template-repo/azure-pipeline-templates/pesy-publish-build-cache.yml b/npm-cli/share/template-repo/azure-pipeline-templates/pesy-publish-build-cache.yml deleted file mode 100644 index faeb3f8a..00000000 --- a/npm-cli/share/template-repo/azure-pipeline-templates/pesy-publish-build-cache.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Steps for publishing project cache - -steps: - - task: PublishBuildArtifacts@1 - displayName: 'Cache: Upload install folder' - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) - inputs: - pathToPublish: '$(ESY__CACHE_INSTALL_PATH)' - artifactName: 'cache-$(Agent.OS)-install' - parallel: true - parallelCount: 8 diff --git a/npm-cli/share/template-repo/azure-pipeline-templates/pesy-restore-build-cache.yml b/npm-cli/share/template-repo/azure-pipeline-templates/pesy-restore-build-cache.yml deleted file mode 100644 index 41bd5c83..00000000 --- a/npm-cli/share/template-repo/azure-pipeline-templates/pesy-restore-build-cache.yml +++ /dev/null @@ -1,23 +0,0 @@ -# Steps for restoring project cache - -steps: - - task: DownloadBuildArtifacts@0 - condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/master')) - displayName: 'Cache: Restore install' - inputs: - buildType: 'specific' - project: '$(System.TeamProject)' - pipeline: '$(Build.DefinitionName)' - branchName: 'refs/heads/master' - buildVersionToDownload: 'latestFromBranch' - downloadType: 'single' - artifactName: 'cache-$(Agent.OS)-install' - downloadPath: '$(System.ArtifactsDirectory)' - continueOnError: true - - - task: CopyFiles@2 - condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/master')) - inputs: - sourceFolder: '$(System.ArtifactsDirectory)\cache-$(Agent.OS)-install' - targetFolder: '$(ESY__CACHE_INSTALL_PATH)' - continueOnError: true diff --git a/npm-cli/share/template-repo/dune b/npm-cli/share/template-repo/dune deleted file mode 100644 index a2f0991e..00000000 --- a/npm-cli/share/template-repo/dune +++ /dev/null @@ -1,20 +0,0 @@ -(library - (name PesyAssets) - (public_name pesy.assets) -) - -(install - (section share_root) - (files - (pesy-package.template.json as template-repo/pesy-package.template.json) - (pesy-gitignore.template as template-repo/pesy-gitignore.template) - (pesy-Util.template.re as template-repo/pesy-Util.template.re) - (pesy-README.template.md as template-repo/pesy-README.template.md) - (pesy-Test.template.re as template-repo/pesy-Test.template.re) - (pesy-TestFramework.template.re as template-repo/pesy-TestFramework.template.re) - (pesy-RunTests.template.re as template-repo/pesy-RunTests.template.re) - (pesy-App.template.re as template-repo/pesy-App.template.re) - (azure-pipeline-templates/pesy-azure-pipelines.yml as template-repo/azure-pipeline-templates/pesy-azure-pipelines.yml) - (azure-pipeline-templates/pesy-esy-build-steps.template.yml as template-repo/azure-pipeline-templates/pesy-esy-build-steps.template.yml) - (azure-pipeline-templates/pesy-publish-build-cache.yml as template-repo/azure-pipeline-templates/pesy-publish-build-cache.yml) - (azure-pipeline-templates/pesy-restore-build-cache.yml as template-repo/azure-pipeline-templates/pesy-restore-build-cache.yml))) diff --git a/npm-cli/share/template-repo/pesy-App.template.re b/npm-cli/share/template-repo/pesy-App.template.re deleted file mode 100644 index 43dd0176..00000000 --- a/npm-cli/share/template-repo/pesy-App.template.re +++ /dev/null @@ -1 +0,0 @@ -Library.Util.foo(); diff --git a/npm-cli/share/template-repo/pesy-README.template.md b/npm-cli/share/template-repo/pesy-README.template.md deleted file mode 100644 index 47191317..00000000 --- a/npm-cli/share/template-repo/pesy-README.template.md +++ /dev/null @@ -1,47 +0,0 @@ -# - - -[![CircleCI](https://circleci.com/gh/yourgithubhandle//tree/master.svg?style=svg)](https://circleci.com/gh/yourgithubhandle//tree/master) - - -**Contains the following libraries and executables:** - -``` -@0.0.0 -│ -├─test/ -│ name: Test.exe -│ require: -│ -├─library/ -│ library name: -│ require: -│ -└─executable/ - name: App.exe - require: -``` - -## Developing: - -``` -npm install -g esy -git clone -esy install -esy build -``` - -## Running Binary: - -After building the project, you can run the main binary that is produced. - -``` -esy x App.exe -``` - -## Running Tests: - -``` -# Runs the "test" command in `package.json`. -esy test -``` diff --git a/npm-cli/share/template-repo/pesy-RunTests.template.re b/npm-cli/share/template-repo/pesy-RunTests.template.re deleted file mode 100644 index 338aef21..00000000 --- a/npm-cli/share/template-repo/pesy-RunTests.template.re +++ /dev/null @@ -1 +0,0 @@ -Test.TestFramework.cli(); diff --git a/npm-cli/share/template-repo/pesy-Test.template.re b/npm-cli/share/template-repo/pesy-Test.template.re deleted file mode 100644 index fac8aecf..00000000 --- a/npm-cli/share/template-repo/pesy-Test.template.re +++ /dev/null @@ -1,7 +0,0 @@ -open TestFramework; - -describe("my first test suite", ({test, _}) => - test("1 + 1 should equal 2", ({expect}) => - expect.int(1 + 1).toBe(2) - ) -); diff --git a/npm-cli/share/template-repo/pesy-TestFramework.template.re b/npm-cli/share/template-repo/pesy-TestFramework.template.re deleted file mode 100644 index cd957ba8..00000000 --- a/npm-cli/share/template-repo/pesy-TestFramework.template.re +++ /dev/null @@ -1,7 +0,0 @@ -include Rely.Make({ - let config = - Rely.TestFrameworkConfig.initialize({ - snapshotDir: "test/_snapshots", - projectDir: "", - }); - }); diff --git a/npm-cli/share/template-repo/pesy-Util.template.re b/npm-cli/share/template-repo/pesy-Util.template.re deleted file mode 100644 index 0e752684..00000000 --- a/npm-cli/share/template-repo/pesy-Util.template.re +++ /dev/null @@ -1 +0,0 @@ -let foo = () => print_endline("Hello"); diff --git a/npm-cli/share/template-repo/pesy-gitignore.template b/npm-cli/share/template-repo/pesy-gitignore.template deleted file mode 100644 index ae81586b..00000000 --- a/npm-cli/share/template-repo/pesy-gitignore.template +++ /dev/null @@ -1,9 +0,0 @@ -npm-debug.log -.merlin -yarn-error.log -node_modules/ -_build -_release -.install -.DS_Store -*.install diff --git a/npm-cli/share/template-repo/pesy-package.template.json b/npm-cli/share/template-repo/pesy-package.template.json deleted file mode 100644 index 8e839e44..00000000 --- a/npm-cli/share/template-repo/pesy-package.template.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "name": "", - "version": "0.0.0", - "description": "My Project", - "esy": { - "build": "dune build -p #{self.name}", - "release": { - "releasedBinaries": ["App.exe"] - } - }, - "buildDirs": { - "test": { - "require": ["", "rely.lib"], - "flags": ["-linkall", "-g", "-w", "-9"] - }, - "testExe": { - "require": [""], - "bin": { - "RunTests.exe": "RunTests.re" - } - }, - "library": {}, - "executable": { - "require": [""], - "bin": { - "App.exe": "App.re" - } - } - }, - "scripts": { - "test": "esy x RunTests.exe" - }, - "dependencies": { - "@opam/dune": "*", - "@esy-ocaml/reason": "*", - "refmterr": "*", - "ocaml": "4.7.x", - "pesy": "*", - "@reason-native/rely": "*" - }, - "devDependencies": { - "@opam/merlin": "*" - }, - "resolutions": { - "pesy": "esy/pesy#3d8a18385e07fa11daabe811814fae3f869ad355" - } -} diff --git a/npm-cli/src/Pesy.bs.js b/npm-cli/src/Pesy.bs.js index 106e5914..1acb72a9 100644 --- a/npm-cli/src/Pesy.bs.js +++ b/npm-cli/src/Pesy.bs.js @@ -47,7 +47,7 @@ var template = Belt_Option.getWithDefault(Belt_Option.map(Belt_Array.get(Belt_Ar return param.includes("--template"); })), 0), (function (param) { return param.replace("--template=", ""); - })), "github:esy/pesy-reason-template"); + })), "github:esy/pesy-reason-template#86b37d16dcfe15"); var download_spinner = Spinner$PesyBootstrapper.start("\x1b[2mDownloading template\x1b[0m " + template); diff --git a/npm-cli/src/Pesy.re b/npm-cli/src/Pesy.re index fd6ae74c..72998543 100644 --- a/npm-cli/src/Pesy.re +++ b/npm-cli/src/Pesy.re @@ -24,12 +24,8 @@ let substituteTemplateValues = s => packageNameUpperCamelCase, ); let stripTemplateExtension = s => { - s - |> Js.String.replace( - "-template", - "", - ) -} + s |> Js.String.replace("-template", ""); +}; let substituteFileNames = s => s @@ -49,7 +45,9 @@ let template = ->Belt.Array.keep(Js.String.includes("--template")) ->Belt.Array.get(0) ->Belt.Option.map(Js.String.replace("--template=", "")) - ->Belt.Option.getWithDefault("github:esy/pesy-reason-template"); + ->Belt.Option.getWithDefault( + "github:esy/pesy-reason-template#86b37d16dcfe15", + ); let download_spinner = Spinner.start("\x1b[2mDownloading template\x1b[0m " ++ template); @@ -72,7 +70,10 @@ download_git( file => { let () = readFile(file)->substituteTemplateValues |> write(file); - renameSync(file, file |> substituteFileNames |> stripTemplateExtension); + renameSync( + file, + file |> substituteFileNames |> stripTemplateExtension, + ); }, ); Spinner.stop(setup_files_spinner); diff --git a/package.json b/package.json index b97a8a33..77efd240 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { - "name": "pesy", - "version": "0.5.0-alpha.5", + "name": "@pesy/esy-pesy", + "version": "0.1.0-alpha.2", "description": "\"Esy Pesy\" - Your Esy Assistant.", "esy": { "buildsInSource": "_build", "build": [ - "dune build -p #{self.name}" + "dune build -p pesy--esy-pesy" ], "buildDev": [ - "refmterr dune build -p #{self.name}" + "refmterr dune build -p pesy--esy-pesy" ], "release": { "bin": [ @@ -25,8 +25,8 @@ "pesy": "Pesy.re" }, "require": [ - "pesy/lib", - "pesy/utils", + "pesy--esy-pesy/lib", + "pesy--esy-pesy/utils", "cmdliner", "findlib" ] @@ -37,7 +37,7 @@ "sexplib", "yojson", "findlib", - "pesy/utils" + "pesy--esy-pesy/utils" ], "rawBuildConfigFooter": [ "(rule (targets Lexer.ml) (deps Lexer.mll) (action (run %{bin:ocamllex} -q -o %{targets} %{deps})))", diff --git a/pesy.opam b/pesy--esy-pesy.opam similarity index 94% rename from pesy.opam rename to pesy--esy-pesy.opam index 63ff00a3..7286d086 100644 --- a/pesy.opam +++ b/pesy--esy-pesy.opam @@ -2,7 +2,7 @@ opam-version: "2.0" name: "pesy" description: "Esy Pesy - Your Esy Assistant" synopsis: "Esy Pesy - Your Esy Assistant" -version: "0.5.0-alpha.1" +version: "0.5.0-alpha.6" maintainer: "Jordan Walke" authors: [ "Jordan Walke" diff --git a/scripts/run.bat b/scripts/run.bat index 1d2c4d73..9febb365 100644 --- a/scripts/run.bat +++ b/scripts/run.bat @@ -2,6 +2,6 @@ call esy build call esy npm-release call cd _release call npm pack -call npm install -g ./pesy-0.5.0-alpha.2.tgz +call npm install -g ./pesy-0.5.0-alpha.6.tgz call cd .. call .\_build\install\default\bin\TestPesyConfigure.exe diff --git a/scripts/run.sh b/scripts/run.sh index be502cfc..f7e569ef 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -6,7 +6,7 @@ root=$PWD custom_registry_url=http://localhost:4873 original_npm_registry_url=https://registry.npmjs.org # `npm get registry` original_yarn_registry_url=https://registry.yarnpkg.com # `yarn config get registry` -version=0.5.0-alpha.5 +version=0.5.0-alpha.6 function cleanup { diff --git a/utils/dune b/utils/dune index eda90e69..41e2eac4 100644 --- a/utils/dune +++ b/utils/dune @@ -1,2 +1,2 @@ -(library (name Utils) (public_name pesy.utils) - (libraries unix str pastel.lib)) \ No newline at end of file +(library (name Utils) (public_name pesy--esy-pesy.utils) + (libraries unix str pastel.lib))