Skip to content

Commit 8291bac

Browse files
authored
Clean up addons injection script and fix bugs in library (#227)
* Move addons injection files into package structure We should still figure out moving these files in - #226 * Add supplemental files to support updated addons injection module * Update injection script * Fix issues with response return order If `Response.clone()` is used without `await` the resulting instance has missing attributes, like `url = null`. The docs do not indicate that `clone()` is async however, so it's not clear why this is required. With this, and more careful response instance usage, most of the cases of dangling, unused, cloned responses have been removed. Now, any response that is used is cloned right as we use it and evaluate the body. This is important, as `response.body` is ultimately what causes the request to buffer. * Update throw debug header * Add more comments on response cloning * Bump up conditional for debug error throw * Test more response header passthrough * Add test for build.commands builds * Add path to wrangler build context * Fix wrangler path in docker compose * Increase logging on wrangler
1 parent b8051be commit 8291bac

13 files changed

+4837
-248
lines changed

.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.direnv/
2+
.envrc
3+
.ropeproject/
4+
.tool-versions
5+
packages/addons-inject/node_modules

dockerfiles/Dockerfile.wrangler

-2
This file was deleted.

dockerfiles/docker-compose.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,17 @@ services:
3434

3535
wrangler:
3636
build:
37-
context: ${PWD}
38-
dockerfile: ${PWD}/common/dockerfiles/Dockerfile.wrangler
37+
context: ${PWD}/common/packages/addons-inject/
38+
dockerfile: ${PWD}/common/packages/addons-inject/Dockerfile
3939
volumes:
40-
- ${PWD}/common/dockerfiles/force-readthedocs-addons.js:/usr/src/app/docker/force-readthedocs-addons.js
40+
- ${PWD}/common/packages/addons-inject/:/usr/src/app/packages/addons-inject/
4141
networks:
4242
readthedocs:
43+
working_dir: /usr/src/app/packages/addons-inject/
4344
command: [
44-
"wrangler",
45+
"node_modules/.bin/wrangler",
4546
"dev",
46-
"/usr/src/app/docker/force-readthedocs-addons.js",
47-
"--name=force-addons",
48-
"--latest",
49-
"--log-level=error",
47+
"--log-level=info",
5048
"--host=nginx:8080", # El Proxito on NGINX configuration
5149
"--ip=0.0.0.0",
5250
"--port=8000",

dockerfiles/force-readthedocs-addons.js

-238
This file was deleted.

packages/addons-inject/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.wrangler/
2+
node_modules/
3+
.tool-versions
+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.wrangler/
2+
node_modules/
3+
package-lock.json

packages/addons-inject/Dockerfile

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM node:18.15
2+
COPY package.json /usr/src/app/packages/addons-inject/
3+
COPY index.js /usr/src/app/packages/addons-inject/
4+
COPY wrangler.toml /usr/src/app/packages/addons-inject/
5+
WORKDIR /usr/src/app/packages/addons-inject/
6+
RUN npm install --omit dev
7+
CMD ["node_modules/.bin/wrangler", "dev"]

0 commit comments

Comments
 (0)