Merge upstream 3.1.56

.clang-format

@@ -8,6 +8,7 @@ ConstructorInitializerIndentWidth: 2
 SpaceAfterTemplateKeyword: false
 BinPackArguments: false
 BinPackParameters: false
+WhitespaceSensitiveMacros: ['EM_ASM', 'EM_JS', 'EM_ASM_INT', 'EM_ASM_DOUBLE', 'EM_ASM_PTR', 'MAIN_THREAD_EM_ASM', 'MAIN_THREAD_EM_ASM_INT', 'MAIN_THREAD_EM_ASM_DOUBLE', 'MAIN_THREAD_EM_ASM_DOUBLE', 'MAIN_THREAD_ASYNC_EM_ASM']
 ---
 Language: JavaScript
 BasedOnStyle: LLVM

.eslintrc.yml

@@ -7,6 +7,7 @@ extends:
 parserOptions:
   ecmaVersion: 12
 ignorePatterns:
+  - "out/"
   - "site/"
   - "cache/"
   - "third_party/"

.flake8

@@ -1,16 +1,16 @@
 [flake8]
 ignore = E111,E114,E501,E261,E266,E121,E402,E241,W504,E741,B011,B023,U101
 exclude =
+ ./node_modules/, # third-party code
  ./third_party/, # third-party code
  ./tools/filelock.py, # third-party code
  ./tools/scons/, # third-party code
  ./test/third_party/, # third-party code
  ./site/source/conf.py,
- ./tools/debug/,
  ./system/lib/, # system libraries
  ./cache/, # download/built content
  .git
-# The ports plugins have a lot of unused imports becuase
+# The ports plugins have a lot of unused imports because
 # they need to implement the specific plugin APIs
 per-file-ignores =
   ./tools/ports/*.py: U100

.git-blame-ignore-revs

@@ -0,0 +1,24 @@
+# This file contains a list of commits that are not likely what you
+# are looking for in a blame, such as mass reformatting or renaming.
+# You can set this file as a default ignore file for blame by running
+# the following command.
+#
+# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# Remove tabs and fix formatting in test/sse/.  NFC (#18245)
+3cd47cff5da467ae7ca2a29490d8b04af897023f
+
+# [embind docs] Reformat and cleanup whitespace.
+9b1a5910c4f31cff4949541a42ac956ba45e4701
+
+# [NFC] WasmFS: Run clang-format (#19995)
+2384d4e16f5309a642481387edb3774913fab382
+
+# Don't indent code inside C++ namespace in embind.h. NFC (#14098)
+752f66a7434386b4a8ed6e0e6babdafc23d78047
+
+# Remove indentation from C++ namespaces in embind code. NFC (#16400)
+5dbf740fd2064c89bc1112897f960a49caa7b6d1
+
+# Fix indentation in embind code. NFC (#17447)
+14c106a0a8cbc539d6efe4a4e7b4ee7bbb73a0a6

.github/ISSUE_TEMPLATE/bug_report.md

@@ -19,3 +19,12 @@ along with its entire output.
 Even for runtime issues it helps a lot if you can include the full link command.
 Adding `-v` to the link command will show all of the sub-commands run which
 can help us diagnose your issue.
+
+Note:  Where possible, please avoid attaching screen shots of code or console
+logs.  Instead, please include them as text so that they may be copied /
+searched.  To make code blocks more readable and syntax highlighted, please
+escape them with three backticks before and after, like this:
+
+```cpp
+int x = 20;
+```

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/archive.yml

@@ -15,13 +15,13 @@ jobs:
   archive:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
     - name: make dist
       run: |
         make dist
         version=`cat emscripten-version.txt | sed s/\"//g`
         echo "VERSION=$version" >> $GITHUB_ENV
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
       with:
         name: emscripten-${{ env.VERSION }}
         path: emscripten-${{ env.VERSION }}.tar.bz2

.github/workflows/scorecards.yml

@@ -19,15 +19,17 @@ jobs:
       security-events: write
       actions: read
       contents: read
+      # Needed to publish results
+      id-token: write
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@c1aec4ac820532bab364f02a81873c555a0ba3a1 # v1.0.4
+        uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # v2.1.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -42,14 +44,14 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # v1.0.26
+        uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
         with:
           sarif_file: results.sarif

.gitignore

@@ -34,3 +34,9 @@ coverage.xml
 /.dotnet
 /.packages
 /artifacts
+
+# All the ps1 files are generated by bootstrap...
+*.ps1
+# ...except the templates.
+!/tools/run_python.ps1
+!/tools/run_python_compiler.ps1

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "test/third_party/googletest"]
 	path = test/third_party/googletest
 	url = https://github.com/google/googletest
+[submodule "test/third_party/wasi-test-suite"]
+	path = test/third_party/wasi-test-suite
+	url = https://github.com/khronosproject/wasi-test-suite

.mypy.ini

@@ -2,6 +2,7 @@
 mypy_path = third_party/,third_party/ply,third_party/websockify
 files = .
 exclude = (?x)(
+  cache |
   third_party |
   conf\.py |
   emrun\.py |

.prettierrc.yml

@@ -1,4 +1,3 @@
 singleQuote: true
 bracketSpacing: false
-arrowParens: avoid
 printWidth: 100

AUTHORS

@@ -592,3 +592,8 @@ a license to everyone to use it as detailed in LICENSE.)
 * Alexandra Cherdantseva <neluhus.vagus@gmail.com>
 * Michael Schmuki <michael@schmuki.io>
 * Skye Gibney <skyejgibney@gmail.com>
+* Piotr Wierciński <laminowany@gmail.com>
+* 郑苏波 (Super Zheng) <superzheng@tencent.com>
+* James Hu <jameshu2022@gmail.com>
+* Jerry Zhuang <jerry.zhuang@jwzg.com>
+* Taisei Kon <kinsei0916@gmail.com>