forked from fedi/mastodon
Change the JavaScript package manager from yarn
back to npm
This commit is contained in:
parent
d7fab238a8
commit
42ba4239b5
|
@ -66,7 +66,7 @@ jobs:
|
||||||
ruby-version: '3.0'
|
ruby-version: '3.0'
|
||||||
- node/install-packages:
|
- node/install-packages:
|
||||||
cache-version: v1
|
cache-version: v1
|
||||||
pkg-manager: yarn
|
pkg-manager: npm
|
||||||
- run:
|
- run:
|
||||||
command: ./bin/rails assets:precompile
|
command: ./bin/rails assets:precompile
|
||||||
name: Precompile assets
|
name: Precompile assets
|
||||||
|
@ -202,8 +202,8 @@ workflows:
|
||||||
- node/run:
|
- node/run:
|
||||||
cache-version: v1
|
cache-version: v1
|
||||||
name: test-webui
|
name: test-webui
|
||||||
pkg-manager: yarn
|
pkg-manager: npm
|
||||||
requires:
|
requires:
|
||||||
- build
|
- build
|
||||||
version: lts
|
version: lts
|
||||||
yarn-run: test:jest
|
npm-run: test:jest
|
||||||
|
|
|
@ -47,20 +47,19 @@ RUN apt-get update && \
|
||||||
ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin"
|
ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin"
|
||||||
|
|
||||||
RUN npm install -g npm@latest && \
|
RUN npm install -g npm@latest && \
|
||||||
npm install -g yarn && \
|
|
||||||
gem install bundler && \
|
gem install bundler && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get install -y --no-install-recommends git libicu-dev libidn11-dev \
|
apt-get install -y --no-install-recommends git libicu-dev libidn11-dev \
|
||||||
libpq-dev shared-mime-info
|
libpq-dev shared-mime-info
|
||||||
|
|
||||||
COPY Gemfile* package.json yarn.lock /opt/mastodon/
|
COPY Gemfile* package.json package-lock.json /opt/mastodon/
|
||||||
|
|
||||||
RUN cd /opt/mastodon && \
|
RUN cd /opt/mastodon && \
|
||||||
bundle config set --local deployment 'true' && \
|
bundle config set --local deployment 'true' && \
|
||||||
bundle config set --local without 'development test' && \
|
bundle config set --local without 'development test' && \
|
||||||
bundle config set silence_root_warning true && \
|
bundle config set silence_root_warning true && \
|
||||||
bundle install -j"$(nproc)" && \
|
bundle install -j"$(nproc)" && \
|
||||||
yarn install --pure-lockfile
|
npm install
|
||||||
|
|
||||||
FROM ubuntu:20.04
|
FROM ubuntu:20.04
|
||||||
|
|
||||||
|
@ -113,7 +112,7 @@ USER mastodon
|
||||||
# Precompile assets
|
# Precompile assets
|
||||||
RUN cd ~ && \
|
RUN cd ~ && \
|
||||||
OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder rails assets:precompile && \
|
OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder rails assets:precompile && \
|
||||||
yarn cache clean
|
npm cache clean
|
||||||
|
|
||||||
# Set the work dir and the container entry point
|
# Set the work dir and the container entry point
|
||||||
WORKDIR /opt/mastodon
|
WORKDIR /opt/mastodon
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
web: env PORT=3000 RAILS_ENV=development bundle exec puma -C config/puma.rb
|
web: env PORT=3000 RAILS_ENV=development bundle exec puma -C config/puma.rb
|
||||||
sidekiq: env PORT=3000 RAILS_ENV=development bundle exec sidekiq
|
sidekiq: env PORT=3000 RAILS_ENV=development bundle exec sidekiq
|
||||||
stream: env PORT=4000 yarn run start
|
stream: env PORT=4000 npm run start
|
||||||
webpack: ./bin/webpack-dev-server --listen-host 0.0.0.0
|
webpack: ./bin/webpack-dev-server --listen-host 0.0.0.0
|
||||||
|
|
34399
package-lock.json
generated
Normal file
34399
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue