Skip to content

Commit

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

* chore: Removed @tsconfig/esm (deprecated, moduleResolution is now set by @tsconfig/node16)

* chore: Updated fixtures

* chore: Added changeset

---------

Co-authored-by: ijlee2 <ijlee2@users.noreply.github.com>
  • Loading branch information
@ijlee2
ijlee2 and ijlee2 authored Sep 2, 2023
1 parent 6fcb5e6 commit 7901632
Show file tree
Hide file tree
Showing 24 changed files with 142 additions and 153 deletions.
5 changes: 5 additions & 0 deletions .changeset/loud-seahorses-decide.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@codemod-utils/cli": patch
---

Updated blueprints
2 changes: 1 addition & 1 deletion packages/cli/src/blueprints/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"pnpm": {
"overrides": {
"eslint-plugin-import@2.28.0>tsconfig-paths": "^4.2.0"
"eslint-plugin-import@2.28.1>tsconfig-paths": "^4.2.0"
}
}
}<% } else { %>{
Expand Down
3 changes: 1 addition & 2 deletions packages/cli/src/blueprints/tsconfig.build.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": [
"@tsconfig/node16/tsconfig",
"@tsconfig/strictest/tsconfig",
"@tsconfig/esm/tsconfig"
"@tsconfig/strictest/tsconfig"
],
"compilerOptions": {
"declaration": false,
Expand Down
3 changes: 1 addition & 2 deletions packages/cli/src/blueprints/tsconfig.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": [
"@tsconfig/node16/tsconfig",
"@tsconfig/strictest/tsconfig",
"@tsconfig/esm/tsconfig"
"@tsconfig/strictest/tsconfig"
],
"compilerOptions": {
"declaration": false,
Expand Down
1 change: 0 additions & 1 deletion packages/cli/src/migration/steps/update-package-json.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ function updateDevDependencies(

if (codemod.hasTypeScript) {
packagesToInstall.delete('@babel/eslint-parser');
packagesToInstall.add('@tsconfig/esm');
packagesToInstall.add('@tsconfig/node16');
packagesToInstall.add('@tsconfig/strictest');
packagesToInstall.add('@types/node');
Expand Down
37 changes: 18 additions & 19 deletions packages/cli/src/utils/blueprints/get-version.ts
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,34 @@
import { decideVersion } from '@codemod-utils/blueprints';

const latestVersions = new Map([
['@babel/core', '7.22.10'],
['@babel/eslint-parser', '7.22.10'],
['@codemod-utils/ast-javascript', '0.3.3'],
['@babel/core', '7.22.11'],
['@babel/eslint-parser', '7.22.11'],
['@codemod-utils/ast-javascript', '0.3.4'],
['@codemod-utils/ast-template', '0.3.1'],
['@codemod-utils/blueprints', '0.2.1'],
['@codemod-utils/ember-cli-string', '0.1.1'],
['@codemod-utils/files', '0.5.2'],
['@codemod-utils/json', '0.4.1'],
['@codemod-utils/tests', '0.3.0'],
['@codemod-utils/files', '0.5.3'],
['@codemod-utils/json', '0.4.2'],
['@codemod-utils/tests', '0.3.1'],
['@sondr3/minitest', '0.1.1'],
['@tsconfig/esm', '1.0.4'],
['@tsconfig/node16', '16.1.0'],
['@tsconfig/strictest', '2.0.1'],
['@types/node', '16.18.40'],
['@tsconfig/node16', '16.1.1'],
['@tsconfig/strictest', '2.0.2'],
['@types/node', '16.18.47'],
['@types/yargs', '17.0.24'],
['@typescript-eslint/eslint-plugin', '6.3.0'],
['@typescript-eslint/parser', '6.3.0'],
['concurrently', '8.2.0'],
['eslint', '8.47.0'],
['@typescript-eslint/eslint-plugin', '6.5.0'],
['@typescript-eslint/parser', '6.5.0'],
['concurrently', '8.2.1'],
['eslint', '8.48.0'],
['eslint-config-prettier', '9.0.0'],
['eslint-import-resolver-typescript', '3.6.0'],
['eslint-plugin-import', '2.28.0'],
['eslint-plugin-n', '16.0.1'],
['eslint-plugin-import', '2.28.1'],
['eslint-plugin-n', '16.0.2'],
['eslint-plugin-prettier', '5.0.0'],
['eslint-plugin-simple-import-sort', '10.0.0'],
['eslint-plugin-typescript-sort-keys', '2.3.0'],
['eslint-plugin-typescript-sort-keys', '3.0.0'],
['lerna-changelog', '2.2.0'],
['prettier', '3.0.1'],
['typescript', '5.1.6'],
['prettier', '3.0.3'],
['typescript', '5.2.2'],
['yargs', '17.7.2'],
]);

Expand Down
22 changes: 11 additions & 11 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 @@ -30,28 +30,28 @@
"test": "mt tests --quiet"
},
"dependencies": {
"@codemod-utils/ast-javascript": "^0.3.3",
"@codemod-utils/ast-javascript": "^0.3.4",
"@codemod-utils/ast-template": "^0.3.1",
"@codemod-utils/blueprints": "^0.2.1",
"@codemod-utils/ember-cli-string": "^0.1.1",
"@codemod-utils/files": "^0.5.2",
"@codemod-utils/json": "^0.4.1",
"@codemod-utils/files": "^0.5.3",
"@codemod-utils/json": "^0.4.2",
"yargs": "^17.7.2"
},
"devDependencies": {
"@babel/core": "^7.22.10",
"@babel/eslint-parser": "^7.22.10",
"@codemod-utils/tests": "^0.3.0",
"@babel/core": "^7.22.11",
"@babel/eslint-parser": "^7.22.11",
"@codemod-utils/tests": "^0.3.1",
"@sondr3/minitest": "0.1.1",
"concurrently": "^8.2.0",
"eslint": "^8.47.0",
"concurrently": "^8.2.1",
"eslint": "^8.48.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-n": "^16.0.2",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"lerna-changelog": "^2.2.0",
"prettier": "^3.0.1"
"prettier": "^3.0.3"
},
"engines": {
"node": "16.* || >= 18"
Expand Down
18 changes: 9 additions & 9 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 @@ -30,23 +30,23 @@
"test": "mt tests --quiet"
},
"dependencies": {
"@codemod-utils/files": "^0.5.2",
"@codemod-utils/files": "^0.5.3",
"yargs": "^17.7.2"
},
"devDependencies": {
"@babel/core": "^7.22.10",
"@babel/eslint-parser": "^7.22.10",
"@codemod-utils/tests": "^0.3.0",
"@babel/core": "^7.22.11",
"@babel/eslint-parser": "^7.22.11",
"@codemod-utils/tests": "^0.3.1",
"@sondr3/minitest": "0.1.1",
"concurrently": "^8.2.0",
"eslint": "^8.47.0",
"concurrently": "^8.2.1",
"eslint": "^8.48.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-n": "^16.0.2",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"lerna-changelog": "^2.2.0",
"prettier": "^3.0.1"
"prettier": "^3.0.3"
},
"engines": {
"node": "16.* || >= 18"
Expand Down
2 changes: 1 addition & 1 deletion ...rom-blueprints/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 @@ -47,7 +47,7 @@
},
"pnpm": {
"overrides": {
"eslint-plugin-import@2.28.0>tsconfig-paths": "^4.2.0"
"eslint-plugin-import@2.28.1>tsconfig-paths": "^4.2.0"
}
}
}
3 changes: 1 addition & 2 deletions ...eprints/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,8 +1,7 @@
{
"extends": [
"@tsconfig/node16/tsconfig",
"@tsconfig/strictest/tsconfig",
"@tsconfig/esm/tsconfig"
"@tsconfig/strictest/tsconfig"
],
"compilerOptions": {
"declaration": false,
Expand Down
3 changes: 1 addition & 2 deletions ...om-blueprints/typescript-with-addons/output/ember-codemod-args-to-signature/tsconfig.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": [
"@tsconfig/node16/tsconfig",
"@tsconfig/strictest/tsconfig",
"@tsconfig/esm/tsconfig"
"@tsconfig/strictest/tsconfig"
],
"compilerOptions": {
"declaration": false,
Expand Down
2 changes: 1 addition & 1 deletion ...s/create-files-from-blueprints/typescript/output/ember-codemod-pod-to-octane/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"pnpm": {
"overrides": {
"eslint-plugin-import@2.28.0>tsconfig-paths": "^4.2.0"
"eslint-plugin-import@2.28.1>tsconfig-paths": "^4.2.0"
}
}
}
3 changes: 1 addition & 2 deletions ...e-files-from-blueprints/typescript/output/ember-codemod-pod-to-octane/tsconfig.build.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": [
"@tsconfig/node16/tsconfig",
"@tsconfig/strictest/tsconfig",
"@tsconfig/esm/tsconfig"
"@tsconfig/strictest/tsconfig"
],
"compilerOptions": {
"declaration": false,
Expand Down
3 changes: 1 addition & 2 deletions .../create-files-from-blueprints/typescript/output/ember-codemod-pod-to-octane/tsconfig.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": [
"@tsconfig/node16/tsconfig",
"@tsconfig/strictest/tsconfig",
"@tsconfig/esm/tsconfig"
"@tsconfig/strictest/tsconfig"
],
"compilerOptions": {
"declaration": false,
Expand Down
22 changes: 11 additions & 11 deletions ...e-package-json/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 @@ -30,28 +30,28 @@
"test": "mt tests --quiet"
},
"dependencies": {
"@codemod-utils/ast-javascript": "^0.3.3",
"@codemod-utils/ast-javascript": "^0.3.4",
"@codemod-utils/ast-template": "^0.3.1",
"@codemod-utils/blueprints": "^0.2.1",
"@codemod-utils/ember-cli-string": "^0.1.1",
"@codemod-utils/files": "^0.5.2",
"@codemod-utils/json": "^0.4.1",
"@codemod-utils/files": "^0.5.3",
"@codemod-utils/json": "^0.4.2",
"yargs": "^17.7.2"
},
"devDependencies": {
"@babel/core": "^7.22.10",
"@babel/eslint-parser": "^7.22.10",
"@codemod-utils/tests": "^0.3.0",
"@babel/core": "^7.22.11",
"@babel/eslint-parser": "^7.22.11",
"@codemod-utils/tests": "^0.3.1",
"@sondr3/minitest": "0.1.1",
"concurrently": "^8.2.0",
"eslint": "^8.47.0",
"concurrently": "^8.2.1",
"eslint": "^8.48.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-n": "^16.0.2",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"lerna-changelog": "^2.2.0",
"prettier": "^3.0.1"
"prettier": "^3.0.3"
},
"engines": {
"node": "16.* || >= 18"
Expand Down
18 changes: 9 additions & 9 deletions ...ures/steps/update-package-json/javascript/output/ember-codemod-pod-to-octane/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,23 @@
"test": "mt tests --quiet"
},
"dependencies": {
"@codemod-utils/files": "^0.5.2",
"@codemod-utils/files": "^0.5.3",
"yargs": "^17.7.2"
},
"devDependencies": {
"@babel/core": "^7.22.10",
"@babel/eslint-parser": "^7.22.10",
"@codemod-utils/tests": "^0.3.0",
"@babel/core": "^7.22.11",
"@babel/eslint-parser": "^7.22.11",
"@codemod-utils/tests": "^0.3.1",
"@sondr3/minitest": "0.1.1",
"concurrently": "^8.2.0",
"eslint": "^8.47.0",
"concurrently": "^8.2.1",
"eslint": "^8.48.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-n": "^16.0.2",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"lerna-changelog": "^2.2.0",
"prettier": "^3.0.1"
"prettier": "^3.0.3"
},
"engines": {
"node": "16.* || >= 18"
Expand Down
35 changes: 17 additions & 18 deletions ...e-package-json/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 @@ -32,37 +32,36 @@
"test": "./build.sh --test && mt dist-for-testing --quiet"
},
"dependencies": {
"@codemod-utils/ast-javascript": "^0.3.3",
"@codemod-utils/ast-javascript": "^0.3.4",
"@codemod-utils/ast-template": "^0.3.1",
"@codemod-utils/blueprints": "^0.2.1",
"@codemod-utils/ember-cli-string": "^0.1.1",
"@codemod-utils/files": "^0.5.2",
"@codemod-utils/json": "^0.4.1",
"@codemod-utils/files": "^0.5.3",
"@codemod-utils/json": "^0.4.2",
"yargs": "^17.7.2"
},
"devDependencies": {
"@babel/core": "^7.22.10",
"@codemod-utils/tests": "^0.3.0",
"@babel/core": "^7.22.11",
"@codemod-utils/tests": "^0.3.1",
"@sondr3/minitest": "0.1.1",
"@tsconfig/esm": "^1.0.4",
"@tsconfig/node16": "^16.1.0",
"@tsconfig/strictest": "^2.0.1",
"@types/node": "^16.18.40",
"@tsconfig/node16": "^16.1.1",
"@tsconfig/strictest": "^2.0.2",
"@types/node": "^16.18.47",
"@types/yargs": "^17.0.24",
"@typescript-eslint/eslint-plugin": "^6.3.0",
"@typescript-eslint/parser": "^6.3.0",
"concurrently": "^8.2.0",
"eslint": "^8.47.0",
"@typescript-eslint/eslint-plugin": "^6.5.0",
"@typescript-eslint/parser": "^6.5.0",
"concurrently": "^8.2.1",
"eslint": "^8.48.0",
"eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-typescript": "^3.6.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-n": "^16.0.2",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-typescript-sort-keys": "^2.3.0",
"eslint-plugin-typescript-sort-keys": "^3.0.0",
"lerna-changelog": "^2.2.0",
"prettier": "^3.0.1",
"typescript": "^5.1.6"
"prettier": "^3.0.3",
"typescript": "^5.2.2"
},
"engines": {
"node": "16.* || >= 18"
Expand Down
Loading

0 comments on commit 7901632

Please sign in to comment.