--skip-npm flag to Skip putting emsdk's npm on PATH

.circleci/config.yml

@@ -7,6 +7,46 @@ executors:
   bionic:
     docker:
       - image: buildpack-deps:bionic
+  mac:
+    environment:
+      EMSDK_NOTTY: "1"
+      # Without this, any `brew install` command will result in self-update of
+      # brew itself which takes more than 4 minutes.
+      HOMEBREW_NO_AUTO_UPDATE: "1"
+    macos:
+      xcode: "12.5.1"
+    resource_class: macos.x86.medium.gen2
+  mac_arm64:
+    environment:
+      EMSDK_NOTTY: "1"
+      # Without this, any `brew install` command will result in self-update of
+      # brew itself which takes more than 4 minutes.
+      HOMEBREW_NO_AUTO_UPDATE: "1"
+    macos:
+      xcode: "13.4.1"
+    resource_class: macos.m1.medium.gen1
+  linux_arm64:
+    machine:
+      image: ubuntu-2004:202101-01
+    resource_class: arm.medium
+
+commands:
+  setup-macos:
+    steps:
+      - checkout
+      - run:
+          name: Install CMake
+          command: brew install cmake
+  test-macos:
+    steps:
+      - run:
+          name: test.sh
+          command: test/test.sh
+      - run:
+          name: test.py
+          command: |
+            source emsdk_env.sh
+            test/test.py
 
 jobs:
   flake8:
@@ -20,9 +60,9 @@ jobs:
             apt-get install -q -y python-pip python3-pip
       - run: python2 -m pip install --upgrade pip
       - run: python3 -m pip install --upgrade pip
-      - run: python2 -m pip install flake8==3.7.8
-      - run: python3 -m pip install flake8==3.7.8
-      - run: python2 -m flake8 --show-source --statistics
+      - run: python2 -m pip install flake8==3.9.2
+      - run: python3 -m pip install flake8==3.9.2
+      - run: python2 -m flake8 --show-source --statistics --extend-exclude=./scripts
       - run: python3 -m flake8 --show-source --statistics
   test-linux:
     executor: bionic
@@ -40,32 +80,32 @@ jobs:
       - run:
           name: Install debian packages
           command: apt-get update -q && apt-get install -q -y cmake build-essential openjdk-8-jre-headless ksh zsh
+      - run: test/test_node_path.sh
       - run: test/test.sh
       - run: test/test_source_env.sh
       - run:
           name: test.py
           command: |
             source emsdk_env.sh
             test/test.py
-  test-mac:
-    macos:
-      xcode: "12.5.1"
-    environment:
-      EMSDK_NOTTY: "1"
-      # Without this, any `brew installl` command will result in self-update of
-      # brew itself which takes more than 4 minutes.
-      HOMEBREW_NO_AUTO_UPDATE: "1"
+  test-linux-arm64:
+    executor: linux_arm64
     steps:
       - checkout
       - run:
-          name: Install cmake
-          command: brew install cmake
+          name: Install debian packages
+          command: sudo apt-get update -q && sudo apt-get install -q cmake build-essential openjdk-8-jre-headless
       - run: test/test.sh
-      - run:
-          name: test.py
-          command: |
-            source emsdk_env.sh
-            test/test.py
+  test-mac:
+    executor: mac
+    steps:
+      - setup-macos
+      - test-macos
+  test-mac-arm64:
+    executor: mac_arm64
+    steps:
+      - setup-macos
+      - test-macos
   test-windows:
     executor:
       name: win/vs2019
@@ -190,11 +230,7 @@ jobs:
       - run: test/test_bazel.sh
 
   test-bazel-mac:
-    macos:
-      xcode: "12.5.1"
-    environment:
-      EMSDK_NOTTY: "1"
-      HOMEBREW_NO_AUTO_UPDATE: "1"
+    executor: mac
     steps:
       - checkout
       - run: brew install grep
@@ -211,6 +247,7 @@ jobs:
     environment:
       PYTHONUNBUFFERED: "1"
       EMSDK_NOTTY: "1"
+      USE_BAZEL_VERSION: "5.4.0"
     steps:
       - checkout
       - run:
@@ -233,9 +270,15 @@ workflows:
   test-linux:
     jobs:
       - test-linux
+  test-linux-arm64:
+    jobs:
+      - test-linux-arm64
   test-mac:
     jobs:
       - test-mac
+  test-mac-arm64:
+    jobs:
+      - test-mac-arm64
   test-windows:
     jobs:
       - test-windows

.dockerignore

@@ -1,7 +1,8 @@
 # Ignore everything
 *
 
-# Allow to run the test script inside the Docker container
+# Allow the entrypoint/test script inside the Docker container
+!/docker/entrypoint.sh
 !/docker/test_dockerimage.sh
 
 # Allow license file

.flake8

@@ -5,19 +5,20 @@ ignore =
    E501, # Line too long
    E121, # Continuation line under-indented for hanging indent
    E722  # bare excepts
+   E741, # Variable names such as 'l', 'O', or 'I'
 exclude =
-  ./llvm
-  ./gnu
-  ./upstream
-  ./fastcomp
-  ./fastcomp-clang
-  ./releases
-  ./clang
-  ./emscripten
-  ./binaryen
-  ./git
-  ./node
-  ./python
-  ./temp
-  ./zips
-  ./crunch
+  ./llvm,
+  ./gnu,
+  ./upstream,
+  ./fastcomp,
+  ./fastcomp-clang,
+  ./releases,
+  ./clang,
+  ./emscripten,
+  ./binaryen,
+  ./git,
+  ./node,
+  ./python,
+  ./temp,
+  ./downloads,
+  ./crunch,

.gitignore

@@ -27,7 +27,7 @@ __pycache__
 /node
 /python
 /temp
-/zips
+/downloads
 /crunch
 /java
 /mingw

README.md

@@ -36,16 +36,14 @@ important concepts to help understanding the internals of the SDK:
 * **SDK**: A set of tools. For example, 'sdk-1.5.6-32bit' is an SDK consisting
   of the tools `clang-3.2-32bit`, `node-0.10.17-32bit`, `python-2.7.5.1-32bit`
   and `emscripten-1.5.6`.
-* **Active Tool/SDK**: Emscripten stores compiler configuration in a
-  user-specific file **~/.emscripten**. This file points to paths for
-  Emscripten, Python, Clang and so on. If the file ~/.emscripten is configured
-  to point to a Tool in a specific directory, then that tool is denoted as being
-  **active**. The Emscripten Command Prompt always gives access to the currently
-  active Tools. This mechanism allows switching between different installed SDK
-  versions easily.
+* **Active Tool/SDK**: Emscripten SDK stores compiler configuration in a file
+  called `.emscripten` within the emsdk directory. This file points to paths
+  for Emscripten, Python, Clang and so on. If the configuration file points to a
+  Tool in a specific directory, then that tool is denoted as being
+  **active**. This mechanism allows switching between different installed
+  tools and SDKs.
 * **emsdk**: This is the name of the manager script that Emscripten SDK is
-  accessed through. Most operations are of the form `emsdk command`. To access
-  the emsdk script, launch the Emscripten Command Prompt.
+  accessed through. Most operations are of the form `emsdk <command>`.
 
 ## System Requirements
 
@@ -136,11 +134,11 @@ using git, and compile the package on demand.
 When you run `emsdk list`, it will group the Tools and SDKs under these two
 categories.
 
-To obtain and build latest upstream wasm SDK from source, run
+To obtain and build latest wasm SDK from source, run
 
 ```
-emsdk install sdk-upstream-main-64bit
-emsdk activate sdk-upstream-main-64bit
+emsdk install sdk-main-64bit
+emsdk activate sdk-main-64bit
 ```
 
 You can use this target for example to bootstrap developing patches to LLVM,
@@ -156,7 +154,7 @@ https://emscripten.org/docs/contributing/developers_guide.html?highlight=develop
 ### When working on git branches compiled from source, how do I update to a newer compiler version?
 
 Unlike tags and precompiled versions, a few of the SDK packages are based on
