Skip to content

Commit

Permalink
Merge pull request #185 from embroider-build/downgrade-prettier-plugi…
Browse files Browse the repository at this point in the history
…n-template-tag

Until we're on prettier v3, we can't use prettier-plugin-ember-template-tag@v1
  • Loading branch information
NullVoxPopuli authored Aug 18, 2023
2 parents e1bbdfb + ee7f539 commit 1a9dcd9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion files/__addonLocation__/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"eslint-plugin-n": "^16.0.0",
"eslint-plugin-prettier": "^4.0.0",
"prettier": "^2.5.1",
"prettier-plugin-ember-template-tag": "^1.0.0",
"prettier-plugin-ember-template-tag": "^0.3.2",
"rollup": "^3.21.8"<% if (!isExistingMonorepo) { %>,
"rollup-plugin-copy": "^3.4.0"<% } %><% if (typescript) { %>,
"typescript": "^5.0.4"<% } %>
Expand Down
2 changes: 1 addition & 1 deletion files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"devDependencies": {
"concurrently": "^8.2.0",
"prettier": "^2.5.1",
"prettier-plugin-ember-template-tag": "^1.0.0"
"prettier-plugin-ember-template-tag": "^0.3.2"
},
"workspaces": [
"<%= addonInfo.location %>",
Expand Down
5 changes: 5 additions & 0 deletions tests/smoke-tests/--typescript.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
await helper.fixtures.use('./test-app/tests');
// Sync fixture with project's lint / formatting configuration
// (controlled by ember-cli)
//
// Ensure that we have no lint errors.
// It's important to keep this along with the tests,
// so that we can have confidence that the lints aren't destructively changing
// the files in a way that would break consumers
await helper.run('lint:fix');

/**
Expand Down
13 changes: 6 additions & 7 deletions tests/smoke-tests/defaults.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,18 @@ for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
expect(exitCode).toEqual(0);
});

it('lint with fixtures pass', async () => {
it('build and test ', async () => {
// Copy over fixtures
await helper.fixtures.use('./my-addon/src/components');
await helper.fixtures.use('./test-app/tests');

// Ensure that we have no lint errors.
// It's important to keep this along with the tests,
// so that we can have confidence that the lints aren't destructively changing
// the files in a way that would break consumers
let { exitCode } = await helper.run('lint:fix');

expect(exitCode).toEqual(0);
});

it('build and test ', async () => {
// Copy over fixtures
await helper.fixtures.use('./my-addon/src/components');
await helper.fixtures.use('./test-app/tests');

let buildResult = await helper.build();

Expand Down

0 comments on commit 1a9dcd9

Please sign in to comment.