Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci-default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
DOCS_ALGOLIA_APP_ID: "test"
DOCS_ALGOLIA_API_KEY: "test"
DOCS_ALGOLIA_INDEX: "test"
DOCS_SEGMENT_WRITE_KEY: "test"
DOCS_GOOGLE_ANALYTICS_KEY: "test"

# Trigger the workflow when:
on:
Expand Down Expand Up @@ -55,15 +55,15 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.6.0
version: 10.13.1
run_install: |
- recursive: true
args: [--frozen-lockfile, --strict-peer-dependencies]

- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: "20.x"
node-version: "24.x"
cache: "pnpm"

- name: Install Foundry
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy-docusaurus-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
DOCS_ALGOLIA_APP_ID: ${{ vars.DOCS_ALGOLIA_APP_ID }}
DOCS_ALGOLIA_API_KEY: ${{ vars.DOCS_ALGOLIA_API_KEY }}
DOCS_ALGOLIA_INDEX: ${{ vars.DOCS_ALGOLIA_INDEX }}
DOCS_SEGMENT_WRITE_KEY: ${{ vars.DOCS_SEGMENT_WRITE_KEY }}
DOCS_GOOGLE_ANALYTICS_KEY: ${{ vars.DOCS_GOOGLE_ANALYTICS_KEY }}

# Trigger the workflow when:
on:
Expand Down Expand Up @@ -34,16 +34,16 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.6.0
version: 10.13.1
run_install: |
- recursive: true
args: [--frozen-lockfile, --strict-peer-dependencies]

- name: Set up Node.js 20
- name: Set up Node.js 24
uses: actions/setup-node@v4
with:
cache: "pnpm"
node-version: "20.x"
node-version: "24.x"

- name: Build
run: pnpm build:docs
Expand Down
2 changes: 1 addition & 1 deletion .lintstagedrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"**/!(.eslintrc)*.{js,jsx,ts,tsx,sol}": [
"eslint --ignore-path .gitignore --max-warnings 0",
"eslint --max-warnings 0",
"prettier --ignore-path .gitignore --write",
"prettier --ignore-path .gitignore --log-level warn --check"
],
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/.env.local.example
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ DOCS_URL=
DOCS_ALGOLIA_APP_ID=
DOCS_ALGOLIA_API_KEY=
DOCS_ALGOLIA_INDEX=
DOCS_SEGMENT_WRITE_KEY=
DOCS_GOOGLE_ANALYTICS_KEY=
9 changes: 5 additions & 4 deletions apps/docs/docusaurus.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
ALGOLIA_API_KEY,
ALGOLIA_APP_ID,
ALGOLIA_INDEX,
SEGMENT_WRITE_KEY,
GOOGLE_ANALYTICS_KEY,
} from "./src/config";

const config: Config = {
Expand Down Expand Up @@ -53,6 +53,10 @@ const config: Config = {
blogSidebarCount: "ALL",
blogTagsPostsComponent: "@site/src/components/BlogTagsPostsPage.tsx",
},
gtag: {
trackingID: GOOGLE_ANALYTICS_KEY,
//anonymizeIP: true, // Should we anonymize the IP?
},
theme: {
customCss: "./src/css/custom.css",
},
Expand Down Expand Up @@ -140,9 +144,6 @@ const config: Config = {
darkTheme: prismThemes.dracula,
},
} satisfies Preset.ThemeConfig,
plugins: [
["@laxels/docusaurus-plugin-segment", { apiKey: SEGMENT_WRITE_KEY }],
],
};

export default config;
1 change: 0 additions & 1 deletion apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"@docusaurus/core": "3.8.1",
"@docusaurus/preset-classic": "3.8.1",
"@docusaurus/theme-common": "3.8.1",
"@laxels/docusaurus-plugin-segment": "^1.0.6",
"@mdx-js/react": "^3.1.0",
"@plasmicapp/react-web": "^0.2.393",
"@plasmicpkgs/plasmic-basic-components": "^0.0.249",
Expand Down
6 changes: 3 additions & 3 deletions apps/docs/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const ALGOLIA_INDEX = requireEnv(
process.env.DOCS_ALGOLIA_INDEX,
"DOCS_ALGOLIA_INDEX",
);
export const SEGMENT_WRITE_KEY = requireEnv(
process.env.DOCS_SEGMENT_WRITE_KEY,
"DOCS_SEGMENT_WRITE_KEY",
export const GOOGLE_ANALYTICS_KEY = requireEnv(
process.env.DOCS_GOOGLE_ANALYTICS_KEY,
"DOCS_GOOGLE_ANALYTICS_KEY",
);
90 changes: 90 additions & 0 deletions eslint.config.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
const {
defineConfig,
globalIgnores,
} = require("eslint/config");

const globals = require("globals");
const tsParser = require("@typescript-eslint/parser");
const typescriptEslint = require("@typescript-eslint/eslint-plugin");
const react = require("eslint-plugin-react");
const js = require("@eslint/js");

const {
FlatCompat,
} = require("@eslint/eslintrc");

const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
});

module.exports = defineConfig([{
languageOptions: {
globals: {
...globals.browser,
...globals.node,
},

parser: tsParser,
ecmaVersion: "latest",
sourceType: "module",

parserOptions: {
ecmaFeatures: {
jsx: true,
},

tsconfigRootDir: __dirname,
project: "./tsconfig.json",
},
},

extends: compat.extends(
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"prettier",
),

plugins: {
"@typescript-eslint": typescriptEslint,
react,
},

settings: {
react: {
version: "detect",
},
},

rules: {
"@typescript-eslint/no-misused-promises": "error",
"@typescript-eslint/no-floating-promises": "error",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-expressions": "off",

"@typescript-eslint/no-unused-vars": ["warn", {
argsIgnorePattern: "^_",
}],

"no-restricted-properties": ["error", {
object: "console",
property: "error",
message: "Please use the logger instead.",
}],

"no-restricted-globals": ["error", {
name: "prompt",
message: "Please use a React modal instead.",
}],
},
}, globalIgnores([
"**/vendor/*.js",
"vendor/**/*.js",
"**/jest.config.ts",
"**/test.only/**/*",
"**/utilities/**/*",
"**/.eslintrc.js",
"**/postcss.config.js",
])]);
23 changes: 13 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,25 @@
"prepare": "husky"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^8.9.0",
"eslint": "^9.12.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react": "^7.37.1",
"husky": "^9.1.6",
"lint-staged": "^15.2.10",
"@eslint/eslintrc": "^3.3.1",
"@eslint/js": "^9.31.0",
"@typescript-eslint/eslint-plugin": "^8.37.0",
"eslint": "^9.31.0",
"eslint-config-prettier": "^10.1.5",
"eslint-plugin-react": "^7.37.5",
"globals": "^16.3.0",
"husky": "^9.1.7",
"lint-staged": "^16.1.2",
"npm-check-updates": "^18.0.1",
"prettier": "^3.3.3",
"turbo": "^2.1.3"
"prettier": "^3.6.2",
"turbo": "^2.5.4"
},
"engines": {
"node": ">=18.x",
"pnpm": ">=8"
},
"packageManager": "pnpm@9.6.0",
"packageManager": "pnpm@10.13.1",
"dependencies": {
"pyright": "^1.1.385"
"pyright": "^1.1.403"
}
}
Loading