Skip to content

Commit

Permalink
Updated blueprints (#151)
Browse files Browse the repository at this point in the history 
* chore: Updated blueprints

* chore: Updated fixtures

* chore: Added changeset

---------

Co-authored-by: ijlee2 <[email protected]>
  • Loading branch information
@ijlee2
ijlee2 and ijlee2 authored Feb 10, 2025
1 parent 9adabe7 commit d12262c
Show file tree
Hide file tree
Showing 13 changed files with 63 additions and 67 deletions.
5 changes: 5 additions & 0 deletions .changeset/popular-berries-drop.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@codemod-utils/cli": patch
---

Updated blueprints
7 changes: 1 addition & 6 deletions packages/cli/src/blueprints/tsconfig.build.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{
"extends": [
"@tsconfig/node18/tsconfig",
"@tsconfig/strictest/tsconfig"
],
"extends": "@shared-configs/typescript/node18",
"compilerOptions": {
"declaration": false,
"module": "nodenext",
"moduleResolution": "nodenext",
"outDir": "dist"
},
"include": ["bin", "src"],
Expand Down
7 changes: 1 addition & 6 deletions packages/cli/src/blueprints/tsconfig.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{
"extends": [
"@tsconfig/node18/tsconfig",
"@tsconfig/strictest/tsconfig"
],
"extends": "@shared-configs/typescript/node18",
"compilerOptions": {
"declaration": false,
"module": "nodenext",
"moduleResolution": "nodenext",
"outDir": "dist-for-testing"
},
"include": ["bin", "src", "tests"],
Expand Down
18 changes: 16 additions & 2 deletions packages/cli/src/steps/update-package-json.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ function updateDevDependencies(
]);

if (codemod.hasTypeScript) {
packagesToInstall.add('@tsconfig/node18');
packagesToInstall.add('@tsconfig/strictest');
packagesToInstall.add('@ijlee2-frontend-configs/typescript');
packagesToInstall.add('@types/node');
packagesToInstall.add('@types/yargs');
packagesToInstall.add('typescript');
Expand All @@ -76,6 +75,20 @@ function addPackageManager(packageJson: PackageJson): void {
packageJson['packageManager'] = `pnpm@${version}`;
}

function addPnpmOverrides(packageJson: PackageJson, options: Options): void {
const { codemod } = options;

if (!codemod.hasTypeScript) {
return;
}

packageJson['pnpm'] = {
overrides: {
'get-tsconfig': '4.7.3',
},
};
}

export function updatePackageJson(options: Options): void {
const { codemod, projectRoot } = options;

Expand All @@ -86,6 +99,7 @@ export function updatePackageJson(options: Options): void {
updateDependencies(packageJson, options);
updateDevDependencies(packageJson, options);
addPackageManager(packageJson);
addPnpmOverrides(packageJson, options);

const destination = join(projectRoot, codemod.name, 'package.json');
const file = JSON.stringify(packageJson, null, 2) + '\n';
Expand Down
13 changes: 6 additions & 7 deletions packages/cli/src/utils/blueprints/get-version.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,23 @@ import { decideVersion } from '@codemod-utils/blueprints';
const latestVersions = new Map([
['@changesets/cli', '2.27.12'],
['@changesets/get-github-info', '0.6.0'],
['@codemod-utils/ast-javascript', '1.2.12'],
['@codemod-utils/ast-javascript', '1.2.13'],
['@codemod-utils/ast-template', '1.1.8'],
['@codemod-utils/blueprints', '1.1.9'],
['@codemod-utils/ember', '2.0.4'],
['@codemod-utils/files', '2.0.8'],
['@codemod-utils/json', '1.1.13'],
['@codemod-utils/json', '1.1.14'],
['@codemod-utils/tests', '1.1.11'],
['@ijlee2-frontend-configs/eslint-config-node', '0.1.1'],
['@ijlee2-frontend-configs/eslint-config-node', '0.2.1'],
['@ijlee2-frontend-configs/prettier', '0.2.0'],
['@ijlee2-frontend-configs/typescript', '0.3.0'],
['@sondr3/minitest', '0.1.2'],
['@tsconfig/node18', '18.2.4'],
['@tsconfig/strictest', '2.0.5'],
['@types/node', '18.19.75'],
['@types/yargs', '17.0.33'],
['concurrently', '9.1.2'],
['eslint', '9.19.0'],
['eslint', '9.20.0'],
['pnpm', '9.15.5'],
['prettier', '3.4.2'],
['prettier', '3.5.0'],
['typescript', '5.7.3'],
['yargs', '17.7.2'],
]);
Expand Down
10 changes: 5 additions & 5 deletions ...tests/fixtures/javascript-with-addons/output/ember-codemod-args-to-signature/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,24 @@
"test": "mt tests --quiet"
},
"dependencies": {
"@codemod-utils/ast-javascript": "^1.2.12",
"@codemod-utils/ast-javascript": "^1.2.13",
"@codemod-utils/ast-template": "^1.1.8",
"@codemod-utils/blueprints": "^1.1.9",
"@codemod-utils/ember": "^2.0.4",
"@codemod-utils/files": "^2.0.8",
"@codemod-utils/json": "^1.1.13",
"@codemod-utils/json": "^1.1.14",
"yargs": "^17.7.2"
},
"devDependencies": {
"@changesets/cli": "^2.27.12",
"@changesets/get-github-info": "^0.6.0",
"@codemod-utils/tests": "^1.1.11",
"@ijlee2-frontend-configs/eslint-config-node": "^0.1.1",
"@ijlee2-frontend-configs/eslint-config-node": "^0.2.1",
"@ijlee2-frontend-configs/prettier": "^0.2.0",
"@sondr3/minitest": "^0.1.2",
"concurrently": "^9.1.2",
"eslint": "^9.19.0",
"prettier": "^3.4.2"
"eslint": "^9.20.0",
"prettier": "^3.5.0"
},
"engines": {
"node": "18.* || >= 20"
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/tests/fixtures/javascript/output/ember-codemod-pod-to-octane/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
"@changesets/cli": "^2.27.12",
"@changesets/get-github-info": "^0.6.0",
"@codemod-utils/tests": "^1.1.11",
"@ijlee2-frontend-configs/eslint-config-node": "^0.1.1",
"@ijlee2-frontend-configs/eslint-config-node": "^0.2.1",
"@ijlee2-frontend-configs/prettier": "^0.2.0",
"@sondr3/minitest": "^0.1.2",
"concurrently": "^9.1.2",
"eslint": "^9.19.0",
"prettier": "^3.4.2"
"eslint": "^9.20.0",
"prettier": "^3.5.0"
},
"engines": {
"node": "18.* || >= 20"
Expand Down
20 changes: 12 additions & 8 deletions ...tests/fixtures/typescript-with-addons/output/ember-codemod-args-to-signature/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,36 @@
"test": "./build.sh --test && mt dist-for-testing --quiet"
},
"dependencies": {
"@codemod-utils/ast-javascript": "^1.2.12",
"@codemod-utils/ast-javascript": "^1.2.13",
"@codemod-utils/ast-template": "^1.1.8",
"@codemod-utils/blueprints": "^1.1.9",
"@codemod-utils/ember": "^2.0.4",
"@codemod-utils/files": "^2.0.8",
"@codemod-utils/json": "^1.1.13",
"@codemod-utils/json": "^1.1.14",
"yargs": "^17.7.2"
},
"devDependencies": {
"@changesets/cli": "^2.27.12",
"@changesets/get-github-info": "^0.6.0",
"@codemod-utils/tests": "^1.1.11",
"@ijlee2-frontend-configs/eslint-config-node": "^0.1.1",
"@ijlee2-frontend-configs/eslint-config-node": "^0.2.1",
"@ijlee2-frontend-configs/prettier": "^0.2.0",
"@ijlee2-frontend-configs/typescript": "^0.3.0",
"@sondr3/minitest": "^0.1.2",
"@tsconfig/node18": "^18.2.4",
"@tsconfig/strictest": "^2.0.5",
"@types/node": "^18.19.75",
"@types/yargs": "^17.0.33",
"concurrently": "^9.1.2",
"eslint": "^9.19.0",
"prettier": "^3.4.2",
"eslint": "^9.20.0",
"prettier": "^3.5.0",
"typescript": "^5.7.3"
},
"engines": {
"node": "18.* || >= 20"
},
"packageManager": "[email protected]"
"packageManager": "[email protected]",
"pnpm": {
"overrides": {
"get-tsconfig": "4.7.3"
}
}
}
7 changes: 1 addition & 6 deletions ...ixtures/typescript-with-addons/output/ember-codemod-args-to-signature/tsconfig.build.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{
"extends": [
"@tsconfig/node18/tsconfig",
"@tsconfig/strictest/tsconfig"
],
"extends": "@shared-configs/typescript/node18",
"compilerOptions": {
"declaration": false,
"module": "nodenext",
"moduleResolution": "nodenext",
"outDir": "dist"
},
"include": ["bin", "src"],
Expand Down
7 changes: 1 addition & 6 deletions ...ests/fixtures/typescript-with-addons/output/ember-codemod-args-to-signature/tsconfig.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{
"extends": [
"@tsconfig/node18/tsconfig",
"@tsconfig/strictest/tsconfig"
],
"extends": "@shared-configs/typescript/node18",
"compilerOptions": {
"declaration": false,
"module": "nodenext",
"moduleResolution": "nodenext",
"outDir": "dist-for-testing"
},
"include": ["bin", "src", "tests"],
Expand Down
16 changes: 10 additions & 6 deletions packages/cli/tests/fixtures/typescript/output/ember-codemod-pod-to-octane/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,24 @@
"@changesets/cli": "^2.27.12",
"@changesets/get-github-info": "^0.6.0",
"@codemod-utils/tests": "^1.1.11",
"@ijlee2-frontend-configs/eslint-config-node": "^0.1.1",
"@ijlee2-frontend-configs/eslint-config-node": "^0.2.1",
"@ijlee2-frontend-configs/prettier": "^0.2.0",
"@ijlee2-frontend-configs/typescript": "^0.3.0",
"@sondr3/minitest": "^0.1.2",
"@tsconfig/node18": "^18.2.4",
"@tsconfig/strictest": "^2.0.5",
"@types/node": "^18.19.75",
"@types/yargs": "^17.0.33",
"concurrently": "^9.1.2",
"eslint": "^9.19.0",
"prettier": "^3.4.2",
"eslint": "^9.20.0",
"prettier": "^3.5.0",
"typescript": "^5.7.3"
},
"engines": {
"node": "18.* || >= 20"
},
"packageManager": "[email protected]"
"packageManager": "[email protected]",
"pnpm": {
"overrides": {
"get-tsconfig": "4.7.3"
}
}
}
7 changes: 1 addition & 6 deletions ...ages/cli/tests/fixtures/typescript/output/ember-codemod-pod-to-octane/tsconfig.build.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{
"extends": [
"@tsconfig/node18/tsconfig",
"@tsconfig/strictest/tsconfig"
],
"extends": "@shared-configs/typescript/node18",
"compilerOptions": {
"declaration": false,
"module": "nodenext",
"moduleResolution": "nodenext",
"outDir": "dist"
},
"include": ["bin", "src"],
Expand Down
7 changes: 1 addition & 6 deletions packages/cli/tests/fixtures/typescript/output/ember-codemod-pod-to-octane/tsconfig.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{
"extends": [
"@tsconfig/node18/tsconfig",
"@tsconfig/strictest/tsconfig"
],
"extends": "@shared-configs/typescript/node18",
"compilerOptions": {
"declaration": false,
"module": "nodenext",
"moduleResolution": "nodenext",
"outDir": "dist-for-testing"
},
"include": ["bin", "src", "tests"],
Expand Down

0 comments on commit d12262c

Please sign in to comment.