From 4998c854cbc5f685725f0f897c58091e34e496b9 Mon Sep 17 00:00:00 2001 From: remorses Date: Sun, 29 Dec 2024 19:30:17 +0100 Subject: [PATCH] trying concurrently-ui --- .changeset/config.json | 3 +- nextjs-app/package.json | 3 +- nextjs-app/src/pages/page.tsx | 2 + pnpm-lock.yaml | 79 ++++++++++++++++++++++++++++++++++- unframer/src/exporter.ts | 4 +- 5 files changed, 86 insertions(+), 5 deletions(-) diff --git a/.changeset/config.json b/.changeset/config.json index 967df659..61880296 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -1,10 +1,11 @@ { "$schema": "https://unpkg.com/@changesets/config@1.4.0/schema.json", "changelog": "@changesets/cli/changelog", - "commit": false, + "commit": true, "linked": [], "access": "public", "baseBranch": "main", + "githubRelease": true, "updateInternalDependencies": "patch", "ignore": ["nextjs-app", "remix-app"] } diff --git a/nextjs-app/package.json b/nextjs-app/package.json index d52063d4..012828b2 100644 --- a/nextjs-app/package.json +++ b/nextjs-app/package.json @@ -2,7 +2,7 @@ "name": "nextjs-app", "private": true, "scripts": { - "dev": "next dev --port 5543", + "dev": "concurrently-ui 'next dev --port 5543' 'pnpm unframer'", "gen": "pnpm --filter unframer build && pnpm unframer", "build": "pnpm --filter unframer build && next build", "start": "next start", @@ -13,6 +13,7 @@ "@types/react": "18.3.5", "@types/react-dom": "18.3.0", "autoprefixer": "10.4.14", + "concurrently-ui": "^1.2.0", "next": "15.0.4", "postcss": "8.4.24", "react": "19.0.0", diff --git a/nextjs-app/src/pages/page.tsx b/nextjs-app/src/pages/page.tsx index ec73d633..faccfda2 100644 --- a/nextjs-app/src/pages/page.tsx +++ b/nextjs-app/src/pages/page.tsx @@ -5,3 +5,5 @@ import '@/framer/tokens.css' import Page from '../app/page' export default Page + + diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4cafc6e8..a747f24d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -47,6 +47,9 @@ importers: autoprefixer: specifier: 10.4.14 version: 10.4.14(postcss@8.4.24) + concurrently-ui: + specifier: ^1.2.0 + version: 1.2.0 next: specifier: 15.0.4 version: 15.0.4(@opentelemetry/api@1.9.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) @@ -1412,6 +1415,34 @@ packages: '@jspm/core@2.1.0': resolution: {integrity: sha512-3sRl+pkyFY/kLmHl0cgHiFp2xEqErA8N3ECjMs7serSUBmoJ70lBa0PG5t0IM6WJgdZNyyI0R8YFfi5wM8+mzg==} + '@lydell/node-pty-darwin-arm64@1.0.3': + resolution: {integrity: sha512-cpLatXzGHds9fU6KSA+5jB4CRKqqK1ITerYlbucyhfsE0uksMVpzD6Ti6jMeEq7YM0N+c61q6EURl/pIwNYSqA==} + cpu: [arm64] + os: [darwin] + + '@lydell/node-pty-darwin-x64@1.0.3': + resolution: {integrity: sha512-IuEf8TXwo+wzoUEhqv+LtznwW94gMm4V9XVFMisFh+oRz0TNtnWHtgTCdWCVn4Dm3dpEDAjiAlTLx0ayC5uMVA==} + cpu: [x64] + os: [darwin] + + '@lydell/node-pty-linux-x64@1.0.3': + resolution: {integrity: sha512-tfj6Zg9F5KkyCQQ2wCUXUW/1lcNgdWAVJNtt6gQH3X+fUueSrRl+R7xoWTcl5NGcfn2l7QWgUrjZcVKP3/ljTg==} + cpu: [x64] + os: [linux] + + '@lydell/node-pty-win32-arm64@1.0.3': + resolution: {integrity: sha512-5MTd7hbrvmO/de/B2MDhxjh3E109i5bSds6JtIcVR1M6+uCvWJrON5ibbvWIAqTHpFup20IyDv0cQJxVv9o9nA==} + cpu: [arm64] + os: [win32] + + '@lydell/node-pty-win32-x64@1.0.3': + resolution: {integrity: sha512-XMANgXpBYGtKa5q+czro+TaJAyv3njbT7R81Pky+p7e4GwNdWtSUNBxtQm+O4ZLV0VJ1rNiMEHMyGOq8T9i4FA==} + cpu: [x64] + os: [win32] + + '@lydell/node-pty@1.0.3': + resolution: {integrity: sha512-nLTNwJXEPi1oMyzxRwqsLB4jCmhDrltQS/kAYhV05qbPo5NOIKpw2tb+Iok/yhd9zP9+E5Lu7sWDGD+G4fdKbQ==} + '@manypkg/find-root@1.1.0': resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} @@ -2201,6 +2232,11 @@ packages: bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} + blessed@0.1.81: + resolution: {integrity: sha512-LoF5gae+hlmfORcG1M5+5XZi4LBmvlXTzwJWzUlPryN/SJdSflZvROM2TwkT0GMpq7oqT48NRd4GS7BiVBc5OQ==} + engines: {node: '>= 0.8.0'} + hasBin: true + body-parser@1.20.3: resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==} engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} @@ -2446,6 +2482,10 @@ packages: resolution: {integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==} engines: {'0': node >= 0.8} + concurrently-ui@1.2.0: + resolution: {integrity: sha512-PlCh/Alu8js/yGrWUYqJll0lR2w5HEsDpPN2V+ledPM1xaxQ4TafLX0AT62PeErJRRTajcdYxzFenZxmOLfm7A==} + hasBin: true + concurrently@8.2.2: resolution: {integrity: sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg==} engines: {node: ^14.13.0 || >=16.0.0} @@ -2801,6 +2841,9 @@ packages: es-module-lexer@1.5.4: resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==} + es-module-lexer@1.6.0: + resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==} + es-object-atoms@1.0.0: resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==} engines: {node: '>= 0.4'} @@ -6846,6 +6889,29 @@ snapshots: '@jspm/core@2.1.0': {} + '@lydell/node-pty-darwin-arm64@1.0.3': + optional: true + + '@lydell/node-pty-darwin-x64@1.0.3': + optional: true + + '@lydell/node-pty-linux-x64@1.0.3': + optional: true + + '@lydell/node-pty-win32-arm64@1.0.3': + optional: true + + '@lydell/node-pty-win32-x64@1.0.3': + optional: true + + '@lydell/node-pty@1.0.3': + optionalDependencies: + '@lydell/node-pty-darwin-arm64': 1.0.3 + '@lydell/node-pty-darwin-x64': 1.0.3 + '@lydell/node-pty-linux-x64': 1.0.3 + '@lydell/node-pty-win32-arm64': 1.0.3 + '@lydell/node-pty-win32-x64': 1.0.3 + '@manypkg/find-root@1.1.0': dependencies: '@babel/runtime': 7.25.6 @@ -7864,6 +7930,8 @@ snapshots: inherits: 2.0.4 readable-stream: 3.6.2 + blessed@0.1.81: {} + body-parser@1.20.3: dependencies: bytes: 3.1.2 @@ -8166,6 +8234,13 @@ snapshots: readable-stream: 2.3.8 typedarray: 0.0.6 + concurrently-ui@1.2.0: + dependencies: + '@lydell/node-pty': 1.0.3 + blessed: 0.1.81 + cac: 6.7.14 + picocolors: 1.1.1 + concurrently@8.2.2: dependencies: chalk: 4.1.2 @@ -8557,6 +8632,8 @@ snapshots: es-module-lexer@1.5.4: {} + es-module-lexer@1.6.0: {} + es-object-atoms@1.0.0: dependencies: es-errors: 1.3.0 @@ -11849,7 +11926,7 @@ snapshots: browserslist: 4.24.3 chrome-trace-event: 1.0.4 enhanced-resolve: 5.18.0 - es-module-lexer: 1.5.4 + es-module-lexer: 1.6.0 eslint-scope: 5.1.1 events: 3.3.0 glob-to-regexp: 0.4.1 diff --git a/unframer/src/exporter.ts b/unframer/src/exporter.ts index 29be60b1..e68fabc2 100644 --- a/unframer/src/exporter.ts +++ b/unframer/src/exporter.ts @@ -70,8 +70,8 @@ export async function bundle({ const buildResult = await build({ absWorkingDir: out, entryPoints: Object.keys(components).map((name) => { - const url = components[name] - validateUrl(url) + // const url = components[name] + // validateUrl(url) return { in: `virtual:${name}`,