diff --git a/.changeset/gentle-elephants-call.md b/.changeset/gentle-elephants-call.md new file mode 100644 index 00000000..56c3455b --- /dev/null +++ b/.changeset/gentle-elephants-call.md @@ -0,0 +1,5 @@ +--- +"create-v2-addon-repo": minor +--- + +Updated blueprints diff --git a/configs/eslint/ember/app/index.js b/configs/eslint/ember/app/index.js index 0166bfce..6e5d05fa 100644 --- a/configs/eslint/ember/app/index.js +++ b/configs/eslint/ember/app/index.js @@ -59,14 +59,14 @@ module.exports = { }, }, { - files: ['**/*.gts'], + files: ['**/*.gjs'], parser: 'ember-eslint-parser', - extends: ['plugin:ember/recommended-gts'], + extends: ['plugin:ember/recommended-gjs'], }, { - files: ['**/*.gjs'], + files: ['**/*.gts'], parser: 'ember-eslint-parser', - extends: ['plugin:ember/recommended-gjs'], + extends: ['plugin:ember/recommended-gts'], }, { files: ['**/*.{gjs,gts,js,ts}'], diff --git a/configs/eslint/ember/v1-addon/index.js b/configs/eslint/ember/v1-addon/index.js index c0155d20..f04c4351 100644 --- a/configs/eslint/ember/v1-addon/index.js +++ b/configs/eslint/ember/v1-addon/index.js @@ -59,14 +59,14 @@ module.exports = { }, }, { - files: ['**/*.gts'], + files: ['**/*.gjs'], parser: 'ember-eslint-parser', - extends: ['plugin:ember/recommended-gts'], + extends: ['plugin:ember/recommended-gjs'], }, { - files: ['**/*.gjs'], + files: ['**/*.gts'], parser: 'ember-eslint-parser', - extends: ['plugin:ember/recommended-gjs'], + extends: ['plugin:ember/recommended-gts'], }, { files: ['**/*.{gjs,gts,js,ts}'], diff --git a/configs/eslint/ember/v2-addon/index.js b/configs/eslint/ember/v2-addon/index.js index 381b3a02..e48e8eaf 100644 --- a/configs/eslint/ember/v2-addon/index.js +++ b/configs/eslint/ember/v2-addon/index.js @@ -59,14 +59,14 @@ module.exports = { }, }, { - files: ['**/*.gts'], + files: ['**/*.gjs'], parser: 'ember-eslint-parser', - extends: ['plugin:ember/recommended-gts'], + extends: ['plugin:ember/recommended-gjs'], }, { - files: ['**/*.gjs'], + files: ['**/*.gts'], parser: 'ember-eslint-parser', - extends: ['plugin:ember/recommended-gjs'], + extends: ['plugin:ember/recommended-gts'], }, { files: ['**/*.{gjs,gts,js,ts}'], diff --git a/packages/blueprints-addon/CHANGELOG.md b/packages/blueprints-addon/CHANGELOG.md index fa256ffb..cd34df35 100644 --- a/packages/blueprints-addon/CHANGELOG.md +++ b/packages/blueprints-addon/CHANGELOG.md @@ -1,31 +1 @@ # blueprints-addon - -## 0.3.0 - -### Minor Changes - -- [#16](https://github.com/ijlee2/embroider-toolbox/pull/16) Added blueprints for create-v2-addon-repo (Part 5) ([@ijlee2](https://github.com/ijlee2)) - -## 0.2.0 - -### Minor Changes - -- [#10](https://github.com/ijlee2/embroider-toolbox/pull/10) Simplified API for new command and tests ([@ijlee2](https://github.com/ijlee2)) -- [#13](https://github.com/ijlee2/embroider-toolbox/pull/13) Added blueprints for create-v2-addon-repo (Part 2) ([@ijlee2](https://github.com/ijlee2)) -- [#14](https://github.com/ijlee2/embroider-toolbox/pull/14) Added blueprints for create-v2-addon-repo (Part 3) ([@ijlee2](https://github.com/ijlee2)) - -### Patch Changes - -- [#12](https://github.com/ijlee2/embroider-toolbox/pull/12) Specified the location of test-app for generate and destroy commands ([@ijlee2](https://github.com/ijlee2)) - -## 0.1.0 - -### Minor Changes - -- [#2](https://github.com/ijlee2/embroider-toolbox/pull/2) Scaffolded blueprints-addon ([@ijlee2](https://github.com/ijlee2)) -- [#3](https://github.com/ijlee2/embroider-toolbox/pull/3) Implemented new command ([@ijlee2](https://github.com/ijlee2)) -- [#4](https://github.com/ijlee2/embroider-toolbox/pull/4) Scaffolded generate and destroy commands ([@ijlee2](https://github.com/ijlee2)) -- [#5](https://github.com/ijlee2/embroider-toolbox/pull/5) Separated generate commands ([@ijlee2](https://github.com/ijlee2)) -- [#6](https://github.com/ijlee2/embroider-toolbox/pull/6) Implemented generate commands (Part 1) ([@ijlee2](https://github.com/ijlee2)) -- [#7](https://github.com/ijlee2/embroider-toolbox/pull/7) Implemented generate commands (Part 2) ([@ijlee2](https://github.com/ijlee2)) -- [#8](https://github.com/ijlee2/embroider-toolbox/pull/8) Implemented destroy commands ([@ijlee2](https://github.com/ijlee2)) diff --git a/packages/blueprints-addon/README.md b/packages/blueprints-addon/README.md index cd34df35..1401d5d8 100644 --- a/packages/blueprints-addon/README.md +++ b/packages/blueprints-addon/README.md @@ -1 +1,73 @@ # blueprints-addon + +_CLI for v2 addons_ + +1. [Features](#features) +1. [Usage](#usage) +1. [Compatibility](#compatibility) + + +## Features + +Standardize how you write v2 addons: + +- Run `new` to create a v2 addon +- Run `generate` to create source and test files +- Run `destroy` to remove source and test files +- Blueprints available for components, helpers, modifiers, services, and utilities +- Tailor addon blueprints to your needs + + +## Usage + +Install `blueprints-addon` as a development dependency in these locations: + +
+ +Workspace root + +```json5 +/* package.json */ +{ + "scripts": { + "addon": "blueprints-addon" + }, + "devDependencies": { + "blueprints-addon": "workspace:*" + } +} +``` + +
+ +
+ +V2 addon in packages + +```json5 +/* Example: packages/ui/button/package.json */ +{ + "scripts": { + "addon": "blueprints-addon --test-app-location '../../../test-app'" + }, + "devDependencies": { + "blueprints-addon": "workspace:*" + } +} +``` + +
+ +> [!NOTE] +> +> After you build `blueprints-addon`, please run `pnpm install` at the workspace root so that the blueprints are available. + + +## Compatibility + +- Node.js v18 or above + + +## License + +This project is licensed under the [MIT License](LICENSE.md). diff --git a/packages/blueprints-addon/bin/blueprints-addon.ts b/packages/blueprints-addon/bin/blueprints-addon.ts index df42913a..fa51f27a 100755 --- a/packages/blueprints-addon/bin/blueprints-addon.ts +++ b/packages/blueprints-addon/bin/blueprints-addon.ts @@ -10,6 +10,14 @@ import { runDestroy, runGenerate, runNew } from '../src/index.js'; process.title = 'blueprints-addon'; // Set codemod options +const DEFAULT_BLUEPRINT_VALUE = { + component: 'glimmer', + helper: 'class', + modifier: 'class', + service: 'class', + util: 'function', +} as const; + yargs(hideBin(process.argv)) .command({ aliases: ['d'], @@ -98,7 +106,8 @@ yargs(hideBin(process.argv)) handler: (argv) => { runGenerate({ entity: { - blueprint: argv['blueprint'] ?? 'glimmer', + blueprint: + argv['blueprint'] ?? DEFAULT_BLUEPRINT_VALUE.component, name: argv['name'], type: 'component', }, @@ -127,7 +136,7 @@ yargs(hideBin(process.argv)) handler: (argv) => { runGenerate({ entity: { - blueprint: argv['blueprint'] ?? 'class', + blueprint: argv['blueprint'] ?? DEFAULT_BLUEPRINT_VALUE.helper, name: argv['name'], type: 'helper', }, @@ -156,7 +165,8 @@ yargs(hideBin(process.argv)) handler: (argv) => { runGenerate({ entity: { - blueprint: argv['blueprint'] ?? 'class', + blueprint: + argv['blueprint'] ?? DEFAULT_BLUEPRINT_VALUE.modifier, name: argv['name'], type: 'modifier', }, @@ -185,7 +195,7 @@ yargs(hideBin(process.argv)) handler: (argv) => { runGenerate({ entity: { - blueprint: argv['blueprint'] ?? 'class', + blueprint: argv['blueprint'] ?? DEFAULT_BLUEPRINT_VALUE.service, name: argv['name'], type: 'service', }, @@ -214,7 +224,7 @@ yargs(hideBin(process.argv)) handler: (argv) => { runGenerate({ entity: { - blueprint: argv['blueprint'] ?? 'function', + blueprint: argv['blueprint'] ?? DEFAULT_BLUEPRINT_VALUE.util, name: argv['name'], type: 'util', }, diff --git a/packages/blueprints-addon/package.json b/packages/blueprints-addon/package.json index f2aa99c3..ccb5ae98 100644 --- a/packages/blueprints-addon/package.json +++ b/packages/blueprints-addon/package.json @@ -1,8 +1,8 @@ { "name": "blueprints-addon", - "version": "0.3.0", + "version": "0.0.0", "private": true, - "description": "Blueprints for v2 addons", + "description": "CLI for v2 addons", "keywords": [ "codemod", "ember-codemod", diff --git a/packages/blueprints-addon/src/blueprints/run-generate/component/__testAppLocation__/__fileName__.gts b/packages/blueprints-addon/src/blueprints/run-generate/component/__testAppLocation__/__fileName__.gts index b26e65ec..849d821d 100644 --- a/packages/blueprints-addon/src/blueprints/run-generate/component/__testAppLocation__/__fileName__.gts +++ b/packages/blueprints-addon/src/blueprints/run-generate/component/__testAppLocation__/__fileName__.gts @@ -1,7 +1,7 @@ import { <%= options.entity.classifiedName %> } from '<%= options.addon.name %>'; import { render } from '@ember/test-helpers'; import { module, test } from 'qunit'; -import { setupRenderingTest } from 'test-app/tests/helpers'; +import { setupRenderingTest } from '<%= options.testApp.name %>/tests/helpers'; module('Integration | Component | <%= options.entity.name %>', function (hooks) { setupRenderingTest(hooks); diff --git a/packages/blueprints-addon/src/blueprints/run-generate/component/__testAppLocation__/__fileName__.ts b/packages/blueprints-addon/src/blueprints/run-generate/component/__testAppLocation__/__fileName__.ts index 0ba628c5..1a97d05a 100644 --- a/packages/blueprints-addon/src/blueprints/run-generate/component/__testAppLocation__/__fileName__.ts +++ b/packages/blueprints-addon/src/blueprints/run-generate/component/__testAppLocation__/__fileName__.ts @@ -1,7 +1,7 @@ import { render } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; import { module, test } from 'qunit'; -import { setupRenderingTest } from 'test-app/tests/helpers'; +import { setupRenderingTest } from '<%= options.testApp.name %>/tests/helpers'; module('Integration | Component | <%= options.entity.name %>', function (hooks) { setupRenderingTest(hooks); diff --git a/packages/blueprints-addon/src/blueprints/run-generate/component/template-tag/__fileName__.gts b/packages/blueprints-addon/src/blueprints/run-generate/component/template-tag/__fileName__.gts index c2e3891d..93e5ba9d 100644 --- a/packages/blueprints-addon/src/blueprints/run-generate/component/template-tag/__fileName__.gts +++ b/packages/blueprints-addon/src/blueprints/run-generate/component/template-tag/__fileName__.gts @@ -1,4 +1,4 @@ -import Component from '@glimmer/component'; +import type { TOC } from '@ember/component/template-only'; import styles from './<%= data.localFileName %>.css'; @@ -10,11 +10,11 @@ interface <%= options.entity.classifiedName %>Signature { Element: null; } -// eslint-disable-next-line ember/no-empty-glimmer-component-classes -export default class <%= options.entity.classifiedName %>Component extends Component<<%= options.entity.classifiedName %>Signature> { +const <%= options.entity.classifiedName %>Component: TOC<<%= options.entity.classifiedName %>Signature> = -} + ; + +export default <%= options.entity.classifiedName %>Component; diff --git a/packages/blueprints-addon/src/blueprints/run-generate/helper/__testAppLocation__/__fileName__.gts b/packages/blueprints-addon/src/blueprints/run-generate/helper/__testAppLocation__/__fileName__.gts index 39f2ad4f..d849ea1c 100644 --- a/packages/blueprints-addon/src/blueprints/run-generate/helper/__testAppLocation__/__fileName__.gts +++ b/packages/blueprints-addon/src/blueprints/run-generate/helper/__testAppLocation__/__fileName__.gts @@ -1,7 +1,7 @@ import { <%= options.entity.camelizedName %> } from '<%= options.addon.name %>'; import { render } from '@ember/test-helpers'; import { module, test } from 'qunit'; -import { setupRenderingTest } from 'test-app/tests/helpers'; +import { setupRenderingTest } from '<%= options.testApp.name %>/tests/helpers'; module('Integration | Helper | <%= options.entity.name %>', function (hooks) { setupRenderingTest(hooks); diff --git a/packages/blueprints-addon/src/blueprints/run-generate/helper/__testAppLocation__/__fileName__.ts b/packages/blueprints-addon/src/blueprints/run-generate/helper/__testAppLocation__/__fileName__.ts index dc2fea5b..711f39b0 100644 --- a/packages/blueprints-addon/src/blueprints/run-generate/helper/__testAppLocation__/__fileName__.ts +++ b/packages/blueprints-addon/src/blueprints/run-generate/helper/__testAppLocation__/__fileName__.ts @@ -1,7 +1,7 @@ import { render } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; import { module, test } from 'qunit'; -import { setupRenderingTest } from 'test-app/tests/helpers'; +import { setupRenderingTest } from '<%= options.testApp.name %>/tests/helpers'; module('Integration | Helper | <%= options.entity.name %>', function (hooks) { setupRenderingTest(hooks); diff --git a/packages/blueprints-addon/src/blueprints/run-generate/modifier/__testAppLocation__/__fileName__.gts b/packages/blueprints-addon/src/blueprints/run-generate/modifier/__testAppLocation__/__fileName__.gts index 1a0994aa..069b5a8d 100644 --- a/packages/blueprints-addon/src/blueprints/run-generate/modifier/__testAppLocation__/__fileName__.gts +++ b/packages/blueprints-addon/src/blueprints/run-generate/modifier/__testAppLocation__/__fileName__.gts @@ -1,7 +1,7 @@ import { <%= options.entity.camelizedName %> } from '<%= options.addon.name %>'; import { render } from '@ember/test-helpers'; import { module, test } from 'qunit'; -import { setupRenderingTest } from 'test-app/tests/helpers'; +import { setupRenderingTest } from '<%= options.testApp.name %>/tests/helpers'; module('Integration | Modifier | <%= options.entity.name %>', function (hooks) { setupRenderingTest(hooks); diff --git a/packages/blueprints-addon/src/blueprints/run-generate/modifier/__testAppLocation__/__fileName__.ts b/packages/blueprints-addon/src/blueprints/run-generate/modifier/__testAppLocation__/__fileName__.ts index b82e5751..812feca6 100644 --- a/packages/blueprints-addon/src/blueprints/run-generate/modifier/__testAppLocation__/__fileName__.ts +++ b/packages/blueprints-addon/src/blueprints/run-generate/modifier/__testAppLocation__/__fileName__.ts @@ -1,7 +1,7 @@ import { render } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; import { module, test } from 'qunit'; -import { setupRenderingTest } from 'test-app/tests/helpers'; +import { setupRenderingTest } from '<%= options.testApp.name %>/tests/helpers'; module('Integration | Modifier | <%= options.entity.name %>', function (hooks) { setupRenderingTest(hooks); diff --git a/packages/blueprints-addon/src/blueprints/run-generate/service/__testAppLocation__/__fileName__.ts b/packages/blueprints-addon/src/blueprints/run-generate/service/__testAppLocation__/__fileName__.ts index a3d2e9b3..c11819a7 100644 --- a/packages/blueprints-addon/src/blueprints/run-generate/service/__testAppLocation__/__fileName__.ts +++ b/packages/blueprints-addon/src/blueprints/run-generate/service/__testAppLocation__/__fileName__.ts @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { setupTest } from 'test-app/tests/helpers'; +import { setupTest } from '<%= options.testApp.name %>/tests/helpers'; module('Unit | Service | <%= options.entity.name %>', function (hooks) { setupTest(hooks); diff --git a/packages/blueprints-addon/src/blueprints/run-new/__addonLocation__/.eslintrc.js b/packages/blueprints-addon/src/blueprints/run-new/__addonLocation__/.eslintrc.js index 6befcff2..c4a80d3e 100644 --- a/packages/blueprints-addon/src/blueprints/run-new/__addonLocation__/.eslintrc.js +++ b/packages/blueprints-addon/src/blueprints/run-new/__addonLocation__/.eslintrc.js @@ -4,22 +4,4 @@ require('@shared-configs/eslint-config-ember/patch'); module.exports = { extends: ['@shared-configs/eslint-config-ember/v2-addon'], - parserOptions: { - project: true, - tsconfigRootDir: __dirname, - }, - overrides: [ - // TypeScript files - { - files: ['**/*.{gts,ts}'], - rules: { - '@typescript-eslint/no-unnecessary-condition': 'error', - }, - }, - // JavaScript files - { - files: ['**/*.{cjs,js,gjs,mjs}'], - extends: ['plugin:@typescript-eslint/disable-type-checked'], - }, - ], }; diff --git a/packages/blueprints-addon/src/blueprints/run-new/__addonLocation__/.prettierignore b/packages/blueprints-addon/src/blueprints/run-new/__addonLocation__/.prettierignore index d3b7efae..dd79592e 100644 --- a/packages/blueprints-addon/src/blueprints/run-new/__addonLocation__/.prettierignore +++ b/packages/blueprints-addon/src/blueprints/run-new/__addonLocation__/.prettierignore @@ -4,7 +4,3 @@ # compiled output /declarations/ /dist/ - -# ; + +export default MyExampleTemplateTagComponent; diff --git a/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/components/my-example/glimmer-test.ts b/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/components/my-example/glimmer-test.gts similarity index 72% rename from packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/components/my-example/glimmer-test.ts rename to packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/components/my-example/glimmer-test.gts index c5533f63..5b419e61 100644 --- a/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/components/my-example/glimmer-test.ts +++ b/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/components/my-example/glimmer-test.gts @@ -1,5 +1,5 @@ +import { MyExampleGlimmer } from '@my-org-ui/button'; import { render } from '@ember/test-helpers'; -import { hbs } from 'ember-cli-htmlbars'; import { module, test } from 'qunit'; import { setupRenderingTest } from 'test-app/tests/helpers'; @@ -7,9 +7,9 @@ module('Integration | Component | my-example/glimmer', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { - await render(hbs` - - `); + await render(); assert.dom().hasText(''); }); diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/components/my-example/template-tag-test.ts b/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/components/my-example/template-tag-test.gts similarity index 71% rename from packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/components/my-example/template-tag-test.ts rename to packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/components/my-example/template-tag-test.gts index 28ab1ea2..52d5f10b 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/components/my-example/template-tag-test.ts +++ b/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/components/my-example/template-tag-test.gts @@ -1,5 +1,5 @@ +import { MyExampleTemplateTag } from '@my-org-ui/button'; import { render } from '@ember/test-helpers'; -import { hbs } from 'ember-cli-htmlbars'; import { module, test } from 'qunit'; import { setupRenderingTest } from 'test-app/tests/helpers'; @@ -7,9 +7,9 @@ module('Integration | Component | my-example/template-tag', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { - await render(hbs` - - `); + await render(); assert.dom().hasText(''); }); diff --git a/packages/create-v2-addon-repo/src/blueprints/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/helpers/my-example/class-test.ts b/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/helpers/my-example/class-test.gts similarity index 72% rename from packages/create-v2-addon-repo/src/blueprints/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/helpers/my-example/class-test.ts rename to packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/helpers/my-example/class-test.gts index 4fe90f3b..26d8a78c 100644 --- a/packages/create-v2-addon-repo/src/blueprints/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/helpers/my-example/class-test.ts +++ b/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/helpers/my-example/class-test.gts @@ -1,5 +1,5 @@ +import { myExampleClass } from '@my-org-ui/button'; import { render } from '@ember/test-helpers'; -import { hbs } from 'ember-cli-htmlbars'; import { module, test } from 'qunit'; import { setupRenderingTest } from 'test-app/tests/helpers'; @@ -7,9 +7,9 @@ module('Integration | Helper | my-example/class', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { - await render(hbs` - {{my-example/class "1234"}} - `); + await render(); assert.dom().hasText('1234'); }); diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/helpers/my-example/function-test.ts b/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/helpers/my-example/function-test.gts similarity index 71% rename from packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/helpers/my-example/function-test.ts rename to packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/helpers/my-example/function-test.gts index 3b122735..b7484ac4 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/helpers/my-example/function-test.ts +++ b/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/helpers/my-example/function-test.gts @@ -1,5 +1,5 @@ +import { myExampleFunction } from '@my-org-ui/button'; import { render } from '@ember/test-helpers'; -import { hbs } from 'ember-cli-htmlbars'; import { module, test } from 'qunit'; import { setupRenderingTest } from 'test-app/tests/helpers'; @@ -7,9 +7,9 @@ module('Integration | Helper | my-example/function', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { - await render(hbs` - {{my-example/function "1234"}} - `); + await render(); assert.dom().hasText('1234'); }); diff --git a/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/modifiers/my-example/class-test.ts b/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/modifiers/my-example/class-test.gts similarity index 70% rename from packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/modifiers/my-example/class-test.ts rename to packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/modifiers/my-example/class-test.gts index dbebcf64..8bbf3a6c 100644 --- a/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/modifiers/my-example/class-test.ts +++ b/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/modifiers/my-example/class-test.gts @@ -1,5 +1,5 @@ +import { myExampleClass } from '@my-org-ui/button'; import { render } from '@ember/test-helpers'; -import { hbs } from 'ember-cli-htmlbars'; import { module, test } from 'qunit'; import { setupRenderingTest } from 'test-app/tests/helpers'; @@ -7,9 +7,9 @@ module('Integration | Modifier | my-example/class', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { - await render(hbs` -
- `); + await render(); assert.ok(true); }); diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/modifiers/my-example/function-test.ts b/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/modifiers/my-example/function-test.gts similarity index 70% rename from packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/modifiers/my-example/function-test.ts rename to packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/modifiers/my-example/function-test.gts index d64c6728..27b2e32d 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/modifiers/my-example/function-test.ts +++ b/packages/blueprints-addon/tests/fixtures/run-generate/output/test-app/tests/integration/modifiers/my-example/function-test.gts @@ -1,5 +1,5 @@ +import { myExampleFunction } from '@my-org-ui/button'; import { render } from '@ember/test-helpers'; -import { hbs } from 'ember-cli-htmlbars'; import { module, test } from 'qunit'; import { setupRenderingTest } from 'test-app/tests/helpers'; @@ -7,9 +7,9 @@ module('Integration | Modifier | my-example/function', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { - await render(hbs` -
- `); + await render(); assert.ok(true); }); diff --git a/packages/blueprints-addon/tests/fixtures/run-new/output/packages/ui/button/.eslintrc.js b/packages/blueprints-addon/tests/fixtures/run-new/output/packages/ui/button/.eslintrc.js index 6befcff2..c4a80d3e 100644 --- a/packages/blueprints-addon/tests/fixtures/run-new/output/packages/ui/button/.eslintrc.js +++ b/packages/blueprints-addon/tests/fixtures/run-new/output/packages/ui/button/.eslintrc.js @@ -4,22 +4,4 @@ require('@shared-configs/eslint-config-ember/patch'); module.exports = { extends: ['@shared-configs/eslint-config-ember/v2-addon'], - parserOptions: { - project: true, - tsconfigRootDir: __dirname, - }, - overrides: [ - // TypeScript files - { - files: ['**/*.{gts,ts}'], - rules: { - '@typescript-eslint/no-unnecessary-condition': 'error', - }, - }, - // JavaScript files - { - files: ['**/*.{cjs,js,gjs,mjs}'], - extends: ['plugin:@typescript-eslint/disable-type-checked'], - }, - ], }; diff --git a/packages/blueprints-addon/tests/fixtures/run-new/output/packages/ui/button/.prettierignore b/packages/blueprints-addon/tests/fixtures/run-new/output/packages/ui/button/.prettierignore index d3b7efae..dd79592e 100644 --- a/packages/blueprints-addon/tests/fixtures/run-new/output/packages/ui/button/.prettierignore +++ b/packages/blueprints-addon/tests/fixtures/run-new/output/packages/ui/button/.prettierignore @@ -4,7 +4,3 @@ # compiled output /declarations/ /dist/ - -#