webpacker-pnpm 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e158c9136e7684be56fce973c9272ec8ab16ff20d6c08c5949e0c9f13f2c0e3
-  data.tar.gz: bf02dcac8a0165359548569f6fd73c44decd31a9cd05393d35ae0a81377f7bdf
+  metadata.gz: 85df72b48e172802a711481f7f54ea75410cde46e7df8a68e2dd8f1772faa711
+  data.tar.gz: b82b39eb173396c7bb03b49a934a1e9811d2c82a9d608a7ef00ea33565424dca
 SHA512:
-  metadata.gz: '058a4834ac5ff8dd02fdc5dfab8253888500c06d0420dfe1643dab0cfc1cb7e50c3157556c34eb8b71b720f5a97e55b2f712be2f0d1d5a7125924024d0ebe885'
-  data.tar.gz: 6ced6827e35f59e42f1f979dbadddb54d2eb54f039c7aff2fc25a0de2b0450c7149fe39c6f7a98abc224fb54245d001443280982f82020e163a00bc362cc0e49
+  metadata.gz: e121ebbbb865ba38282969ea40d278964ebfec79109e9287c90e2d8cc0898ceeef34a58cbc1906d341f032308f7958985183bfc4f0fc73a4a1ed3ffbd061ff3a
+  data.tar.gz: 95a7cf3b7e5b59e9db88aeacfedf98590e10cdf288029755925895107e06f6ec402292983533faf1cdd3d2058b870f8254bd8d9e21a9ebe23187e8817edb93a3

data/.github/workflows/ci.yaml

@@ -42,9 +42,10 @@ jobs:
         key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
         restore-keys: |
           ${{ runner.os }}-pnpm-store-
-    - run: pnpm install --frozen-lockfile
-      working-directory: ./test/test_app
     - name: Check formatting and syntax
       run: bundle exec rubocop
     - name: Run tests
-      run: bundle exec rake test
+      working-directory: ./test_app
+      run: |
+        pnpm i --frozen-lockfile --shamefully-hoist
+        bundle exec rake test

data/.gitignore

@@ -1,6 +1,4 @@
-/tmp/
-**/log
+.pnpm-store
+
 Gemfile.lock
-**/*.gem
-gemfiles/vendor
-.bundle
+*.gem

data/.rubocop.yml

@@ -17,8 +17,27 @@ inherit_mode:
 # cop-specific excludes are not inherited for some reason (likely a bug in RuboCop) so
 # we need to manually re-omit the intended files and directories.
 Layout/LineLength:
+  Max: 88
   Exclude:
     - "**/config/initializers/**/*"
 Style/MethodCallWithArgsParentheses:
   Exclude:
     - "**/Gemfile"
+
+# cops to backfill into practical pig
+Performance/AncestorsInclude:
+  Enabled: false
+Performance/BigDecimalWithNumericArgument:
+  Enabled: true
+Performance/RedundantSortBlock:
+  Enabled: true
+Performance/RedundantStringChars:
+  Enabled: true
+Performance/ReverseFirst:
+  Enabled: true
+Performance/SortReverse:
+  Enabled: true
+Performance/Squeeze:
+  Enabled: true
+Performance/StringInclude:
+  Enabled: true

