Skip to content

Commit a6c29c2

Browse files
authored
Avoid the direct dependency to node-gyp since it's now bundled with npm (#627)
1 parent cc33795 commit a6c29c2

File tree

5 files changed

+0
-660
lines changed

5 files changed

+0
-660
lines changed

devspaces-code/build/dockerfiles/brew.Dockerfile

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,6 @@ RUN git init .; \
113113
RUN sed -i -r -e '/function yarnInstall/ !s|^[^#]*yarnInstal|//&|' build/npm/postinstall.js
114114
# ... and run the dependencies installation manually for each sub-package listed in the 'code/build/npm/dirs.js' (except the 'test' folder).
115115

116-
# install node-gyp - workaround for `yarn global add node-gyp`, since installing it
117-
# globally it tries to fetch it from outside. So, we install locally the module
118-
# that has node-gyp dependency, and then put it's node_modules to yarns global modules
119-
RUN cd $REMOTE_SOURCES_DIR/devspaces-images-code/app/devspaces-code/cachito \
120-
&& yarn \
121-
&& mkdir -p $(yarn global dir) && cp -r $REMOTE_SOURCES_DIR/devspaces-images-code/app/devspaces-code/cachito/node_modules/. $(yarn global dir)/node_modules \
122-
&& mkdir -p $(yarn global bin) && ln -s $(yarn global dir)/node_modules/.bin/node-gyp $(yarn global bin)/node-gyp \
123-
&& ls -l $(yarn global bin) \
124-
&& ls -l $(yarn global dir)/node_modules/.bin \
125-
&& which node-gyp \
126-
&& node-gyp version
127-
128116
# Cachito clears all project's '.yarnrc' files, To make sure yarn is configured to the local Nexus.
129117
# To avoid any possible issues, like failure of build because of missing 'ms_build_id', or 'target' properties,
130118
# or @parcel/watcher skipping compilation because of missing 'build_from_source' flag.
@@ -331,18 +319,6 @@ RUN git init .; \
331319
RUN sed -i -r -e '/function yarnInstall/ !s|^[^#]*yarnInstal|//&|' build/npm/postinstall.js
332320
# ... and run the dependencies installation manually for each sub-package listed in the 'code/build/npm/dirs.js' (except the 'test' folder).
333321

334-
# install node-gyp - workaround for `yarn global add node-gyp`, since installing it
335-
# globally it tries to fetch it from outside. So, we install locally the module
336-
# that has node-gyp dependency, and then put it's node_modules to yarns global modules
337-
RUN cd $REMOTE_SOURCES_DIR/devspaces-images-code/app/devspaces-code/cachito \
338-
&& yarn \
339-
&& mkdir -p $(yarn global dir) && cp -r $REMOTE_SOURCES_DIR/devspaces-images-code/app/devspaces-code/cachito/node_modules/. $(yarn global dir)/node_modules \
340-
&& mkdir -p $(yarn global bin) && ln -s $(yarn global dir)/node_modules/.bin/node-gyp $(yarn global bin)/node-gyp \
341-
&& ls -l $(yarn global bin) \
342-
&& ls -l $(yarn global dir)/node_modules/.bin \
343-
&& which node-gyp \
344-
&& node-gyp version
345-
346322
# Cachito clears all project's '.yarnrc' files, To make sure yarn is configured to the local Nexus.
347323
# To avoid any possible issues, like failure of build because of missing 'ms_build_id', or 'target' properties,
348324
# or @parcel/watcher skipping compilation because of missing 'build_from_source' flag.

devspaces-code/cachito/README.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

devspaces-code/cachito/package.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)