diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000000..663c7f2c6c --- /dev/null +++ b/.dockerignore @@ -0,0 +1,49 @@ +# Ignore node_modules directories +node_modules +**/node_modules + +# Ignore .cache directories +**/.cache + +# Ignore .DS_Store files +**/.DS_Store + +# Ignore .sync.ffs_db directories +**/.sync.ffs_db + +# Ignore .direnv directories +**/.direnv + +# Ignore .log files +**/*.log + +# Ignore .turbo directories +**/.turbo +.turbo + +# Ignore dist directories +**/dist + +# Ignore .next directories +**/.next + +# Ignore specific .vscode files +.vscode/_.code-workspace +.vscode/settings.json + +*.tsbuildinfo + +# Ignore .env files +.env +.env.test + +# Ignore tsconfig.tsbuildinfo file in the current directory +/tsconfig.tsbuildinfo + +# Ignore .next directory in the current directory +/.next + +# Ignore .vscode directory in the current directory +/.vscode + +/.git diff --git a/packages/components/package.json b/packages/components/package.json index 1449287c51..e70df49364 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -105,8 +105,8 @@ "build:ts": "tsc -b", "build:css": "postcss ./src/styles/full.css -o ./dist/full.css && postcss ./src/styles/common.css -o ./dist/common.css", "build:lezer": "cd ./src/components/CodeEditor/languageSupport; mkdir -p generated; lezer-generator ./squiggle.grammar --output generated/squiggle.ts", + "build": "pnpm run build:lezer && pnpm run build:ts && pnpm run build:css", "build:storybook": "storybook build", - "build": "pnpm run build:lezer && pnpm run build:ts && pnpm run build:css && pnpm run build:storybook", "lint": "pnpm lint:prettier && pnpm eslint", "lint:prettier": "prettier --check .", "eslint": "eslint --ignore-path .gitignore .", diff --git a/packages/components/turbo.json b/packages/components/turbo.json index b18a99e79d..176fee97b4 100644 --- a/packages/components/turbo.json +++ b/packages/components/turbo.json @@ -4,7 +4,6 @@ "build": { "outputs": [ "dist/**", - "storybook-static/**", "src/components/CodeEditor/languageSupport/generated/**" ] }, diff --git a/packages/components/vercel.json b/packages/components/vercel.json index 9ff10a49c8..3945cd75c0 100644 --- a/packages/components/vercel.json +++ b/packages/components/vercel.json @@ -1,5 +1,5 @@ { - "buildCommand": "PLATFORM=vercel npx turbo build", + "buildCommand": "PLATFORM=vercel npx turbo build:storybook", "outputDirectory": "storybook-static", "ignoreCommand": "npx turbo-ignore || ../../skip-dependabot.sh" } diff --git a/packages/hub/dockerfile b/packages/hub/dockerfile new file mode 100644 index 0000000000..83f2bb821b --- /dev/null +++ b/packages/hub/dockerfile @@ -0,0 +1,49 @@ +# Should be invoked from monorepo's root. + +# Use the official Node.js 20 image as the base +ARG DOCKER_NODE_VERSION=20-bookworm-slim + +FROM node:$DOCKER_NODE_VERSION AS node-with-openssl + +# Install OpenSSL - necessary for Prisma client +# Mount caches via https://stackoverflow.com/a/72851168 +RUN --mount=type=cache,id=apt-lists,target=/var/lib/apt/lists,sharing=locked \ + --mount=type=cache,id=apt-cache,target=/var/cache/apt,sharing=locked \ + rm -f /etc/apt/apt.conf.d/docker-clean \ + && apt-get update \ + && apt-get install -y \ + openssl +# If we ever need canvas for components, uncomment these: +# build-essential \ +# libcairo2-dev \ +# libpango1.0-dev \ +# libjpeg-dev \ +# libgif-dev \ +# librsvg2-dev + +# Build +FROM node-with-openssl AS build-stage +WORKDIR /build + +# Install pnpm and turbo globally +RUN npm install -g pnpm + +# Copy the entire monorepo to the working directory +COPY . . + +# Install monorepo dependencies +RUN --mount=type=cache,id=pnpm-store,target=/root/.local/share/pnpm/store/v3 pnpm install --frozen-lockfile + +WORKDIR /build/packages/hub +ENV NODE_ENV=production + +# TODO - turbo cache, either as volume or remote +RUN npx turbo run bundle --concurrency=1 + +FROM node-with-openssl AS run-stage +WORKDIR /app + +COPY --from=build-stage /build/packages/hub/dist /app/dist +COPY --from=build-stage /build/node_modules/.pnpm/@prisma+client*/node_modules/.prisma/client/*.so.node /app/dist + +CMD ["node", "dist/bundle/buildRecentModelRevision.js"] diff --git a/packages/hub/package.json b/packages/hub/package.json index cb4f9b6268..095bd2dbf6 100644 --- a/packages/hub/package.json +++ b/packages/hub/package.json @@ -17,6 +17,7 @@ "gen": "pnpm gen:prisma && pnpm gen:schema && pnpm gen:relay", "gen:watch": "nodemon --watch src --ext ts,tsx,prisma --exec 'pnpm run gen'", "build:ts": "pnpm gen && tsc", + "bundle": "esbuild ./src/scripts/buildRecentModelRevision.ts --format=cjs --platform=node --sourcemap --minify --bundle --outdir=./dist/bundle", "build": "pnpm gen && __NEXT_PRIVATE_PREBUNDLED_REACT=next next build", "lint": "prettier --check . && next lint", "format": "prettier --write .", @@ -82,6 +83,7 @@ "@types/relay-runtime": "^14.1.23", "babel-plugin-relay": "^16.2.0", "dotenv-cli": "^7.3.0", + "esbuild": "^0.20.1", "eslint": "^8.57.0", "eslint-config-next": "^14.1.0", "graphql": "^16.8.1", diff --git a/packages/hub/turbo.json b/packages/hub/turbo.json index 390cd7deca..ec40ced34c 100644 --- a/packages/hub/turbo.json +++ b/packages/hub/turbo.json @@ -3,6 +3,10 @@ "pipeline": { "build": { "env": ["DATABASE_URL", "VERCEL_ENV"] + }, + "bundle": { + "dependsOn": ["^build", "build:ts"], + "outputs": ["dist/bundle*"] } } } diff --git a/packages/squiggle-lang/__tests__/dist/AlgebraicShapeCombination_test.ts b/packages/squiggle-lang/__tests__/dists/AlgebraicShapeCombination_test.ts similarity index 100% rename from packages/squiggle-lang/__tests__/dist/AlgebraicShapeCombination_test.ts rename to packages/squiggle-lang/__tests__/dists/AlgebraicShapeCombination_test.ts diff --git a/packages/squiggle-lang/__tests__/dist/Bandwidth_test.ts b/packages/squiggle-lang/__tests__/dists/Bandwidth_test.ts similarity index 78% rename from packages/squiggle-lang/__tests__/dist/Bandwidth_test.ts rename to packages/squiggle-lang/__tests__/dists/Bandwidth_test.ts index d83a2f752b..64e33cde60 100644 --- a/packages/squiggle-lang/__tests__/dist/Bandwidth_test.ts +++ b/packages/squiggle-lang/__tests__/dists/Bandwidth_test.ts @@ -1,4 +1,4 @@ -import { nrd, nrd0 } from "../../src/dist/SampleSetDist/bandwidth.js"; +import { nrd, nrd0 } from "../../src/dists/SampleSetDist/bandwidth.js"; describe("Bandwidth", () => { test("nrd0()", () => { diff --git a/packages/squiggle-lang/__tests__/dist/Dotwise_test.ts b/packages/squiggle-lang/__tests__/dists/Dotwise_test.ts similarity index 96% rename from packages/squiggle-lang/__tests__/dist/Dotwise_test.ts rename to packages/squiggle-lang/__tests__/dists/Dotwise_test.ts index 339b44d2e5..88a752db79 100644 --- a/packages/squiggle-lang/__tests__/dist/Dotwise_test.ts +++ b/packages/squiggle-lang/__tests__/dists/Dotwise_test.ts @@ -1,6 +1,6 @@ import * as fc from "fast-check"; -import { binaryOperations } from "../../src/dist/distOperations/index.js"; +import { binaryOperations } from "../../src/dists/distOperations/index.js"; import { DivisionByZeroError } from "../../src/operationError.js"; import { getDefaultRng } from "../../src/rng/index.js"; import { diff --git a/packages/squiggle-lang/__tests__/dist/GenericDist_test.ts b/packages/squiggle-lang/__tests__/dists/GenericDist_test.ts similarity index 93% rename from packages/squiggle-lang/__tests__/dist/GenericDist_test.ts rename to packages/squiggle-lang/__tests__/dists/GenericDist_test.ts index 80b3069100..dbabee9842 100644 --- a/packages/squiggle-lang/__tests__/dist/GenericDist_test.ts +++ b/packages/squiggle-lang/__tests__/dists/GenericDist_test.ts @@ -1,6 +1,6 @@ -import { BaseDist } from "../../src/dist/BaseDist.js"; -import { DistError } from "../../src/dist/DistError.js"; -import { SampleSetDist } from "../../src/dist/SampleSetDist/index.js"; +import { BaseDist } from "../../src/dists/BaseDist.js"; +import { DistError } from "../../src/dists/DistError.js"; +import { SampleSetDist } from "../../src/dists/SampleSetDist/index.js"; import { Env } from "../../src/index.js"; import { getDefaultRng } from "../../src/rng/index.js"; import * as Result from "../../src/utility/result.js"; diff --git a/packages/squiggle-lang/__tests__/dist/Invariants/AlgebraicCombination_test.ts b/packages/squiggle-lang/__tests__/dists/Invariants/AlgebraicCombination_test.ts similarity index 98% rename from packages/squiggle-lang/__tests__/dist/Invariants/AlgebraicCombination_test.ts rename to packages/squiggle-lang/__tests__/dists/Invariants/AlgebraicCombination_test.ts index 7e367582c0..58692df7cd 100644 --- a/packages/squiggle-lang/__tests__/dist/Invariants/AlgebraicCombination_test.ts +++ b/packages/squiggle-lang/__tests__/dists/Invariants/AlgebraicCombination_test.ts @@ -5,7 +5,7 @@ when things substantially change. Also, there are some open comments in https://github.com/quantified-uncertainty/squiggle/pull/232 that haven't been addressed. */ -import { binaryOperations } from "../../../src/dist/distOperations/index.js"; +import { binaryOperations } from "../../../src/dists/distOperations/index.js"; import { getDefaultRng } from "../../../src/rng/index.js"; import * as Result from "../../../src/utility/result.js"; import { diff --git a/packages/squiggle-lang/__tests__/dist/Invariants/Means_test.ts b/packages/squiggle-lang/__tests__/dists/Invariants/Means_test.ts similarity index 94% rename from packages/squiggle-lang/__tests__/dist/Invariants/Means_test.ts rename to packages/squiggle-lang/__tests__/dists/Invariants/Means_test.ts index 256c9b2019..350b028013 100644 --- a/packages/squiggle-lang/__tests__/dist/Invariants/Means_test.ts +++ b/packages/squiggle-lang/__tests__/dists/Invariants/Means_test.ts @@ -8,12 +8,12 @@ Details in https://squiggle-language.com/docs/internal/invariants/ Note: epsilon of 1e3 means the invariants are, in general, not being satisfied. */ -import { BaseDist } from "../../../src/dist/BaseDist.js"; +import { BaseDist } from "../../../src/dists/BaseDist.js"; import { BinaryOperation, binaryOperations, -} from "../../../src/dist/distOperations/index.js"; -import { Env } from "../../../src/dist/env.js"; +} from "../../../src/dists/distOperations/index.js"; +import { Env } from "../../../src/dists/env.js"; import { getDefaultRng } from "../../../src/rng/index.js"; import { env, diff --git a/packages/squiggle-lang/__tests__/dist/KDE_test.ts b/packages/squiggle-lang/__tests__/dists/KDE_test.ts similarity index 98% rename from packages/squiggle-lang/__tests__/dist/KDE_test.ts rename to packages/squiggle-lang/__tests__/dists/KDE_test.ts index 752820460b..627360c285 100644 --- a/packages/squiggle-lang/__tests__/dist/KDE_test.ts +++ b/packages/squiggle-lang/__tests__/dists/KDE_test.ts @@ -3,7 +3,7 @@ import range from "lodash/range.js"; import sum from "lodash/sum.js"; import sumBy from "lodash/sumBy.js"; -import { kde } from "../../src/dist/SampleSetDist/kde.js"; +import { kde } from "../../src/dists/SampleSetDist/kde.js"; import * as XYShape from "../../src/XYShape.js"; // KDE by definition, with triangular kernel max(0, |1-x|) diff --git a/packages/squiggle-lang/__tests__/dist/LogKde_Test.ts b/packages/squiggle-lang/__tests__/dists/LogKde_Test.ts similarity index 98% rename from packages/squiggle-lang/__tests__/dist/LogKde_Test.ts rename to packages/squiggle-lang/__tests__/dists/LogKde_Test.ts index 6b8c71c5e1..42a5cef013 100644 --- a/packages/squiggle-lang/__tests__/dist/LogKde_Test.ts +++ b/packages/squiggle-lang/__tests__/dists/LogKde_Test.ts @@ -1,6 +1,6 @@ import * as fc from "fast-check"; -import { logKde } from "../../src/dist/SampleSetDist/logKde.js"; +import { logKde } from "../../src/dists/SampleSetDist/logKde.js"; import * as E_A_Floats from "../../src/utility/E_A_Floats.js"; const exampleSets = [ diff --git a/packages/squiggle-lang/__tests__/dist/Mixture_test.ts b/packages/squiggle-lang/__tests__/dists/Mixture_test.ts similarity index 97% rename from packages/squiggle-lang/__tests__/dist/Mixture_test.ts rename to packages/squiggle-lang/__tests__/dists/Mixture_test.ts index b19abaafa5..d33e0d437a 100644 --- a/packages/squiggle-lang/__tests__/dist/Mixture_test.ts +++ b/packages/squiggle-lang/__tests__/dists/Mixture_test.ts @@ -1,4 +1,4 @@ -import { mixture } from "../../src/dist/distOperations/index.js"; +import { mixture } from "../../src/dists/distOperations/index.js"; import { getDefaultRng } from "../../src/rng/index.js"; import { env, diff --git a/packages/squiggle-lang/__tests__/dist/Scale_test.ts b/packages/squiggle-lang/__tests__/dists/Scale_test.ts similarity index 92% rename from packages/squiggle-lang/__tests__/dist/Scale_test.ts rename to packages/squiggle-lang/__tests__/dists/Scale_test.ts index c8a8cad7f2..e4efe6c9c2 100644 --- a/packages/squiggle-lang/__tests__/dist/Scale_test.ts +++ b/packages/squiggle-lang/__tests__/dists/Scale_test.ts @@ -1,5 +1,5 @@ -import { operationDistError } from "../../src/dist/DistError.js"; -import * as distOperations from "../../src/dist/distOperations/index.js"; +import { operationDistError } from "../../src/dists/DistError.js"; +import * as distOperations from "../../src/dists/distOperations/index.js"; import { DivisionByZeroError, NegativeInfinityError, diff --git a/packages/squiggle-lang/__tests__/dist/Scoring/KlDivergence_test.ts b/packages/squiggle-lang/__tests__/dists/Scoring/KlDivergence_test.ts similarity index 97% rename from packages/squiggle-lang/__tests__/dist/Scoring/KlDivergence_test.ts rename to packages/squiggle-lang/__tests__/dists/Scoring/KlDivergence_test.ts index fee8f6648a..5f6e62dbc4 100644 --- a/packages/squiggle-lang/__tests__/dist/Scoring/KlDivergence_test.ts +++ b/packages/squiggle-lang/__tests__/dists/Scoring/KlDivergence_test.ts @@ -1,9 +1,9 @@ -import { BaseDist } from "../../../src/dist/BaseDist.js"; -import { distErrorToString } from "../../../src/dist/DistError.js"; +import { BaseDist } from "../../../src/dists/BaseDist.js"; +import { distErrorToString } from "../../../src/dists/DistError.js"; import { logScoreDistAnswer, mixture, -} from "../../../src/dist/distOperations/index.js"; +} from "../../../src/dists/distOperations/index.js"; import { getDefaultRng } from "../../../src/rng/index.js"; import { floatDist, diff --git a/packages/squiggle-lang/__tests__/dist/Scoring/WithScalarAnswer_test.ts b/packages/squiggle-lang/__tests__/dists/Scoring/WithScalarAnswer_test.ts similarity index 97% rename from packages/squiggle-lang/__tests__/dist/Scoring/WithScalarAnswer_test.ts rename to packages/squiggle-lang/__tests__/dists/Scoring/WithScalarAnswer_test.ts index 9f09313474..bd00aef290 100644 --- a/packages/squiggle-lang/__tests__/dist/Scoring/WithScalarAnswer_test.ts +++ b/packages/squiggle-lang/__tests__/dists/Scoring/WithScalarAnswer_test.ts @@ -1,7 +1,7 @@ import { logScoreScalarAnswer, mixture, -} from "../../../src/dist/distOperations/index.js"; +} from "../../../src/dists/distOperations/index.js"; import { getDefaultRng } from "../../../src/rng/index.js"; import { env, mkPointMass, unpackResult } from "../../helpers/distHelpers.js"; diff --git a/packages/squiggle-lang/__tests__/dist/SplitContinuousAndDiscrete_test.ts b/packages/squiggle-lang/__tests__/dists/SplitContinuousAndDiscrete_test.ts similarity index 98% rename from packages/squiggle-lang/__tests__/dist/SplitContinuousAndDiscrete_test.ts rename to packages/squiggle-lang/__tests__/dists/SplitContinuousAndDiscrete_test.ts index 365afaa3ad..5f662745a9 100644 --- a/packages/squiggle-lang/__tests__/dist/SplitContinuousAndDiscrete_test.ts +++ b/packages/squiggle-lang/__tests__/dists/SplitContinuousAndDiscrete_test.ts @@ -2,7 +2,7 @@ import fc from "fast-check"; import flatten from "lodash/flatten.js"; import range from "lodash/range.js"; -import { splitContinuousAndDiscrete as split } from "../../src/dist/SampleSetDist/splitContinuousAndDiscrete.js"; +import { splitContinuousAndDiscrete as split } from "../../src/dists/SampleSetDist/splitContinuousAndDiscrete.js"; const makeTest = (params: { name: string; diff --git a/packages/squiggle-lang/__tests__/dist/Symbolic_test.ts b/packages/squiggle-lang/__tests__/dists/Symbolic_test.ts similarity index 99% rename from packages/squiggle-lang/__tests__/dist/Symbolic_test.ts rename to packages/squiggle-lang/__tests__/dists/Symbolic_test.ts index 0ecf1ac7a3..0d84f05f22 100644 --- a/packages/squiggle-lang/__tests__/dist/Symbolic_test.ts +++ b/packages/squiggle-lang/__tests__/dists/Symbolic_test.ts @@ -1,4 +1,4 @@ -import * as SymbolicDist from "../../src/dist/SymbolicDist.js"; +import * as SymbolicDist from "../../src/dists/SymbolicDist.js"; import * as E_A from "../../src/utility/E_A.js"; import * as E_A_Floats from "../../src/utility/E_A_Floats.js"; import * as Result from "../../src/utility/result.js"; diff --git a/packages/squiggle-lang/__tests__/dist/yTransform_test.ts b/packages/squiggle-lang/__tests__/dists/yTransform_test.ts similarity index 100% rename from packages/squiggle-lang/__tests__/dist/yTransform_test.ts rename to packages/squiggle-lang/__tests__/dists/yTransform_test.ts diff --git a/packages/squiggle-lang/__tests__/fixtures/distFixtures.ts b/packages/squiggle-lang/__tests__/fixtures/distFixtures.ts index 254bc05bd4..857cd5620a 100644 --- a/packages/squiggle-lang/__tests__/fixtures/distFixtures.ts +++ b/packages/squiggle-lang/__tests__/fixtures/distFixtures.ts @@ -1,4 +1,4 @@ -import * as SymbolicDist from "../../src/dist/SymbolicDist.js"; +import * as SymbolicDist from "../../src/dists/SymbolicDist.js"; import { unpackResult } from "../helpers/distHelpers.js"; export const normalDist5 = unpackResult( diff --git a/packages/squiggle-lang/__tests__/helpers/distHelpers.ts b/packages/squiggle-lang/__tests__/helpers/distHelpers.ts index bd1017fdb8..f0b53290b5 100644 --- a/packages/squiggle-lang/__tests__/helpers/distHelpers.ts +++ b/packages/squiggle-lang/__tests__/helpers/distHelpers.ts @@ -1,5 +1,5 @@ -import { defaultEnv, Env } from "../../src/dist/env.js"; -import * as SymbolicDist from "../../src/dist/SymbolicDist.js"; +import { defaultEnv, Env } from "../../src/dists/env.js"; +import * as SymbolicDist from "../../src/dists/SymbolicDist.js"; import * as Result from "../../src/utility/result.js"; export const env: Env = defaultEnv; diff --git a/packages/squiggle-lang/__tests__/reducer/frTypes_test.ts b/packages/squiggle-lang/__tests__/reducer/frTypes_test.ts index 08bd82e91e..f5f85a4887 100644 --- a/packages/squiggle-lang/__tests__/reducer/frTypes_test.ts +++ b/packages/squiggle-lang/__tests__/reducer/frTypes_test.ts @@ -1,6 +1,6 @@ -import { PointSetDist } from "../../src/dist/PointSetDist.js"; -import { SampleSetDist } from "../../src/dist/SampleSetDist/index.js"; -import { Normal } from "../../src/dist/SymbolicDist.js"; +import { PointSetDist } from "../../src/dists/PointSetDist.js"; +import { SampleSetDist } from "../../src/dists/SampleSetDist/index.js"; +import { Normal } from "../../src/dists/SymbolicDist.js"; import { frAny, frArray, diff --git a/packages/squiggle-lang/src/cli/utils.ts b/packages/squiggle-lang/src/cli/utils.ts index 8b096fa4ea..d7c694d731 100644 --- a/packages/squiggle-lang/src/cli/utils.ts +++ b/packages/squiggle-lang/src/cli/utils.ts @@ -2,7 +2,7 @@ import { promises as fs } from "fs"; import isFinite from "lodash/isFinite.js"; import path from "path"; -import { Env } from "../dist/env.js"; +import { Env } from "../dists/env.js"; import { SqLinker } from "../public/SqLinker.js"; import { SqProject } from "../public/SqProject/index.js"; import { bold, red } from "./colors.js"; diff --git a/packages/squiggle-lang/src/dist/BaseDist.ts b/packages/squiggle-lang/src/dists/BaseDist.ts similarity index 100% rename from packages/squiggle-lang/src/dist/BaseDist.ts rename to packages/squiggle-lang/src/dists/BaseDist.ts diff --git a/packages/squiggle-lang/src/dist/DistError.ts b/packages/squiggle-lang/src/dists/DistError.ts similarity index 100% rename from packages/squiggle-lang/src/dist/DistError.ts rename to packages/squiggle-lang/src/dists/DistError.ts diff --git a/packages/squiggle-lang/src/dist/PointSetDist.ts b/packages/squiggle-lang/src/dists/PointSetDist.ts similarity index 100% rename from packages/squiggle-lang/src/dist/PointSetDist.ts rename to packages/squiggle-lang/src/dists/PointSetDist.ts diff --git a/packages/squiggle-lang/src/dist/SampleSetDist/bandwidth.ts b/packages/squiggle-lang/src/dists/SampleSetDist/bandwidth.ts similarity index 100% rename from packages/squiggle-lang/src/dist/SampleSetDist/bandwidth.ts rename to packages/squiggle-lang/src/dists/SampleSetDist/bandwidth.ts diff --git a/packages/squiggle-lang/src/dist/SampleSetDist/index.ts b/packages/squiggle-lang/src/dists/SampleSetDist/index.ts similarity index 100% rename from packages/squiggle-lang/src/dist/SampleSetDist/index.ts rename to packages/squiggle-lang/src/dists/SampleSetDist/index.ts diff --git a/packages/squiggle-lang/src/dist/SampleSetDist/kde.ts b/packages/squiggle-lang/src/dists/SampleSetDist/kde.ts similarity index 100% rename from packages/squiggle-lang/src/dist/SampleSetDist/kde.ts rename to packages/squiggle-lang/src/dists/SampleSetDist/kde.ts diff --git a/packages/squiggle-lang/src/dist/SampleSetDist/logKde.ts b/packages/squiggle-lang/src/dists/SampleSetDist/logKde.ts similarity index 100% rename from packages/squiggle-lang/src/dist/SampleSetDist/logKde.ts rename to packages/squiggle-lang/src/dists/SampleSetDist/logKde.ts diff --git a/packages/squiggle-lang/src/dist/SampleSetDist/samplesToPointSetDist.ts b/packages/squiggle-lang/src/dists/SampleSetDist/samplesToPointSetDist.ts similarity index 100% rename from packages/squiggle-lang/src/dist/SampleSetDist/samplesToPointSetDist.ts rename to packages/squiggle-lang/src/dists/SampleSetDist/samplesToPointSetDist.ts diff --git a/packages/squiggle-lang/src/dist/SampleSetDist/splitContinuousAndDiscrete.ts b/packages/squiggle-lang/src/dists/SampleSetDist/splitContinuousAndDiscrete.ts similarity index 100% rename from packages/squiggle-lang/src/dist/SampleSetDist/splitContinuousAndDiscrete.ts rename to packages/squiggle-lang/src/dists/SampleSetDist/splitContinuousAndDiscrete.ts diff --git a/packages/squiggle-lang/src/dist/SymbolicDist.ts b/packages/squiggle-lang/src/dists/SymbolicDist.ts similarity index 100% rename from packages/squiggle-lang/src/dist/SymbolicDist.ts rename to packages/squiggle-lang/src/dists/SymbolicDist.ts diff --git a/packages/squiggle-lang/src/dist/distOperations/algebraicCombination.ts b/packages/squiggle-lang/src/dists/distOperations/algebraicCombination.ts similarity index 100% rename from packages/squiggle-lang/src/dist/distOperations/algebraicCombination.ts rename to packages/squiggle-lang/src/dists/distOperations/algebraicCombination.ts diff --git a/packages/squiggle-lang/src/dist/distOperations/binaryOperations.ts b/packages/squiggle-lang/src/dists/distOperations/binaryOperations.ts similarity index 100% rename from packages/squiggle-lang/src/dist/distOperations/binaryOperations.ts rename to packages/squiggle-lang/src/dists/distOperations/binaryOperations.ts diff --git a/packages/squiggle-lang/src/dist/distOperations/index.ts b/packages/squiggle-lang/src/dists/distOperations/index.ts similarity index 100% rename from packages/squiggle-lang/src/dist/distOperations/index.ts rename to packages/squiggle-lang/src/dists/distOperations/index.ts diff --git a/packages/squiggle-lang/src/dist/distOperations/logScore.ts b/packages/squiggle-lang/src/dists/distOperations/logScore.ts similarity index 100% rename from packages/squiggle-lang/src/dist/distOperations/logScore.ts rename to packages/squiggle-lang/src/dists/distOperations/logScore.ts diff --git a/packages/squiggle-lang/src/dist/distOperations/mixture.ts b/packages/squiggle-lang/src/dists/distOperations/mixture.ts similarity index 100% rename from packages/squiggle-lang/src/dist/distOperations/mixture.ts rename to packages/squiggle-lang/src/dists/distOperations/mixture.ts diff --git a/packages/squiggle-lang/src/dist/distOperations/pointwiseCombination.ts b/packages/squiggle-lang/src/dists/distOperations/pointwiseCombination.ts similarity index 100% rename from packages/squiggle-lang/src/dist/distOperations/pointwiseCombination.ts rename to packages/squiggle-lang/src/dists/distOperations/pointwiseCombination.ts diff --git a/packages/squiggle-lang/src/dist/distOperations/scaleOperations.ts b/packages/squiggle-lang/src/dists/distOperations/scaleOperations.ts similarity index 100% rename from packages/squiggle-lang/src/dist/distOperations/scaleOperations.ts rename to packages/squiggle-lang/src/dists/distOperations/scaleOperations.ts diff --git a/packages/squiggle-lang/src/dist/env.ts b/packages/squiggle-lang/src/dists/env.ts similarity index 100% rename from packages/squiggle-lang/src/dist/env.ts rename to packages/squiggle-lang/src/dists/env.ts diff --git a/packages/squiggle-lang/src/errors/messages.ts b/packages/squiggle-lang/src/errors/messages.ts index 0ad9a3e5e8..17d9ad5439 100644 --- a/packages/squiggle-lang/src/errors/messages.ts +++ b/packages/squiggle-lang/src/errors/messages.ts @@ -1,4 +1,4 @@ -import { DistError, distErrorToString } from "../dist/DistError.js"; +import { DistError, distErrorToString } from "../dists/DistError.js"; import { OperationError } from "../operationError.js"; // Common error types. diff --git a/packages/squiggle-lang/src/fr/danger.ts b/packages/squiggle-lang/src/fr/danger.ts index b17d36b948..acbcb18fcd 100644 --- a/packages/squiggle-lang/src/fr/danger.ts +++ b/packages/squiggle-lang/src/fr/danger.ts @@ -2,7 +2,7 @@ import jstat from "jstat"; -import * as SymbolicDist from "../dist/SymbolicDist.js"; +import * as SymbolicDist from "../dists/SymbolicDist.js"; import { REArgumentError, REOther } from "../errors/messages.js"; import { SDate } from "../index.js"; import { FRFunction, makeFnExample } from "../library/registry/core.js"; diff --git a/packages/squiggle-lang/src/fr/dist.ts b/packages/squiggle-lang/src/fr/dist.ts index 2979bf72ba..620e2970d8 100644 --- a/packages/squiggle-lang/src/fr/dist.ts +++ b/packages/squiggle-lang/src/fr/dist.ts @@ -1,5 +1,5 @@ -import { argumentError, otherError } from "../dist/DistError.js"; -import * as SymbolicDist from "../dist/SymbolicDist.js"; +import { argumentError, otherError } from "../dists/DistError.js"; +import * as SymbolicDist from "../dists/SymbolicDist.js"; import { REDistributionError } from "../errors/messages.js"; import { FRFunction, makeFnExample } from "../library/registry/core.js"; import { makeDefinition } from "../library/registry/fnDefinition.js"; diff --git a/packages/squiggle-lang/src/fr/distUtil.ts b/packages/squiggle-lang/src/fr/distUtil.ts index 86902688f4..a6a43167e6 100644 --- a/packages/squiggle-lang/src/fr/distUtil.ts +++ b/packages/squiggle-lang/src/fr/distUtil.ts @@ -1,5 +1,5 @@ -import { otherError } from "../dist/DistError.js"; -import * as SymbolicDist from "../dist/SymbolicDist.js"; +import { otherError } from "../dists/DistError.js"; +import * as SymbolicDist from "../dists/SymbolicDist.js"; import { REDistributionError } from "../errors/messages.js"; import * as Result from "../utility/result.js"; diff --git a/packages/squiggle-lang/src/fr/genericDist.ts b/packages/squiggle-lang/src/fr/genericDist.ts index 303778d84b..1273104839 100644 --- a/packages/squiggle-lang/src/fr/genericDist.ts +++ b/packages/squiggle-lang/src/fr/genericDist.ts @@ -4,12 +4,12 @@ import { algebraicDiff, algebraicProduct, algebraicSum, -} from "../dist/distOperations/binaryOperations.js"; +} from "../dists/distOperations/binaryOperations.js"; import { BinaryOperation, binaryOperations, -} from "../dist/distOperations/index.js"; -import * as SymbolicDist from "../dist/SymbolicDist.js"; +} from "../dists/distOperations/index.js"; +import * as SymbolicDist from "../dists/SymbolicDist.js"; import { FRFunction } from "../library/registry/core.js"; import { makeDefinition } from "../library/registry/fnDefinition.js"; import { diff --git a/packages/squiggle-lang/src/fr/mixture.ts b/packages/squiggle-lang/src/fr/mixture.ts index 5dfd6ae084..1e0912cdb8 100644 --- a/packages/squiggle-lang/src/fr/mixture.ts +++ b/packages/squiggle-lang/src/fr/mixture.ts @@ -1,6 +1,6 @@ -import { BaseDist } from "../dist/BaseDist.js"; -import { argumentError } from "../dist/DistError.js"; -import * as distOperations from "../dist/distOperations/index.js"; +import { BaseDist } from "../dists/BaseDist.js"; +import { argumentError } from "../dists/DistError.js"; +import * as distOperations from "../dists/distOperations/index.js"; import { REDistributionError } from "../errors/messages.js"; import { makeDefinition } from "../library/registry/fnDefinition.js"; import { diff --git a/packages/squiggle-lang/src/fr/pointset.ts b/packages/squiggle-lang/src/fr/pointset.ts index b6e1aa5620..fcaaa05c93 100644 --- a/packages/squiggle-lang/src/fr/pointset.ts +++ b/packages/squiggle-lang/src/fr/pointset.ts @@ -1,6 +1,6 @@ -import { xyShapeDistError } from "../dist/DistError.js"; -import { PointSetDist } from "../dist/PointSetDist.js"; -import { PointMass } from "../dist/SymbolicDist.js"; +import { xyShapeDistError } from "../dists/DistError.js"; +import { PointSetDist } from "../dists/PointSetDist.js"; +import { PointMass } from "../dists/SymbolicDist.js"; import { REDistributionError } from "../errors/messages.js"; import { makeFnExample } from "../library/registry/core.js"; import { makeDefinition } from "../library/registry/fnDefinition.js"; diff --git a/packages/squiggle-lang/src/fr/sampleset.ts b/packages/squiggle-lang/src/fr/sampleset.ts index 4a603e639f..b0dcdf3bb3 100644 --- a/packages/squiggle-lang/src/fr/sampleset.ts +++ b/packages/squiggle-lang/src/fr/sampleset.ts @@ -1,4 +1,4 @@ -import * as SampleSetDist from "../dist/SampleSetDist/index.js"; +import * as SampleSetDist from "../dists/SampleSetDist/index.js"; import { makeFnExample } from "../library/registry/core.js"; import { FnDefinition, diff --git a/packages/squiggle-lang/src/fr/scoring.ts b/packages/squiggle-lang/src/fr/scoring.ts index b4ceacffba..32ddd20725 100644 --- a/packages/squiggle-lang/src/fr/scoring.ts +++ b/packages/squiggle-lang/src/fr/scoring.ts @@ -1,6 +1,6 @@ -import { BaseDist } from "../dist/BaseDist.js"; -import * as distOperations from "../dist/distOperations/index.js"; -import { Env } from "../dist/env.js"; +import { BaseDist } from "../dists/BaseDist.js"; +import * as distOperations from "../dists/distOperations/index.js"; +import { Env } from "../dists/env.js"; import { REArgumentError, REDistributionError } from "../errors/messages.js"; import { makeFnExample } from "../library/registry/core.js"; import { makeDefinition } from "../library/registry/fnDefinition.js"; diff --git a/packages/squiggle-lang/src/fr/sym.ts b/packages/squiggle-lang/src/fr/sym.ts index bb5b24d017..a98e9ed0fe 100644 --- a/packages/squiggle-lang/src/fr/sym.ts +++ b/packages/squiggle-lang/src/fr/sym.ts @@ -1,4 +1,4 @@ -import * as SymbolicDist from "../dist/SymbolicDist.js"; +import * as SymbolicDist from "../dists/SymbolicDist.js"; import { FRFunction, makeFnExample } from "../library/registry/core.js"; import { makeDefinition } from "../library/registry/fnDefinition.js"; import { diff --git a/packages/squiggle-lang/src/index.ts b/packages/squiggle-lang/src/index.ts index dc9089e744..94a0286e56 100644 --- a/packages/squiggle-lang/src/index.ts +++ b/packages/squiggle-lang/src/index.ts @@ -1,4 +1,4 @@ -import { type Env } from "./dist/env.js"; +import { type Env } from "./dists/env.js"; import { registry } from "./library/registry/index.js"; import { SqProject } from "./public/SqProject/index.js"; import { @@ -74,7 +74,7 @@ export { } from "./utility/SDuration.js"; export { type LocationRange as SqLocation } from "peggy"; -export { defaultEnv as defaultEnvironment } from "./dist/env.js"; +export { defaultEnv as defaultEnvironment } from "./dists/env.js"; export { type Env, SqDateValue, diff --git a/packages/squiggle-lang/src/library/registry/frTypes.ts b/packages/squiggle-lang/src/library/registry/frTypes.ts index 540ad410bf..c4db479830 100644 --- a/packages/squiggle-lang/src/library/registry/frTypes.ts +++ b/packages/squiggle-lang/src/library/registry/frTypes.ts @@ -1,7 +1,7 @@ -import { BaseDist } from "../../dist/BaseDist.js"; -import { PointSetDist } from "../../dist/PointSetDist.js"; -import { SampleSetDist } from "../../dist/SampleSetDist/index.js"; -import { SymbolicDist } from "../../dist/SymbolicDist.js"; +import { BaseDist } from "../../dists/BaseDist.js"; +import { PointSetDist } from "../../dists/PointSetDist.js"; +import { SampleSetDist } from "../../dists/SampleSetDist/index.js"; +import { SymbolicDist } from "../../dists/SymbolicDist.js"; import { Lambda } from "../../reducer/lambda.js"; import { ImmutableMap } from "../../utility/immutableMap.js"; import { SDate } from "../../utility/SDate.js"; diff --git a/packages/squiggle-lang/src/library/registry/helpers.ts b/packages/squiggle-lang/src/library/registry/helpers.ts index fa2b8fa825..ce60a4f62d 100644 --- a/packages/squiggle-lang/src/library/registry/helpers.ts +++ b/packages/squiggle-lang/src/library/registry/helpers.ts @@ -1,12 +1,12 @@ import intersection from "lodash/intersection.js"; import last from "lodash/last.js"; -import { BaseDist } from "../../dist/BaseDist.js"; -import { DistError } from "../../dist/DistError.js"; -import { Env } from "../../dist/env.js"; -import * as SampleSetDist from "../../dist/SampleSetDist/index.js"; -import * as SymbolicDist from "../../dist/SymbolicDist.js"; -import { PointMass } from "../../dist/SymbolicDist.js"; +import { BaseDist } from "../../dists/BaseDist.js"; +import { DistError } from "../../dists/DistError.js"; +import { Env } from "../../dists/env.js"; +import * as SampleSetDist from "../../dists/SampleSetDist/index.js"; +import * as SymbolicDist from "../../dists/SymbolicDist.js"; +import { PointMass } from "../../dists/SymbolicDist.js"; import { REArgumentError, REDistributionError, diff --git a/packages/squiggle-lang/src/library/registry/squiggleDefinition.ts b/packages/squiggle-lang/src/library/registry/squiggleDefinition.ts index b03692512a..97a69560fa 100644 --- a/packages/squiggle-lang/src/library/registry/squiggleDefinition.ts +++ b/packages/squiggle-lang/src/library/registry/squiggleDefinition.ts @@ -1,5 +1,5 @@ import { parse } from "../../ast/parse.js"; -import { defaultEnv } from "../../dist/env.js"; +import { defaultEnv } from "../../dists/env.js"; import { compileAst } from "../../expression/compile.js"; import { Reducer } from "../../reducer/Reducer.js"; import { Bindings } from "../../reducer/Stack.js"; diff --git a/packages/squiggle-lang/src/public/SqProject/index.ts b/packages/squiggle-lang/src/public/SqProject/index.ts index 24bb34fbf0..5d2f6dd923 100644 --- a/packages/squiggle-lang/src/public/SqProject/index.ts +++ b/packages/squiggle-lang/src/public/SqProject/index.ts @@ -1,5 +1,5 @@ import { isBindingStatement } from "../../ast/utils.js"; -import { defaultEnv, Env } from "../../dist/env.js"; +import { defaultEnv, Env } from "../../dists/env.js"; import { AST } from "../../index.js"; import * as Library from "../../library/index.js"; import { Bindings } from "../../reducer/Stack.js"; diff --git a/packages/squiggle-lang/src/public/SqValue/SqCalculator.ts b/packages/squiggle-lang/src/public/SqValue/SqCalculator.ts index 437a4f951b..930f1c8c76 100644 --- a/packages/squiggle-lang/src/public/SqValue/SqCalculator.ts +++ b/packages/squiggle-lang/src/public/SqValue/SqCalculator.ts @@ -1,4 +1,4 @@ -import { Env } from "../../dist/env.js"; +import { Env } from "../../dists/env.js"; import * as Result from "../../utility/result.js"; import { Calculator } from "../../value/VCalculator.js"; import { SqError, SqOtherError } from "../SqError.js"; diff --git a/packages/squiggle-lang/src/public/SqValue/SqDistribution/SqDistributionError.ts b/packages/squiggle-lang/src/public/SqValue/SqDistribution/SqDistributionError.ts index e70156bf7e..7cddb2f80e 100644 --- a/packages/squiggle-lang/src/public/SqValue/SqDistribution/SqDistributionError.ts +++ b/packages/squiggle-lang/src/public/SqValue/SqDistribution/SqDistributionError.ts @@ -1,4 +1,4 @@ -import { DistError, distErrorToString } from "../../../dist/DistError.js"; +import { DistError, distErrorToString } from "../../../dists/DistError.js"; export class SqDistributionError { constructor(private _value: DistError) {} diff --git a/packages/squiggle-lang/src/public/SqValue/SqDistribution/SqPointSet.ts b/packages/squiggle-lang/src/public/SqValue/SqDistribution/SqPointSet.ts index 53731afe52..6c5565d5f0 100644 --- a/packages/squiggle-lang/src/public/SqValue/SqDistribution/SqPointSet.ts +++ b/packages/squiggle-lang/src/public/SqValue/SqDistribution/SqPointSet.ts @@ -1,6 +1,6 @@ import zipWith from "lodash/zipWith.js"; -import { PointSetDist } from "../../../dist/PointSetDist.js"; +import { PointSetDist } from "../../../dists/PointSetDist.js"; import { ContinuousShape } from "../../../PointSet/Continuous.js"; import { DiscreteShape } from "../../../PointSet/Discrete.js"; import { MixedShape } from "../../../PointSet/Mixed.js"; diff --git a/packages/squiggle-lang/src/public/SqValue/SqDistribution/index.ts b/packages/squiggle-lang/src/public/SqValue/SqDistribution/index.ts index 20008c43ba..d11810561f 100644 --- a/packages/squiggle-lang/src/public/SqValue/SqDistribution/index.ts +++ b/packages/squiggle-lang/src/public/SqValue/SqDistribution/index.ts @@ -1,9 +1,9 @@ -import { BaseDist } from "../../../dist/BaseDist.js"; -import { DistError } from "../../../dist/DistError.js"; -import { Env } from "../../../dist/env.js"; -import { PointSetDist } from "../../../dist/PointSetDist.js"; -import { SampleSetDist } from "../../../dist/SampleSetDist/index.js"; -import { SymbolicDist } from "../../../dist/SymbolicDist.js"; +import { BaseDist } from "../../../dists/BaseDist.js"; +import { DistError } from "../../../dists/DistError.js"; +import { Env } from "../../../dists/env.js"; +import { PointSetDist } from "../../../dists/PointSetDist.js"; +import { SampleSetDist } from "../../../dists/SampleSetDist/index.js"; +import { SymbolicDist } from "../../../dists/SymbolicDist.js"; import * as Result from "../../../utility/result.js"; import { Ok, result } from "../../../utility/result.js"; import { SqDistributionError } from "./SqDistributionError.js"; diff --git a/packages/squiggle-lang/src/public/SqValue/SqLambda.ts b/packages/squiggle-lang/src/public/SqValue/SqLambda.ts index bd9d4fac25..9e2738be33 100644 --- a/packages/squiggle-lang/src/public/SqValue/SqLambda.ts +++ b/packages/squiggle-lang/src/public/SqValue/SqLambda.ts @@ -1,4 +1,4 @@ -import { Env } from "../../dist/env.js"; +import { Env } from "../../dists/env.js"; import { getStdLib } from "../../library/index.js"; import { Lambda } from "../../reducer/lambda.js"; import { Reducer } from "../../reducer/Reducer.js"; diff --git a/packages/squiggle-lang/src/public/SqValue/SqTableChart.ts b/packages/squiggle-lang/src/public/SqValue/SqTableChart.ts index 5127ee844b..05e7256d83 100644 --- a/packages/squiggle-lang/src/public/SqValue/SqTableChart.ts +++ b/packages/squiggle-lang/src/public/SqValue/SqTableChart.ts @@ -1,4 +1,4 @@ -import { Env } from "../../dist/env.js"; +import { Env } from "../../dists/env.js"; import { Lambda } from "../../reducer/lambda.js"; import * as Result from "../../utility/result.js"; import { TableChart } from "../../value/VTableChart.js"; diff --git a/packages/squiggle-lang/src/reducer/Reducer.ts b/packages/squiggle-lang/src/reducer/Reducer.ts index 2fe57f3561..ae03df91f9 100644 --- a/packages/squiggle-lang/src/reducer/Reducer.ts +++ b/packages/squiggle-lang/src/reducer/Reducer.ts @@ -1,7 +1,7 @@ import jstat from "jstat"; import { LocationRange } from "peggy"; -import { Env } from "../dist/env.js"; +import { Env } from "../dists/env.js"; import { IRuntimeError } from "../errors/IError.js"; import { ErrorMessage, diff --git a/packages/squiggle-lang/src/reducer/index.ts b/packages/squiggle-lang/src/reducer/index.ts index 4574115594..60cf1a5e96 100644 --- a/packages/squiggle-lang/src/reducer/index.ts +++ b/packages/squiggle-lang/src/reducer/index.ts @@ -1,5 +1,5 @@ import { parse } from "../ast/parse.js"; -import { defaultEnv } from "../dist/env.js"; +import { defaultEnv } from "../dists/env.js"; import { ICompileError, IRuntimeError } from "../errors/IError.js"; import { compileAst } from "../expression/compile.js"; import { Expression } from "../expression/index.js"; diff --git a/packages/squiggle-lang/src/value/VDist.ts b/packages/squiggle-lang/src/value/VDist.ts index b6a0053234..642c663378 100644 --- a/packages/squiggle-lang/src/value/VDist.ts +++ b/packages/squiggle-lang/src/value/VDist.ts @@ -1,4 +1,4 @@ -import { BaseDist } from "../dist/BaseDist.js"; +import { BaseDist } from "../dists/BaseDist.js"; import { BaseValue } from "./BaseValue.js"; export class VDist extends BaseValue { diff --git a/packages/squiggle-lang/src/value/VPlot.ts b/packages/squiggle-lang/src/value/VPlot.ts index 21ecc235bd..81b1628d4e 100644 --- a/packages/squiggle-lang/src/value/VPlot.ts +++ b/packages/squiggle-lang/src/value/VPlot.ts @@ -1,5 +1,5 @@ -import { BaseDist } from "../dist/BaseDist.js"; -import { SampleSetDist } from "../dist/SampleSetDist/index.js"; +import { BaseDist } from "../dists/BaseDist.js"; +import { SampleSetDist } from "../dists/SampleSetDist/index.js"; import { REOther } from "../errors/messages.js"; import { Lambda } from "../reducer/lambda.js"; import { BaseValue } from "./BaseValue.js"; diff --git a/packages/squiggle-lang/src/value/simpleValue.ts b/packages/squiggle-lang/src/value/simpleValue.ts index 3273b98220..ac616cd362 100644 --- a/packages/squiggle-lang/src/value/simpleValue.ts +++ b/packages/squiggle-lang/src/value/simpleValue.ts @@ -1,6 +1,6 @@ import toPlainObject from "lodash/toPlainObject.js"; -import { SampleSetDist } from "../dist/SampleSetDist/index.js"; +import { SampleSetDist } from "../dists/SampleSetDist/index.js"; import { REOther } from "../errors/messages.js"; import { SDate } from "../index.js"; import { BaseLambda, Lambda } from "../reducer/lambda.js"; diff --git a/packages/ui/package.json b/packages/ui/package.json index d6e68c4cfc..a193bd8d98 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -16,7 +16,7 @@ "build:css": "postcss ./src/styles/full.css -o ./dist/full.css", "build:storybook": "storybook build", "clean:ts": "rm -rf ./dist ./tsconfig.tsbuildinfo", - "build": "pnpm clean:ts && pnpm build:ts && pnpm build:css && pnpm build:storybook", + "build": "pnpm clean:ts && pnpm build:ts && pnpm build:css", "lint": "pnpm lint:prettier && pnpm eslint", "lint:prettier": "prettier --check .", "eslint": "eslint --ignore-path .gitignore ./src", diff --git a/packages/ui/vercel.json b/packages/ui/vercel.json index 9ff10a49c8..3945cd75c0 100644 --- a/packages/ui/vercel.json +++ b/packages/ui/vercel.json @@ -1,5 +1,5 @@ { - "buildCommand": "PLATFORM=vercel npx turbo build", + "buildCommand": "PLATFORM=vercel npx turbo build:storybook", "outputDirectory": "storybook-static", "ignoreCommand": "npx turbo-ignore || ../../skip-dependabot.sh" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b4b3e03d92..2fae24e2c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -457,6 +457,9 @@ importers: dotenv-cli: specifier: ^7.3.0 version: 7.3.0 + esbuild: + specifier: ^0.20.1 + version: 0.20.1 eslint: specifier: ^8.57.0 version: 8.57.0 diff --git a/turbo.json b/turbo.json index d4b03285c7..ab97587872 100644 --- a/turbo.json +++ b/turbo.json @@ -6,7 +6,7 @@ "pipeline": { // dev target for pre-push checks "build:ts": { - "dependsOn": ["^build:ts"], + "dependsOn": ["^build"], "outputs": ["dist/**", "*.tsbuildinfo"] }, "build": { @@ -19,15 +19,15 @@ "!.next/cache/**" ] }, + "build:storybook": { + "dependsOn": ["build"], + "outputs": ["storybook-static/**"] + }, "lint": {}, "eslint": {}, "test": { "dependsOn": ["build"] }, - "bundle": { - "dependsOn": ["build"], - "outputs": ["dist/bundle*"] - }, "coverage": { "dependsOn": ["build"], "outputs": ["coverage/**"]