From 6a3fbda599fc186400b82c5366e4daf8c7d9a8ad Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Wed, 10 Jun 2020 12:42:44 +0200 Subject: [PATCH] Switch to bootstrapless lerna setup via lerna link convert --- bootstrap | 1 - package.json | 28 ++++++++++++++++++++++- packages/core/package.json | 4 ---- packages/default.js.do | 6 ++--- packages/driver-browser-ui/package.json | 6 ++--- packages/driver-http-node/package.json | 8 +++---- packages/driver-mdns/package.json | 10 ++++---- packages/driver-streams-node/package.json | 6 ++--- packages/driver-timer/package.json | 6 ++--- packages/driver-udp-node/package.json | 8 +++---- packages/driver-websocket/package.json | 8 +++---- packages/flappy-bird-demo/package.json | 12 ++++------ packages/server/package.json | 22 +++++++----------- packages/socks/package.json | 16 +++++-------- packages/syntax-playground/package.json | 26 ++++++++------------- packages/syntax-server/package.json | 10 ++++---- packages/syntax/package.json | 3 --- 17 files changed, 82 insertions(+), 98 deletions(-) diff --git a/bootstrap b/bootstrap index e70585e..b54b02a 100755 --- a/bootstrap +++ b/bootstrap @@ -1,5 +1,4 @@ #!/bin/sh [ -d node_modules/lerna ] || npm i . -npx lerna bootstrap --ignore-scripts redo clean redo -j3 all diff --git a/package.json b/package.json index 2fe0774..92eef0b 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,32 @@ "name": "@syndicate-lang/root", "private": true, "devDependencies": { - "lerna": "^3.4.3" + "@babel/core": "^7.2.0", + "@babel/plugin-syntax-jsx": "^7.2.0", + "@babel/plugin-transform-react-jsx": "^7.2.0", + "@babel/preset-env": "^7.2.0", + "@syndicate-lang/syntax": "^0.1.1", + "lerna": "^3.4.3", + "mocha": "^5.2.0", + "nyc": "^14.1.1", + "webpack": "^4.27.1", + "webpack-cli": "^3.1.2" + }, + "dependencies": { + "@syndicate-lang/core": "file:packages/core", + "@syndicate-lang/create": "file:packages/create", + "@syndicate-lang/driver-browser-ui": "file:packages/driver-browser-ui", + "@syndicate-lang/driver-http-node": "file:packages/driver-http-node", + "@syndicate-lang/driver-mdns": "file:packages/driver-mdns", + "@syndicate-lang/driver-streams-node": "file:packages/driver-streams-node", + "@syndicate-lang/driver-timer": "file:packages/driver-timer", + "@syndicate-lang/driver-udp-node": "file:packages/driver-udp-node", + "@syndicate-lang/driver-websocket": "file:packages/driver-websocket", + "@syndicate-lang/flappy-bird-demo": "file:packages/flappy-bird-demo", + "@syndicate-lang/server": "file:packages/server", + "@syndicate-lang/socks": "file:packages/socks", + "@syndicate-lang/syntax": "file:packages/syntax", + "@syndicate-lang/syntax-playground": "file:packages/syntax-playground", + "@syndicate-lang/syntax-server": "file:packages/syntax-server" } } diff --git a/packages/core/package.json b/packages/core/package.json index acfa5a6..bccf1e9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -14,10 +14,6 @@ }, "main": "src/index.js", "author": "Tony Garnock-Jones ", - "devDependencies": { - "mocha": "^5.2.0", - "nyc": "^14.1.1" - }, "dependencies": { "debug": "^4.1.1", "immutable": "^4.0.0-rc.12", diff --git a/packages/default.js.do b/packages/default.js.do index cce361f..d230bc6 100644 --- a/packages/default.js.do +++ b/packages/default.js.do @@ -4,7 +4,7 @@ mkdir -p "$(dirname "$1")" cd "$(dirname "$1")"/.. case "$1" in syntax/lib/babel_parser.js) - src=node_modules/@babel/parser/lib/index.js + src=../../node_modules/@babel/parser/lib/index.js [ -f "$src" ] || npm -i . redo-ifchange "$src" babel_parser_suffix.js cat "$src" babel_parser_suffix.js @@ -12,7 +12,7 @@ case "$1" in syntax/lib/*) file=$(basename "$1") redo-ifchange "src/$file" - npx babel "src/$file" + ../../node_modules/.bin/babel "src/$file" ;; */lib/*) redo-ifchange ../syntax/all @@ -66,7 +66,7 @@ case "$1" in done | xargs redo-ifchange configfile=$(basename "$1" .js).webpack.config.js redo-ifchange $configfile - for maybedep in $(npx webpack --config "$configfile" --json -o "$targettempfile" | jq -r '.modules[].identifier') + for maybedep in $(../../node_modules/.bin/webpack --config "$configfile" --json -o "$targettempfile" | jq -r '.modules[].identifier') do [ -f "$maybedep" ] && echo "$maybedep" done | xargs redo-ifchange diff --git a/packages/driver-browser-ui/package.json b/packages/driver-browser-ui/package.json index 7c048e3..18414d5 100644 --- a/packages/driver-browser-ui/package.json +++ b/packages/driver-browser-ui/package.json @@ -14,12 +14,10 @@ }, "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/driver-browser-ui", "devDependencies": { - "@babel/core": "^7.2.0", - "@babel/preset-env": "^7.2.0", - "@syndicate-lang/syntax": "^0.1.1" + "@syndicate-lang/syntax": "file:../syntax" }, "dependencies": { - "@syndicate-lang/core": "^0.3.0", + "@syndicate-lang/core": "file:../core", "immutable": "^4.0.0-rc.12" } } diff --git a/packages/driver-http-node/package.json b/packages/driver-http-node/package.json index 792c1fd..b6710dd 100644 --- a/packages/driver-http-node/package.json +++ b/packages/driver-http-node/package.json @@ -14,13 +14,11 @@ }, "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/driver-http-node", "devDependencies": { - "@babel/core": "^7.2.0", - "@babel/preset-env": "^7.2.0", - "@syndicate-lang/syntax": "^0.1.1" + "@syndicate-lang/syntax": "file:../syntax" }, "dependencies": { - "@syndicate-lang/core": "^0.3.0", - "@syndicate-lang/driver-streams-node": "^0.3.0", + "@syndicate-lang/core": "file:../core", + "@syndicate-lang/driver-streams-node": "file:../driver-streams-node", "ws": "^6.1.2" } } diff --git a/packages/driver-mdns/package.json b/packages/driver-mdns/package.json index c3f645a..0327765 100644 --- a/packages/driver-mdns/package.json +++ b/packages/driver-mdns/package.json @@ -14,13 +14,11 @@ }, "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/driver-mdns", "devDependencies": { - "@babel/core": "^7.2.0", - "@babel/preset-env": "^7.2.0", - "@syndicate-lang/syntax": "^0.1.1" + "@syndicate-lang/syntax": "file:../syntax" }, "dependencies": { - "@syndicate-lang/core": "^0.3.0", - "@syndicate-lang/driver-streams-node": "^0.3.0", - "@syndicate-lang/driver-timer": "^0.3.0" + "@syndicate-lang/core": "file:../core", + "@syndicate-lang/driver-streams-node": "file:../driver-streams-node", + "@syndicate-lang/driver-timer": "file:../driver-timer" } } diff --git a/packages/driver-streams-node/package.json b/packages/driver-streams-node/package.json index 6aa891f..71c2983 100644 --- a/packages/driver-streams-node/package.json +++ b/packages/driver-streams-node/package.json @@ -14,12 +14,10 @@ }, "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/driver-streams-node", "devDependencies": { - "@babel/core": "^7.2.0", - "@babel/preset-env": "^7.2.0", - "@syndicate-lang/syntax": "^0.1.1" + "@syndicate-lang/syntax": "file:../syntax" }, "dependencies": { - "@syndicate-lang/core": "^0.3.0", + "@syndicate-lang/core": "file:../core", "debug": "^4.1.1" } } diff --git a/packages/driver-timer/package.json b/packages/driver-timer/package.json index 7ce679f..ac3aae8 100644 --- a/packages/driver-timer/package.json +++ b/packages/driver-timer/package.json @@ -14,11 +14,9 @@ }, "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/driver-timer", "devDependencies": { - "@babel/core": "^7.2.0", - "@babel/preset-env": "^7.2.0", - "@syndicate-lang/syntax": "^0.1.1" + "@syndicate-lang/syntax": "file:../syntax" }, "dependencies": { - "@syndicate-lang/core": "^0.3.0" + "@syndicate-lang/core": "file:../core" } } diff --git a/packages/driver-udp-node/package.json b/packages/driver-udp-node/package.json index 02ae24c..ae8d5a1 100644 --- a/packages/driver-udp-node/package.json +++ b/packages/driver-udp-node/package.json @@ -14,12 +14,10 @@ }, "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/driver-udp-node", "devDependencies": { - "@babel/core": "^7.2.0", - "@babel/preset-env": "^7.2.0", - "@syndicate-lang/syntax": "^0.1.1" + "@syndicate-lang/syntax": "file:../syntax" }, "dependencies": { - "@syndicate-lang/core": "^0.3.0", - "@syndicate-lang/driver-timer": "^0.3.0" + "@syndicate-lang/core": "file:../core", + "@syndicate-lang/driver-timer": "file:../driver-timer" } } diff --git a/packages/driver-websocket/package.json b/packages/driver-websocket/package.json index 8c4ad48..7ecb5ca 100644 --- a/packages/driver-websocket/package.json +++ b/packages/driver-websocket/package.json @@ -14,13 +14,11 @@ }, "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/driver-websocket", "devDependencies": { - "@babel/core": "^7.2.0", - "@babel/preset-env": "^7.2.0", - "@syndicate-lang/syntax": "^0.1.1" + "@syndicate-lang/syntax": "file:../syntax" }, "dependencies": { - "@syndicate-lang/core": "^0.3.0", - "@syndicate-lang/driver-timer": "^0.3.0", + "@syndicate-lang/core": "file:../core", + "@syndicate-lang/driver-timer": "file:../driver-timer", "debug": "^4.1.1", "isomorphic-ws": "^4.0.1", "ws": "^6.1.2" diff --git a/packages/flappy-bird-demo/package.json b/packages/flappy-bird-demo/package.json index f27af37..de5a8be 100644 --- a/packages/flappy-bird-demo/package.json +++ b/packages/flappy-bird-demo/package.json @@ -7,16 +7,12 @@ "repository": "github:syndicate-lang/syndicate-js", "author": "Tony Garnock-Jones ", "devDependencies": { - "@babel/core": "^7.2.0", - "@babel/plugin-syntax-jsx": "^7.2.0", - "@babel/plugin-transform-react-jsx": "^7.2.0", - "@babel/preset-env": "^7.2.0", - "@syndicate-lang/syntax": "^0.1.1" + "@syndicate-lang/syntax": "file:../syntax" }, "dependencies": { - "@syndicate-lang/core": "^0.3.0", - "@syndicate-lang/driver-browser-ui": "^0.3.0", - "@syndicate-lang/driver-timer": "^0.3.0", + "@syndicate-lang/core": "file:../core", + "@syndicate-lang/driver-browser-ui": "file:../driver-browser-ui", + "@syndicate-lang/driver-timer": "file:../driver-timer", "webpack": "^4.27.1", "webpack-cli": "^3.1.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 6f28d26..806a456 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -13,22 +13,16 @@ }, "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/server", "devDependencies": { - "@babel/core": "^7.2.0", - "@babel/plugin-syntax-jsx": "^7.2.0", - "@babel/plugin-transform-react-jsx": "^7.2.0", - "@babel/preset-env": "^7.2.0", - "@syndicate-lang/syntax": "^0.1.1", - "webpack": "^4.27.1", - "webpack-cli": "^3.1.2" + "@syndicate-lang/syntax": "file:../syntax" }, "dependencies": { - "@syndicate-lang/core": "^0.3.0", - "@syndicate-lang/driver-browser-ui": "^0.3.0", - "@syndicate-lang/driver-http-node": "^0.3.0", - "@syndicate-lang/driver-mdns": "^0.3.0", - "@syndicate-lang/driver-streams-node": "^0.3.0", - "@syndicate-lang/driver-timer": "^0.3.0", - "@syndicate-lang/driver-websocket": "^0.3.0", + "@syndicate-lang/core": "file:../core", + "@syndicate-lang/driver-browser-ui": "file:../driver-browser-ui", + "@syndicate-lang/driver-http-node": "file:../driver-http-node", + "@syndicate-lang/driver-mdns": "file:../driver-mdns", + "@syndicate-lang/driver-streams-node": "file:../driver-streams-node", + "@syndicate-lang/driver-timer": "file:../driver-timer", + "@syndicate-lang/driver-websocket": "file:../driver-websocket", "debug": "^4.1.1" }, "main": "lib/index.js", diff --git a/packages/socks/package.json b/packages/socks/package.json index 00bdba3..52d27db 100644 --- a/packages/socks/package.json +++ b/packages/socks/package.json @@ -13,18 +13,14 @@ }, "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/socks", "devDependencies": { - "@babel/core": "^7.2.0", - "@babel/plugin-syntax-jsx": "^7.2.0", - "@babel/plugin-transform-react-jsx": "^7.2.0", - "@babel/preset-env": "^7.2.0", - "@syndicate-lang/syntax": "^0.1.1" + "@syndicate-lang/syntax": "file:../syntax" }, "dependencies": { - "@syndicate-lang/core": "^0.3.0", - "@syndicate-lang/driver-mdns": "^0.3.0", - "@syndicate-lang/driver-streams-node": "^0.3.0", - "@syndicate-lang/driver-timer": "^0.3.0", - "@syndicate-lang/server": "^0.3.0", + "@syndicate-lang/core": "file:../core", + "@syndicate-lang/driver-mdns": "file:../driver-mdns", + "@syndicate-lang/driver-streams-node": "file:../driver-streams-node", + "@syndicate-lang/driver-timer": "file:../driver-timer", + "@syndicate-lang/server": "file:../server", "debug": "^4.1.1", "dockerode": "^2.5.8" }, diff --git a/packages/syntax-playground/package.json b/packages/syntax-playground/package.json index ba9024f..8f61223 100644 --- a/packages/syntax-playground/package.json +++ b/packages/syntax-playground/package.json @@ -7,24 +7,18 @@ "repository": "github:syndicate-lang/syndicate-js", "author": "Tony Garnock-Jones ", "devDependencies": { - "@babel/core": "^7.2.0", - "@babel/plugin-syntax-jsx": "^7.2.0", - "@babel/plugin-transform-react-jsx": "^7.2.0", - "@babel/preset-env": "^7.2.0", - "@syndicate-lang/syntax": "^0.1.1", - "webpack": "^4.27.1", - "webpack-cli": "^3.1.2" + "@syndicate-lang/syntax": "file:../syntax" }, "dependencies": { - "@syndicate-lang/core": "^0.3.0", - "@syndicate-lang/driver-browser-ui": "^0.3.0", - "@syndicate-lang/driver-http-node": "^0.3.0", - "@syndicate-lang/driver-mdns": "^0.3.0", - "@syndicate-lang/driver-streams-node": "^0.3.0", - "@syndicate-lang/driver-timer": "^0.3.0", - "@syndicate-lang/driver-udp-node": "^0.3.0", - "@syndicate-lang/driver-websocket": "^0.3.0", - "@syndicate-lang/server": "^0.3.0", + "@syndicate-lang/core": "file:../core", + "@syndicate-lang/driver-browser-ui": "file:../driver-browser-ui", + "@syndicate-lang/driver-http-node": "file:../driver-http-node", + "@syndicate-lang/driver-mdns": "file:../driver-mdns", + "@syndicate-lang/driver-streams-node": "file:../driver-streams-node", + "@syndicate-lang/driver-timer": "file:../driver-timer", + "@syndicate-lang/driver-udp-node": "file:../driver-udp-node", + "@syndicate-lang/driver-websocket": "file:../driver-websocket", + "@syndicate-lang/server": "file:../server", "debug": "^4.1.1", "dockerode": "^2.5.8" } diff --git a/packages/syntax-server/package.json b/packages/syntax-server/package.json index 075c028..6833cb8 100644 --- a/packages/syntax-server/package.json +++ b/packages/syntax-server/package.json @@ -17,11 +17,11 @@ "@babel/plugin-syntax-jsx": "^7.2.0", "@babel/plugin-transform-react-jsx": "^7.2.0", "@babel/preset-env": "^7.2.0", - "@syndicate-lang/core": "^0.3.0", - "@syndicate-lang/driver-browser-ui": "^0.3.0", - "@syndicate-lang/driver-http-node": "^0.3.0", - "@syndicate-lang/driver-streams-node": "^0.3.0", - "@syndicate-lang/syntax": "^0.1.1" + "@syndicate-lang/core": "file:../core", + "@syndicate-lang/driver-browser-ui": "file:../driver-browser-ui", + "@syndicate-lang/driver-http-node": "file:../driver-http-node", + "@syndicate-lang/driver-streams-node": "file:../driver-streams-node", + "@syndicate-lang/syntax": "file:../syntax" }, "bin": { "syndicate-babel-server": "./bin/syndicate-babel-server.js" diff --git a/packages/syntax/package.json b/packages/syntax/package.json index dda9ae1..bda822b 100644 --- a/packages/syntax/package.json +++ b/packages/syntax/package.json @@ -11,9 +11,6 @@ "scripts": { "prepare": "which redo >/dev/null && redo || ../../do" }, - "devDependencies": { - "@babel/preset-env": "^7.2.0" - }, "dependencies": { "@babel/cli": "^7.2.0", "@babel/core": "^7.2.0",