Skip to content

Commit

Permalink
Merge branch 'main' into wip-starknet-snap
Browse files Browse the repository at this point in the history
  • Loading branch information
joaniefromtheblock authored Sep 30, 2024
2 parents 99839e7 + c86f086 commit f92fdc3
Show file tree
Hide file tree
Showing 229 changed files with 22,709 additions and 37,618 deletions.
8 changes: 0 additions & 8 deletions .eslintignore

This file was deleted.

20 changes: 0 additions & 20 deletions .eslintrc.js

This file was deleted.

8 changes: 0 additions & 8 deletions .gitattributes

This file was deleted.

2 changes: 0 additions & 2 deletions .github/workflows/dependabot.yml → .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
name: 'Dependency Review'

version: 2
updates:
- package-ecosystem: "npm"
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ name: Build

on:
workflow_call:
secrets:
SEGMENT_ANALYTICS_KEY:
required: true
LD_CLIENT_ID:
required: true
secrets:
SEGMENT_ANALYTICS_KEY:
required: true
LD_CLIENT_ID:
required: true
SENTRY_KEY:
required: true

env:
SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_KEY }}
LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }}

SENTRY_KEY: ${{ secrets.SENTRY_KEY }}

jobs:
build:
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/case.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ name: Check file name case

on:
workflow_call:
secrets:
SEGMENT_ANALYTICS_KEY:
required: true
LD_CLIENT_ID:
required: true
secrets:
SEGMENT_ANALYTICS_KEY:
required: true
LD_CLIENT_ID:
required: true
SENTRY_KEY:
required: true

env:
SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_KEY }}
LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }}

SENTRY_KEY: ${{ secrets.SENTRY_KEY }}

jobs:
case:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Crowdin Action

on:
push:
path: ["i18n/**"]
paths: ["i18n/**"]
branches: [main]

permissions: write-all
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ name: Check for lint, spelling and link errors

on:
workflow_call:
secrets:
SEGMENT_ANALYTICS_KEY:
required: true
LD_CLIENT_ID:
required: true
secrets:
SEGMENT_ANALYTICS_KEY:
required: true
LD_CLIENT_ID:
required: true
SENTRY_KEY:
required: true

env:
SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_KEY }}
LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }}

SENTRY_KEY: ${{ secrets.SENTRY_KEY }}

jobs:
lint:
Expand All @@ -24,7 +26,7 @@ jobs:
- uses: actions/checkout@v4

- name: Lint
uses: ConsenSys/docs-gha/lint@main
uses: ConsenSys/docs-gha/lint@cc8b9d9065f5f20b105954f8e806f55c1e235ecd
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,23 @@ jobs:
secrets:
SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_DEV_KEY }}
LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }}
SENTRY_KEY: ${{ secrets.SENTRY_KEY }}

lint:
name: Lint
uses: ./.github/workflows/lint.yml
secrets:
SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_DEV_KEY }}
LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }}
SENTRY_KEY: ${{ secrets.SENTRY_KEY }}

case:
name: Case
uses: ./.github/workflows/case.yml
secrets:
SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_DEV_KEY }}
LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }}

SENTRY_KEY: ${{ secrets.SENTRY_KEY }}

all-jobs-completed:
name: All jobs completed
Expand Down
12 changes: 0 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,6 @@
.cache-loader
.idea

# yarn v3 (w/o zero-install)
# See: https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# Misc
.DS_Store
.env.local
Expand All @@ -27,8 +17,6 @@
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
.vercel
.envrc
.env
6 changes: 6 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "stylelint-config-standard",
"rules": {
"selector-class-pattern": null
}
}
9 changes: 0 additions & 9 deletions .yarn/plugins/@yarnpkg/plugin-allow-scripts.cjs

This file was deleted.

873 changes: 0 additions & 873 deletions .yarn/releases/yarn-3.4.1.cjs

This file was deleted.

15 changes: 0 additions & 15 deletions .yarnrc.yml

This file was deleted.

4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ To contribute changes:
> `developer-tools` directories.
> - If you add a new documentation page, edit `wallet-sidebar.js`, `snaps-sidebar.js`,
> `services-sidebar.js`, or `dashboard-sidebar.js` to add the page to the
> [sidebar](https://docs-template.consensys.net/contribute/configure-docusaurus#sidebar).
> [sidebar](https://docs-template.consensys.io/create/configure-docusaurus#sidebar).
> - If you delete, rename, or move a documentation file, add a
> [redirect](https://vercel.com/docs/edge-network/redirects#configuration-redirects).
> - See additional instructions for [updating the interactive API reference](#update-the-interactive-api-reference).
Expand Down Expand Up @@ -251,5 +251,5 @@ export SEGMENT_ANALYTICS_KEY="<your key>"
Then build the project in production mode using the following command:
```bash
yarn build && yarn serve
npm run build && npm run serve
```
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ Build the documentation site locally using the following steps.
2. Install dependencies.
```bash
yarn install
npm install
```
3. Start the development server.
```bash
yarn start
npm start
```
Once the server starts, you can view the documentation at `http://localhost:3000`.
Expand Down
2 changes: 1 addition & 1 deletion developer-tools/dashboard/how-to/credit-usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: View your Infura credit usage stats.

:::info

The [credit pricing model](../api/learn/pricing/) replaces request-based billing for free-tier (Core)
The [credit pricing model](/services/get-started/pricing) replaces request-based billing for free-tier (Core)
customers. Customers on Developer and Team plans will be transitioned to the credit model on
September 30, 2024.

Expand Down
9 changes: 9 additions & 0 deletions docs/whats-new.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ of the [MetaMask developer page](https://metamask.io/developer/).

## September 2024

- Updated [credit cost](/services/get-started/pricing/credit-cost/#ethereum) for `eth_sendRawTransaction`.
([#1581](https://github.com/MetaMask/metamask-docs/pull/1581))
- Documented WebSocket support for [Base](/services/reference/base),
[Blast](/services/reference/blast), [Celo](/services/reference/celo),
[Ethereum Holesky](/services/reference/ethereum), and [Mantle](/services/reference/mantle).
([#1552](https://github.com/MetaMask/metamask-docs/pull/1552))
- Documented new [Snaps custom UI JSX components](/snaps/features/custom-ui) for Flask
version 12.4, and removed documentation for deprecated function-based library.
([#1540](https://github.com/MetaMask/metamask-docs/pull/1540))
- Documented [Snaps user-defined components](/snaps/features/custom-ui/user-defined-components).
([#1557](https://github.com/MetaMask/metamask-docs/pull/1557))
- Updated [Android SDK documentation](/wallet/how-to/use-sdk/mobile/android) with convenience
Expand Down
9 changes: 9 additions & 0 deletions docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

require("dotenv").config();
const { themes } = require("prism-react-renderer");
const { REF_ALLOW_LOGIN_PATH } = require("./src/lib/constants");
const codeTheme = themes.dracula;
const remarkCodesandbox = require("remark-codesandbox");
const isProd = process.env.NODE_ENV === "production";
Expand Down Expand Up @@ -32,6 +33,8 @@ const config = {

customFields: {
LD_CLIENT_ID: process.env.LD_CLIENT_ID,
VERCEL_ENV: process.env.VERCEL_ENV,
DASHBOARD_PREVIEW_URL: process.env.DASHBOARD_PREVIEW_URL,
SENTRY_KEY: process.env.SENTRY_KEY,
},

Expand Down Expand Up @@ -89,6 +92,7 @@ const config = {
],
],
plugins: [
"docusaurus-plugin-sass",
[
"@docusaurus/plugin-content-docs",
{
Expand Down Expand Up @@ -206,6 +210,11 @@ const config = {
label: "User support",
position: "right",
},
{
type: "custom-navbarWallet",
position: "right",
includeUrl: REF_ALLOW_LOGIN_PATH,
},
/* Language drop down
{
type: "localeDropdown",
Expand Down
55 changes: 55 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import react from "eslint-plugin-react";
import tsParser from "@typescript-eslint/parser";
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
});

export default [{
ignores: [
"build",
"**/.eslintrc.js",
"node_modules/*",
".docusaurus/*",
"**/*.md",
"**/*.mdx",
"static/*",
"*.js",
"*.mjs"
],
}, ...compat.extends("plugin:@docusaurus/recommended"), {
plugins: {
react,
},

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

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

project: ["./tsconfig.json"],
tsconfigRootDir: "./",
},
},

rules: {
"@docusaurus/no-untranslated-text": 0,

"react/no-unknown-property": ["error", {
ignore: ["*"],
}],
},
}];
Loading

0 comments on commit f92fdc3

Please sign in to comment.