Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ COPY .docker/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/
RUN install_packages \
build-essential python2 \
# needed for compiling native modules on ARM
nodejs ruby \
curl ruby \
# Used both to install dependencies and at run time
bash less \
# Just in case you have to shell into the image
Expand All @@ -37,6 +37,8 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

RUN curl -sL https://deb.nodesource.com/setup_22.x | bash -
RUN install_packages nodejs

FROM base AS ruby_deps
RUN install_packages \
Expand Down
10 changes: 5 additions & 5 deletions lib/ES/Util.pm
Original file line number Diff line number Diff line change
Expand Up @@ -691,10 +691,10 @@ sub start_web_resources_watcher {

close STDIN;
open( STDIN, "</dev/null" );
exec( qw(/node_modules/parcel/bin/cli.js serve
exec( qw(npx parcel serve
--public-url /guide/static/
--hmr-port 8001
-d /tmp/parcel/
--dist-dir /tmp/parcel/
resources/web/docs_js/index-v1.js resources/web/styles-v1.pcss) );
}

Expand Down Expand Up @@ -731,10 +731,10 @@ sub build_web_resources {
# when you run the integration tests and saves about 1.5 seconds on
# every docs build.
say "Compiling web resources";
run '/node_modules/parcel/bin/cli.js', 'build',
run 'npx', 'parcel', 'build',
'--public-url', '/guide/static/',
'--experimental-scope-hoisting', '--no-source-maps',
'-d', $parcel_out,
'--no-source-maps',
'--dist-dir', $parcel_out,
'resources/web/docs_js/index-v1.js', 'resources/web/styles-v1.pcss';
die "Parcel didn't make $compiled_js" unless -e $compiled_js;
die "Parcel didn't make $compiled_css" unless -e $compiled_css;
Expand Down
21 changes: 16 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"license": "SEE LICENSE IN README.asciidoc",
"devDependencies": {
"jest": "^24.8.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^30.0.5",
"nock": "^10.0.6",
"rmfr": "^2.0.0"
},
Expand All @@ -11,16 +12,17 @@
"jest": {
"setupFiles": [
"./jest.js"
]
],
"testEnvironment": "jsdom"
},
"dependencies": {
"dedent": "^0.7.0",
"details-polyfill": "^1.1.0",
"jquery": "^1.11.3",
"jquery": "^3.5.0",
"js-cookie": "^2.1.0",
"linkstate": "^1.1.1",
"parcel": "^1.12.3",
"postcss-assets": "^5.0.0",
"parcel": "^2.15.4",
"postcss-assets": "^6.0.0",
"preact": "^8.4.2",
"preact-context": "^1.1.3",
"preact-redux": "^2.1.0",
Expand All @@ -31,5 +33,14 @@
"redux-thunk": "^2.3.0",
"url-search-params-polyfill": "^8.0.0",
"yargs": "^14.0.0"
},
"resolutions": {
"postcss": "^8.5.6"
},
"overrides": {
"postcss": "^8.5.6"
},
"engines": {
"node": ">= 22"
}
}
2 changes: 1 addition & 1 deletion resources/web/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jest: tests
.PHONY: tests
tests:
rm -rf tests
$(DOCKER) node_test /node_modules/parcel/bin/cli.js build ./docs_js/__tests__/**/* ./docs_js/__tests__/* -d ./tests/ --target node --no-minify --no-source-maps
$(DOCKER) node_test npx parcel build ./docs_js/__tests__/**/*.j{s,sx} ./docs_js/__tests__/*.j{s,sx} --dist-dir ./tests/ --no-optimize --no-source-maps
Loading