Skip to content

Commit

Permalink
Merged with main
Browse files Browse the repository at this point in the history
  • Loading branch information
OAGr committed Jan 1, 2024
2 parents 4af569c + b211028 commit dbcc301
Show file tree
Hide file tree
Showing 18 changed files with 1,387 additions and 2,378 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -55,7 +55,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3
- name: Install dependencies
run: pnpm install
- uses: pnpm/action-setup@v2
Expand All @@ -80,4 +80,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
},
"devDependencies": {
"@changesets/cli": "^2.27.1",
"prettier": "^3.0.3",
"prettier": "^3.1.1",
"turbo": "^1.11.2",
"turbo-ignore": "^1.10.16"
"turbo-ignore": "^1.11.2"
},
"version": "0.0.1-0"
}
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
"indent-string": "^5.0.0"
},
"devDependencies": {
"prettier": "^3.0.3"
"prettier": "^3.1.1"
}
}
36 changes: 18 additions & 18 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
},
"author": "Quantified Uncertainty Research Institute",
"dependencies": {
"@codemirror/autocomplete": "^6.10.2",
"@codemirror/commands": "^6.3.2",
"@codemirror/autocomplete": "^6.11.1",
"@codemirror/commands": "^6.3.3",
"@codemirror/language": "^6.10.0",
"@codemirror/lint": "^6.4.2",
"@codemirror/search": "^6.5.5",
"@codemirror/state": "^6.4.0",
"@codemirror/theme-one-dark": "^6.1.2",
"@codemirror/view": "^6.21.4",
"@codemirror/view": "^6.23.0",
"@floating-ui/react": "^0.26.3",
"@heroicons/react": "^1.0.6",
"@hookform/resolvers": "^3.3.3",
"@lezer/common": "^1.1.1",
"@lezer/common": "^1.2.0",
"@quri/prettier-plugin-squiggle": "workspace:*",
"@quri/squiggle-textmate-grammar": "workspace:*",
"@quri/squiggle-lang": "workspace:*",
Expand All @@ -33,10 +33,10 @@
"framer-motion": "^10.16.12",
"lodash": "^4.17.21",
"mermaid": "^10.6.1",
"prettier": "^3.0.3",
"prettier": "^3.1.1",
"react": "^18.2.0",
"react-draggable": "^4.4.6",
"react-hook-form": "^7.48.2",
"react-hook-form": "^7.49.2",
"react-markdown": "^9.0.1",
"remark-gfm": "^4.0.0",
"shikiji": "^0.9.15",
Expand All @@ -51,26 +51,26 @@
"@lezer/highlight": "^1.2.0",
"@lezer/lr": "^1.3.14",
"@storybook/addon-actions": "^7.6.6",
"@storybook/addon-docs": "^7.5.2",
"@storybook/addon-docs": "^7.6.6",
"@storybook/addon-essentials": "^7.6.6",
"@storybook/addon-links": "^7.6.3",
"@storybook/addon-links": "^7.6.7",
"@storybook/blocks": "^7.6.3",
"@storybook/node-logger": "^7.6.3",
"@storybook/node-logger": "^7.6.6",
"@storybook/react": "^7.5.2",
"@storybook/react-vite": "^7.5.2",
"@testing-library/jest-dom": "^6.1.5",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.1",
"@testing-library/user-event": "^14.5.2",
"@types/d3": "^7.4.3",
"@types/hast": "^3.0.3",
"@types/jest": "^29.5.10",
"@types/lodash": "^4.14.202",
"@types/node": "^20.10.2",
"@types/react": "^18.2.41",
"@types/react-dom": "^18.2.17",
"@types/node": "^20.10.6",
"@types/react": "^18.2.46",
"@types/react-dom": "^18.2.18",
"@types/unist": "^3.0.2",
"@typescript-eslint/eslint-plugin": "^6.16.0",
"@typescript-eslint/parser": "^6.13.1",
"@typescript-eslint/parser": "^6.16.0",
"@wogns3623/eslint-plugin-better-exhaustive-deps": "^1.1.0",
"canvas": "^2.11.2",
"eslint": "^8.56.0",
Expand All @@ -79,17 +79,17 @@
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jsdom": "^23.0.1",
"postcss": "^8.4.31",
"postcss": "^8.4.32",
"postcss-cli": "^11.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"resize-observer-polyfill": "^1.5.1",
"rollup-plugin-node-builtins": "^2.1.2",
"storybook": "^7.6.3",
"storybook": "^7.6.7",
"tailwindcss": "^3.4.0",
"ts-jest": "^29.1.1",
"typescript": "^5.3.2",
"vite": "^5.0.5"
"typescript": "^5.3.3",
"vite": "^5.0.10"
},
"peerDependencies": {
"react": "^16.8.0 || ^17 || ^18",
Expand Down
8 changes: 4 additions & 4 deletions packages/components/src/components/DynamicSquiggleViewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ export const DynamicSquiggleViewer = forwardRef<SquiggleViewerHandle, Props>(
{isRunning
? "rendering..."
: squiggleOutput
? `render #${squiggleOutput.executionId} in ${showTime(
squiggleOutput.executionTime
)}`
: null}
? `render #${squiggleOutput.executionId} in ${showTime(
squiggleOutput.executionTime
)}`
: null}
</div>
)}
<div
Expand Down
24 changes: 12 additions & 12 deletions packages/hub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,37 +20,37 @@
"@next-auth/prisma-adapter": "^1.0.7",
"@pothos/core": "^3.39.0",
"@pothos/plugin-errors": "^3.11.1",
"@pothos/plugin-prisma": "^3.61.0",
"@pothos/plugin-prisma": "^3.63.0",
"@pothos/plugin-relay": "^3.45.1",
"@pothos/plugin-scope-auth": "^3.20.0",
"@pothos/plugin-simple-objects": "^3.7.0",
"@pothos/plugin-validation": "^3.10.1",
"@pothos/plugin-with-input": "^3.10.1",
"@prisma/client": "5.6.0",
"@prisma/client": "5.7.1",
"@quri/squiggle-components": "workspace:*",
"@quri/squiggle-lang": "workspace:*",
"@quri/ui": "workspace:*",
"@quri/versioned-squiggle-components": "workspace:*",
"base64-js": "^1.5.1",
"clsx": "^2.1.0",
"d3": "^7.8.5",
"date-fns": "^2.30.0",
"date-fns": "^3.0.6",
"graphql": "^16.8.1",
"graphql-yoga": "^5.1.0",
"immutable": "^4.3.4",
"invariant": "^2.2.4",
"lodash": "^4.17.21",
"next": "^14.0.1",
"next": "^14.0.4",
"next-auth": "^4.24.4",
"nodemailer": "^6.9.7",
"nodemailer": "^6.9.8",
"pako": "^2.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.48.2",
"react-hook-form": "^7.49.2",
"react-icons": "^4.12.0",
"react-loading-skeleton": "^3.3.1",
"react-markdown": "^9.0.1",
"react-relay": "^16.0.0",
"react-relay": "^16.1.0",
"react-select": "^5.7.7",
"relay-runtime": "^16.1.0",
"remark-breaks": "^4.0.0",
Expand All @@ -68,22 +68,22 @@
"@types/jest": "^29.5.10",
"@types/lodash": "^4.14.202",
"@types/pako": "^2.0.3",
"@types/react": "^18.2.41",
"@types/react": "^18.2.46",
"@types/react-relay": "^16.0.4",
"@types/relay-runtime": "^14.1.19",
"babel-plugin-relay": "^16.0.0",
"babel-plugin-relay": "^16.1.0",
"dotenv-cli": "^7.3.0",
"eslint": "^8.56.0",
"eslint-config-next": "^14.0.3",
"graphql": "^16.8.1",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"postcss": "^8.4.31",
"prettier": "^3.0.3",
"postcss": "^8.4.32",
"prettier": "^3.1.1",
"prisma": "^5.7.1",
"relay-compiler": "^16.0.0",
"tailwindcss": "^3.4.0",
"tsx": "^4.7.0",
"typescript": "^5.3.2"
"typescript": "^5.3.3"
}
}
4 changes: 2 additions & 2 deletions packages/hub/src/graphql/mutations/reactToGroupInvite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ builder.mutationField("reactToGroupInvite", (t) =>
input.action === "Accept"
? "Accepted"
: input.action === "Decline"
? "Declined"
: ("" as never);
? "Declined"
: ("" as never);

const { invite, membership } = await prisma.$transaction(async (tx) => {
const invite = await tx.groupInvite.update({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ const SortBy: FC<{
? ArrowUpIcon
: ArrowDownIcon
: iconDesc
? ArrowLeftIcon
: ArrowRightIcon;
? ArrowLeftIcon
: ArrowRightIcon;

const setSort = () => {
dispatch({
Expand Down
8 changes: 4 additions & 4 deletions packages/ops/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
"@babel/plugin-syntax-typescript": "^7.23.3",
"@changesets/get-github-info": "^0.6.0",
"@changesets/types": "^6.0.0",
"@types/babel__core": "^7.20.4",
"@types/babel__core": "^7.20.5",
"@types/lodash": "^4.14.202",
"@types/node": "^20.10.2",
"@types/node": "^20.10.6",
"tsx": "^4.7.0",
"typescript": "^5.3.2"
"typescript": "^5.3.3"
},
"dependencies": {
"@babel/core": "^7.23.3",
"@babel/core": "^7.23.7",
"@babel/parser": "^7.23.6",
"lodash": "^4.17.21",
"mdast-util-to-string": "^4.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/prettier-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
},
"dependencies": {
"@quri/squiggle-lang": "workspace:*",
"prettier": "^3.0.3"
"prettier": "^3.1.1"
},
"devDependencies": {
"@babel/preset-typescript": "^7.23.3",
"@types/jest": "^29.5.10",
"jest": "^29.7.0",
"typescript": "^5.3.2"
"typescript": "^5.3.3"
},
"files": [
"dist",
Expand Down
14 changes: 7 additions & 7 deletions packages/squiggle-lang/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,24 @@
"immutable": "^4.3.4",
"jstat": "^1.9.6",
"lodash": "^4.17.21",
"open": "^9.1.0"
"open": "^10.0.2"
},
"devDependencies": {
"@babel/preset-typescript": "^7.23.3",
"@jest/globals": "^29.7.0",
"@types/jest": "^29.5.10",
"@types/lodash": "^4.14.202",
"@types/node": "^20.10.2",
"@types/node": "^20.10.6",
"@typescript-eslint/eslint-plugin": "^6.16.0",
"@typescript-eslint/parser": "^6.13.1",
"@typescript-eslint/parser": "^6.16.0",
"codecov": "^3.8.3",
"eslint": "^8.56.0",
"fast-check": "^3.14.0",
"fast-check": "^3.15.0",
"jest": "^29.7.0",
"peggy": "^3.0.2",
"prettier": "^3.0.3",
"ts-node": "^10.9.1",
"typescript": "^5.3.2"
"prettier": "^3.1.1",
"ts-node": "^10.9.2",
"typescript": "^5.3.3"
},
"files": [
"dist",
Expand Down
2 changes: 1 addition & 1 deletion packages/textmate-grammar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"devDependencies": {
"js-yaml": "^4.1.0",
"prettier": "^3.0.3",
"prettier": "^3.1.1",
"vscode-tmgrammar-test": "^0.1.2"
},
"contributes": {
Expand Down
24 changes: 12 additions & 12 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,39 +47,39 @@
"clsx": "^2.1.0",
"framer-motion": "^10.16.12",
"react-colorful": "^5.6.1",
"react-hook-form": "^7.48.2",
"react-hook-form": "^7.49.2",
"react-select": "^5.8.0",
"react-textarea-autosize": "8.5.3",
"react-use": "^17.4.2"
},
"devDependencies": {
"@storybook/addon-docs": "^7.5.2",
"@storybook/addon-docs": "^7.6.6",
"@storybook/addon-essentials": "^7.6.6",
"@storybook/addon-interactions": "^7.6.3",
"@storybook/addon-links": "^7.6.3",
"@storybook/addon-interactions": "^7.6.6",
"@storybook/addon-links": "^7.6.7",
"@storybook/blocks": "^7.6.3",
"@storybook/react": "^7.5.2",
"@storybook/react-vite": "^7.5.2",
"@storybook/testing-library": "^0.2.2",
"@tailwindcss/forms": "^0.5.7",
"@types/react": "^18.2.41",
"@types/react-dom": "^18.2.17",
"@types/react": "^18.2.46",
"@types/react-dom": "^18.2.18",
"@typescript-eslint/eslint-plugin": "^6.16.0",
"@typescript-eslint/parser": "^6.13.1",
"@typescript-eslint/parser": "^6.16.0",
"autoprefixer": "^10.4.16",
"eslint": "^8.56.0",
"eslint-plugin-react": "^7.33.2",
"postcss": "^8.4.31",
"postcss": "^8.4.32",
"postcss-cli": "^11.0.0",
"prettier": "^3.0.3",
"prettier": "^3.1.1",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rollup-plugin-node-builtins": "^2.1.2",
"storybook": "^7.6.3",
"storybook": "^7.6.7",
"tailwindcss": "^3.4.0",
"typescript": "^5.3.2",
"vite": "^5.0.5"
"typescript": "^5.3.3",
"vite": "^5.0.10"
},
"eslintConfig": {
"env": {
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/components/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ export const Button: FC<ButtonProps> = ({
disabled
? "opacity-60"
: theme === "primary"
? "hover:bg-green-800 hover:border-green-800 hover:text-white"
: "hover:bg-slate-200 hover:text-gray-900",
? "hover:bg-green-800 hover:border-green-800 hover:text-white"
: "hover:bg-slate-200 hover:text-gray-900",
wide && "w-full",
size === "medium" && "h-8 rounded-md",
size === "small" && "h-6 rounded-sm",
Expand Down
Loading

0 comments on commit dbcc301

Please sign in to comment.