Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions packages/boxel-ui/addon/bin/conditional-build.sh

This file was deleted.

7 changes: 0 additions & 7 deletions packages/boxel-ui/addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
},
"scripts": {
"build": "concurrently \"pnpm:build:*\" --names \"build:\"",
"build:js": "echo 'noop'",
"build:types": "ember-tsc --declaration --emitDeclarationOnly --noEmit false",
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
Expand All @@ -26,9 +25,7 @@
"rebuild:icons": "node bin/rebuild-icons.mjs",
"rebuild:usage": "node bin/rebuild-usage.mjs",
"generate:component-specs": "node bin/generate-component-specs.mjs",
"prepack": "rollup --config",
"start": "concurrently \"pnpm:start:*\" --names \"start:\"",
"start:js": "rollup --config --watch --no-watch.clearScreen",
"start:types": "ember-tsc --declaration --emitDeclarationOnly --watch",
"test": "echo 'A v2 addon does not have tests, run tests in test-app'",
"test:ember": "ember test"
Expand Down Expand Up @@ -79,7 +76,6 @@
"@cardstack/local-types": "workspace:*",
"@embroider/addon-dev": "^8.0.0",
"@embroider/macros": "~1.16.5",
"@rollup/plugin-babel": "catalog:",
"@tsconfig/ember": "3.0.1",
"@types/dompurify": "catalog:",
"@types/lodash-es": "catalog:",
Expand All @@ -101,8 +97,6 @@
"glimmer-scoped-css": "catalog:",
"prettier": "catalog:",
"prettier-plugin-ember-template-tag": "catalog:",
"rollup": "catalog:",
"rollup-plugin-copy": "catalog:",
"svgo": "catalog:",
"@glint/ember-tsc": "catalog:"
},
Expand Down Expand Up @@ -134,7 +128,6 @@
"files": [
"addon-main.cjs",
"declarations",
"dist",
"public"
],
"typesVersions": {
Expand Down
91 changes: 0 additions & 91 deletions packages/boxel-ui/addon/rollup.config.mjs

This file was deleted.

1 change: 0 additions & 1 deletion packages/host/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"lint:js": "eslint . --report-unused-disable-directives --cache",
"lint:js:fix": "eslint . --report-unused-disable-directives --fix",
"lint:types": "ember-tsc --noEmit",
"ensure-boxel-ui": "../boxel-ui/addon/bin/conditional-build.sh",
"start": "node scripts/vite-serve.js",
"serve:dist": "node scripts/serve-dist.js",
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
Expand Down
34 changes: 3 additions & 31 deletions packages/host/scripts/vite-serve.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,13 @@
* Wrapper around `vite` (dev server) for `pnpm start`. Delegates to the
* shared launcher, which handles BOXEL_ENVIRONMENT / Traefik registration.
* Mirrors scripts/serve-dist.js, which does the same for `vite preview`.
*
* Runs `ensure-boxel-ui` inline (synchronously, via execFileSync) so that
* the `start` script can be a single `node ...` command rather than
* `pnpm ensure-boxel-ui && node ...`. With `&&` chaining, pnpm runs the
* script through `sh -c`, which has no SIGTERM handler — so on Ctrl-C
* the shell dies via signal even though this Node process exits 0,
* leaving pnpm to report `Command failed with signal "SIGTERM"` and
* `[ERR_PNPM_RECURSIVE_RUN_FIRST_FAIL]`. Running ensure-boxel-ui
* inline keeps Node as pnpm's direct child, so pnpm sees our clean exit.
*/

const { execFileSync } = require('child_process');
const path = require('path');

// Refuse a second env-mode vite from this worktree BEFORE the boxel-ui
// conditional-build runs — that step can take many seconds when the
// addon dist is stale, which would look like a hang to the user instead
// of a clear error. See env-mode-lock.js for the underlying constraint.
// Refuse a second env-mode vite from this worktree before we start, so the
// second start exits with a clear error instead of racing the first. See
// env-mode-lock.js for the underlying constraint.
require('./env-mode-lock').refuseIfAnotherSlugLocked();

execFileSync(
path.join(
__dirname,
'..',
'..',
'boxel-ui',
'addon',
'bin',
'conditional-build.sh',
),
{
stdio: 'inherit',
},
);

const { startWithTraefik } = require('./vite-with-traefik');

startWithTraefik({
Expand Down
4 changes: 2 additions & 2 deletions packages/host/scripts/vite-with-traefik.js
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@ function startWithTraefik({ subcommand, defaultPort, label, nodeMemory }) {

const slug = getEnvSlug();
// Belt-and-suspenders: vite-serve.js / serve-dist.js also call this
// up-front (before boxel-ui conditional-build) so the second start
// exits immediately. Repeat here for direct callers of startWithTraefik.
// up-front so the second start exits immediately. Repeat here for
// direct callers of startWithTraefik.
refuseIfAnotherSlugLocked();

ensureTraefik();
Expand Down
9 changes: 0 additions & 9 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading