Skip to content

Commit

Permalink
Use rollup's addWatchFile API to mark dependencies
Browse files Browse the repository at this point in the history
This solves a bunch of watch-mode (not) rebuilding issues; as a
general rule everytime we probe or read from the file system we
should at least consider whether such an annotation is needed.

Unfortunately this package doesn't appear to be tested currently,
but I have applied the same patch locally and it appears to be
working fine.
  • Loading branch information
chancancode committed Dec 6, 2023
1 parent 9ea9e87 commit 4fcdb2d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 3 deletions.
11 changes: 8 additions & 3 deletions packages/addon-dev/src/rollup-addon-dependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ const compilationModules = new Set(
templateCompilationModules.map((m) => m.module)
);

function resolvableDependencies() {
let deps = new Set();
function resolvableDependencies(): Set<string> {
let deps = new Set<string>();
let pkg = readJsonSync('package.json');
if (pkg.dependencies) {
for (let name of Object.keys(pkg.dependencies)) {
Expand All @@ -28,11 +28,16 @@ function resolvableDependencies() {
}

export default function emberExternals(): Plugin {
let deps = resolvableDependencies();
let deps: Set<string>;

return {
name: 'ember-externals',

buildStart() {
this.addWatchFile('package.json');
deps = resolvableDependencies();
},

async resolveId(source) {
let pkgName = packageName(source);
if (!pkgName) {
Expand Down
6 changes: 6 additions & 0 deletions packages/addon-dev/src/rollup-keep-assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ export default function keepAssets({
return {
name: 'copy-assets',

// Prior to https://github.com/rollup/rollup/pull/5270, we cannot call this
// from within `generateBundle`
buildStart() {
this.addWatchFile(from);
},

// imports of assets should be left alone in the source code. This can cover
// the case of .css as defined in the embroider v2 addon spec.
async resolveId(source, importer, options) {
Expand Down
7 changes: 7 additions & 0 deletions packages/addon-dev/src/rollup-public-assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ export default function publicAssets(

return {
name: 'public-assets-bundler',

// Prior to https://github.com/rollup/rollup/pull/5270, we cannot call this
// from within `generateBundle`
buildStart() {
this.addWatchFile(path);
},

generateBundle() {
let pkg = readJsonSync('package.json');
const filenames = walkSync(path, {
Expand Down
2 changes: 2 additions & 0 deletions packages/addon-dev/src/rollup-public-entrypoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ export default function publicEntrypoints(args: {
return {
name: 'addon-modules',
async buildStart() {
this.addWatchFile(args.srcDir);

let matches = walkSync(args.srcDir, {
globs: [...args.include, '**/*.hbs', '**/*.ts', '**/*.gts', '**/*.gjs'],
});
Expand Down

0 comments on commit 4fcdb2d

Please sign in to comment.