Address PR comments

npm.sh → build-npm-package.sh

@@ -2,6 +2,10 @@
 # TODO(cleanup): Convert to bazel rules/GitHub Actions
 set -euo pipefail
 
+if [ -z "${1-}" ]; then
+    echo "Please specify a command"
+    exit 1
+fi
 bazel build @capnp-cpp//src/capnp:capnp_tool
 
 export LATEST_COMPATIBILITY_DATE=$(bazel-bin/external/capnp-cpp/src/capnp/capnp_tool eval src/workerd/io/compatibility-date.capnp supportedCompatibilityDate)
@@ -60,5 +64,8 @@ clean)
     rm -rf npm/workerd/bin
     rm -rf npm/workerd/lib
     ;;
-*) ;;
+*)
+    echo "Invalid command"
+    exit 1
+    ;;
 esac

npm/lib/node-install.ts

@@ -1,9 +1,11 @@
-/* Adapted from github.com/evanw/esbuild
-MIT License
-Copyright (c) 2020 Evan Wallace
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
+// Adapted from github.com/evanw/esbuild
+// Original copyright and license:
+//     Copyright (c) 2020 Evan Wallace
+//     MIT License
+//
+//     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//     The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 import {
   downloadedBinPath,
   pkgAndSubpathForCurrentPlatform

npm/lib/node-path.ts

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
-/* Adapted from github.com/evanw/esbuild
-MIT License
-Copyright (c) 2020 Evan Wallace
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
-
+// Adapted from github.com/evanw/esbuild
+// Original copyright and license:
+//     Copyright (c) 2020 Evan Wallace
+//     MIT License
+//
+//     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//     The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 import { generateBinPath } from './node-platform';
 const { binPath } = generateBinPath();
 

npm/lib/node-platform.ts

@@ -1,9 +1,11 @@
-/* Adapted from github.com/evanw/esbuild
-MIT License
-Copyright (c) 2020 Evan Wallace
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
+// Adapted from github.com/evanw/esbuild
+// Original copyright and license:
+//     Copyright (c) 2020 Evan Wallace
+//     MIT License
+//
+//     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//     The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 import fs from 'fs';
 import os from 'os';
 import path from 'path';

npm/lib/node-shim.ts

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
-/* Adapted from github.com/evanw/esbuild
-MIT License
-Copyright (c) 2020 Evan Wallace
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
-
+// Adapted from github.com/evanw/esbuild
+// Original copyright and license:
+//     Copyright (c) 2020 Evan Wallace
+//     MIT License
+//
+//     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//     The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 import { generateBinPath } from './node-platform';
 const { binPath } = generateBinPath();
 

npm/scripts/build-shim-package.mjs

@@ -1,9 +1,11 @@
-/* Adapted from github.com/evanw/esbuild
-MIT License
-Copyright (c) 2020 Evan Wallace
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
+// Adapted from github.com/evanw/esbuild
+// Original copyright and license:
+//     Copyright (c) 2020 Evan Wallace
+//     MIT License
+//
+//     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//     The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 import path from 'path';
 import fs from 'fs';
 

npm/scripts/bump-version.mjs

@@ -1,9 +1,11 @@
-/* Adapted from github.com/evanw/esbuild
-MIT License
-Copyright (c) 2020 Evan Wallace
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
+// Adapted from github.com/evanw/esbuild
+// Original copyright and license:
+//     Copyright (c) 2020 Evan Wallace
+//     MIT License
+//
+//     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//     The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 import fs from 'fs';
 
 function updateVersionPackageJSON(pathToPackageJSON) {

npm/workerd-darwin-64/package.json

@@ -4,7 +4,6 @@
   "repository": "https://github.com/cloudflare/workerd",
   "license": "Apache-2.0",
   "preferUnplugged": false,
-  "private": true,
   "engines": {
     "node": ">=16"
   },
@@ -14,8 +13,5 @@
   "cpu": [
     "x64"
   ],
-  "publishConfig": {
-    "registry": "https://registry-gateway.cloudflare-ui.workers.dev"
-  },
-  "version": "1.20220920.0"
+  "version": "1.20220926.0"
 }

npm/workerd-darwin-arm64/package.json

@@ -13,8 +13,5 @@
   "cpu": [
     "arm64"
   ],
-  "publishConfig": {
-    "registry": "https://registry-gateway.cloudflare-ui.workers.dev"
-  },
-  "version": "1.20220920.0"
+  "version": "1.20220926.0"
 }

npm/workerd-linux-64/package.json

@@ -4,7 +4,6 @@
   "repository": "https://github.com/cloudflare/workerd",
   "license": "Apache-2.0",
   "preferUnplugged": false,
-  "private": true,
   "engines": {
     "node": ">=16"
   },
@@ -14,8 +13,5 @@
   "cpu": [
     "x64"
   ],
-  "publishConfig": {
-    "registry": "https://registry-gateway.cloudflare-ui.workers.dev"
-  },
-  "version": "1.20220920.0"
+  "version": "1.20220926.0"
 }

npm/workerd-linux-arm64/package.json

@@ -3,7 +3,6 @@
   "description": "👷 workerd for Linux ARM 64-bit, Cloudflare's JavaScript/Wasm Runtime",
   "repository": "https://github.com/cloudflare/workerd",
   "license": "Apache-2.0",
-  "private": true,
   "preferUnplugged": false,
   "engines": {
     "node": ">=16"
@@ -14,8 +13,5 @@
   "cpu": [
     "arm64"
   ],
-  "publishConfig": {
-    "registry": "https://registry-gateway.cloudflare-ui.workers.dev"
-  },
-  "version": "1.20220920.0"
+  "version": "1.20220926.0"
 }

npm/workerd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workerd",
-  "version": "1.20220920.0",
+  "version": "1.20220926.0",
   "description": "👷 workerd, Cloudflare's JavaScript/Wasm Runtime",
   "repository": "https://github.com/cloudflare/workerd",
   "scripts": {},
@@ -12,13 +12,10 @@
     "workerd": "bin/workerd"
   },
   "optionalDependencies": {
-    "@cloudflare/workerd-darwin-arm64": "1.20220920.0",
-    "@cloudflare/workerd-darwin-64": "1.20220920.0",
-    "@cloudflare/workerd-linux-arm64": "1.20220920.0",
-    "@cloudflare/workerd-linux-64": "1.20220920.0"
+    "@cloudflare/workerd-darwin-arm64": "1.20220926.0",
+    "@cloudflare/workerd-darwin-64": "1.20220926.0",
+    "@cloudflare/workerd-linux-arm64": "1.20220926.0",
+    "@cloudflare/workerd-linux-64": "1.20220926.0"
   },
-  "license": "Apache-2.0",
-  "publishConfig": {
-    "registry": "https://registry-gateway.cloudflare-ui.workers.dev"
-  }
+  "license": "Apache-2.0"
 }