-"moving" git branches and compiled from source (e.g. sdk-upstream-main,
+"moving" git branches and compiled from source (e.g. sdk-main,
 sdk-main, emscripten-main, binaryen-main). Because of that, the
 compiled versions will eventually go out of date as new commits are introduced
 to the development branches. To update an old compiled installation of one of
@@ -179,30 +177,18 @@ activate <tool/sdk name>`. Activating a tool will set up `~/.emscripten` to
 point to that particular tool. On Windows, you can pass the option `--permanent` to
 the `activate` command to register the environment permanently for the current user. Use `--system` to do this for all users.
 
-### How do I build multiple projects with different SDK versions in parallel?
-
-By default, Emscripten locates all configuration files in the home directory of
-the user. This may be a problem if you need to simultaneously build with
-multiple Emscripten compiler versions, since the user home directory can only be
-configured to point to one compiler at a time. This can be overcome by
-specifying the '--embedded' option as a parameter to 'emsdk activate', which
-will signal emsdk to generate the compiler configuration files inside the emsdk
-root directory instead of the user home directory. Use this option also when it
-is desirable to run emsdk in a fully portable mode that does not touch any files
-outside the emsdk directory.
-
 ### How do I track the latest Emscripten development with the SDK?
 
 A common and supported use case of the Emscripten SDK is to enable the workflow
 where you directly interact with the github repositories. This allows you to
 obtain new features and latest fixes immediately as they are pushed to the
 github repository, without having to wait for release to be tagged. You do not
 need a github account or a fork of Emscripten to do this. To switch to using the
-latest upstream git development branch `main`, run the following:
+latest git development branch `main`, run the following:
 
     emsdk install git-1.9.4 # Install git. Skip if the system already has it.
-    emsdk install sdk-upstream-main-64bit # Clone+pull the latest emscripten-core/emscripten/main.
-    emsdk activate sdk-upstream-main-64bit # Set the main SDK as the currently active one.
+    emsdk install sdk-main-64bit # Clone+pull the latest emscripten-core/emscripten/main.
+    emsdk activate sdk-main-64bit # Set the main SDK as the currently active one.
 
 ### How do I use my own Emscripten github fork with the SDK?
 

SECURITY.md

@@ -0,0 +1,16 @@
+# Security Policy
+
+If you have discovered a security vulnerability in this project, please report it
+privately. **Do not disclose it as a public issue.** This gives us time to work with you
+to fix the issue before public exposure, reducing the chance that the exploit will be
+used before a patch is released.
+
+Please submit the report as a [security bug on the Chromium tracker](https://bugs.chromium.org/p/chromium/issues/entry?template=Security%20Bug).
+
+Please provide the following information in your report:
+
+- A description of the vulnerability and its impact
+- How to reproduce the issue
+- Make it clear that it's an Emscripten SDK bug.
+
+We ask that you give us 90 days to work on a fix before public exposure.

bazel/BUILD

@@ -8,6 +8,14 @@ config_setting(
     ],
 )
 
+config_setting(
+    name = "linux_arm64",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:arm64",
+    ],
+)
+
 config_setting(
     name = "macos",
     constraint_values = [
@@ -38,6 +46,7 @@ alias(
     name = "compiler_files",
     actual = select({
         ":linux": "@emscripten_bin_linux//:compiler_files",
+        ":linux_arm64": "@emscripten_bin_linux_arm64//:compiler_files",
         ":macos": "@emscripten_bin_mac//:compiler_files",
         ":macos_arm64": "@emscripten_bin_mac_arm64//:compiler_files",
         ":windows": "@emscripten_bin_win//:compiler_files",
@@ -49,6 +58,7 @@ alias(
     name = "linker_files",
     actual = select({
         ":linux": "@emscripten_bin_linux//:linker_files",
+        ":linux_arm64": "@emscripten_bin_linux_arm64//:linker_files",
         ":macos": "@emscripten_bin_mac//:linker_files",
         ":macos_arm64": "@emscripten_bin_mac_arm64//:linker_files",
         ":windows": "@emscripten_bin_win//:linker_files",
@@ -60,6 +70,7 @@ alias(
     name = "ar_files",
     actual = select({
         ":linux": "@emscripten_bin_linux//:ar_files",
+        ":linux_arm64": "@emscripten_bin_linux_arm64//:ar_files",
         ":macos": "@emscripten_bin_mac//:ar_files",
         ":macos_arm64": "@emscripten_bin_mac_arm64//:ar_files",
         ":windows": "@emscripten_bin_win//:ar_files",
@@ -73,3 +84,11 @@ platform(
         "@platforms//cpu:wasm32",
     ],
 )
+
+platform(
+    name = "platform_wasi",
+    constraint_values = [
+        "@platforms//cpu:wasm32",
+        "@platforms//os:wasi",
+    ],
+)

bazel/README.md

@@ -3,7 +3,7 @@
 ## Setup Instructions
 
 In `WORKSPACE` file, put:
-```
+```starlark
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "emsdk",
@@ -37,7 +37,7 @@ build --incompatible_enable_cc_toolchain_resolution
 
 Then write a new rule wrapping your `cc_binary`.
 
-```
+```starlark
 load("@rules_cc//cc:defs.bzl", "cc_binary")
 load("@emsdk//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")