From 5c01a567fb8508761891f64e1e25d1774daacb83 Mon Sep 17 00:00:00 2001 From: Behrokh Satarnejad Date: Fri, 25 Oct 2024 07:40:33 +0200 Subject: [PATCH 1/2] update core with new version of octicon and primer view components --- Gemfile | 6 +++--- Gemfile.lock | 14 +++++++------- frontend/package-lock.json | 28 ++++++++++++++-------------- frontend/package.json | 4 ++-- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Gemfile b/Gemfile index 38c2ecb1179c..c393b21e00f8 100644 --- a/Gemfile +++ b/Gemfile @@ -397,6 +397,6 @@ gemfiles.each do |file| send(:eval_gemfile, file) if File.readable?(file) end -gem "openproject-octicons", "~>19.18.0" -gem "openproject-octicons_helper", "~>19.18.0" -gem "openproject-primer_view_components", "~>0.48.0" +gem "openproject-octicons", "~>19.19.0" +gem "openproject-octicons_helper", "~>19.19.0" +gem "openproject-primer_view_components", "~>0.48.1" diff --git a/Gemfile.lock b/Gemfile.lock index 1d0e82c6aa94..45a6cbd61ea6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -803,12 +803,12 @@ GEM validate_email validate_url webfinger (~> 2.0) - openproject-octicons (19.18.0) - openproject-octicons_helper (19.18.0) + openproject-octicons (19.19.0) + openproject-octicons_helper (19.19.0) actionview - openproject-octicons (= 19.18.0) + openproject-octicons (= 19.19.0) railties - openproject-primer_view_components (0.48.0) + openproject-primer_view_components (0.48.1) actionview (>= 5.0.0) activesupport (>= 5.0.0) openproject-octicons (>= 19.17.0) @@ -1304,10 +1304,10 @@ DEPENDENCIES openproject-job_status! openproject-ldap_groups! openproject-meeting! - openproject-octicons (~> 19.18.0) - openproject-octicons_helper (~> 19.18.0) + openproject-octicons (~> 19.19.0) + openproject-octicons_helper (~> 19.19.0) openproject-openid_connect! - openproject-primer_view_components (~> 0.48.0) + openproject-primer_view_components (~> 0.48.1) openproject-recaptcha! openproject-reporting! openproject-storages! diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 3fe85edf2891..8c384c6ab38b 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -46,8 +46,8 @@ "@ng-select/ng-select": "^13.2.0", "@ngneat/content-loader": "^7.0.0", "@ngx-formly/core": "^6.1.4", - "@openproject/octicons-angular": "^19.18.0", - "@openproject/primer-view-components": "^0.48.0", + "@openproject/octicons-angular": "^19.19.0", + "@openproject/primer-view-components": "^0.48.1", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^21.5.0", "@primer/primitives": "^9.1.2", @@ -4809,9 +4809,9 @@ "integrity": "sha512-jrqoTI8lk5UziDsDPJ2Y+nmXYCcRhmr6uMARr3v/W6AMxRgsnRLWJyWKYr6FjaGMgbyxXG+OkCUPQY4Xl3toGg==" }, "node_modules/@openproject/octicons-angular": { - "version": "19.18.0", - "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.18.0.tgz", - "integrity": "sha512-BXrP73iAiges65Voobkzf7pBuG7YbR3dDtNx6Xx6yZFlpYVXxnEeAoj7dyGPi5C9ZiKBkNYEAygxFeurasXpAA==", + "version": "19.19.0", + "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.19.0.tgz", + "integrity": "sha512-RvLatG2EygvHNWsveDLNFqoikxviQciw87cQkr3R+/bHBIF7DvPQ0BzLKzC9m5tY8tkX0Dk11yI2V2IIcRoHvQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -4823,9 +4823,9 @@ } }, "node_modules/@openproject/primer-view-components": { - "version": "0.48.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.48.0.tgz", - "integrity": "sha512-eR9vv6UTInqr3Oi3nlOLHlFa6hDhy4kdEbTXZEZS8pEa9E4IlcZNGjA+0foRPecBCizg2v+E+TgpS/wk3Vd0FA==", + "version": "0.48.1", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.48.1.tgz", + "integrity": "sha512-6mQC3fNq0F48AGkRBPg/GVych006/y6q4md5tjkI5twnpm/Pf2tSpou7zPegTSM9/3mK6dwZdpyIOShcu/C+Vg==", "license": "MIT", "dependencies": { "@github/auto-check-element": "^5.2.0", @@ -25270,17 +25270,17 @@ "integrity": "sha512-jrqoTI8lk5UziDsDPJ2Y+nmXYCcRhmr6uMARr3v/W6AMxRgsnRLWJyWKYr6FjaGMgbyxXG+OkCUPQY4Xl3toGg==" }, "@openproject/octicons-angular": { - "version": "19.18.0", - "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.18.0.tgz", - "integrity": "sha512-BXrP73iAiges65Voobkzf7pBuG7YbR3dDtNx6Xx6yZFlpYVXxnEeAoj7dyGPi5C9ZiKBkNYEAygxFeurasXpAA==", + "version": "19.19.0", + "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.19.0.tgz", + "integrity": "sha512-RvLatG2EygvHNWsveDLNFqoikxviQciw87cQkr3R+/bHBIF7DvPQ0BzLKzC9m5tY8tkX0Dk11yI2V2IIcRoHvQ==", "requires": { "tslib": "^2.3.0" } }, "@openproject/primer-view-components": { - "version": "0.48.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.48.0.tgz", - "integrity": "sha512-eR9vv6UTInqr3Oi3nlOLHlFa6hDhy4kdEbTXZEZS8pEa9E4IlcZNGjA+0foRPecBCizg2v+E+TgpS/wk3Vd0FA==", + "version": "0.48.1", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.48.1.tgz", + "integrity": "sha512-6mQC3fNq0F48AGkRBPg/GVych006/y6q4md5tjkI5twnpm/Pf2tSpou7zPegTSM9/3mK6dwZdpyIOShcu/C+Vg==", "requires": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", diff --git a/frontend/package.json b/frontend/package.json index 28186153066b..d9b554b294ae 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -98,8 +98,8 @@ "@ng-select/ng-select": "^13.2.0", "@ngneat/content-loader": "^7.0.0", "@ngx-formly/core": "^6.1.4", - "@openproject/octicons-angular": "^19.18.0", - "@openproject/primer-view-components": "^0.48.0", + "@openproject/octicons-angular": "^19.19.0", + "@openproject/primer-view-components": "^0.48.1", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^21.5.0", "@primer/primitives": "^9.1.2", From 2c96ca53312a06365e7b23455f795098e6cc0484 Mon Sep 17 00:00:00 2001 From: Behrokh Satarnejad Date: Fri, 25 Oct 2024 08:49:19 +0200 Subject: [PATCH 2/2] fix missing version update --- frontend/package-lock.json | 14 +++++++------- frontend/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 8c384c6ab38b..06fb1a385b9b 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -51,7 +51,7 @@ "@openproject/reactivestates": "^3.0.1", "@primer/css": "^21.5.0", "@primer/primitives": "^9.1.2", - "@primer/view-components": "npm:@openproject/primer-view-components@^0.48.0", + "@primer/view-components": "npm:@openproject/primer-view-components@^0.48.1", "@types/hotwired__turbo": "^8.0.1", "@uirouter/angular": "^13.0.0", "@uirouter/core": "^6.1.0", @@ -4910,9 +4910,9 @@ }, "node_modules/@primer/view-components": { "name": "@openproject/primer-view-components", - "version": "0.48.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.48.0.tgz", - "integrity": "sha512-eR9vv6UTInqr3Oi3nlOLHlFa6hDhy4kdEbTXZEZS8pEa9E4IlcZNGjA+0foRPecBCizg2v+E+TgpS/wk3Vd0FA==", + "version": "0.48.1", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.48.1.tgz", + "integrity": "sha512-6mQC3fNq0F48AGkRBPg/GVych006/y6q4md5tjkI5twnpm/Pf2tSpou7zPegTSM9/3mK6dwZdpyIOShcu/C+Vg==", "license": "MIT", "dependencies": { "@github/auto-check-element": "^5.2.0", @@ -25344,9 +25344,9 @@ } }, "@primer/view-components": { - "version": "npm:@openproject/primer-view-components@0.48.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.48.0.tgz", - "integrity": "sha512-eR9vv6UTInqr3Oi3nlOLHlFa6hDhy4kdEbTXZEZS8pEa9E4IlcZNGjA+0foRPecBCizg2v+E+TgpS/wk3Vd0FA==", + "version": "npm:@openproject/primer-view-components@0.48.1", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.48.1.tgz", + "integrity": "sha512-6mQC3fNq0F48AGkRBPg/GVych006/y6q4md5tjkI5twnpm/Pf2tSpou7zPegTSM9/3mK6dwZdpyIOShcu/C+Vg==", "requires": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", diff --git a/frontend/package.json b/frontend/package.json index d9b554b294ae..63af85a41c63 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -103,7 +103,7 @@ "@openproject/reactivestates": "^3.0.1", "@primer/css": "^21.5.0", "@primer/primitives": "^9.1.2", - "@primer/view-components": "npm:@openproject/primer-view-components@^0.48.0", + "@primer/view-components": "npm:@openproject/primer-view-components@^0.48.1", "@types/hotwired__turbo": "^8.0.1", "@uirouter/angular": "^13.0.0", "@uirouter/core": "^6.1.0",