✨ Current rails project using yarn as package manager, please change to pnpm, also keep yarn.lock version as same as possible. You may need to search web first to see any relative standard migration process or guide.

Eric-Guo · Eric-Guo · commit ec8ead831ca3 · 2025-10-26T17:37:40.000+08:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,12 +16,10 @@ jobs:
     steps:
       - checkout # pull down our git code.
       - ruby/install-deps # use the ruby orb to install dependencies
-      # use the node orb to install our packages
-      # specifying that we use `yarn` and to cache dependencies with `yarn.lock`
-      # learn more: https://circleci.com/docs/2.0/caching/
+      # use the node orb to install our packages with pnpm and cache using pnpm-lock.yaml
       - node/install-packages:
-          pkg-manager: yarn
-          cache-key: "yarn.lock"
+          pkg-manager: pnpm
+          cache-key: "pnpm-lock.yaml"
 
   test:  # our next job, called "test"
     docker:
@@ -51,8 +49,8 @@ jobs:
       - browser-tools/install-chrome
       - ruby/install-deps
       - node/install-packages:
-          pkg-manager: yarn
-          cache-key: "yarn.lock"
+          pkg-manager: pnpm
+          cache-key: "pnpm-lock.yaml"
       - run:
           name: Check browser install
           command: |
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -8,6 +8,13 @@ before_script:
   - gem install bundler
   - bundle config set path 'vendor'  # Install dependencies into ./vendor/ruby
   - sed -i 's/mutex_m (0.2.0)/mutex_m (0.1.1)/g' Gemfile.lock
+  - |
+    if command -v corepack >/dev/null; then
+      corepack enable pnpm
+      corepack prepare pnpm@latest --activate
+    else
+      npm install -g pnpm@8
+    fi
 
 stages:
   - test
@@ -23,12 +30,12 @@ test:
         - vendor/ruby
     - key:
         files:
-          - yarn.lock
+          - pnpm-lock.yaml
       paths:
-        - ".yarn-cache/"
+        - ".pnpm-store/"
   script:
     - bundle install -j $(nproc)
-    - yarn install --cache-folder .yarn-cache
+    - pnpm install --frozen-lockfile --store-dir .pnpm-store
     - cp config/database.yml.sample config/database.yml
     - echo $RAILS_MASTER_KEY > config/master.key
     - bundle exec rails db:migrate RAILS_ENV=test
diff --git a/AGENTS.md b/AGENTS.md
@@ -4,7 +4,7 @@
 Keep Rails domain logic inside `app/`, following conventional directories for controllers, models, policies, datatables, and views. Stimulus controllers and Webpacker packs live in `app/javascript`, while shared helpers and extensions belong in `lib/`. Configuration, environment credentials, and deployment hooks sit under `config/`, and migrations plus seeds live in `db/`. Test fixtures, unit specs, and system flows mirror the app layout within `test/`, with Capybara scenarios in `test/system/`.
 
 ## Build, Test, and Development Commands
-Run `bin/setup` after cloning or pulling to install Ruby gems, Yarn packages, and migrate the database. Start the Rails server via `bin/rails s`, and pair it with `bin/webpack-dev-server` or `foreman start -f Procfile.dev` for hot asset reloading. Sync front-end dependencies with `yarn install --check-files`. Execute the targeted test suite using `bin/rails test path/to/file_test.rb`, or run the full matrix through `bin/rails test:all`.
+Run `bin/setup` after cloning or pulling to install Ruby gems, PNPM packages, and migrate the database. Start the Rails server via `bin/rails s`, and pair it with `bin/webpack-dev-server` or `foreman start -f Procfile.dev` for hot asset reloading. Sync front-end dependencies with `pnpm install --frozen-lockfile`. Execute the targeted test suite using `bin/rails test path/to/file_test.rb`, or run the full matrix through `bin/rails test:all`.
 
 ## Coding Style & Naming Conventions
 Use Ruby two-space indentation and idiomatic Rails naming: `CamelCase` classes, snake_case files, and kebab-case Stimulus controllers in `app/javascript/controllers/`. Follow the cops configured in `.rubocop.yml`; run `bundle exec rubocop` before opening a pull request. JavaScript modules target ES2015 and are linted with the “recommended” ESLint profile defined in `.eslintrc.js`.
diff --git a/Capfile b/Capfile
@@ -30,7 +30,6 @@ install_plugin Capistrano::SCM::Git
 require 'capistrano/rbenv'
 # require 'capistrano/chruby'
 require 'capistrano/bundler'
