From 5d71d6f87a02b29679f41c651a1409fe5b3a748c Mon Sep 17 00:00:00 2001 From: joostdecock Date: Thu, 24 Apr 2025 08:47:55 +0200 Subject: [PATCH] [plugins] fix: Provide name in export. Fixes #280 --- plugins/core-plugins/src/index.mjs | 3 ++- plugins/plugin-annotations/src/index.mjs | 3 ++- plugins/plugin-bin-pack/src/index.mjs | 3 ++- plugins/plugin-bust/src/index.mjs | 3 ++- plugins/plugin-flip/src/index.mjs | 3 ++- plugins/plugin-gore/src/index.mjs | 3 ++- plugins/plugin-i18n/src/index.mjs | 3 ++- plugins/plugin-measurements/src/index.mjs | 3 ++- plugins/plugin-mirror/src/index.mjs | 3 ++- plugins/plugin-path-utils/src/index.mjs | 3 ++- plugins/plugin-ringsector/src/index.mjs | 3 ++- plugins/plugin-round/src/index.mjs | 3 ++- plugins/plugin-sprinkle/src/index.mjs | 3 ++- plugins/plugin-svgattr/src/index.mjs | 3 ++- plugins/plugin-theme/src/index.mjs | 3 ++- plugins/plugin-timing/src/index.mjs | 3 ++- plugins/plugin-versionfree-svg/src/index.mjs | 3 ++- 17 files changed, 34 insertions(+), 17 deletions(-) diff --git a/plugins/core-plugins/src/index.mjs b/plugins/core-plugins/src/index.mjs index 160c1c844bb..ff65156ce41 100644 --- a/plugins/core-plugins/src/index.mjs +++ b/plugins/core-plugins/src/index.mjs @@ -45,7 +45,8 @@ for (const plugin of bundledPlugins) { } export const plugin = { - ...about, + name: about.id, + version: about.version, store, hooks, macros, diff --git a/plugins/plugin-annotations/src/index.mjs b/plugins/plugin-annotations/src/index.mjs index 15a5061b29c..23482b85277 100644 --- a/plugins/plugin-annotations/src/index.mjs +++ b/plugins/plugin-annotations/src/index.mjs @@ -23,7 +23,8 @@ import { sewtogetherMacros, sewtogetherDefs } from './sewtogether.mjs' import { flagStores } from './flag.mjs' export const plugin = { - ...about, + name: about.id, + version: about.version, hooks: { preRender: [ function (svg) { diff --git a/plugins/plugin-bin-pack/src/index.mjs b/plugins/plugin-bin-pack/src/index.mjs index d59dcc5fbba..6b0a6000f77 100644 --- a/plugins/plugin-bin-pack/src/index.mjs +++ b/plugins/plugin-bin-pack/src/index.mjs @@ -2,7 +2,8 @@ import about from '../about.json' with { type: 'json' } import { pack } from './growing-packer.mjs' export const plugin = { - ...about, + name: about.id, + version: about.version, store: [['pack', pack]], } diff --git a/plugins/plugin-bust/src/index.mjs b/plugins/plugin-bust/src/index.mjs index ee423a83219..eac4434a721 100644 --- a/plugins/plugin-bust/src/index.mjs +++ b/plugins/plugin-bust/src/index.mjs @@ -1,7 +1,8 @@ import about from '../about.json' with { type: 'json' } export const plugin = { - ...about, + name: about.id, + version: about.version, hooks: { preSetDraft: function ({ settings, activeSet }) { const set = settings[Number(activeSet)] diff --git a/plugins/plugin-flip/src/index.mjs b/plugins/plugin-flip/src/index.mjs index d46ca6979e6..5597a849a24 100644 --- a/plugins/plugin-flip/src/index.mjs +++ b/plugins/plugin-flip/src/index.mjs @@ -1,7 +1,8 @@ import about from '../about.json' with { type: 'json' } export const plugin = { - ...about, + name: about.id, + version: about.version, macros: { flip: function (so, { paths, points, snippets }) { const axis = so?.axis === 'y' ? 'y' : 'x' diff --git a/plugins/plugin-gore/src/index.mjs b/plugins/plugin-gore/src/index.mjs index 6382aced971..cdf4df34256 100644 --- a/plugins/plugin-gore/src/index.mjs +++ b/plugins/plugin-gore/src/index.mjs @@ -1,7 +1,8 @@ import about from '../about.json' with { type: 'json' } export const plugin = { - ...about, + name: about.id, + version: about.version, macros: { gore: function (so, { points, paths, Path }) { const from = so.from diff --git a/plugins/plugin-i18n/src/index.mjs b/plugins/plugin-i18n/src/index.mjs index 264704cc5e6..139f68d6c21 100644 --- a/plugins/plugin-i18n/src/index.mjs +++ b/plugins/plugin-i18n/src/index.mjs @@ -24,7 +24,8 @@ const translate = (locale, text, t, pattern) => { } export const plugin = { - ...about, + name: about.id, + version: about.version, hooks: { insertText: translate }, } diff --git a/plugins/plugin-measurements/src/index.mjs b/plugins/plugin-measurements/src/index.mjs index ccd31d22af9..ee7469610b0 100644 --- a/plugins/plugin-measurements/src/index.mjs +++ b/plugins/plugin-measurements/src/index.mjs @@ -1,7 +1,8 @@ import about from '../about.json' with { type: 'json' } export const plugin = { - ...about, + name: about.id, + version: about.version, hooks: { preDraft: function ({ settings }) { for (const set of settings) { diff --git a/plugins/plugin-mirror/src/index.mjs b/plugins/plugin-mirror/src/index.mjs index e8c869bc9ad..fa431606b32 100644 --- a/plugins/plugin-mirror/src/index.mjs +++ b/plugins/plugin-mirror/src/index.mjs @@ -36,7 +36,8 @@ const mirrorGen = (start, end) => { const capFirst = (string) => string.charAt(0).toUpperCase() + string.slice(1) export const plugin = { - ...about, + name: about.id, + version: about.version, macros: { mirror: function ({ mirror, diff --git a/plugins/plugin-path-utils/src/index.mjs b/plugins/plugin-path-utils/src/index.mjs index 32f4e193666..9924cab86cd 100644 --- a/plugins/plugin-path-utils/src/index.mjs +++ b/plugins/plugin-path-utils/src/index.mjs @@ -485,7 +485,8 @@ const hemMacro = function ( } export const plugin = { - ...about, + name: about.id, + version: about.version, macros: { join: joinMacro, offset: offsetMacro, diff --git a/plugins/plugin-ringsector/src/index.mjs b/plugins/plugin-ringsector/src/index.mjs index e94c96b7760..5842a00411f 100644 --- a/plugins/plugin-ringsector/src/index.mjs +++ b/plugins/plugin-ringsector/src/index.mjs @@ -44,7 +44,8 @@ const keys = [ * The plugin object itself */ export const plugin = { - ...about, + name: about.id, + version: about.version, macros: { rmringsector: function (id = 'ringsector', { points, paths, store, part }) { const storeRoot = ['parts', part.name, 'macros', '@freesewing/plugin-ringsector', 'ids', id] diff --git a/plugins/plugin-round/src/index.mjs b/plugins/plugin-round/src/index.mjs index f933c7aaad2..526d3d7435a 100644 --- a/plugins/plugin-round/src/index.mjs +++ b/plugins/plugin-round/src/index.mjs @@ -7,7 +7,8 @@ const pointKeys = ['start', 'cp1', 'cp2', 'end'] const pathKeys = ['path'] export const plugin = { - ...about, + name: about.id, + version: about.version, macros: { round: function (mc, { points, paths, Point, Path, store }) { const C = 0.55191502449 diff --git a/plugins/plugin-sprinkle/src/index.mjs b/plugins/plugin-sprinkle/src/index.mjs index 519640f4ab7..d6601cfedeb 100644 --- a/plugins/plugin-sprinkle/src/index.mjs +++ b/plugins/plugin-sprinkle/src/index.mjs @@ -1,7 +1,8 @@ import about from '../about.json' with { type: 'json' } export const plugin = { - ...about, + name: about.id, + version: about.version, macros: { sprinkle: function (so, { snippets, Snippet, points }) { for (let pid of so.on) { diff --git a/plugins/plugin-svgattr/src/index.mjs b/plugins/plugin-svgattr/src/index.mjs index e7d1cee0902..df98136c1a4 100644 --- a/plugins/plugin-svgattr/src/index.mjs +++ b/plugins/plugin-svgattr/src/index.mjs @@ -1,7 +1,8 @@ import about from '../about.json' with { type: 'json' } export const plugin = { - ...about, + name: about.id, + version: about.version, hooks: { preRender: function (svg, attributes = {}) { for (const key of Object.keys(attributes)) svg.attributes.set(key, attributes[key]) diff --git a/plugins/plugin-theme/src/index.mjs b/plugins/plugin-theme/src/index.mjs index e164551f2cb..4c3622404df 100644 --- a/plugins/plugin-theme/src/index.mjs +++ b/plugins/plugin-theme/src/index.mjs @@ -21,7 +21,8 @@ const grid = { } export const plugin = { - ...about, + name: about.id, + version: about.version, hooks: { preRender: function (svg, data = {}) { const current = svg.attributes.get('class') diff --git a/plugins/plugin-timing/src/index.mjs b/plugins/plugin-timing/src/index.mjs index bb4be42c753..8a6c6ddc3e1 100644 --- a/plugins/plugin-timing/src/index.mjs +++ b/plugins/plugin-timing/src/index.mjs @@ -17,7 +17,8 @@ const delta = (start) => { /* eslint-enable no-undef */ export const plugin = { - ...about, + name: about.id, + version: about.version, hooks: { preSetDraft: function (pattern) { const time = now() diff --git a/plugins/plugin-versionfree-svg/src/index.mjs b/plugins/plugin-versionfree-svg/src/index.mjs index 177ec38ae64..f55278acf17 100644 --- a/plugins/plugin-versionfree-svg/src/index.mjs +++ b/plugins/plugin-versionfree-svg/src/index.mjs @@ -1,7 +1,8 @@ import about from '../about.json' with { type: 'json' } export const plugin = { - ...about, + name: about.id, + version: about.version, hooks: { preRender: function (svg) { for (const key in svg.attributes.list) {