Skip to content

Commit 6f8976e

Browse files
committed
adjustments to build config
1 parent bf3a6c3 commit 6f8976e

File tree

6 files changed

+104
-35
lines changed

6 files changed

+104
-35
lines changed

packages/boxel-ui/addon/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"@babel/plugin-transform-class-static-block": "^7.22.11",
7474
"@babel/plugin-transform-typescript": "^7.22.15",
7575
"@babel/runtime": "^7.24.4",
76-
"@embroider/addon-dev": "^7.0.0",
76+
"@embroider/addon-dev": "7.0.1-unstable.4070ba7",
7777
"@embroider/macros": "^1.16.9",
7878
"@rollup/plugin-babel": "^6.0.4",
7979
"@tsconfig/ember": "3.0.1",
@@ -97,7 +97,6 @@
9797
"prettier-plugin-ember-template-tag": "^1.1.0",
9898
"rollup": "^4.18.1",
9999
"rollup-plugin-copy": "^3.5.0",
100-
"rollup-plugin-import-css": "^3.5.7",
101100
"svgo": "3.0.2"
102101
},
103102
"peerDependencies": {

packages/boxel-ui/addon/rollup.config.mjs

+10-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { Addon } from '@embroider/addon-dev/rollup';
22
import { babel } from '@rollup/plugin-babel';
33
import { scopedCSS } from 'glimmer-scoped-css/rollup';
44
import copy from 'rollup-plugin-copy';
5-
import css from 'rollup-plugin-import-css';
65

76
const addon = new Addon({
87
srcDir: 'src',
@@ -16,7 +15,6 @@ export default {
1615

1716
plugins: [
1817
scopedCSS('src'),
19-
css(),
2018

2119
// These are the modules that users should be able to import from your
2220
// addon. Anything not listed here may get optimized away.
@@ -44,29 +42,28 @@ export default {
4442
// Ensure that .gjs files are properly integrated as Javascript
4543
addon.gjs(),
4644

47-
// addons are allowed to contain imports of .css files, which we want rollup
48-
// to leave alone and keep in the published output.
45+
// css is importable for side-effect
46+
addon.keepAssets(['**/*.css']),
47+
48+
// these asset types are imported for their URLs
4949
addon.keepAssets(
50-
[
51-
'styles/**/*.css',
52-
'**/*.css',
53-
'**/*.otf',
54-
'**/*.png',
55-
'**/*.webp',
56-
'**/*.woff2',
57-
],
50+
['**/*.otf', '**/*.png', '**/*.webp', '**/*.woff2'],
5851
'default',
5952
),
6053

6154
// Remove leftover build artifacts when starting a new build.
6255
addon.clean({ runOnce: true }),
6356

64-
// Copy Readme and License into published package
57+
// Copy files into published package
6558
copy({
6659
targets: [
6760
{ src: '../README.md', dest: '.' },
6861
{ src: '../LICENSE.md', dest: '.' },
62+
{ src: './src/styles/*.{css,woff2,otf}', dest: './dist/styles' },
6963
],
64+
// this makes it late enough that the `clean()` hook above doesn't remove
65+
// our copied files
66+
hook: 'generateBundle',
7067
}),
7168

7269
// This babel config should *not* apply presets or compile away ES modules.

packages/boxel-ui/addon/src/components/drag-and-drop/index.gts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { LoadingIndicator } from '@cardstack/boxel-ui/components';
21
import { fn, hash } from '@ember/helper';
32
import { on } from '@ember/modifier';
43
import { action } from '@ember/object';
54
import Component from '@glimmer/component';
65
import { tracked } from '@glimmer/tracking';
76

87
import { and, eq } from '../../helpers/truth-helpers.ts';
8+
import LoadingIndicator from '../loading-indicator/index.gts';
99

1010
const isFastBoot = typeof (globalThis as any).FastBoot !== 'undefined';
1111

packages/boxel-ui/addon/src/components/drag-and-drop/usage.gts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { cssVar } from '@cardstack/boxel-ui/helpers';
21
import { fn } from '@ember/helper';
32
import Component from '@glimmer/component';
43
import { tracked } from '@glimmer/tracking';
@@ -9,6 +8,7 @@ import {
98
} from 'ember-freestyle/decorators/css-variable';
109
import { get } from 'lodash';
1110

11+
import cssVar from '../../helpers/css-var.ts';
1212
import Pill from '../pill/index.gts';
1313
import DndKanbanBoard, { DndColumn } from './index.gts';
1414

packages/boxel-ui/addon/src/types/ember-power-calendar/components/index.d.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import DayComponent from 'ember-power-calendar/components/days';
2-
import NavComponent from 'ember-power-calendar/components/nav';
1+
import type DayComponent from 'ember-power-calendar/components/days';
2+
import type NavComponent from 'ember-power-calendar/components/nav';
33

44
declare module 'ember-power-calendar/components/power-calendar-range' {
55
interface PowerCalendarRangeDefaultBlock {

pnpm-lock.yaml

+89-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)