Plutonomicon · klntsky · Dec 15, 2023 · Jun 29, 2023 · Jun 29, 2023 · Jun 29, 2023
diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,14 @@ result-*
 .node
 .node-cfg
 .projectile
-/dist/
+/dist/*
+!/dist/esbuild/
+/dist/esbuild/*
+!/dist/esbuild/index.html
+!/dist/esbuild/wrapper.js
+!/dist/webpack/
+/dist/webpack/*
+!/dist/webpack/.gitkeep
 output.js
 .DS_Store
 .idea/

diff --git a/Makefile b/Makefile
@@ -1,21 +1,34 @@
 SHELL := bash
 .ONESHELL:
-.PHONY: run-dev run-build check-format format query-testnet-tip clean check-explicit-exports
+.PHONY: esbuild-bundle esbuild-serve webpack-bundle webpack-serve check-format format query-testnet-tip clean check-explicit-exports
 .SHELLFLAGS := -eu -o pipefail -c
 
 ps-sources := $(shell fd --no-ignore-parent -epurs)
 nix-sources := $(shell fd --no-ignore-parent -enix --exclude='spago*')
 js-sources := $(shell fd --no-ignore-parent -ejs)
 ps-entrypoint := Ctl.Examples.ByUrl # points to one of the example PureScript modules in examples/
-ps-bundle = spago bundle-module -m ${ps-entrypoint} --to output.js
 preview-node-ipc = $(shell docker volume inspect store_node-preview-ipc | jq -r '.[0].Mountpoint')
 preprod-node-ipc = $(shell docker volume inspect store_node-preprod-ipc | jq -r '.[0].Mountpoint')
 
-run-dev:
-	@${ps-bundle} && BROWSER_RUNTIME=1 webpack-dev-server --progress
+esbuild-bundle:
+	@spago build \
+		&& cp -rf fixtures dist/esbuild \
+		&& BROWSER_RUNTIME=1 node esbuild/bundle.js ${ps-entrypoint}
 
-run-build:
-	@${ps-bundle} && BROWSER_RUNTIME=1 webpack --mode=production
+esbuild-serve:
+	@spago build \
+		&& cp -rf fixtures dist/esbuild \
+		&& BROWSER_RUNTIME=1 node esbuild/serve.js ${ps-entrypoint}
+
+webpack-bundle:
+	@spago build \
+		&& rm -rf dist/webpack/* \
+		&& cp -rf fixtures/* dist/webpack \
+		&& BROWSER_RUNTIME=1 webpack --mode=production --env entry=./output/${ps-entrypoint}/index.js
+
+webpack-serve:
+	@spago build \
+		&& BROWSER_RUNTIME=1 webpack-dev-server --progress --env entry=./output/${ps-entrypoint}/index.js
 
 .ONESHELL:
 check-explicit-exports:
@@ -36,7 +49,7 @@ check-format: check-explicit-exports check-examples-imports check-whitespace
 	@purs-tidy check ${ps-sources}
 	@nixpkgs-fmt --check ${nix-sources}
 	@prettier --loglevel warn -c ${js-sources}
-	@eslint --quiet ${js-sources}
+	@eslint --quiet ${js-sources} --parser-options 'sourceType: module'
 
 format:
 	@purs-tidy format-in-place ${ps-sources}

diff --git a/dist/esbuild/index.html b/dist/esbuild/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en" data-framework="purescript">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+
+<body>
+  <script type="module">
+    import("./index.js").then(m => m.main());
+  </script>
+  Examples source code is located in <i>examples/</i> directory.<br>
+</body>
+</html>
diff --git a/dist/webpack/.gitkeep b/dist/webpack/.gitkeep
diff --git a/doc/getting-started.md b/doc/getting-started.md
@@ -38,7 +38,9 @@ Then, add `https://public-plutonomicon.cachix.org` and `public-plutonomicon.cach
 
 The easiest way to create a new CTL project is to use our `ctl-scaffold` flake template. This lives in the CTL repo -- you can have a look [here](../templates/ctl-scaffold). It contains a simple, yet complete, flakes-based scaffolding project with example `outputs` for a CTL project, including its runtime.
 
+<!-- markdown-link-check-disable -->
 Alternatively, consider [the-plutus-scaffold](https://github.com/mlabs-haskell/the-plutus-scaffold) flake template. It's a scaffold built on top of the above mentioned `ctl-scaffold`, but includes a react based frontend and a haskell onchain additionaly. It's more of a demo application, than a minimal working example.
+<!-- markdown-link-check-enable -->
 
 A new project can be initialized as follows:
 

diff --git a/esbuild/bundle.js b/esbuild/bundle.js
@@ -0,0 +1,4 @@
+import * as esbuild from "esbuild";
+import { buildOptions } from "./config.js";
+
+esbuild.build(buildOptions);
diff --git a/esbuild/config.js b/esbuild/config.js
@@ -0,0 +1,28 @@
+import { wasmLoader } from "esbuild-plugin-wasm";
+import { polyfillNode } from "esbuild-plugin-polyfill-node";
+
+export const buildOptions = {
+  entryPoints: [`output/${process.argv[2]}/index.js`],
+  outdir: "dist/esbuild",
+  define: {
+    BROWSER_RUNTIME: process.env.BROWSER_RUNTIME,
+    SCRIPTS_DIR: '"fixtures/scripts"',
+  },
+  plugins: [
+    polyfillNode({
+      polyfills: {
+        crypto: true,
+        fs: true,
+        os: true,
+      },
+    }),
+    wasmLoader({
+      mode: "deferred",
+    }),
+  ],
+  bundle: true,
+  platform: "browser",
+  format: "esm",
+  treeShaking: true,
+  logLevel: "error",
+};
diff --git a/esbuild/serve.js b/esbuild/serve.js
@@ -0,0 +1,9 @@
+import * as esbuild from "esbuild";
+import { buildOptions } from "./config.js";
+
+const ctx = await esbuild.context(buildOptions);
+await ctx.serve({
+  host: "127.0.0.1",
+  port: 4008,
+  servedir: "dist/esbuild",
+});
diff --git a/examples/AlwaysMints.js b/examples/AlwaysMints.js
diff --git a/examples/AlwaysMints.purs b/examples/AlwaysMints.purs
@@ -13,23 +13,16 @@ import Contract.Prelude
 
 import Contract.Config (ContractParams, testnetNamiConfig)
 import Contract.Log (logInfo')
-import Contract.Monad (Contract, launchAff_, runContract)
+import Contract.Monad (Contract, launchAff_, liftContractAffM, runContract)
 import Contract.ScriptLookups as Lookups
 import Contract.Scripts (MintingPolicy(PlutusMintingPolicy))
-import Contract.TextEnvelope
-  ( decodeTextEnvelope
-  , plutusScriptV1FromEnvelope
-  )
+import Contract.TextEnvelope (decodeTextEnvelope, plutusScriptV1FromEnvelope)
 import Contract.Transaction (awaitTxConfirmed, submitTxFromConstraints)
 import Contract.TxConstraints as Constraints
 import Contract.Value as Value
-import Control.Monad.Error.Class (liftMaybe)
-import Ctl.Examples.Helpers
-  ( mkCurrencySymbol
-  , mkTokenName
-  ) as Helpers
+import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers
+import Ctl.Examples.Helpers.LoadScript (loadScript)
 import Data.BigInt as BigInt
-import Effect.Exception (error)
 
 main :: Effect Unit
 main = example testnetNamiConfig
@@ -57,14 +50,12 @@ example :: ContractParams -> Effect Unit
 example cfg = launchAff_ $ do
   runContract cfg contract
 
-foreign import alwaysMints :: String
-
-alwaysMintsPolicyMaybe :: Maybe MintingPolicy
-alwaysMintsPolicyMaybe = do
-  envelope <- decodeTextEnvelope alwaysMints
-  PlutusMintingPolicy <$> plutusScriptV1FromEnvelope envelope
+alwaysMintsPolicyMaybe :: Aff (Maybe MintingPolicy)
+alwaysMintsPolicyMaybe =
+  loadScript "always-mints.plutus" <#> \alwaysMints -> do
+    envelope <- decodeTextEnvelope alwaysMints
+    PlutusMintingPolicy <$> plutusScriptV1FromEnvelope envelope
 
 alwaysMintsPolicy :: Contract MintingPolicy
 alwaysMintsPolicy =
-  liftMaybe (error "Error decoding alwaysMintsPolicy")
-    alwaysMintsPolicyMaybe
+  liftContractAffM "Error decoding alwaysMintsPolicy" alwaysMintsPolicyMaybe
diff --git a/examples/AlwaysSucceeds.js b/examples/AlwaysSucceeds.js
diff --git a/examples/AlwaysSucceeds.purs b/examples/AlwaysSucceeds.purs
@@ -2,8 +2,7 @@
 -- | balance, and submit a smart-contract transaction. It creates a transaction
 -- | that pays two Ada to the `AlwaysSucceeds` script address.
 module Ctl.Examples.AlwaysSucceeds
-  ( alwaysSucceeds
-  , alwaysSucceedsScript
+  ( alwaysSucceedsScript
   , contract
   , example
   , main
@@ -35,6 +34,7 @@ import Contract.Utxos (utxosAt)
 import Contract.Value as Value
 import Contract.Wallet (ownStakePubKeyHashes)
 import Control.Monad.Error.Class (liftMaybe)
+import Ctl.Examples.Helpers.LoadScript (loadScript)
 import Data.Array (head)
 import Data.BigInt as BigInt
 import Data.Lens (view)
@@ -118,10 +118,9 @@ spendFromAlwaysSucceeds vhash validator txId = do
   awaitTxConfirmed spendTxId
   logInfo' "Successfully spent locked values."
 
-foreign import alwaysSucceeds :: String
-
 alwaysSucceedsScript :: Contract Validator
-alwaysSucceedsScript =
+alwaysSucceedsScript = do
+  alwaysSucceeds <- liftAff $ loadScript "always-succeeds.plutus"
   liftMaybe (error "Error decoding alwaysSucceeds") do
     envelope <- decodeTextEnvelope alwaysSucceeds
     Validator <$> plutusScriptV1FromEnvelope envelope
diff --git a/examples/ECDSA.js b/examples/ECDSA.js
diff --git a/examples/ECDSA.purs b/examples/ECDSA.purs
@@ -15,7 +15,7 @@ import Contract.Crypto.Secp256k1.Utils
   , randomSecp256k1PrivateKey
   )
 import Contract.Log (logInfo')
-import Contract.Monad (Contract, liftContractM)
+import Contract.Monad (Contract, liftContractAffM, liftContractM)
 import Contract.Numeric.BigNum as BigNum
 import Contract.PlutusData
   ( class ToData
@@ -36,6 +36,7 @@ import Contract.Transaction
 import Contract.TxConstraints as Constraints
 import Contract.Utxos (utxosAt)
 import Contract.Value as Value
+import Ctl.Examples.Helpers.LoadScript (loadScript)
 import Data.Map as Map
 import Data.Set as Set
 
@@ -59,7 +60,7 @@ contract = do
 -- | Prepare the ECDSA test by locking some funds at the validator address
 prepTest :: Contract TransactionHash
 prepTest = do
-  validator <- liftContractM "Caonnot get validator" getValidator
+  validator <- liftContractAffM "Caonnot get validator" getValidator
   let
     valHash = validatorHash validator
 
@@ -85,7 +86,7 @@ testVerification
 testVerification txId ecdsaRed = do
   let red = Redeemer $ toData ecdsaRed
 
-  validator <- liftContractM "Can't get validator" getValidator
+  validator <- liftContractAffM "Can't get validator" getValidator
   let valHash = validatorHash validator
 
   netId <- getNetworkId
@@ -128,8 +129,7 @@ testECDSA txId = do
       , pk: publicKey
       }
 
-getValidator :: Maybe Validator
-getValidator = do
-  decodeTextEnvelope validateECDSA >>= plutusScriptV2FromEnvelope >>> map wrap
-
-foreign import validateECDSA :: String
+getValidator :: Aff (Maybe Validator)
+getValidator =
+  loadScript "validate-ecdsa.plutus" <#> \validateECDSA ->
+    decodeTextEnvelope validateECDSA >>= plutusScriptV2FromEnvelope >>> map wrap
diff --git a/examples/ExUnits.js b/examples/ExUnits.js
diff --git a/examples/ExUnits.purs b/examples/ExUnits.purs
@@ -33,6 +33,7 @@ import Contract.Utxos (utxosAt)
 import Contract.Value as Value
 import Contract.Wallet (ownStakePubKeyHashes)
 import Control.Monad.Error.Class (liftMaybe)
+import Ctl.Examples.Helpers.LoadScript (loadScript)
 import Data.Array (head)
 import Data.BigInt (BigInt)
 import Data.BigInt as BigInt
@@ -120,10 +121,9 @@ spendFromExUnits iters vhash validator txId = do
   awaitTxConfirmed spendTxId
   logInfo' "Successfully spent locked values."
 
-foreign import exUnits :: String
-
 exUnitsScript :: Contract Validator
-exUnitsScript =
+exUnitsScript = do
+  exUnits <- liftAff $ loadScript "exunits.plutus"
   liftMaybe (error "Error decoding exUnits") do
     envelope <- decodeTextEnvelope exUnits
     Validator <$> plutusScriptV2FromEnvelope envelope
diff --git a/examples/Helpers/LoadScript.js b/examples/Helpers/LoadScript.js
@@ -0,0 +1,12 @@
+/* global BROWSER_RUNTIME SCRIPTS_DIR */
+
+export const _loadScript = path => async () => {
+  if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
+    const response = await fetch(`${SCRIPTS_DIR}/${path}`);
+    return await response.text();
+  } else {
+    const fs = await import("fs");
+    const url = new URL(`../../fixtures/scripts/${path}`, import.meta.url);
+    return fs.readFileSync(url, "utf8");
+  }
+};
diff --git a/examples/Helpers/LoadScript.purs b/examples/Helpers/LoadScript.purs
@@ -0,0 +1,14 @@
+module Ctl.Examples.Helpers.LoadScript
+  ( loadScript
+  ) where
+
+import Prelude
+
+import Control.Promise (Promise, toAffE)
+import Effect (Effect)
+import Effect.Aff (Aff)
+
+foreign import _loadScript :: String -> Effect (Promise String)
+
+loadScript :: String -> Aff String
+loadScript filepath = toAffE $ _loadScript filepath
diff --git a/examples/IncludeDatum.js b/examples/IncludeDatum.js