From b5a8d762b02588cbc81f016c514654dad8020ae2 Mon Sep 17 00:00:00 2001 From: Jon Robson Date: Fri, 2 Feb 2024 18:45:30 -0800 Subject: [PATCH] Upgrade skin cli --- package-lock.json | 17 +++++++++-------- package.json | 2 +- src/pages/Add.vue | 6 +++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbf345d..a0443ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@babel/node": "^7.18.10", "less": "4.1.0", "mediawiki-skins-cli": "0.5.6", - "mediawiki-skins-cli-latest": "npm:mediawiki-skins-cli@1.40.2", + "mediawiki-skins-cli-latest": "npm:mediawiki-skins-cli@1.42.0", "mustache": "4.1.0", "node-fetch": "3.2.10", "vue": "2.6.12", @@ -12545,16 +12545,17 @@ }, "node_modules/mediawiki-skins-cli-latest": { "name": "mediawiki-skins-cli", - "version": "1.40.2", - "resolved": "https://registry.npmjs.org/mediawiki-skins-cli/-/mediawiki-skins-cli-1.40.2.tgz", - "integrity": "sha512-Mc412+F2CgWOzB/32SUMjXWFFF+fxDJhTd3XbTSj01S6ETjvV7pjgCsCnUdxYy76kQJLkCsSNrreCcsKHJmqvg==", + "version": "1.42.0", + "resolved": "https://registry.npmjs.org/mediawiki-skins-cli/-/mediawiki-skins-cli-1.42.0.tgz", + "integrity": "sha512-IWw+rHtmdMgfDVfq6tS5u5T+5vlivvq0Fiw/xbcyZBQsuk0haFvt1FO2Cq0diM5dXALnBHEOdcbsybHUvxttBw==", "dependencies": { "@rollup/plugin-commonjs": "21.0.1", "@rollup/plugin-node-resolve": "13.0.6", "unminify": "2.0.0" }, "bin": { - "create-mw-skin": "createSkin.js" + "create-mw-skin": "createSkin.js", + "update-mw-skin": "updateSkin.js" } }, "node_modules/mediawiki-skins-cli-latest/node_modules/@rollup/plugin-commonjs": { @@ -29282,9 +29283,9 @@ } }, "mediawiki-skins-cli-latest": { - "version": "npm:mediawiki-skins-cli@1.40.2", - "resolved": "https://registry.npmjs.org/mediawiki-skins-cli/-/mediawiki-skins-cli-1.40.2.tgz", - "integrity": "sha512-Mc412+F2CgWOzB/32SUMjXWFFF+fxDJhTd3XbTSj01S6ETjvV7pjgCsCnUdxYy76kQJLkCsSNrreCcsKHJmqvg==", + "version": "npm:mediawiki-skins-cli@1.42.0", + "resolved": "https://registry.npmjs.org/mediawiki-skins-cli/-/mediawiki-skins-cli-1.42.0.tgz", + "integrity": "sha512-IWw+rHtmdMgfDVfq6tS5u5T+5vlivvq0Fiw/xbcyZBQsuk0haFvt1FO2Cq0diM5dXALnBHEOdcbsybHUvxttBw==", "requires": { "@rollup/plugin-commonjs": "21.0.1", "@rollup/plugin-node-resolve": "13.0.6", diff --git a/package.json b/package.json index 0e5495f..c045f66 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@babel/node": "^7.18.10", "less": "4.1.0", "mediawiki-skins-cli": "0.5.6", - "mediawiki-skins-cli-latest": "npm:mediawiki-skins-cli@1.40.2", + "mediawiki-skins-cli-latest": "npm:mediawiki-skins-cli@1.42.0", "mustache": "4.1.0", "node-fetch": "3.2.10", "vue": "2.6.12", diff --git a/src/pages/Add.vue b/src/pages/Add.vue index 939119e..1be61dd 100644 --- a/src/pages/Add.vue +++ b/src/pages/Add.vue @@ -95,7 +95,7 @@ import { PARTIALS, getLessVarsCode, getLessVarsRaw, JQUERY, buildDefaultAssets, getResourceLoaderSkinModuleStylesFromStylesheet, SCRIPTS, messages } from 'mediawiki-skins-cli'; -import { buildSkin as buildSkin140 } from 'mediawiki-skins-cli-latest'; +import { buildSkin as buildSkinLatest } from 'mediawiki-skins-cli-latest'; import api from '../api.js'; import { TEST_ARTICLES, HOST, LESS_RENDER_OPTIONS } from '../constants'; import { render } from 'mustache'; @@ -236,8 +236,8 @@ export default { }, download() { let fn = buildSkin; - if ( this.skinOutputVersion === '1.40' ) { - fn = buildSkin140; + if ( parseFloat( this.skinOutputVersion ) >= 1.41 ) { + fn = buildSkinLatest; } fn( this.skinname, this.mustache, this.less, this.js, this.variables ); },