-require 'capistrano/yarn'
 require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'
 # require "capistrano/passenger"
diff --git a/Dockerfile b/Dockerfile
@@ -24,12 +24,11 @@ RUN apt-get update -qq && \
 # Install curl and gpg
 RUN apt-get update && apt-get install -y curl gnupg
 
-# Install Node.js and Yarn
+# Install Node.js and pnpm
 RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && \
     apt-get install -y nodejs gcc g++ make && \
-    curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null && \
-    echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt-get update && apt-get install -y yarn
+    corepack enable && \
+    corepack prepare pnpm@10.18.3 --activate
 
 # Install application gems
 COPY Gemfile Gemfile.lock ./
@@ -38,8 +37,8 @@ RUN bundle install && \
     bundle exec bootsnap precompile --gemfile
 
 # Install node modules
-COPY package.json yarn.lock ./
-RUN yarn install --frozen-lockfile    
+COPY package.json pnpm-lock.yaml ./
+RUN pnpm install --frozen-lockfile    
 
 # Copy application code
 COPY . .
diff --git a/Gemfile b/Gemfile
@@ -96,7 +96,6 @@ group :development do
 
   gem 'capistrano3-puma', '~> 6.0'
   gem 'capistrano-rails'
-  gem 'capistrano-yarn'
   gem 'capistrano-rbenv'
   gem 'ed25519'
   gem 'bcrypt_pbkdf'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -155,8 +155,6 @@ GEM
     capistrano-rbenv (2.2.0)
       capistrano (~> 3.1)
       sshkit (~> 1.3)
-    capistrano-yarn (2.0.2)
-      capistrano (~> 3.0)
     capistrano3-puma (6.2.0)
       capistrano (~> 3.7)
       capistrano-bundler
@@ -480,7 +478,6 @@ DEPENDENCIES
   bootsnap (>= 1.18.4)
   capistrano-rails
   capistrano-rbenv
-  capistrano-yarn
   capistrano3-puma (~> 6.0)
   capybara (>= 3.40)
   csv
diff --git a/bin/pnpm b/bin/pnpm
@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
+  pnpm = ENV.fetch('PATH', '').split(File::PATH_SEPARATOR).
+    reject { |dir| File.expand_path(dir) == __dir__ }.
+    product(%w[pnpm pnpm.cmd pnpm.ps1]).
+    map { |dir, file| File.expand_path(file, dir) }.
+    find { |file| File.executable?(file) }
+
+  if pnpm
+    exec pnpm, *ARGV
+  else
+    $stderr.puts 'pnpm executable was not detected in the system.'
+    $stderr.puts 'Install pnpm via https://pnpm.io/installation'
+    exit 1
+  end
+end
diff --git a/bin/setup b/bin/setup
@@ -18,7 +18,7 @@ FileUtils.chdir APP_ROOT do
   system("bundle check") || system!("bundle install")
 
   # Install JavaScript dependencies
-  system! 'bin/yarn'
+  system! 'bin/pnpm', 'install', '--frozen-lockfile'
 
   # puts "\n== Copying sample files =="
   # unless File.exist?("config/database.yml")
diff --git a/bin/update b/bin/update
@@ -17,8 +17,8 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
-  # Install JavaScript dependencies if using Yarn
-  # system('bin/yarn')
+  # Install JavaScript dependencies if needed
+  # system('bin/pnpm', 'install', '--frozen-lockfile')
 
   puts "\n== Updating database =="
   system! 'bin/rails db:migrate'
diff --git a/bin/webpack b/bin/webpack
@@ -6,6 +6,7 @@ ENV["NODE_ENV"]  ||= "development"
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
+ENV["WEBPACKER_NODE_MODULES_BIN_PATH"] ||= File.expand_path("../node_modules/.bin", __dir__)
 
 require "rubygems"
 require "bundler/setup"
diff --git a/bin/webpack-dev-server b/bin/webpack-dev-server
@@ -6,6 +6,7 @@ ENV["NODE_ENV"]  ||= "development"
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
+ENV["WEBPACKER_NODE_MODULES_BIN_PATH"] ||= File.expand_path("../node_modules/.bin", __dir__)
 
 require "rubygems"
 require "bundler/setup"
diff --git a/bin/yarn b/bin/yarn
@@ -1,17 +1,18 @@
 #!/usr/bin/env ruby
 APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
