From 35e15c6ce6e798cd863e581efda83fddb6824a8d Mon Sep 17 00:00:00 2001 From: Paulo Vareiro Date: Tue, 7 Jan 2025 16:06:00 +0000 Subject: [PATCH 1/9] ci: fix failling verify monorepo --- packages/components/scripts/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/scripts/build.js b/packages/components/scripts/build.js index 0c19db91e..18d2324d9 100644 --- a/packages/components/scripts/build.js +++ b/packages/components/scripts/build.js @@ -126,7 +126,7 @@ async function nextTask(label, action) { } await nextTask('Cleaning up the previous build', async () => { - await Promise.all([...bundleDirectories.map(dir => deleteAsync(dir))]); + await Promise.all([...bundleDirectories.map(dir => deleteAsync(dir, { force: true }))]); await fs.mkdir(outdir, { recursive: true }); }); From c8f16baeabb8678fb082b321be58da1b18482964 Mon Sep 17 00:00:00 2001 From: Paulo Vareiro Date: Tue, 7 Jan 2025 16:26:04 +0000 Subject: [PATCH 2/9] ci: fix failling verify monorepo --- package.json | 2 +- packages/components/scripts/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 149537c4f..de6b60d3c 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "prepare": "node .husky/install.mjs", - "verify": "pnpm format.verify && pnpm lint.verify && pnpm --recursive --if-present verify", + "verify": "pnpm format.verify && pnpm lint.verify && pnpm --recursive --if-present --workspace-concurrency=1 verify", "fix": "pnpm lint.fix && pnpm format.fix", "lint.fix": "eslint packages --max-warnings 0 --fix", "lint.verify": "eslint packages --max-warnings 0 && echo '✅ Linting verified'", diff --git a/packages/components/scripts/build.js b/packages/components/scripts/build.js index 18d2324d9..0c19db91e 100644 --- a/packages/components/scripts/build.js +++ b/packages/components/scripts/build.js @@ -126,7 +126,7 @@ async function nextTask(label, action) { } await nextTask('Cleaning up the previous build', async () => { - await Promise.all([...bundleDirectories.map(dir => deleteAsync(dir, { force: true }))]); + await Promise.all([...bundleDirectories.map(dir => deleteAsync(dir))]); await fs.mkdir(outdir, { recursive: true }); }); From 727ce01b778e1613e562d88ff2c9c1be4a02be75 Mon Sep 17 00:00:00 2001 From: Paulo Vareiro Date: Thu, 9 Jan 2025 09:12:11 +0000 Subject: [PATCH 3/9] chore: empty changeset --- .changeset/two-guests-train.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changeset/two-guests-train.md diff --git a/.changeset/two-guests-train.md b/.changeset/two-guests-train.md new file mode 100644 index 000000000..a49ba4844 --- /dev/null +++ b/.changeset/two-guests-train.md @@ -0,0 +1,2 @@ +--- +--- \ No newline at end of file From 9bec0aba2b7b7084f1de5f5efd3fbf2455393bc6 Mon Sep 17 00:00:00 2001 From: Paulo Vareiro Date: Thu, 9 Jan 2025 17:04:57 +0000 Subject: [PATCH 4/9] ci: implement lite build and fix test.watch --- packages/components/package.json | 9 ++-- packages/components/scripts/build.js | 62 ++++++++++++++----------- packages/components/scripts/make-css.js | 3 ++ 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 1d51a9ecd..f8abd77c2 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -60,13 +60,14 @@ }, "scripts": { "build": "node scripts/build.js", + "build.lite": "pnpm build --lite", "verify": "pnpm build && echo '✅ Build verified' && pnpm ts.verify && pnpm test.verify && echo '✅ Test verified'", "ts.verify": "tsc --noEmit --project ./tsconfig.json && echo '✅ TypeScript verified'", "plop": "plop --plopfile scripts/plop/plopfile.js", - "test": "pnpm build && web-test-runner --group default", - "test.verify": "web-test-runner --group default", - "test.single": "web-test-runner -- --watch --group", - "test.watch": "web-test-runner --watch --group default", + "test": "pnpm build.lite && web-test-runner --group default", + "test.verify": "pnpm build.lite && web-test-runner --group default", + "test.single": "pnpm build.lite && web-test-runner -- --watch --group", + "test.watch": "pnpm build.lite && web-test-runner --watch --group default", "postversion": "pnpm build && node scripts/node-write-sizes.mjs" }, "dependencies": { diff --git a/packages/components/scripts/build.js b/packages/components/scripts/build.js index 0c19db91e..0257513a6 100644 --- a/packages/components/scripts/build.js +++ b/packages/components/scripts/build.js @@ -12,12 +12,14 @@ import { litTailwindAndMinifyPlugin } from './esbuild-plugin-lit-tailwind-and-mi const outdir = 'dist'; const cdndir = 'cdn'; +const lite = process.argv.includes('--lite'); + const spinner = ora({ hideCursor: false }).start(); const execPromise = util.promisify(exec); let childProcess; let buildResults; -const bundleDirectories = [cdndir, outdir, `${outdir}-versioned`, `${cdndir}-versioned`]; +const bundleDirectories = lite ? [outdir] : [cdndir, outdir, `${outdir}-versioned`, `${cdndir}-versioned`]; // // Builds the source with esbuild. @@ -84,12 +86,11 @@ async function buildTheSource() { entryNames: '[dir]/[name].iife' }; - return await Promise.all([ - esbuild.build(cdnConfig), - esbuild.build(npmConfig), - esbuild.build(bundleConfig), - esbuild.build(iifeConfig) - ]); + return await Promise.all( + lite + ? [esbuild.build(npmConfig)] + : [esbuild.build(cdnConfig), esbuild.build(npmConfig), esbuild.build(bundleConfig), esbuild.build(iifeConfig)] + ); } // @@ -127,38 +128,45 @@ async function nextTask(label, action) { await nextTask('Cleaning up the previous build', async () => { await Promise.all([...bundleDirectories.map(dir => deleteAsync(dir))]); - await fs.mkdir(outdir, { recursive: true }); + await Promise.all([...bundleDirectories.map(dir => fs.mkdir(dir, { recursive: true }))]); }); -await nextTask('Generating component metadata', () => { - return Promise.all( - bundleDirectories.map(dir => { - return execPromise(`node scripts/make-metadata.js --outdir "${dir}"`, { stdio: 'inherit' }); - }) - ); -}); +if (!lite) { + await nextTask('Generating component metadata', () => { + return Promise.all( + bundleDirectories.map(dir => { + return execPromise(`node scripts/make-metadata.js --outdir "${dir}"`, { stdio: 'inherit' }); + }) + ); + }); +} await nextTask('Generating Utility CSS', () => { - return execPromise(`node scripts/make-css.js`, { stdio: 'inherit' }); + const args = lite ? '--lite' : ''; + return execPromise(`node scripts/make-css.js ${args}`, { stdio: 'inherit' }); }); -await nextTask('Running the TypeScript compiler', () => { - return execPromise(`tsc --project ./tsconfig.prod.json --outdir "${outdir}"`, { stdio: 'inherit' }); -}); +if (!lite) { + await nextTask('Running the TypeScript compiler', () => { + return execPromise(`tsc --project ./tsconfig.prod.json --outdir "${outdir}"`, { stdio: 'inherit' }); + }); -// Copy the above steps to the CDN directory directly so we don't need to twice the work for nothing. -await nextTask(`Themes, Icons, and TS Types to "${cdndir}"`, async () => { - await deleteAsync(cdndir); - await copy(outdir, cdndir); -}); + // Copy the above steps to the CDN directory directly so we don't need to twice the work for nothing. + await nextTask(`Themes, Icons, and TS Types to "${cdndir}"`, async () => { + await deleteAsync(cdndir); + await copy(outdir, cdndir); + }); +} await nextTask('Building source files', async () => { buildResults = await buildTheSource(); }); -await nextTask('Versioning components and meta data', async () => { - await execPromise('node scripts/make-versioning.js', { stdio: 'inherit' }); -}); +if (!lite) { + await nextTask('Versioning components and meta data', async () => { + await execPromise('node scripts/make-versioning.js', { stdio: 'inherit' }); + }); +} // Cleanup on exit process.on('SIGINT', handleCleanup); diff --git a/packages/components/scripts/make-css.js b/packages/components/scripts/make-css.js index 052ad86ff..e841d1544 100644 --- a/packages/components/scripts/make-css.js +++ b/packages/components/scripts/make-css.js @@ -13,6 +13,7 @@ import tailwindcss from 'tailwindcss'; import tailwindcssNesting from 'tailwindcss/nesting/index.js'; (async () => { + const lite = process.argv.includes('--lite'); const css = await fs.readFile('./src/solid-components.css', 'utf8'); const result = await postcss([ @@ -26,6 +27,8 @@ import tailwindcssNesting from 'tailwindcss/nesting/index.js'; await fs.writeFile('./dist/solid-components.css', result); + if (lite) return; + const minifiedResult = await postcss([ atImportPlugin({ allowDuplicates: false }), tailwindcssNesting, From 26efc455b018305ca0b5c4d436254ee46a9bae33 Mon Sep 17 00:00:00 2001 From: Paulo Vareiro Date: Fri, 10 Jan 2025 17:14:28 +0000 Subject: [PATCH 5/9] feat: implement improved test-watch (wip) --- packages/components/package.json | 3 +- packages/components/scripts/build.js | 1 - packages/components/scripts/test-watch.js | 44 +++++++++++++++++++++++ pnpm-lock.yaml | 13 ++++--- 4 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 packages/components/scripts/test-watch.js diff --git a/packages/components/package.json b/packages/components/package.json index f8abd77c2..bad210e64 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -67,7 +67,7 @@ "test": "pnpm build.lite && web-test-runner --group default", "test.verify": "pnpm build.lite && web-test-runner --group default", "test.single": "pnpm build.lite && web-test-runner -- --watch --group", - "test.watch": "pnpm build.lite && web-test-runner --watch --group default", + "test.watch": "node scripts/test-watch.js", "postversion": "pnpm build && node scripts/node-write-sizes.mjs" }, "dependencies": { @@ -93,6 +93,7 @@ "autoprefixer": "^10.4.20", "chalk": "^5.3.0", "change-case": "^5.4.4", + "chokidar": "^4.0.3", "command-line-args": "^6.0.1", "comment-parser": "^1.4.1", "cssnano": "^7.0.6", diff --git a/packages/components/scripts/build.js b/packages/components/scripts/build.js index 0257513a6..cdc197967 100644 --- a/packages/components/scripts/build.js +++ b/packages/components/scripts/build.js @@ -11,7 +11,6 @@ import { litTailwindAndMinifyPlugin } from './esbuild-plugin-lit-tailwind-and-mi const outdir = 'dist'; const cdndir = 'cdn'; - const lite = process.argv.includes('--lite'); const spinner = ora({ hideCursor: false }).start(); diff --git a/packages/components/scripts/test-watch.js b/packages/components/scripts/test-watch.js new file mode 100644 index 000000000..4fceb3307 --- /dev/null +++ b/packages/components/scripts/test-watch.js @@ -0,0 +1,44 @@ +import chokidar from 'chokidar'; +import { execSync, spawn } from 'child_process'; + +let testsProcess = null; + +const runBuild = () => { + console.log('Starting build...'); + + try { + execSync('node scripts/build.js --lite'); + } catch {} + + console.log('Build completed!'); +}; + +const runTests = () => { + testsProcess = spawn('web-test-runner', ['--group', 'default'], { + stdio: 'inherit', + shell: true + }); +}; + +const watcher = chokidar.watch('src', { + persistent: true +}); + +runBuild(); +runTests(); + +watcher.on('change', async path => { + console.log('File changes detected!'); + + if (!path.endsWith('.test.ts')) { + runBuild(); + } + + if (testsProcess && !testsProcess.killed) { + testsProcess.kill(); + } + + runTests(); +}); + +console.log('Watching for changes...'); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f9e6484e7..800922e94 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -149,6 +149,9 @@ importers: change-case: specifier: ^5.4.4 version: 5.4.4 + chokidar: + specifier: ^4.0.3 + version: 4.0.3 command-line-args: specifier: ^6.0.1 version: 6.0.1 @@ -2367,8 +2370,8 @@ packages: resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} engines: {node: '>= 8.10.0'} - chokidar@4.0.1: - resolution: {integrity: sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==} + chokidar@4.0.3: + resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} engines: {node: '>= 14.16.0'} chroma-js@3.1.2: @@ -8138,7 +8141,7 @@ snapshots: '@types/koa': 2.15.0 '@types/ws': 7.4.7 '@web/parse5-utils': 2.1.0 - chokidar: 4.0.1 + chokidar: 4.0.3 clone: 2.1.2 es-module-lexer: 1.5.4 get-stream: 6.0.1 @@ -8241,7 +8244,7 @@ snapshots: '@types/istanbul-reports': 3.0.4 '@web/browser-logs': 0.4.0 '@web/dev-server-core': 0.7.4 - chokidar: 4.0.1 + chokidar: 4.0.3 cli-cursor: 3.1.0 co-body: 6.2.0 convert-source-map: 2.0.0 @@ -8757,7 +8760,7 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - chokidar@4.0.1: + chokidar@4.0.3: dependencies: readdirp: 4.0.2 From a4cbd6d11e2c3d0488b15bba7f87efb57eb3dfe1 Mon Sep 17 00:00:00 2001 From: Paulo Vareiro Date: Mon, 13 Jan 2025 11:36:56 +0000 Subject: [PATCH 6/9] ci: fix test.watch script --- packages/components/package.json | 11 ++-- packages/components/scripts/build.js | 80 ++++++++++++++--------- packages/components/scripts/test-watch.js | 44 ------------- pnpm-lock.yaml | 38 +++++++++++ 4 files changed, 92 insertions(+), 81 deletions(-) delete mode 100644 packages/components/scripts/test-watch.js diff --git a/packages/components/package.json b/packages/components/package.json index bad210e64..ecfa0fff4 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -60,14 +60,14 @@ }, "scripts": { "build": "node scripts/build.js", - "build.lite": "pnpm build --lite", + "watch": "pnpm build --watch", "verify": "pnpm build && echo '✅ Build verified' && pnpm ts.verify && pnpm test.verify && echo '✅ Test verified'", "ts.verify": "tsc --noEmit --project ./tsconfig.json && echo '✅ TypeScript verified'", "plop": "plop --plopfile scripts/plop/plopfile.js", - "test": "pnpm build.lite && web-test-runner --group default", - "test.verify": "pnpm build.lite && web-test-runner --group default", - "test.single": "pnpm build.lite && web-test-runner -- --watch --group", - "test.watch": "node scripts/test-watch.js", + "test": "pnpm build --lite && web-test-runner --group default", + "test.verify": "pnpm build --lite && web-test-runner --group default", + "test.single": "concurrently -P --raw \"pnpm watch --lite\" \"web-test-runner --watch --group {1}\" --", + "test.watch": "pnpm test.single default", "postversion": "pnpm build && node scripts/node-write-sizes.mjs" }, "dependencies": { @@ -96,6 +96,7 @@ "chokidar": "^4.0.3", "command-line-args": "^6.0.1", "comment-parser": "^1.4.1", + "concurrently": "^9.1.2", "cssnano": "^7.0.6", "custom-element-jet-brains-integration": "^1.6.2", "custom-element-vs-code-integration": "^1.4.1", diff --git a/packages/components/scripts/build.js b/packages/components/scripts/build.js index cdc197967..3425814f6 100644 --- a/packages/components/scripts/build.js +++ b/packages/components/scripts/build.js @@ -1,7 +1,8 @@ import { deleteAsync } from 'del'; -import { exec, spawn } from 'child_process'; +import { exec } from 'child_process'; import { globby } from 'globby'; import chalk from 'chalk'; +import chokidar from 'chokidar'; import copy from 'recursive-copy'; import esbuild from 'esbuild'; import fs from 'fs/promises'; @@ -12,6 +13,7 @@ import { litTailwindAndMinifyPlugin } from './esbuild-plugin-lit-tailwind-and-mi const outdir = 'dist'; const cdndir = 'cdn'; const lite = process.argv.includes('--lite'); +const watch = process.argv.includes('--watch'); const spinner = ora({ hideCursor: false }).start(); const execPromise = util.promisify(exec); @@ -125,46 +127,60 @@ async function nextTask(label, action) { } } -await nextTask('Cleaning up the previous build', async () => { - await Promise.all([...bundleDirectories.map(dir => deleteAsync(dir))]); - await Promise.all([...bundleDirectories.map(dir => fs.mkdir(dir, { recursive: true }))]); -}); - -if (!lite) { - await nextTask('Generating component metadata', () => { - return Promise.all( - bundleDirectories.map(dir => { - return execPromise(`node scripts/make-metadata.js --outdir "${dir}"`, { stdio: 'inherit' }); - }) - ); - }); -} +async function runBuild() { + if (!watch) { + await nextTask('Cleaning up the previous build', async () => { + await Promise.all([...bundleDirectories.map(dir => deleteAsync(dir))]); + await Promise.all([...bundleDirectories.map(dir => fs.mkdir(dir, { recursive: true }))]); + }); + } -await nextTask('Generating Utility CSS', () => { - const args = lite ? '--lite' : ''; - return execPromise(`node scripts/make-css.js ${args}`, { stdio: 'inherit' }); -}); + if (!lite) { + await nextTask('Generating component metadata', () => { + return Promise.all( + bundleDirectories.map(dir => { + return execPromise(`node scripts/make-metadata.js --outdir "${dir}"`, { stdio: 'inherit' }); + }) + ); + }); + } -if (!lite) { - await nextTask('Running the TypeScript compiler', () => { - return execPromise(`tsc --project ./tsconfig.prod.json --outdir "${outdir}"`, { stdio: 'inherit' }); + await nextTask('Generating Utility CSS', () => { + const args = lite ? '--lite' : ''; + return execPromise(`node scripts/make-css.js ${args}`, { stdio: 'inherit' }); }); - // Copy the above steps to the CDN directory directly so we don't need to twice the work for nothing. - await nextTask(`Themes, Icons, and TS Types to "${cdndir}"`, async () => { - await deleteAsync(cdndir); - await copy(outdir, cdndir); + if (!lite) { + await nextTask('Running the TypeScript compiler', () => { + return execPromise(`tsc --project ./tsconfig.prod.json --outdir "${outdir}"`, { stdio: 'inherit' }); + }); + + // Copy the above steps to the CDN directory directly so we don't need to twice the work for nothing. + await nextTask(`Themes, Icons, and TS Types to "${cdndir}"`, async () => { + await deleteAsync(cdndir); + await copy(outdir, cdndir); + }); + } + + await nextTask('Building source files', async () => { + buildResults = await buildTheSource(); }); + + if (!lite) { + await nextTask('Versioning components and meta data', async () => { + await execPromise('node scripts/make-versioning.js', { stdio: 'inherit' }); + }); + } } -await nextTask('Building source files', async () => { - buildResults = await buildTheSource(); -}); +runBuild(); -if (!lite) { - await nextTask('Versioning components and meta data', async () => { - await execPromise('node scripts/make-versioning.js', { stdio: 'inherit' }); +if (watch) { + const watcher = chokidar.watch('src', { + persistent: true }); + + watcher.on('change', runBuild); } // Cleanup on exit diff --git a/packages/components/scripts/test-watch.js b/packages/components/scripts/test-watch.js deleted file mode 100644 index 4fceb3307..000000000 --- a/packages/components/scripts/test-watch.js +++ /dev/null @@ -1,44 +0,0 @@ -import chokidar from 'chokidar'; -import { execSync, spawn } from 'child_process'; - -let testsProcess = null; - -const runBuild = () => { - console.log('Starting build...'); - - try { - execSync('node scripts/build.js --lite'); - } catch {} - - console.log('Build completed!'); -}; - -const runTests = () => { - testsProcess = spawn('web-test-runner', ['--group', 'default'], { - stdio: 'inherit', - shell: true - }); -}; - -const watcher = chokidar.watch('src', { - persistent: true -}); - -runBuild(); -runTests(); - -watcher.on('change', async path => { - console.log('File changes detected!'); - - if (!path.endsWith('.test.ts')) { - runBuild(); - } - - if (testsProcess && !testsProcess.killed) { - testsProcess.kill(); - } - - runTests(); -}); - -console.log('Watching for changes...'); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 800922e94..762e35315 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -158,6 +158,9 @@ importers: comment-parser: specifier: ^1.4.1 version: 1.4.1 + concurrently: + specifier: ^9.1.2 + version: 9.1.2 cssnano: specifier: ^7.0.6 version: 7.0.6(postcss@8.4.49) @@ -2534,6 +2537,11 @@ packages: concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + concurrently@9.1.2: + resolution: {integrity: sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==} + engines: {node: '>=18'} + hasBin: true + config-chain@1.1.13: resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==} @@ -5542,6 +5550,10 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} + shell-quote@1.8.2: + resolution: {integrity: sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==} + engines: {node: '>= 0.4'} + side-channel@1.0.6: resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==} engines: {node: '>= 0.4'} @@ -5770,6 +5782,10 @@ packages: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} engines: {node: '>=8'} + supports-color@8.1.1: + resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==} + engines: {node: '>=10'} + supports-hyperlinks@2.3.0: resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==} engines: {node: '>=8'} @@ -5887,6 +5903,10 @@ packages: resolution: {integrity: sha512-aXJDbk6SnumuaZSANd21XAo15ucCDE38H4fkqiGsc3MhCK+wOlZvLP9cB/TvpHT0mOyWgC4Z8EwRlzqYSUzdsA==} engines: {node: '>= 0.4'} + tree-kill@1.2.2: + resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} + hasBin: true + trim-newlines@3.0.1: resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==} engines: {node: '>=8'} @@ -8910,6 +8930,16 @@ snapshots: concat-map@0.0.1: {} + concurrently@9.1.2: + dependencies: + chalk: 4.1.2 + lodash: 4.17.21 + rxjs: 7.8.1 + shell-quote: 1.8.2 + supports-color: 8.1.1 + tree-kill: 1.2.2 + yargs: 17.7.2 + config-chain@1.1.13: dependencies: ini: 1.3.8 @@ -12290,6 +12320,8 @@ snapshots: shebang-regex@3.0.0: {} + shell-quote@1.8.2: {} + side-channel@1.0.6: dependencies: call-bind: 1.0.7 @@ -12531,6 +12563,10 @@ snapshots: dependencies: has-flag: 4.0.0 + supports-color@8.1.1: + dependencies: + has-flag: 4.0.0 + supports-hyperlinks@2.3.0: dependencies: has-flag: 4.0.0 @@ -12686,6 +12722,8 @@ snapshots: traverse@0.6.8: {} + tree-kill@1.2.2: {} + trim-newlines@3.0.1: {} trough@2.2.0: {} From 2390ba1121cf727af6432f6e72c60e3b8bba84d4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 16 Jan 2025 10:14:16 +0000 Subject: [PATCH 7/9] chore(release-from-main): components@4.0.0, docs@1.3.0, placeholders@2.1.0, styles@1.0.0 --- packages/components/package.json | 4 ++-- packages/docs/package.json | 4 ++-- packages/placeholders/package.json | 4 ++-- packages/styles/package.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 579d9f9e9..d8ae5ae5b 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,7 +1,7 @@ { "name": "@solid-design-system/components", "description": "Solid Design System: Components", - "version": "4.0.0-next.12", + "version": "4.0.0", "homepage": "https://solid-design-system.fe.union-investment.de/docs/", "author": "Union Investment", "license": "MIT", @@ -123,4 +123,4 @@ "gzip": 94 } } -} +} \ No newline at end of file diff --git a/packages/docs/package.json b/packages/docs/package.json index 04193c6b0..7806c703c 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -2,7 +2,7 @@ "name": "@solid-design-system/docs", "description": "This package provides the documentation for the Solid Design System.", "homepage": "https://solid-design-system.fe.union-investment.de/docs/", - "version": "1.3.0-next.12", + "version": "1.3.0", "author": { "name": "Union Investment" }, @@ -81,4 +81,4 @@ "vite-tsconfig-paths": "^5.1.3", "wc-storybook-helpers": "1.5.3" } -} +} \ No newline at end of file diff --git a/packages/placeholders/package.json b/packages/placeholders/package.json index 624041147..6880b7f1e 100644 --- a/packages/placeholders/package.json +++ b/packages/placeholders/package.json @@ -1,6 +1,6 @@ { "name": "@solid-design-system/placeholders", - "version": "2.1.0-next.0", + "version": "2.1.0", "description": "This package provides license-free placeholder images for all projects at Union Investment.", "publishConfig": { "access": "public", @@ -33,4 +33,4 @@ "devDependencies": { "typescript": "5.7.2" } -} +} \ No newline at end of file diff --git a/packages/styles/package.json b/packages/styles/package.json index 740e5736a..7037c5a2e 100644 --- a/packages/styles/package.json +++ b/packages/styles/package.json @@ -43,7 +43,7 @@ "directory": "packages/styles" }, "type": "module", - "version": "1.0.0-next.1", + "version": "1.0.0", "devDependencies": { "@mariohamann/tailwindcss-var": "^2.1.0", "@semantic-release/changelog": "^6.0.3", @@ -65,4 +65,4 @@ "prettier": "^3.4.1", "tailwindcss": "^3.4.15" } -} +} \ No newline at end of file From 7d59119a391f99333bd7034dbd4198060647d0ac Mon Sep 17 00:00:00 2001 From: Paulo Vareiro Date: Thu, 16 Jan 2025 15:42:15 +0000 Subject: [PATCH 8/9] ci: build watch ignore test files --- packages/components/scripts/build.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/components/scripts/build.js b/packages/components/scripts/build.js index 3425814f6..848e5085d 100644 --- a/packages/components/scripts/build.js +++ b/packages/components/scripts/build.js @@ -177,7 +177,8 @@ runBuild(); if (watch) { const watcher = chokidar.watch('src', { - persistent: true + persistent: true, + ignored: path => path.includes('.test.ts') }); watcher.on('change', runBuild); From 25c9d3a5f26eec03b2b3f5724fc68a17e350bd36 Mon Sep 17 00:00:00 2001 From: Paulo Vareiro Date: Thu, 16 Jan 2025 15:50:25 +0000 Subject: [PATCH 9/9] fix: format --- packages/components/package.json | 2 +- packages/docs/package.json | 2 +- packages/placeholders/package.json | 2 +- packages/styles/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 9ce7d5c52..cc32cdad2 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -126,4 +126,4 @@ "gzip": 94 } } -} \ No newline at end of file +} diff --git a/packages/docs/package.json b/packages/docs/package.json index 7806c703c..4db05fc7e 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -81,4 +81,4 @@ "vite-tsconfig-paths": "^5.1.3", "wc-storybook-helpers": "1.5.3" } -} \ No newline at end of file +} diff --git a/packages/placeholders/package.json b/packages/placeholders/package.json index 6880b7f1e..e6bc5d90f 100644 --- a/packages/placeholders/package.json +++ b/packages/placeholders/package.json @@ -33,4 +33,4 @@ "devDependencies": { "typescript": "5.7.2" } -} \ No newline at end of file +} diff --git a/packages/styles/package.json b/packages/styles/package.json index 7037c5a2e..500f33678 100644 --- a/packages/styles/package.json +++ b/packages/styles/package.json @@ -65,4 +65,4 @@ "prettier": "^3.4.1", "tailwindcss": "^3.4.15" } -} \ No newline at end of file +}