data/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on Keep a Changelog (<https://keepachangelog.com/en/1.0.0/>). This project adheres to Semantic Versioning (<https://semver.org/spec/v2.0.0.html>).
 
+## [v1.2.3] - 2023-01-14
+
+### Fixed
+
+- Actually fixed cross-version watched path compatibility.
+- The previous v1.2.2 fix passed tests due to bad tests. Improved the test suite for real-life usage.
+
 ## [v1.2.2] - 2023-01-13
 
 ### Fixed

data/README.md

@@ -13,21 +13,32 @@ You can read about the philosophy and technology behind `pnpm` in [this convinci
 ## Features
 
 - Production-ready
-- Drop-in seamless replacement for Yarn, no config required
+- Drop-in replacement for Yarn
 - Supports Rails' Template API, including existing templates using Yarn
 - Provides code sanity without the migraines
 - Gives you more disk space
 
 ## Installation
 
-In order to use `webpacker-pnpm`, you must install `pnpm`. The official instructions are [here](https://pnpm.io/installation). After installing `pnpm`, simply add `webpacker-pnpm` to your app's `Gemfile`.
+In order to use `webpacker-pnpm`, you must install `pnpm`. The official instructions are [here](https://pnpm.io/installation).
+
+After installing `pnpm`, first add `webpacker-pnpm` to your app's `Gemfile`.
 
 ```ruby
 gem "webpacker-pnpm"
 ```
 
+Secondly, add the following line to your `./bin/webpack` so it looks like below (the order matters). This step is required as Webpacker spawns a new process isolated from the Rails server (and thus all auto-loaded patches) when compilation happens live.
+
+```ruby
+require "webpacker/webpack_runner"
+require "webpacker/pnpm/patches" if ENV["RAILS_ENV"] != "production"
+```
+
+> _If you know of an automatic way of achieving a similar result, please open an Issue or PR with your suggestion._
+
 ## License
 
 This software is licensed under the [BSD 3-Clause License](LICENSE).
 
-This package is Treeware. If you use it in production, consider buying the world a tree to thank me for my work. By contributing to my forest, you’ll be creating employment for local families and restoring wildlife habitats.
+This package is Treeware. If you use it in production, consider buying the world a tree to thank me for my work. By contributing to my forest, you’ll be creating employment for local families and restoring wildlife habitats.

data/lib/webpacker/pnpm/patches.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require "rails/generators"
-require "webpacker/runner"
 require "webpacker/compiler"
+require "webpacker/webpack_runner"
+require "rails/generators"
+require "rails/engine"
 
 module Webpacker
   module PNPM
@@ -19,7 +20,7 @@ module Webpacker
       end
 
       def configured_paths
-        if config.method_defined?(:additional_paths_globbed)
+        if config.respond_to?(:additional_paths_globbed)
           config.additional_paths_globbed
         else
           config.resolved_paths_globbed
@@ -27,6 +28,27 @@ module Webpacker
       end
     end
 
+    Webpacker::WebpackRunner.class_eval do
+      def run
+        env = Webpacker::Compiler.env
+        env["WEBPACKER_CONFIG"] = @webpacker_config
+
+        cmd = if node_modules_bin_exist?
+                ["#{@node_modules_bin_path}/webpack"]
+              else
+                ["pnpm", "webpack"]
+              end
+
+        cmd = ["node", "--inspect-brk"] + cmd if @argv.include?("--debug-webpacker")
+
+        cmd += ["--config", @webpack_config] + @argv
+
+        Dir.chdir(@app_path) do
+          Kernel.exec(env, *cmd)
+        end
+      end
+    end
+
     # intercept command execution via Thor to replace yarn with pnpm. this exists in
     # order to patch existing Webpacker installation templates that make direct
     # calls to install Yarn dependencies. as a result, this isn't a robust patch

data/lib/webpacker/pnpm/railtie.rb

@@ -16,7 +16,8 @@ module Webpacker
       # Webpack runner initialization
       config.before_configuration do
         begin
-          ENV["WEBPACKER_NODE_MODULES_BIN_PATH"] ||= File.join(`pnpm root`.chomp, ".bin")
+          ENV["WEBPACKER_NODE_MODULES_BIN_PATH"] ||= File.join(`pnpm root`.chomp,
+                                                               ".bin")
         rescue Errno::ENOENT
           # use abort instead of Rails' logger because it doesn't show up when
           # run within Rake tasks

data/lib/webpacker/pnpm/version.rb

@@ -2,7 +2,7 @@
 
 module Webpacker
   module PNPM
-    VERSION = "1.2.2"
+    VERSION = "1.2.3"
 
     public_constant :VERSION
   end

data/test_app/.gitignore

@@ -0,0 +1,6 @@
+dist
+log
+node_modules
+tmp
+
+!Gemfile.lock

data/test_app/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "webpacker-pnpm", path: "../"

data/test_app/Gemfile.lock

@@ -0,0 +1,175 @@
+PATH
+  remote: ..
+  specs:
+    webpacker-pnpm (1.2.3)
+      rails (>= 5.2)
+      rake (>= 12.3.3)
+      semantic_range (~> 2.3)
+      webpacker
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.1.7)
+      actionpack (= 6.1.7)
+      activesupport (= 6.1.7)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.1.7)
+      actionpack (= 6.1.7)
+      activejob (= 6.1.7)
+      activerecord (= 6.1.7)
+      activestorage (= 6.1.7)
+      activesupport (= 6.1.7)
+      mail (>= 2.7.1)
+    actionmailer (6.1.7)
+      actionpack (= 6.1.7)
+      actionview (= 6.1.7)
+      activejob (= 6.1.7)
+      activesupport (= 6.1.7)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.1.7)
+      actionview (= 6.1.7)
+      activesupport (= 6.1.7)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.7)
+      actionpack (= 6.1.7)
+      activerecord (= 6.1.7)
+      activestorage (= 6.1.7)
+      activesupport (= 6.1.7)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.7)
+      activesupport (= 6.1.7)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.7)
+      activesupport (= 6.1.7)
+      globalid (>= 0.3.6)
+    activemodel (6.1.7)
+      activesupport (= 6.1.7)
+    activerecord (6.1.7)
+      activemodel (= 6.1.7)
+      activesupport (= 6.1.7)
+    activestorage (6.1.7)
+      actionpack (= 6.1.7)
+      activejob (= 6.1.7)
+      activerecord (= 6.1.7)
+      activesupport (= 6.1.7)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    builder (3.2.4)
+    concurrent-ruby (1.1.10)
+    crass (1.0.6)
+    digest (3.1.1)
+    erubi (1.12.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    io-wait (0.3.0)
+    loofah (2.19.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.8.0.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    mini_portile2 (2.6.1)
+    minitest (5.15.0)
+    net-imap (0.2.2)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.1.2)
+      io-wait
+      timeout
+    net-smtp (0.3.0)
+      digest
+      net-protocol
+      timeout
+    nio4r (2.5.8)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    racc (1.6.2)
+    rack (2.2.5)
+    rack-proxy (0.7.4)
+      rack
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (6.1.7)
+      actioncable (= 6.1.7)
+      actionmailbox (= 6.1.7)
+      actionmailer (= 6.1.7)
+      actionpack (= 6.1.7)
+      actiontext (= 6.1.7)
+      actionview (= 6.1.7)
+      activejob (= 6.1.7)
+      activemodel (= 6.1.7)
+      activerecord (= 6.1.7)
+      activestorage (= 6.1.7)
+      activesupport (= 6.1.7)
+      bundler (>= 1.15.0)
+      railties (= 6.1.7)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (6.1.7)
+      actionpack (= 6.1.7)
+      activesupport (= 6.1.7)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+    rake (13.0.6)
+    semantic_range (2.3.1)
+    sprockets (4.2.0)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      sprockets (>= 3.0.0)
+    strscan (3.0.5)
+    thor (1.2.1)
+    timeout (0.3.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    webpacker (5.4.3)
+      activesupport (>= 5.2)
+      rack-proxy (>= 0.6.1)
+      railties (>= 5.2)
+      semantic_range (>= 2.3.0)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  webpacker-pnpm!
+
+BUNDLED WITH
+   1.17.3

data/{Rakefile → test_app/Rakefile}

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
+require_relative "config/application"
 require "rake/testtask"
 
+Rails.application.load_tasks
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList["test/**/*_test.rb"]

data/test_app/app/javascript/packs/application.js

@@ -0,0 +1,10 @@
+/* eslint no-console:0 */
+// This file is automatically compiled by Webpack, along with any other files
+// present in this directory. You're encouraged to place your actual application logic
+// in a relevant structure within app/javascript and only use these pack files to
+// reference that code so it'll be compiled.
+//
+// To reference this file, add <%= javascript_pack_tag 'application' %> to the
+// appropriate layout file, like app/views/layouts/application.html.erb
+
+console.log('"Hello Sanity" from webpacker-pnpm!');

data/{test/test_app → test_app}/package.json

@@ -5,7 +5,9 @@
   "license": "CC-BY-NC-SA-4.0",
   "private": true,
   "dependencies": {
-    "left-pad": "^1.2.0"
+    "@rails/webpacker": "^5.4.3",
+    "left-pad": "^1.2.0",
+    "webpack": "^5.75.0"
   },
   "devDependencies": {
     "right-pad": "^1.0.1"