-  yarn = ENV["PATH"].split(File::PATH_SEPARATOR).
-    select { |dir| File.expand_path(dir) != __dir__ }.
-    product(["yarn", "yarn.cmd", "yarn.ps1"]).
+  pnpm = ENV.fetch("PATH", "").split(File::PATH_SEPARATOR).
+    reject { |dir| File.expand_path(dir) == __dir__ }.
+    product(["pnpm", "pnpm.cmd", "pnpm.ps1"]).
     map { |dir, file| File.expand_path(file, dir) }.
     find { |file| File.executable?(file) }
 
-  if yarn
-    exec yarn, *ARGV
+  if pnpm
+    warn "Deprecated: bin/yarn now proxies to pnpm. Update scripts to use bin/pnpm." unless ENV["PNPM_PROXY_SILENT"]
+    exec pnpm, *ARGV
   else
-    $stderr.puts "Yarn executable was not detected in the system."
-    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    $stderr.puts "pnpm executable was not detected in the system."
+    $stderr.puts "Install pnpm via https://pnpm.io/installation"
     exit 1
   end
 end
diff --git a/config/deploy.rb b/config/deploy.rb
@@ -24,7 +24,7 @@
 append :linked_files, *%w[puma.rb config/database.yml config/master.key db/oauth2id_staging.sqlite3]
 
 # Default value for linked_dirs is []
-append :linked_dirs, 'log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'public/system', 'node_modules', 'storage'
+append :linked_dirs, 'log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'public/system', 'storage'
 
 # Default value for local_user is ENV['USER']
 # set :local_user, -> { `git config user.name`.chomp }
diff --git a/config/webpacker.yml b/config/webpacker.yml
@@ -52,8 +52,8 @@ development:
   <<: *default
   compile: true
 
-  # Verifies that correct packages and versions are installed by inspecting package.json, yarn.lock, and node_modules
-  check_yarn_integrity: true
+  # Legacy option retained for compatibility; pnpm's lockfile is validated via install flags instead.
+  check_yarn_integrity: false
 
   # Reference: https://webpack.js.org/configuration/dev-server/
   dev_server:
diff --git a/lib/capistrano/tasks/pnpm.rake b/lib/capistrano/tasks/pnpm.rake
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+namespace :pnpm do
+  desc 'Install JavaScript dependencies using pnpm'
+  task :install do
+    on roles(fetch(:pnpm_roles, :web)) do
+      within release_path do
+        with fetch(:pnpm_env, {}) do
+          execute :pnpm, *Array(fetch(:pnpm_install_command, %w[install --frozen-lockfile]))
+        end
+      end
+    end
+  end
+end
+
+before 'deploy:updated', 'pnpm:install'
diff --git a/lib/tasks/pnpm.rake b/lib/tasks/pnpm.rake
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+namespace :webpacker do
+  begin
+    Rake::Task["webpacker:check_yarn"].clear
+  rescue RuntimeError, NameError
+    # Task not defined yet; nothing to clear.
+  end
+
+  desc "Verifies if pnpm is installed (replaces webpacker yarn check)"
+  task :check_yarn do
+    pnpm_version = `pnpm --version`.strip
+
+    if pnpm_version.empty?
+      $stderr.puts "pnpm not installed. Please install pnpm to compile webpacker assets."
+      $stderr.puts "Exiting!"
+      exit!
+    end
+  end
+end
diff --git a/package.json b/package.json
@@ -2,18 +2,21 @@
   "name": "oauth2id",
   "private": true,
   "dependencies": {
-    "@babel/preset-env": "~7.21.4",
+    "@babel/preset-env": "~7.21.5",
     "@rails/webpacker": "^5.4.4",
     "@stimulus/polyfills": "^2.0.0",
-    "chokidar": "^3.5.3",
+    "chokidar": "^3.6.0",
     "datatables": "^1.10.18",
-    "jqtree": "=1.7.5",
-    "semver": "^7.5.3",
+    "jqtree": "1.7.5",
+    "semver": "^7.7.3",
     "stimulus": "^2.0.0",
     "vali-admin": "^2.4.1",
-    "ws": "~8.18.2"
+    "ws": "~8.18.3"
   },
   "devDependencies": {
+    "babel-loader": "8.4.1",
+    "css-loader": "3.6.0",
+    "postcss-loader": "3.0.0",
     "webpack": "^4.47.0",
     "webpack-dev-server": "^3.11.3"
   },
@@ -32,5 +35,5 @@
     "ws": "~8.18.2",
     "semver": "^7.5.3"
   },
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  "packageManager": "pnpm@10.18.3"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
diff --git a/yarn.lock b/yarn.lock
