From 689fb78f0b7577b5871206fcffdad950c618d7db Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Thu, 15 Aug 2024 19:39:09 +0200 Subject: [PATCH 1/6] refactor: Changed name to be a positional argument --- .../bin/create-v2-addon-repo.ts | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/packages/create-v2-addon-repo/bin/create-v2-addon-repo.ts b/packages/create-v2-addon-repo/bin/create-v2-addon-repo.ts index 10b5c0a..818188b 100755 --- a/packages/create-v2-addon-repo/bin/create-v2-addon-repo.ts +++ b/packages/create-v2-addon-repo/bin/create-v2-addon-repo.ts @@ -5,27 +5,34 @@ import yargs from 'yargs'; import { hideBin } from 'yargs/helpers'; import { runCodemod } from '../src/index.js'; -import type { CodemodOptions } from '../src/types/index.js'; // Provide a title to the process in `ps` process.title = 'create-v2-addon-repo'; // Set codemod options -const argv = yargs(hideBin(process.argv)) - .option('name', { - demandOption: true, - describe: 'Name of your project', - type: 'string', - }) - .option('root', { - describe: 'Where to run the codemod', - type: 'string', +yargs(hideBin(process.argv)) + .command({ + builder: (yargs) => { + return yargs + .positional('name', { + describe: 'Name of your project', + type: 'string', + }) + .option('root', { + describe: 'Where to run the codemod', + type: 'string', + }) + .demandOption(['name']); + }, + command: '* [name]', + describe: 'Creates a v2 addon repo', + handler: (argv) => { + runCodemod({ + name: argv['name'], + projectRoot: argv['root'] ?? process.cwd(), + }); + }, }) + .demandCommand() + .strict() .parseSync(); - -const codemodOptions: CodemodOptions = { - name: argv['name'], - projectRoot: argv['root'] ?? process.cwd(), -}; - -runCodemod(codemodOptions); From 066b10aa57c36307b2aaf36fbcda240b6a8282e7 Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Thu, 15 Aug 2024 19:58:34 +0200 Subject: [PATCH 2/6] bugfix: Fixed blueprints --- packages/blueprints-addon/.gitignore | 15 +++++++++++++++ .../component/template-tag/__fileName__.css | 4 +++- .../__testAppLocation__/__fileName__.gts | 4 +--- .../helper/__testAppLocation__/__fileName__.ts | 4 +--- .../run-generate/helper/class/__fileName__.ts | 6 +++--- .../helper/function/__fileName__.ts | 6 +++--- .../modifier/class/__fileName__.ts | 5 +++-- .../modifier/function/__fileName__.ts | 5 +++-- .../run-new/__addonLocation__/.prettierignore | 4 ++++ .../run-new/__addonLocation__/package.json | 1 + .../run-new/update-test-app-package-json.ts | 12 +++++++++--- .../src/blueprints/LICENSE.md | 9 +++++++++ .../src/blueprints/__gitignore__ | 17 +++++++---------- .../blueprints/blueprints-addon/__gitignore__ | 15 +++++++++++++++ .../component/template-tag/__fileName__.css | 4 +++- .../__testAppLocation__/__fileName__.gts | 4 +--- .../helper/__testAppLocation__/__fileName__.ts | 4 +--- .../run-generate/helper/class/__fileName__.ts | 6 +++--- .../helper/function/__fileName__.ts | 6 +++--- .../modifier/class/__fileName__.ts | 5 +++-- .../modifier/function/__fileName__.ts | 5 +++-- .../run-new/__addonLocation__/.prettierignore | 4 ++++ .../run-new/__addonLocation__/package.json | 1 + .../run-new/update-test-app-package-json.ts | 12 +++++++++--- .../src/blueprints/package.json | 2 +- .../src/blueprints/pnpm-workspace.yaml | 1 + .../src/steps/create-files-from-blueprints.ts | 18 +++++++++++++++++- 27 files changed, 127 insertions(+), 52 deletions(-) create mode 100644 packages/blueprints-addon/.gitignore create mode 100644 packages/create-v2-addon-repo/src/blueprints/LICENSE.md create mode 100644 packages/create-v2-addon-repo/src/blueprints/blueprints-addon/__gitignore__ diff --git a/packages/blueprints-addon/.gitignore b/packages/blueprints-addon/.gitignore new file mode 100644 index 0000000..06c46fa --- /dev/null +++ b/packages/blueprints-addon/.gitignore @@ -0,0 +1,15 @@ +# compiled output +/dist/ +/dist-for-testing/ +/tmp/ + +# dependencies +/node_modules/ + +# misc +/.DS_Store +/.env* +/.eslintcache +/npm-debug.log* +/pnpm-debug.log* +/pnpm-error.log* diff --git a/packages/blueprints-addon/src/blueprints/run-generate/component/template-tag/__fileName__.css b/packages/blueprints-addon/src/blueprints/run-generate/component/template-tag/__fileName__.css index aea1b5d..ba2e596 100644 --- a/packages/blueprints-addon/src/blueprints/run-generate/component/template-tag/__fileName__.css +++ b/packages/blueprints-addon/src/blueprints/run-generate/component/template-tag/__fileName__.css @@ -1 +1,3 @@ -.container {} +.container { + /* Style here */ +} 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 5f3c5a9..39f2ad4 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 @@ -7,10 +7,8 @@ module('Integration | Helper | <%= options.entity.name %>', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { - this.inputValue = '1234'; - await render(); assert.dom().hasText('1234'); 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 2764043..dc2fea5 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 @@ -7,10 +7,8 @@ module('Integration | Helper | <%= options.entity.name %>', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { - this.inputValue = '1234'; - await render(hbs` - {{<%= options.entity.name %> this.inputValue}} + {{<%= options.entity.name %> "1234"}} `); assert.dom().hasText('1234'); diff --git a/packages/blueprints-addon/src/blueprints/run-generate/helper/class/__fileName__.ts b/packages/blueprints-addon/src/blueprints/run-generate/helper/class/__fileName__.ts index 608b2d9..443eb66 100644 --- a/packages/blueprints-addon/src/blueprints/run-generate/helper/class/__fileName__.ts +++ b/packages/blueprints-addon/src/blueprints/run-generate/helper/class/__fileName__.ts @@ -1,8 +1,8 @@ import Helper from '@ember/component/helper'; type Named = {}; -type Positional = []; -type Return = Positional; +type Positional = [string]; +type Return = string; interface <%= options.entity.classifiedName %>Signature { Args: { @@ -14,6 +14,6 @@ interface <%= options.entity.classifiedName %>Signature { export default class <%= options.entity.classifiedName %>Helper extends Helper<<%= options.entity.classifiedName %>Signature> { compute(positional: Positional /*, named: Named*/): Return { - return positional; + return positional[0]; } } diff --git a/packages/blueprints-addon/src/blueprints/run-generate/helper/function/__fileName__.ts b/packages/blueprints-addon/src/blueprints/run-generate/helper/function/__fileName__.ts index b433959..581dee5 100644 --- a/packages/blueprints-addon/src/blueprints/run-generate/helper/function/__fileName__.ts +++ b/packages/blueprints-addon/src/blueprints/run-generate/helper/function/__fileName__.ts @@ -1,8 +1,8 @@ import { helper } from '@ember/component/helper'; type Named = {}; -type Positional = []; -type Return = Positional; +type Positional = [string]; +type Return = string; interface <%= options.entity.classifiedName %>Signature { Args: { @@ -14,6 +14,6 @@ interface <%= options.entity.classifiedName %>Signature { export default helper<<%= options.entity.classifiedName %>Signature>( (positional /*, named*/) => { - return positional; + return positional[0]; }, ); diff --git a/packages/blueprints-addon/src/blueprints/run-generate/modifier/class/__fileName__.ts b/packages/blueprints-addon/src/blueprints/run-generate/modifier/class/__fileName__.ts index b3519d8..91b0e8b 100644 --- a/packages/blueprints-addon/src/blueprints/run-generate/modifier/class/__fileName__.ts +++ b/packages/blueprints-addon/src/blueprints/run-generate/modifier/class/__fileName__.ts @@ -2,7 +2,6 @@ import Modifier from 'ember-modifier'; type Named = {}; type Positional = []; -type Element = Element; interface <%= options.entity.classifiedName %>Signature { Args: { @@ -13,5 +12,7 @@ interface <%= options.entity.classifiedName %>Signature { } export default class <%= options.entity.classifiedName %>Modifier extends Modifier<<%= options.entity.classifiedName %>Signature> { - modify(element: Element /*, positional: Positional, named: Named */) {} + modify(element: Element /*, positional: Positional, named: Named */) { + console.log(element); + } } diff --git a/packages/blueprints-addon/src/blueprints/run-generate/modifier/function/__fileName__.ts b/packages/blueprints-addon/src/blueprints/run-generate/modifier/function/__fileName__.ts index e0c26e9..9288d86 100644 --- a/packages/blueprints-addon/src/blueprints/run-generate/modifier/function/__fileName__.ts +++ b/packages/blueprints-addon/src/blueprints/run-generate/modifier/function/__fileName__.ts @@ -2,7 +2,6 @@ import { modifier } from 'ember-modifier'; type Named = {}; type Positional = []; -type Element = Element; interface <%= options.entity.classifiedName %>Signature { Args: { @@ -13,5 +12,7 @@ interface <%= options.entity.classifiedName %>Signature { } export default modifier<<%= options.entity.classifiedName %>Signature>( - function <%= options.entity.camelizedName %>(element /*, positional, named*/) {}, + function <%= options.entity.camelizedName %>(element /*, positional, named*/) { + console.log(element); + }, ); diff --git a/packages/blueprints-addon/src/blueprints/run-new/__addonLocation__/.prettierignore b/packages/blueprints-addon/src/blueprints/run-new/__addonLocation__/.prettierignore index dd79592..d3b7efa 100644 --- a/packages/blueprints-addon/src/blueprints/run-new/__addonLocation__/.prettierignore +++ b/packages/blueprints-addon/src/blueprints/run-new/__addonLocation__/.prettierignore @@ -4,3 +4,7 @@ # compiled output /declarations/ /dist/ + +#