From e0f7e871f24a52901915e2310bf2445f0ab46f72 Mon Sep 17 00:00:00 2001 From: Henriette Darge Date: Fri, 6 Sep 2024 10:58:06 +0200 Subject: [PATCH] Upgrade Vite; stop updating bundle in CI --- .changeset/weak-nails-arrive.md | 5 +++ .github/workflows/test.yml | 6 ++-- Gemfile.lock | 28 ++++++++-------- demo/Gemfile.lock | 8 ++--- demo/config/initializers/assets.rb | 1 - demo/package-lock.json | 52 ++++++++++++++++-------------- demo/package.json | 4 +-- package-lock.json | 48 +++++++++++++-------------- package.json | 4 +-- 9 files changed, 82 insertions(+), 74 deletions(-) create mode 100644 .changeset/weak-nails-arrive.md diff --git a/.changeset/weak-nails-arrive.md b/.changeset/weak-nails-arrive.md new file mode 100644 index 0000000000..0f45d907b3 --- /dev/null +++ b/.changeset/weak-nails-arrive.md @@ -0,0 +1,5 @@ +--- +'@openproject/primer-view-components': patch +--- + +Upgrade Vite; stop updating bundle in CI diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ec4f436c64..4de3619f88 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -84,7 +84,7 @@ jobs: run: | npm ci bundle config unset deployment - bundle update + bundle install --jobs 4 --retry 3 env: RUBY_VERSION: ${{ matrix.ruby_version }} RAILS_VERSION: ${{ matrix.rails_version }} @@ -136,7 +136,7 @@ jobs: run: | npm ci bundle config unset deployment - bundle update + bundle install --jobs 4 --retry 3 env: RUBY_VERSION: ${{ matrix.ruby_version }} RAILS_VERSION: ${{ matrix.rails_version }} @@ -179,7 +179,7 @@ jobs: - name: Build run: | bundle config unset deployment - bundle update + bundle install --jobs 4 --retry 3 env: RUBY_VERSION: ${{ matrix.ruby_version }} RAILS_VERSION: ${{ matrix.rails_version }} diff --git a/Gemfile.lock b/Gemfile.lock index 48db73ed3e..af692e44f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM bigdecimal (3.1.8) bootsnap (1.18.3) msgpack (~> 1.2) - builder (3.2.4) + builder (3.3.0) capybara (3.40.0) addressable matrix @@ -66,7 +66,7 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) coderay (1.1.3) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) crack (1.0.0) bigdecimal @@ -93,7 +93,7 @@ GEM rubocop smart_properties erblint-github (0.5.1) - erubi (1.12.0) + erubi (1.13.0) ferrum (0.14) addressable (~> 2.5) concurrent-ruby (~> 1.1) @@ -106,7 +106,7 @@ GEM i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.13.1) + irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.7.2) @@ -136,16 +136,16 @@ GEM method_source (1.1.0) mini_mime (1.1.5) mini_portile2 (2.8.7) - minitest (5.23.1) + minitest (5.25.1) mocha (2.3.0) ruby2_keywords (>= 0.0.5) msgpack (1.7.2) mutex_m (0.2.0) nio4r (2.7.3) - nokogiri (1.16.6) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.16.6-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) openproject-octicons (19.17.0) parallel (1.24.0) @@ -160,8 +160,8 @@ GEM public_suffix (5.0.5) puma (6.4.2) nio4r (~> 2.0) - racc (1.8.0) - rack (3.0.11) + racc (1.8.1) + rack (3.1.7) rack-cors (2.0.2) rack (>= 2.0.0) rack-proxy (0.7.7) @@ -197,7 +197,7 @@ GEM psych (>= 4.0.0) redcarpet (3.6.0) regexp_parser (2.9.2) - reline (0.5.7) + reline (0.5.10) io-console (~> 0.5) rexml (3.2.8) strscan (>= 3.0.9) @@ -257,11 +257,11 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - stringio (3.1.0) + stringio (3.1.1) strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.3.1) + thor (1.3.2) timecop (0.9.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -273,7 +273,7 @@ GEM vite_rails (3.0.17) railties (>= 5.1, < 8) vite_ruby (~> 3.0, >= 3.2.2) - vite_ruby (3.8.0) + vite_ruby (3.8.2) dry-cli (>= 0.7, < 2) rack-proxy (~> 0.6, >= 0.6.1) zeitwerk (~> 2.2) @@ -294,7 +294,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.36) - zeitwerk (2.6.15) + zeitwerk (2.6.18) PLATFORMS ruby diff --git a/demo/Gemfile.lock b/demo/Gemfile.lock index 2be3ec10a7..1aadfebbdd 100644 --- a/demo/Gemfile.lock +++ b/demo/Gemfile.lock @@ -299,7 +299,7 @@ GEM psych (>= 4.0.0) recursive-open-struct (1.1.3) redcarpet (3.6.0) - reline (0.5.9) + reline (0.5.10) io-console (~> 0.5) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -328,7 +328,7 @@ GEM stimulus-rails (1.3.4) railties (>= 6.0.0) stringio (3.1.1) - thor (1.3.1) + thor (1.3.2) timeliness (0.3.10) turbo-rails (2.0.6) actionpack (>= 6.0.0) @@ -343,7 +343,7 @@ GEM vite_rails (3.0.17) railties (>= 5.1, < 8) vite_ruby (~> 3.0, >= 3.2.2) - vite_ruby (3.7.0) + vite_ruby (3.8.2) dry-cli (>= 0.7, < 2) rack-proxy (~> 0.6, >= 0.6.1) zeitwerk (~> 2.2) @@ -352,7 +352,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) yard (0.9.36) - zeitwerk (2.6.17) + zeitwerk (2.6.18) PLATFORMS arm64-darwin-21 diff --git a/demo/config/initializers/assets.rb b/demo/config/initializers/assets.rb index 4bcc84eb95..08f073cceb 100644 --- a/demo/config/initializers/assets.rb +++ b/demo/config/initializers/assets.rb @@ -15,4 +15,3 @@ # application.js, application.css, and all non-JS/CSS in the app/assets # folder are already added. # Rails.application.config.assets.precompile += %w( admin.js admin.css ) -Rails.application.config.assets.precompile += %w( images/* ) diff --git a/demo/package-lock.json b/demo/package-lock.json index 7e62955d73..256b361d26 100644 --- a/demo/package-lock.json +++ b/demo/package-lock.json @@ -16,8 +16,8 @@ "webpack-dev-server": "^5.0.4" }, "devDependencies": { - "vite": "^5.3.5", - "vite-plugin-ruby": "^5.0.0" + "vite": "^5.4.3", + "vite-plugin-ruby": "^5.1.0" } }, "node_modules/@esbuild/aix-ppc64": { @@ -2561,9 +2561,9 @@ } }, "node_modules/postcss": { - "version": "8.4.40", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz", - "integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==", + "version": "8.4.45", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz", + "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==", "dev": true, "funding": [ { @@ -3388,14 +3388,14 @@ } }, "node_modules/vite": { - "version": "5.3.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.5.tgz", - "integrity": "sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz", + "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==", "dev": true, "dependencies": { "esbuild": "^0.21.3", - "postcss": "^8.4.39", - "rollup": "^4.13.0" + "postcss": "^8.4.43", + "rollup": "^4.20.0" }, "bin": { "vite": "bin/vite.js" @@ -3414,6 +3414,7 @@ "less": "*", "lightningcss": "^1.21.0", "sass": "*", + "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.4.0" @@ -3431,6 +3432,9 @@ "sass": { "optional": true }, + "sass-embedded": { + "optional": true + }, "stylus": { "optional": true }, @@ -3443,9 +3447,9 @@ } }, "node_modules/vite-plugin-ruby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/vite-plugin-ruby/-/vite-plugin-ruby-5.0.0.tgz", - "integrity": "sha512-c8PjTp21Ah/ttgnNUyu0qvCXZI08Jr9I24oUKg3TRIRhF5GcOZ++6wtlTCrNFd9COEQbpXHxlRIXd/MEg0iZJw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/vite-plugin-ruby/-/vite-plugin-ruby-5.1.0.tgz", + "integrity": "sha512-Dgd/dCvb/8GYxZx2NEgxygEoUpHz9vfad7itlO4fXqYwdfAEwFwwOohC630yf/+kxIGBZXI5yk+Y3WkL9VkwcA==", "dev": true, "dependencies": { "debug": "^4.3.4", @@ -5400,9 +5404,9 @@ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" }, "postcss": { - "version": "8.4.40", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz", - "integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==", + "version": "8.4.45", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz", + "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==", "dev": true, "requires": { "nanoid": "^3.3.7", @@ -5975,21 +5979,21 @@ "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, "vite": { - "version": "5.3.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.5.tgz", - "integrity": "sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz", + "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==", "dev": true, "requires": { "esbuild": "^0.21.3", "fsevents": "~2.3.3", - "postcss": "^8.4.39", - "rollup": "^4.13.0" + "postcss": "^8.4.43", + "rollup": "^4.20.0" } }, "vite-plugin-ruby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/vite-plugin-ruby/-/vite-plugin-ruby-5.0.0.tgz", - "integrity": "sha512-c8PjTp21Ah/ttgnNUyu0qvCXZI08Jr9I24oUKg3TRIRhF5GcOZ++6wtlTCrNFd9COEQbpXHxlRIXd/MEg0iZJw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/vite-plugin-ruby/-/vite-plugin-ruby-5.1.0.tgz", + "integrity": "sha512-Dgd/dCvb/8GYxZx2NEgxygEoUpHz9vfad7itlO4fXqYwdfAEwFwwOohC630yf/+kxIGBZXI5yk+Y3WkL9VkwcA==", "dev": true, "requires": { "debug": "^4.3.4", diff --git a/demo/package.json b/demo/package.json index 879b92e117..06f67f2be6 100644 --- a/demo/package.json +++ b/demo/package.json @@ -11,8 +11,8 @@ "webpack-dev-server": "^5.0.4" }, "devDependencies": { - "vite": "^5.3.5", - "vite-plugin-ruby": "^5.0.0" + "vite": "^5.4.3", + "vite-plugin-ruby": "^5.1.0" }, "scripts": { "build:css": "postcss --config ../ ./app/assets/stylesheets/application.postcss.css -o ./app/assets/builds/application.css" diff --git a/package-lock.json b/package-lock.json index cc9d6d0a27..69db58f84e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,8 +59,8 @@ "stylelint-config-standard": "^36.0.0", "tslib": "^2.4.0", "typescript": "^5.2.2", - "vite": "^5.3.5", - "vite-plugin-ruby": "^5.0.0" + "vite": "^5.4.3", + "vite-plugin-ruby": "^5.1.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -9351,9 +9351,9 @@ } }, "node_modules/postcss": { - "version": "8.4.41", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz", - "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==", + "version": "8.4.45", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz", + "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==", "dev": true, "funding": [ { @@ -12792,14 +12792,14 @@ } }, "node_modules/vite": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.1.tgz", - "integrity": "sha512-1oE6yuNXssjrZdblI9AfBbHCC41nnyoVoEZxQnID6yvQZAFBzxxkqoFLtHUMkYunL8hwOLEjgTuxpkRxvba3kA==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz", + "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==", "dev": true, "dependencies": { "esbuild": "^0.21.3", - "postcss": "^8.4.41", - "rollup": "^4.13.0" + "postcss": "^8.4.43", + "rollup": "^4.20.0" }, "bin": { "vite": "bin/vite.js" @@ -12851,9 +12851,9 @@ } }, "node_modules/vite-plugin-ruby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/vite-plugin-ruby/-/vite-plugin-ruby-5.0.0.tgz", - "integrity": "sha512-c8PjTp21Ah/ttgnNUyu0qvCXZI08Jr9I24oUKg3TRIRhF5GcOZ++6wtlTCrNFd9COEQbpXHxlRIXd/MEg0iZJw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/vite-plugin-ruby/-/vite-plugin-ruby-5.1.0.tgz", + "integrity": "sha512-Dgd/dCvb/8GYxZx2NEgxygEoUpHz9vfad7itlO4fXqYwdfAEwFwwOohC630yf/+kxIGBZXI5yk+Y3WkL9VkwcA==", "dev": true, "dependencies": { "debug": "^4.3.4", @@ -19322,9 +19322,9 @@ "dev": true }, "postcss": { - "version": "8.4.41", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz", - "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==", + "version": "8.4.45", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz", + "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==", "dev": true, "requires": { "nanoid": "^3.3.7", @@ -21339,15 +21339,15 @@ } }, "vite": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.1.tgz", - "integrity": "sha512-1oE6yuNXssjrZdblI9AfBbHCC41nnyoVoEZxQnID6yvQZAFBzxxkqoFLtHUMkYunL8hwOLEjgTuxpkRxvba3kA==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz", + "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==", "dev": true, "requires": { "esbuild": "^0.21.3", "fsevents": "~2.3.3", - "postcss": "^8.4.41", - "rollup": "^4.13.0" + "postcss": "^8.4.43", + "rollup": "^4.20.0" }, "dependencies": { "@types/estree": { @@ -21392,9 +21392,9 @@ } }, "vite-plugin-ruby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/vite-plugin-ruby/-/vite-plugin-ruby-5.0.0.tgz", - "integrity": "sha512-c8PjTp21Ah/ttgnNUyu0qvCXZI08Jr9I24oUKg3TRIRhF5GcOZ++6wtlTCrNFd9COEQbpXHxlRIXd/MEg0iZJw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/vite-plugin-ruby/-/vite-plugin-ruby-5.1.0.tgz", + "integrity": "sha512-Dgd/dCvb/8GYxZx2NEgxygEoUpHz9vfad7itlO4fXqYwdfAEwFwwOohC630yf/+kxIGBZXI5yk+Y3WkL9VkwcA==", "dev": true, "requires": { "debug": "^4.3.4", diff --git a/package.json b/package.json index 012bd07a04..ae39c683c5 100644 --- a/package.json +++ b/package.json @@ -93,8 +93,8 @@ "stylelint-config-standard": "^36.0.0", "tslib": "^2.4.0", "typescript": "^5.2.2", - "vite": "^5.3.5", - "vite-plugin-ruby": "^5.0.0" + "vite": "^5.4.3", + "vite-plugin-ruby": "^5.1.0" }, "prettier": "@github/prettier-config", "browserslist": "extends @github/browserslist-config"