Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix importing of template-only components in V2 addons #1126

Merged
merged 4 commits into from
Apr 13, 2022
Merged

Fix importing of template-only components in V2 addons #1126

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73591d1
Support template-only imports
NullVoxPopuli Feb 11, 2022
12ddb98
use PreparedApp.execute
ef4 Apr 13, 2022
f036ca6
refactor to compose component JS and HBS layers correctly
ef4 Apr 13, 2022
c684edf
attempt to tweak CI for windows
ef4 Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion tests/scenarios/package.json
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@
"dependencies": {
"@embroider/shared-internals": "1.6.0",
"@types/qunit": "^2.11.1",
"execa": "^5.0.0",
"fastboot": "^3.1.0",
"fs-extra": "^10.0.0",
"globby": "^11.0.3",
Expand Down
61 changes: 24 additions & 37 deletions tests/scenarios/v2-addon-dev-test.ts
View file
Open in desktop
Expand Up @@ -3,8 +3,7 @@ import { appScenarios, baseV2Addon } from './scenarios';
import { PreparedApp } from 'scenario-tester';
import QUnit from 'qunit';
import merge from 'lodash/merge';
import execa from 'execa';
import { pathExists } from 'fs-extra';
import { pathExistsSync, readJsonSync } from 'fs-extra';

const { module: Qmodule, test } = QUnit;

Expand All @@ -15,13 +14,17 @@ const { module: Qmodule, test } = QUnit;
appScenarios
.skip('lts_3_16')
.skip('lts_3_24')
.map('v2 addon can have imports of template-only components', async project => {
.map('v2-addon-dev', async project => {
let addon = baseV2Addon();
addon.pkg.name = 'v2-addon';
addon.pkg.files = ['dist'];
addon.pkg.exports = {
'./*': './dist/*',
'./addon-main.js': './addon-main.js',
'./package.json': './package.json',
};
addon.pkg.scripts = {
build: './node_modules/rollup/dist/bin/rollup -c ./rollup.config.mjs',
};

merge(addon.files, {
Expand Down Expand Up @@ -159,60 +162,39 @@ appScenarios
Qmodule(scenario.name, function (hooks) {
let app: PreparedApp;

async function getAddonInfo() {
let pkgPath = path.resolve(path.join(app.dir, 'node_modules/v2-addon/package.json'));
let dir = path.dirname(pkgPath);

return {
dir,
distDir: path.join(dir, 'dist'),
build: async () => {
let rollupBin = 'node_modules/rollup/dist/bin/rollup';

await execa(path.join(dir, rollupBin), ['-c', './rollup.config.mjs'], {
cwd: dir,
});
},
reExports: async () => {
let pkgInfo = await import(pkgPath);
return pkgInfo['ember-addon']['app-js'] as Record<string, string>;
},
};
}

hooks.before(async () => {
app = await scenario.prepare();

let { build } = await getAddonInfo();

await build();
let result = await inDependency(app, 'v2-addon').execute('yarn build');
if (result.exitCode !== 0) {
throw new Error(result.output);
}
});

Qmodule('The addon', function () {
test('output directories exist', async function (assert) {
let { distDir } = await getAddonInfo();

assert.strictEqual(await pathExists(distDir), true, 'dist/');
assert.strictEqual(await pathExists(path.join(distDir, '_app_')), true, 'dist/_app_');
let { dir } = inDependency(app, 'v2-addon');
assert.strictEqual(pathExistsSync(path.join(dir, 'dist')), true, 'dist/');
assert.strictEqual(pathExistsSync(path.join(dir, 'dist', '_app_')), true, 'dist/_app_');
});

test('package.json is modified appropriately', async function (assert) {
let { reExports } = await getAddonInfo();
let { dir } = inDependency(app, 'v2-addon');
let reExports = readJsonSync(path.join(dir, 'package.json'))['ember-addon']['app-js'];

assert.deepEqual(await reExports(), {
assert.deepEqual(reExports, {
'./components/demo/index.js': './dist/_app_/components/demo/index.js',
'./components/demo/out.js': './dist/_app_/components/demo/out.js',
});
});

test('the addon was built successfully', async function (assert) {
let { reExports, dir } = await getAddonInfo();
let files = Object.values(await reExports());
let { dir } = inDependency(app, 'v2-addon');
let files: string[] = Object.values(readJsonSync(path.join(dir, 'package.json'))['ember-addon']['app-js']);

assert.expect(files.length);

for (let pathName of files) {
assert.deepEqual(await pathExists(path.join(dir, pathName)), true, `pathExists: ${pathName}`);
assert.deepEqual(pathExistsSync(path.join(dir, pathName)), true, `pathExists: ${pathName}`);
}
});
});
Expand All @@ -225,3 +207,8 @@ appScenarios
});
});
});

// https://github.com/ef4/scenario-tester/issues/5
function inDependency(app: PreparedApp, dependencyName: string): PreparedApp {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, this makes sense, now that i see it 🤦

return new PreparedApp(path.dirname(require.resolve(`${dependencyName}/package.json`, { paths: [app.dir] })));
}