From cc846aa74c637dcf8eaba3e0591ce1b6d6e8651b Mon Sep 17 00:00:00 2001 From: Vyacheslav Matyukhin Date: Sat, 8 Oct 2022 05:19:15 +0400 Subject: [PATCH] turborepo --- .gitignore | 1 + package.json | 3 ++- packages/vscode-ext/package.json | 15 ++++++------ turbo.json | 15 ++++++++++++ yarn.lock | 42 ++++++++++++++++++++++++++++++++ 5 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 turbo.json diff --git a/.gitignore b/.gitignore index 0712e779..3cc94af0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ yarn-error.log todo.txt result shell.nix +.turbo diff --git a/package.json b/package.json index dcab983e..2db44f0c 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "lint:all": "prettier --check . && cd packages/squiggle-lang && yarn lint:rescript" }, "devDependencies": { - "prettier": "^2.7.1" + "prettier": "^2.7.1", + "turbo": "^1.5.5" }, "workspaces": [ "packages/*" diff --git a/packages/vscode-ext/package.json b/packages/vscode-ext/package.json index 29b62437..325de130 100644 --- a/packages/vscode-ext/package.json +++ b/packages/vscode-ext/package.json @@ -114,13 +114,13 @@ } }, "scripts": { - "vscode:prepublish": "yarn run compile", - "compile:tsc": "tsc -b", - "compile:grammar": "js-yaml syntaxes/squiggle.tmLanguage.yaml >syntaxes/squiggle.tmLanguage.json", - "compile:vendor": "(cd ../squiggle-lang && yarn run build) && (cd ../components && yarn run bundle && yarn run build:css) && mkdir -p media/vendor && cp ../components/dist/bundle.js media/vendor/components.js && cp ../components/dist/main.css media/vendor/components.css && cp ../../node_modules/react/umd/react.production.min.js media/vendor/react.js && cp ../../node_modules/react-dom/umd/react-dom.production.min.js media/vendor/react-dom.js && cp ../website/static/img/squiggle-logo.png media/vendor/icon.png", - "compile": "yarn run compile:vendor && yarn run compile:grammar && yarn run compile:tsc", + "vscode:prepublish": "yarn run build", + "build:tsc": "tsc -b", + "build:grammar": "js-yaml syntaxes/squiggle.tmLanguage.yaml >syntaxes/squiggle.tmLanguage.json", + "build:vendor": "mkdir -p media/vendor && cp ../components/dist/bundle.js media/vendor/components.js && cp ../components/dist/main.css media/vendor/components.css && cp ../../node_modules/react/umd/react.production.min.js media/vendor/react.js && cp ../../node_modules/react-dom/umd/react-dom.production.min.js media/vendor/react-dom.js && cp ../website/static/img/squiggle-logo.png media/vendor/icon.png", + "build": "yarn run build:vendor && yarn run build:grammar && yarn run build:tsc", "watch": "tsc -b -watch", - "pretest": "yarn run compile && yarn run lint", + "pretest": "yarn run build && yarn run lint", "lint": "prettier --check .", "format": "prettier --write .", "package": "npx vsce package --yarn" @@ -138,6 +138,7 @@ "vscode-languageclient": "^8.0.2", "vscode-languageserver": "^8.0.2", "vscode-languageserver-textdocument": "^1.0.7", - "@quri/squiggle-lang": "^0.2.11" + "@quri/squiggle-lang": "*", + "@quri/squiggle-components": "*" } } diff --git a/turbo.json b/turbo.json new file mode 100644 index 00000000..3417e170 --- /dev/null +++ b/turbo.json @@ -0,0 +1,15 @@ +{ + "$schema": "https://turborepo.org/schema.json", + "pipeline": { + "lint": {}, + "build": { + "dependsOn": ["^build"] + }, + "test": { + "dependsOn": ["build"] + }, + "vscode-ext#build": { + "dependsOn": ["^build", "@quri/squiggle-components#bundle"] + } + } +} diff --git a/yarn.lock b/yarn.lock index 2292e288..a7a75fd2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18242,6 +18242,48 @@ tunnel@0.0.4: resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.4.tgz#2d3785a158c174c9a16dc2c046ec5fc5f1742213" integrity sha512-o9QYRJN5WgS8oCtqvwzzcfnzaTnDPr7HpUsQdSXscTyzXbjvl4wSHPTUKOKzEaDeQvOuyRtt3ui+ujM7x7TReQ== +turbo-darwin-64@1.5.5: + version "1.5.5" + resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-1.5.5.tgz#710d4e7999066bd4f500456f7cd1c30f6e6205ed" + integrity sha512-HvEn6P2B+NXDekq9LRpRgUjcT9/oygLTcK47U0qsAJZXRBSq/2hvD7lx4nAwgY/4W3rhYJeWtHTzbhoN6BXqGQ== + +turbo-darwin-arm64@1.5.5: + version "1.5.5" + resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-1.5.5.tgz#f7955a800e945ab110e8a6e23f60a2b9795296ab" + integrity sha512-Dmxr09IUy6M0nc7/xWod9galIO2DD500B75sJSkHeT+CCdJOWnlinux0ZPF8CSygNqymwYO8AO2l15/6yxcycg== + +turbo-linux-64@1.5.5: + version "1.5.5" + resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-1.5.5.tgz#f31eb117a9b605f5731048c50473bff903850047" + integrity sha512-wd07TZ4zXXWjzZE00FcFMLmkybQQK/NV9ff66vvAV0vdiuacSMBCNLrD6Mm4ncfrUPW/rwFW5kU/7hyuEqqtDw== + +turbo-linux-arm64@1.5.5: + version "1.5.5" + resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-1.5.5.tgz#b9ce6912ae6477e829355d6f012500bfef58669d" + integrity sha512-q3q33tuo74R7gicnfvFbnZZvqmlq7Vakcvx0eshifnJw4PR+oMnTCb4w8ElVFx070zsb8DVTibq99y8NJH8T1Q== + +turbo-windows-64@1.5.5: + version "1.5.5" + resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-1.5.5.tgz#609098de3bc6178f733615d21b06d5c1602637eb" + integrity sha512-lPp9kHonNFfqgovbaW+UAPO5cLmoAN+m3G3FzqcrRPnlzt97vXYsDhDd/4Zy3oAKoAcprtP4CGy0ddisqsKTVw== + +turbo-windows-arm64@1.5.5: + version "1.5.5" + resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.5.5.tgz#60522e1e347a54c64bdddb68089fc322ee19c3d7" + integrity sha512-3AfGULKNZiZVrEzsIE+W79ZRW1+f5r4nM4wLlJ1PTBHyRxBZdD6KTH1tijGfy/uTlcV5acYnKHEkDc6Q9PAXGQ== + +turbo@^1.5.5: + version "1.5.5" + resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.5.5.tgz#9fc3a917c914ffa113c260a4eadb4bc632eee227" + integrity sha512-PVQSDl0STC9WXIyHcYUWs9gXsf8JjQig/FuHfuB8N6+XlgCGB3mPbfMEE6zrChGz2hufH4/guKRX1XJuNL6XTA== + optionalDependencies: + turbo-darwin-64 "1.5.5" + turbo-darwin-arm64 "1.5.5" + turbo-linux-64 "1.5.5" + turbo-linux-arm64 "1.5.5" + turbo-windows-64 "1.5.5" + turbo-windows-arm64 "1.5.5" + type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"