Skip to content
Snippets Groups Projects
Commit 328254f0 authored by Ivica Puljic's avatar Ivica Puljic
Browse files

Issue #3473974 by pivica: Remove pnpm support from build scripts

parent 0d629164
No related branches found
No related tags found
1 merge request!6Issue #3473974 by pivica: Remove pnpm support from build scripts
......@@ -294,3 +294,21 @@ function bs_base_bs_update_8012($target_theme_name) {
exec('cd ' . $target_path . ' && ((type pnpm && pnpm update) || npm update)');
}
}
/**
* Remove pnpm support.
*/
function bs_base_bs_update_8013($target_theme_name) {
$themes_info = _bs_base_drupal_theme_list_info();
if (isset($themes_info[$target_theme_name])) {
_bs_base_regexp_file($themes_info[$target_theme_name]->subpath . '/package.json', [
// Packages updates.
'\(\(type pnpm \&\& pnpm install\) \|\| npm install\)' => 'npm install',
]);
system('rm -f ' . escapeshellarg($themes_info[$target_theme_name]->subpath . '/pnpm-lock.yaml'));
// Remove node_modules so, we are sure we install/rebuild everything clean.
system('rm -rf ' . escapeshellarg($themes_info[$target_theme_name]->subpath . '/node_modules'));
}
}
......@@ -27,6 +27,6 @@
"through2": "^4.0.2"
},
"scripts": {
"build-css": "((type pnpm && pnpm install) || npm install) && npx browserslist@latest --update-db && npx gulp clean:css && npx gulp sass"
"build-css": "npm install && npx browserslist@latest --update-db && npx gulp clean:css && npx gulp sass"
}
}
This diff is collapsed.
......@@ -5,7 +5,7 @@ base theme: bs_base
core_version_requirement: ^9.3 || ^10
bs_versions:
bs_base: 8012
bs_base: 8013
dependencies:
- bs_lib:bs_lib
......
......@@ -30,11 +30,11 @@
"through2": "^4.0.2"
},
"scripts": {
"build-install": "((type pnpm && pnpm install) || npm install)",
"build-install": "npm install",
"build-browsers": "npx browserslist@latest --update-db",
"build-css": "npx gulp clean:css && npx gulp sass",
"build-css-dev": "npx gulp clean:css && npx gulp sass:dev",
"build-icons": "fantasticon",
"build": "npm run build-install & npm run build-icons &npm run build-browsers & npm run build-css"
"build": "npm run build-install & npm run build-icons & npm run build-browsers & npm run build-css"
}
}
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment