Skip to content

Commit

Permalink
Swap from yarn to npm
Browse files Browse the repository at this point in the history
  • Loading branch information
ksylvest committed Nov 10, 2023
1 parent 3b19a3c commit 01adda7
Show file tree
Hide file tree
Showing 7 changed files with 3,436 additions and 1,879 deletions.
16 changes: 4 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,8 @@ commands:
setup:
steps:
- checkout
- setup_ruby
- setup_node
setup_ruby:
steps:
- ruby/install-deps:
key: gems-v2
setup_node:
steps:
- node/install-packages:
pkg-manager: yarn
- ruby/install-deps
- node/install-packages

jobs:
containerize:
Expand Down Expand Up @@ -88,13 +80,13 @@ jobs:
executor: default
steps:
- setup
- run: yarn eslint app/packs
- run: pnpm eslint app/packs

prettier:
executor: default
steps:
- setup
- run: yarn prettier --check app/packs
- run: pnpm prettier --check app/packs

rubocop:
executor: default
Expand Down
5 changes: 1 addition & 4 deletions Brewfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
brew 'git'
brew 'hub'
brew 'postgres'
brew 'node'
brew 'rbenv'
brew 'vips'
brew 'yarn'
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ ARG RUBY_VERSION="3.2.2"
FROM ruby:${RUBY_VERSION}-slim AS base

ARG BUNDLER_VERSION="2.4.22"
ARG YARN_VERSION="1.22.19"

ENV BUNDLE_DEPLOYMENT="on" BUNDLE_PATH="/usr/local/bundle"

Expand All @@ -12,7 +11,6 @@ WORKDIR /rails
RUN \
apt-get update -qq && \
apt-get install --no-install-recommends -y curl libpq-dev libvips npm wget && \
npm install -g yarn@${YARN_VERSION} && \
gem install bundler:${BUNDLER_VERSION} && \
rm -rf /var/lib/apt/lists/* /var/cache/apt/archives

Expand All @@ -30,8 +28,8 @@ RUN bundle install && \
rm -rf "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git

COPY package.json .
COPY yarn.lock .
RUN yarn install
COPY package-lock.json .
RUN npm install

COPY . .

Expand Down
4 changes: 2 additions & 2 deletions Procfile.dev
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
web: bin/rails server -p 3000
js: yarn build --watch
css: yarn build:css --watch
js: npm build --watch
css: npm build:css --watch
19 changes: 0 additions & 19 deletions bin/yarn

This file was deleted.

Loading

0 comments on commit 01adda7

Please sign in to comment.