Merge branch 'main' into zs/snaps-jsx

.eslintignore

@@ -1,3 +1,8 @@
 /build
+.eslintrc.js
+./node_modules/*
 /.yarn
+*.md
+*.mdx
 /static/js/feedback-script.js
+LICENSE

.eslintrc.js

@@ -0,0 +1,20 @@
+module.exports = {
+  extends: [
+    "plugin:@docusaurus/recommended",
+  ],
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    "ecmaVersion": "latest",
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    project: ["./tsconfig.json"],
+
+  },
+  plugins: ["react"],
+  rules: {
+    '@docusaurus/no-untranslated-text': 0,
+    "react/no-unknown-property": ["error", { ignore: ["*"] }],
+  },
+};

.github/workflows/build-lint.yml

@@ -3,46 +3,29 @@ name: Build and lint
 on:
   workflow_call:
   secrets:
-      SEGMENT_ANALYTICS_KEY:
-        required: true
+    SEGMENT_ANALYTICS_KEY:
+      required: true
+    LD_CLIENT_ID:
+      required: true
 
-jobs:
-  prepare:
-    name: Prepare
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - name: Install Yarn dependencies
-        run: yarn --immutable
+env:
+  SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_KEY }}
+  LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }}
 
+jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
     needs:
       - prepare
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js
-        uses: actions/setup-node@v3
+
+      - name: Build
+        uses: ConsenSys/docs-gha/build@main
         with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - run: yarn --immutable --immutable-cache
-      - run: yarn build
-        env:
-            SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_KEY }}
-      - name: Require clean working directory
-        shell: bash
-        run: |
-          if ! git diff --exit-code; then
-            echo "Working tree dirty at end of job"
-            exit 1
-          fi
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
 
   lint:
     name: Lint
@@ -51,17 +34,9 @@ jobs:
       - prepare
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js
-        uses: actions/setup-node@v3
+
+      - name: Lint
+        uses: ConsenSys/docs-gha/lint@main
         with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - run: yarn --immutable --immutable-cache
-      - run: yarn lint
-      - name: Require clean working directory
-        shell: bash
-        run: |
-          if ! git diff --exit-code; then
-            echo "Working tree dirty at end of job"
-            exit 1
-          fi
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

.github/workflows/main.yml

@@ -24,6 +24,7 @@ jobs:
     uses: ./.github/workflows/build-lint.yml
     secrets:
       SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_DEV_KEY }}
+      LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }}
 
   all-jobs-completed:
     name: All jobs completed

.gitignore

@@ -30,3 +30,5 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 .vercel
+.envrc
+.env

docs/whats-new.md

@@ -13,6 +13,9 @@ of the [MetaMask developer page](https://metamask.io/developer/).
 
 - Documented [Snaps custom UI with JSX](/snaps/features/custom-ui/with-jsx).
   ([#1348](https://github.com/MetaMask/metamask-docs/pull/1348))
+- Updated [React dapp with global state tutorial](/wallet/tutorials/react-dapp-global-state) with
+  instructions for EIP-6963.
+  ([#1330](https://github.com/MetaMask/metamask-docs/pull/1330))
 - Documented that the Gas API can be [called without an API key secret](/services/gas-api/api-reference). ([#1346](https://github.com/MetaMask/metamask-docs/pull/1346))
 - Updated [Snaps resources](/snaps/learn/resources) and added a new section "Snaps for developers." ([#1329](https://github.com/MetaMask/metamask-docs/pull/1329))
 - Documented [how to allow automatic connections to a Snap](/snaps/how-to/allow-automatic-connections).
@@ -24,6 +27,9 @@ of the [MetaMask developer page](https://metamask.io/developer/).
   ([#1276](https://github.com/MetaMask/metamask-docs/pull/1276)) 
 - Discontinued support for [`eth_sign`](/wallet/concepts/signing-methods/#eth_sign).
   ([#1319](https://github.com/MetaMask/metamask-docs/pull/1319/))
+- Updated [React dapp with local state tutorial](/wallet/tutorials/react-dapp-local-state) with
+  instructions for EIP-6963.
+  ([#1299](https://github.com/MetaMask/metamask-docs/pull/1299))
 - Documented [Snaps initial connections](/snaps/reference/permissions/#initial-connections).
   ([#1318](https://github.com/MetaMask/metamask-docs/pull/1318/))
 - Updated [Snaps allowlisting guide](/snaps/how-to/get-allowlisted) with open permissions.