From 4f2b9393b6694b43b7fe8d074bbc81aaf753230e Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Thu, 14 Jan 2021 16:43:58 +0100 Subject: [PATCH] clients: add npm pre-scripts Add "pre" scripts such that `npm run webpack:server` in a clean working copy will execute all prerequisites to start the server (installing dependencies, generating purescript bridge code, building purescript sources and finally starting the webpack server itself). --- marlowe-playground-client/package.json | 3 +- plutus-playground-client/package.json | 3 +- plutus-scb-client/package.json | 77 +++++++++++++------------- shell.nix | 5 ++ 4 files changed, 48 insertions(+), 40 deletions(-) diff --git a/marlowe-playground-client/package.json b/marlowe-playground-client/package.json index 33d25fcbefc..37e0a7067b3 100644 --- a/marlowe-playground-client/package.json +++ b/marlowe-playground-client/package.json @@ -3,10 +3,11 @@ "version": "1.0.0", "scripts": { "webpack": "NODE_OPTIONS=\"--max-old-space-size=8192\" DEBUG=purs-loader* DEBUG_DEPTH=100 webpack --progress --bail --mode=production -p", - "webpack:watch": "PATH=$PATH:../releases/psc-package DEBUG=purs-loader* DEBUG_DEPTH=100 webpack --progress --display-error-details --display verbose --watch", "webpack:server": "webpack-dev-server --progress --inline --hot --mode=development --host 0.0.0.0 --display verbose", + "prewebpack:server": "npm run purs:compile", "webpack:server:debug": "DEBUG=purs-loader* DEBUG_DEPTH=100 webpack-dev-server --progress --inline --hot", "purs:compile": "spago build", + "prepurs:compile": "npm install && marlowe-playground-generate-purs", "purs:ide": "purs ide server --log-level=debug 'src/**/*.purs' 'generated/**/*.purs' 'test/**/*.purs' 'web-common/**/*.purs'", "test": "NODE_OPTIONS=\"--max-old-space-size=8192\" webpack --config webpack.test.config.js --mode=development && node --max-old-space-size=8192 dist/test.js", "docs": "spago docs", diff --git a/plutus-playground-client/package.json b/plutus-playground-client/package.json index a9bc6650c4b..2735ab78b4b 100644 --- a/plutus-playground-client/package.json +++ b/plutus-playground-client/package.json @@ -3,10 +3,11 @@ "version": "1.0.0", "scripts": { "webpack": "DEBUG=purs-loader* DEBUG_DEPTH=100 webpack --progress --bail --mode=production -p", - "webpack:watch": "PATH=$PATH:../releases/psc-package DEBUG=purs-loader* DEBUG_DEPTH=100 webpack --progress --display-error-details --display verbose --watch", "webpack:server": "webpack-dev-server --progress --inline --hot --mode=development", + "prewebpack:server": "npm run purs:compile", "webpack:server:debug": "DEBUG=purs-loader* DEBUG_DEPTH=100 webpack-dev-server --progress --inline --hot", "purs:compile": "spago build", + "prepurs:compile": "npm install && plutus-playground-generate-purs", "purs:ide": "purs ide server --log-level=debug 'src/**/*.purs' 'generated/**/*.purs' 'test/**/*.purs' 'web-common/**/*.purs'", "test": "spago --no-psa test", "test:watch": "spago test --no-psa --watch", diff --git a/plutus-scb-client/package.json b/plutus-scb-client/package.json index 58a96903487..142687213f4 100644 --- a/plutus-scb-client/package.json +++ b/plutus-scb-client/package.json @@ -1,40 +1,41 @@ { - "name": "plutus-scb-client", - "version": "1.0.0", - "scripts": { - "webpack": "DEBUG=purs-loader* DEBUG_DEPTH=100 webpack --progress --bail --mode=production -p", - "webpack:watch": "PATH=$PATH:../releases/psc-package DEBUG=purs-loader* DEBUG_DEPTH=100 webpack --progress --display-error-details --display verbose --watch", - "webpack:server": "webpack-dev-server --progress --inline --hot --mode=development", - "webpack:server:debug": "DEBUG=purs-loader* DEBUG_DEPTH=100 webpack-dev-server --progress --inline --hot", - "purs:compile": "spago build", - "purs:ide": "purs ide server --log-level=debug 'src/**/*.purs' 'generated/**/*.purs' 'test/**/*.purs' 'web-common/**/*.purs'", - "test": "spago --no-psa test", - "test:watch": "spago test --no-psa --watch", - "docs": "spago docs", - "repl": "spago repl" - }, - "dependencies": { - "@fortawesome/fontawesome-free": "^5.10.2", - "bignumber": "^1.1.0", - "bootstrap": "^4.3.1", - "css-loader": "^1.0.0", - "extract-text-webpack-plugin": "^3.0.2", - "file-loader": "^2.0.0", - "html-webpack-plugin": "^3.2.0", - "jquery": "^3.3.1", - "json-bigint": "^1.0.0", - "node-sass": "^4.12.0", - "purs-loader": "^3.6.0", - "sass-loader": "^7.1.0", - "style-loader": "^0.23.1", - "url-loader": "^1.1.2", - "uuid": "^7.0.2", - "uuid-validate": "^0.0.3", - "webpack": "^4.41.0", - "webpack-cli": "^3.1.2", - "webpack-dev-server": "^3.1.10", - "xhr2": "^0.1.4" - }, - "resolutions": {}, - "license": "Apache-2.0" + "name": "plutus-scb-client", + "version": "1.0.0", + "scripts": { + "webpack": "DEBUG=purs-loader* DEBUG_DEPTH=100 webpack --progress --bail --mode=production -p", + "webpack:server": "webpack-dev-server --progress --inline --hot --mode=development", + "prewebpack:server": "npm run purs:compile", + "webpack:server:debug": "DEBUG=purs-loader* DEBUG_DEPTH=100 webpack-dev-server --progress --inline --hot", + "purs:compile": "spago build", + "prepurs:compile": "npm install && plutus-scb-generate-purs", + "purs:ide": "purs ide server --log-level=debug 'src/**/*.purs' 'generated/**/*.purs' 'test/**/*.purs' 'web-common/**/*.purs'", + "test": "spago --no-psa test", + "test:watch": "spago test --no-psa --watch", + "docs": "spago docs", + "repl": "spago repl" + }, + "dependencies": { + "@fortawesome/fontawesome-free": "^5.10.2", + "bignumber": "^1.1.0", + "bootstrap": "^4.3.1", + "css-loader": "^1.0.0", + "extract-text-webpack-plugin": "^3.0.2", + "file-loader": "^2.0.0", + "html-webpack-plugin": "^3.2.0", + "jquery": "^3.3.1", + "json-bigint": "^1.0.0", + "node-sass": "^4.12.0", + "purs-loader": "^3.6.0", + "sass-loader": "^7.1.0", + "style-loader": "^0.23.1", + "url-loader": "^1.1.2", + "uuid": "^7.0.2", + "uuid-validate": "^0.0.3", + "webpack": "^4.41.0", + "webpack-cli": "^3.1.2", + "webpack-dev-server": "^3.1.10", + "xhr2": "^0.1.4" + }, + "resolutions": {}, + "license": "Apache-2.0" } diff --git a/shell.nix b/shell.nix index aac59f95847..9f2e817ed2e 100644 --- a/shell.nix +++ b/shell.nix @@ -62,6 +62,8 @@ let ${plutus-playground.server-invoker}/bin/plutus-playground psgenerator generated ''; plutus-playground-server = pkgs.writeShellScriptBin "plutus-playground-server" '' + export FRONTEND_URL=https://localhost:8009 + export WEBGHC_URL=http://localhost:8080 ${plutus-playground.server-invoker}/bin/plutus-playground webserver ''; marlowe-playground-generate-purs = pkgs.writeShellScriptBin "marlowe-playground-generate-purs" '' @@ -69,6 +71,7 @@ let ${marlowe-playground.server-invoker}/bin/marlowe-playground psgenerator generated ''; marlowe-playground-server = pkgs.writeShellScriptBin "marlowe-playground-server" '' + export FRONTEND_URL=https://localhost:8009 ${marlowe-playground.server-invoker}/bin/marlowe-playground webserver ''; plutus-scb-generate-purs = pkgs.writeShellScriptBin "plutus-scb-generate-purs" '' @@ -77,6 +80,8 @@ let ${plutus-scb.server-invoker}/bin/plutus-scb psgenerator generated ''; plutus-scb-server = pkgs.writeShellScriptBin "plutus-scb-server" '' + export FRONTEND_URL=https://localhost:8009 + export WEBGHC_URL=http://localhost:8080 rm -rf ./generated cp ${haskell.packages.plutus-scb.src}/plutus-scb.yaml.sample plutus-scb.yaml ${plutus-scb.server-invoker}/bin/plutus-scb webserver