Rename c-dependencies to runtime (#514)

Author: elliottt

.github/dependabot.yml

@@ -11,7 +11,7 @@ updates:
       interval: "daily"
 
   - package-ecosystem: "cargo"
-    directory: "/c-dependencies/js-compute-runtime/rust-url"
+    directory: "/runtime/js-compute-runtime/rust-url"
     schedule:
       interval: "daily"
 

.github/workflows/main.yml

@@ -41,7 +41,7 @@ jobs:
 
     - uses: ./.github/actions/cache-crates
       with:
-        lockfiles: 'c-dependencies/js-compute-runtime/**/Cargo.lock'
+        lockfiles: 'runtime/js-compute-runtime/**/Cargo.lock'
 
     - name: Restore wasm-tools from cache
       uses: actions/cache@v3
@@ -59,26 +59,26 @@ jobs:
 
     - uses: ./.github/actions/install-rust
       with:
-        path: c-dependencies
+        path: runtime
 
     - name: Cache SpiderMonkey object files
       uses: actions/cache@v3
       id: sm-cache
       with:
         path: |
-          c-dependencies/spidermonkey/${{ matrix.profile }}
+          runtime/spidermonkey/${{ matrix.profile }}
         key: cache-${{ hashFiles(
-            'c-dependencies/spidermonkey/build-engine.sh',
-            'c-dependencies/spidermonkey/gecko-revision',
-            'c-dependencies/spidermonkey/object-files.list',
-            'c-dependencies/rust-toolchain.toml'
+            'runtime/spidermonkey/build-engine.sh',
+            'runtime/spidermonkey/gecko-revision',
+            'runtime/spidermonkey/object-files.list',
+            'runtime/rust-toolchain.toml'
           ) }}-${{ matrix.profile }}
       if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
 
     - name: "Build SpiderMonkey"
       if: steps.sm-cache.outputs.cache-hit != 'true'
       run: |
-        cd c-dependencies/spidermonkey/
+        cd runtime/spidermonkey/
         sudo apt-get update -y
         bash ./build-engine.sh ${{ matrix.profile }}
 
@@ -100,8 +100,8 @@ jobs:
     - name: Cache built Rust dependencies
       uses: actions/cache@v3
       with:
-        path: c-dependencies/js-compute-runtime/rusturl
-        key: engine-cargo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('c-dependencies/rust-toolchain.toml', 'c-dependencies/js-compute-runtime/**/Cargo.lock') }}
+        path: runtime/js-compute-runtime/rusturl
+        key: engine-cargo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('runtime/rust-toolchain.toml', 'runtime/js-compute-runtime/**/Cargo.lock') }}
         # We trust cargo to only reuse valid parts of the cache when dependencies change.
         restore-keys: engine-cargo-${{ runner.os }}-${{ runner.arch }}-
       # Out of an abundance of caution, ensure that tagged releases rebuild all
@@ -366,7 +366,7 @@ jobs:
         name: engine-release
     - name: Locate component resources
       run: |
-        cp c-dependencies/js-compute-runtime/fastly.wit .
+        cp runtime/js-compute-runtime/fastly.wit .
     - run: yarn
       shell: bash
     - run: npm test

.github/workflows/release-please.yml

@@ -81,11 +81,11 @@ jobs:
 
       - uses: ./.github/actions/cache-crates
         with:
-          lockfiles: "c-dependencies/js-compute-runtime/**/Cargo.lock"
+          lockfiles: "runtime/js-compute-runtime/**/Cargo.lock"
 
       - uses: ./.github/actions/install-rust
         with:
-          path: c-dependencies
+          path: runtime
 
       - name: Restore wasm-tools from cache
         uses: actions/cache@v3
@@ -106,18 +106,18 @@ jobs:
         id: sm-cache
         with:
           path: |
-            c-dependencies/spidermonkey/release
+            runtime/spidermonkey/release
           key: cache-${{ hashFiles(
-            'c-dependencies/spidermonkey/build-engine.sh',
-            'c-dependencies/spidermonkey/gecko-revision',
-            'c-dependencies/spidermonkey/object-files.list',
-            'c-dependencies/rust-toolchain.toml'
+            'runtime/spidermonkey/build-engine.sh',
+            'runtime/spidermonkey/gecko-revision',
+            'runtime/spidermonkey/object-files.list',
+            'runtime/rust-toolchain.toml'
             ) }}-release
 
       - name: "Build SpiderMonkey"
         if: ${{ steps.sm-cache.outputs.cache-hit != 'true' }}
         run: |
-          cd c-dependencies/spidermonkey/
+          cd runtime/spidermonkey/
           bash ./build-engine.sh release
 
       - name: "Install wasi-sdk-19 (linux)"
@@ -138,8 +138,8 @@ jobs:
       - name: Cache built Rust dependencies
         uses: actions/cache@v3
         with:
-          path: c-dependencies/js-compute-runtime/rusturl
-          key: engine-cargo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('c-dependencies/rust-toolchain.toml', 'c-dependencies/js-compute-runtime/**/Cargo.lock') }}
+          path: runtime/js-compute-runtime/rusturl
+          key: engine-cargo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('runtime/rust-toolchain.toml', 'runtime/js-compute-runtime/**/Cargo.lock') }}
           # We trust cargo to only reuse valid parts of the cache when dependencies change.
           restore-keys: engine-cargo-${{ runner.os }}-${{ runner.arch }}-
 

.gitignore

@@ -13,13 +13,13 @@ node_modules/
 # compiler_flags
 /js-compute-runtime.wasm
 /js-compute-runtime-component.wasm
-/c-dependencies/js-compute-runtime/obj
+/runtime/js-compute-runtime/obj
 tests/wpt-harness/wpt-test-runner.js
 /fastly.wit
 wpt-runtime.wasm
 docs-app/bin/main.wasm
 docs-app/pkg/*.tar.gz
-c-dependencies/js-compute-runtime/fastly-world/fastly_world_component_type.o
+runtime/js-compute-runtime/fastly-world/fastly_world_component_type.o
 
 *.a
 yarn-error.log

.gitmodules

@@ -1,5 +1,5 @@
-[submodule "c-dependencies/spidermonkey"]
-	path = c-dependencies/spidermonkey
+[submodule "runtime/spidermonkey"]
+	path = runtime/spidermonkey
 	url = https://github.com/fastly/spidermonkey-wasi-embedding.git
 	shallow = true
 [submodule "tests/wpt-harness/wpt"]

.vscode/c_cpp_properties.json

@@ -3,10 +3,10 @@
         {
             "name": "sm-wasi",
             "includePath": [
-                "${workspaceFolder}/c-dependencies/spidermonkey/debug/include",
+                "${workspaceFolder}/runtime/spidermonkey/debug/include",
                 "/opt/wasi-sdk/share/wasi-sysroot/include/",
-                "${workspaceFolder}/c-dependencies/js-compute-runtime",
-                "${workspaceFolder}/c-dependencies/js-compute-runtime/build/openssl-3.0.7/include"
+                "${workspaceFolder}/runtime/js-compute-runtime",
+                "${workspaceFolder}/runtime/js-compute-runtime/build/openssl-3.0.7/include"
             ],
             "defines": [
                 "__wasi__"
@@ -21,8 +21,8 @@
             "forcedInclude": [
                 "${workspaceFolder}/.vscode/vscode-preinclude.h"
             ],
-            "compileCommands": "${workspaceFolder}/c-dependencies/js-compute-runtime/compile_commands.json"
+            "compileCommands": "${workspaceFolder}/runtime/js-compute-runtime/compile_commands.json"
         }
     ],
     "version": 4
-}
+}

CONTRIBUTING.md

@@ -1,2 +1,3 @@
-c-dependencies/js-compute-runtime/third_party/wizer.h
-c-dependencies/js-compute-runtime/rust-url/rust-url.h
+runtime/js-compute-runtime/third_party/wizer.h
+runtime/js-compute-runtime/rust-url/rust-url.h
+runtime/js-compute-runtime/rust-encoding/rust-encoding.h

DEVELOPMENT.md

@@ -31,8 +31,8 @@
     "test": "npm run test:types && npm run test:cli",
     "test:cli": "brittle --bail integration-tests/cli/**.test.js",
     "test:types": "tsd",
-    "build": "make -j8 -C c-dependencies/js-compute-runtime && cp c-dependencies/js-compute-runtime/*.wasm c-dependencies/js-compute-runtime/fastly.wit .",
-    "build:debug": "DEBUG=true make -j8 -C c-dependencies/js-compute-runtime && cp c-dependencies/js-compute-runtime/*.wasm c-dependencies/js-compute-runtime/fastly.wit .",
+    "build": "make -j8 -C runtime/js-compute-runtime && cp runtime/js-compute-runtime/*.wasm runtime/js-compute-runtime/fastly.wit .",
+    "build:debug": "DEBUG=true make -j8 -C runtime/js-compute-runtime && cp runtime/js-compute-runtime/*.wasm runtime/js-compute-runtime/fastly.wit .",
     "check-changelog": "cae-release-notes-format-checker CHANGELOG.md"
   },
   "devDependencies": {