From 01edf0172f039f2276e42e21d6cf0a95c57ae8e3412673ef930d0c813e2076ef Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Wed, 31 Jul 2024 12:40:00 +0000 Subject: [PATCH] - update_version.sh: add script for auto-updates - switch to upstream package-lock.json - do not run scripts during npm install OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit-machines?expand=0&rev=39 --- cockpit-machines.changes | 7 ++++++ cockpit-machines.spec | 4 ++-- package-lock.json | 52 ---------------------------------------- 3 files changed, 9 insertions(+), 54 deletions(-) diff --git a/cockpit-machines.changes b/cockpit-machines.changes index 5b71a4a..f6ba3ca 100644 --- a/cockpit-machines.changes +++ b/cockpit-machines.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 31 12:39:14 UTC 2024 - Adam Majer + +- update_version.sh: add script for auto-updates +- switch to upstream package-lock.json +- do not run scripts during npm install + ------------------------------------------------------------------- Mon Jul 15 08:29:29 UTC 2024 - Luna D Dragon diff --git a/cockpit-machines.spec b/cockpit-machines.spec index f3efa9d..aee3b94 100644 --- a/cockpit-machines.spec +++ b/cockpit-machines.spec @@ -27,6 +27,7 @@ URL: https://github.com/cockpit-project/cockpit-machines Source: https://github.com/cockpit-project/cockpit-machines/releases/download/%{version}/cockpit-machines-%{version}.tar.xz Source10: package-lock.json Source11: node_modules.spec.inc +Source12: update_version.sh %include %_sourcedir/node_modules.spec.inc Patch10: hide-docs.patch Patch11: load-css-overrides.patch @@ -60,8 +61,7 @@ If "virt-install" is installed, you can also create new virtual machines. %setup -q -n %{name} %patch -P 10 -p1 %patch -P 11 -p1 -rm -f package-lock.json -local-npm-registry %{_sourcedir} install --with=dev --legacy-peer-deps || ( find ~/.npm/_logs -name '*-debug.log' -print0 | xargs -0 cat; false) +local-npm-registry %{_sourcedir} install --include=dev --ignore-scripts || ( find ~/.npm/_logs -name '*-debug.log' -print0 | xargs -0 cat; false) %build export PREFIX=%_prefix diff --git a/package-lock.json b/package-lock.json index 7a93176..4284c2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3,58 +3,6 @@ "lockfileVersion": 3, "requires": true, "packages": { - "": { - "name": "machines", - "license": "LGPL-2.1", - "dependencies": { - "@novnc/novnc": "1.4.0", - "@patternfly/patternfly": "5.3.1", - "@patternfly/react-console": "5.0.0", - "@patternfly/react-core": "5.3.3", - "@patternfly/react-icons": "5.3.2", - "@patternfly/react-styles": "5.3.1", - "@patternfly/react-table": "5.3.3", - "@patternfly/react-tokens": "5.3.1", - "dequal": "2.0.3", - "prop-types": "15.8.1", - "react": "18.3.1", - "react-dom": "18.3.1", - "redux": "5.0.1", - "redux-thunk": "3.1.0", - "throttle-debounce": "5.0.2", - "xterm": "5.1.0", - "xterm-addon-canvas": "0.5.0" - }, - "devDependencies": { - "argparse": "2.0.1", - "buffer": "6.0.3", - "chrome-remote-interface": "0.33.2", - "esbuild": "0.23.0", - "esbuild-plugin-copy": "2.1.1", - "esbuild-plugin-replace": "1.4.0", - "esbuild-sass-plugin": "3.3.1", - "esbuild-wasm": "0.23.0", - "eslint": "8.57.0", - "eslint-config-standard": "17.1.0", - "eslint-config-standard-jsx": "11.0.0", - "eslint-config-standard-react": "13.0.0", - "eslint-plugin-import": "2.29.1", - "eslint-plugin-jsx-a11y": "6.9.0", - "eslint-plugin-promise": "6.4.0", - "eslint-plugin-react": "7.34.3", - "eslint-plugin-react-hooks": "4.6.2", - "gettext-parser": "8.0.0", - "htmlparser": "1.7.7", - "ipaddr.js": "2.2.0", - "jed": "1.1.1", - "sass": "1.77.6", - "sizzle": "2.3.10", - "stylelint": "16.6.1", - "stylelint-config-standard-scss": "13.1.0", - "stylelint-formatter-pretty": "4.0.0", - "stylelint-use-logical-spec": "5.0.1" - } - }, "node_modules/@babel/code-frame": { "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",