From c7cb072c64b2795af7974d8b1c22227b4f1e14cf Mon Sep 17 00:00:00 2001 From: Dan Freeman Date: Wed, 26 Oct 2022 13:14:22 +0200 Subject: [PATCH 1/6] Airlift `updatePathsForAddon` from the blueprints package (cherry picked from commit 75f589eb9e5cac83ba5938b7dca4bb0f0090c555) --- ts/blueprints/ember-cli-typescript/index.js | 3 +- .../update-paths-for-addon.js | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 ts/blueprints/ember-cli-typescript/update-paths-for-addon.js diff --git a/ts/blueprints/ember-cli-typescript/index.js b/ts/blueprints/ember-cli-typescript/index.js index b9540f980..6ffb531f9 100644 --- a/ts/blueprints/ember-cli-typescript/index.js +++ b/ts/blueprints/ember-cli-typescript/index.js @@ -78,8 +78,7 @@ module.exports = { 2 ).replace(/\n/g, '\n '), pathsFor: (dasherizedName) => { - // We need to wait to use this module until `ember-cli-typescript-blueprints` has been installed - let updatePathsForAddon = require('ember-cli-typescript-blueprints/lib/utilities/update-paths-for-addon'); + let updatePathsForAddon = require('./update-paths-for-addon'); let appName = isAddon ? 'dummy' : dasherizedName; let paths = { [`${appName}/tests/*`]: ['tests/*'], diff --git a/ts/blueprints/ember-cli-typescript/update-paths-for-addon.js b/ts/blueprints/ember-cli-typescript/update-paths-for-addon.js new file mode 100644 index 000000000..90f46e8d6 --- /dev/null +++ b/ts/blueprints/ember-cli-typescript/update-paths-for-addon.js @@ -0,0 +1,46 @@ +/* eslint-disable no-prototype-builtins */ + +module.exports = function (paths, addonName, appName, options) { + options = options || {}; + const addonNameStar = [addonName, '*'].join('/'); + const addonPath = [options.isLinked ? 'node_modules' : 'lib', addonName].join('/'); + const addonAddonPath = [addonPath, 'addon'].join('/'); + const addonAppPath = [addonPath, 'app'].join('/'); + const appNameStar = [appName, '*'].join('/'); + const addonTestSupportPath = [addonName, 'test-support'].join('/'); + const addonTestSupportStarPath = `${addonTestSupportPath}/*`; + let appStarPaths; + paths = paths || {}; + appStarPaths = paths[appNameStar] = paths[appNameStar] || []; + + if (options.removePaths) { + if (paths.hasOwnProperty(addonName)) { + delete paths[addonName]; + } + if (paths.hasOwnProperty(addonNameStar)) { + delete paths[addonNameStar]; + } + let addonAppPathIndex = appStarPaths.indexOf([addonAppPath, '*'].join('/')); + if (addonAppPathIndex > -1) { + appStarPaths.splice(addonAppPathIndex, 1); + paths[appNameStar] = appStarPaths; + } + } else { + if (!paths.hasOwnProperty(addonName)) { + paths[addonName] = [addonAddonPath]; + } + if (!paths.hasOwnProperty(addonNameStar)) { + paths[addonNameStar] = [[addonAddonPath, '*'].join('/')]; + } + if (!paths.hasOwnProperty(addonTestSupportPath)) { + paths[addonTestSupportPath] = [[addonPath, 'addon-test-support'].join('/')]; + } + if (!paths.hasOwnProperty(addonTestSupportStarPath)) { + paths[addonTestSupportStarPath] = [[addonPath, 'addon-test-support', '*'].join('/')]; + } + if (appStarPaths.indexOf(addonAppPath) === -1) { + appStarPaths.push([addonAppPath, '*'].join('/')); + paths[appNameStar] = appStarPaths; + } + } +}; From 6a02752a01399b960ee55012c3fa9376aff9dc73 Mon Sep 17 00:00:00 2001 From: Dan Freeman Date: Wed, 26 Oct 2022 13:14:53 +0200 Subject: [PATCH 2/6] Remove assumption of `ember-cli-typescript-blueprints` from docs (cherry picked from commit e3d1227503090dbebae7c255e6f77e864e4ea9d8) --- docs/configuration.md | 18 ------------------ docs/ts/with-addons.md | 2 -- 2 files changed, 20 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index 4376f7130..2eb1fad34 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1,23 +1,5 @@ # Configuration -## Blueprints - -By default, ember-cli-typescript installs the [ember-cli-typescript-blueprints](https://github.com/typed-ember/ember-cli-typescript-blueprints) package so that you can use Ember's generators like normal, but with all the special sauce you need for things to work nicely throughout your system with TypeScript. - -If you want to stick with the normal JavaScript blueprints—say, because your team isn't ready to dive into the deep end with making _everything_ TypeScript yet—you can simply uninstall the blueprints package. - -With yarn: - -```bash -yarn remove ember-cli-typescript-blueprints -``` - -With npm: - -```bash -npm uninstall ember-cli-typescript-blueprints -``` - ## `tsconfig.json` We generate a good default [`tsconfig.json`](https://github.com/typed-ember/ember-cli-typescript/blob/master/blueprint-files/ember-cli-typescript/tsconfig.json), which will usually make everything _Just Work™_. In general, you may customize your TypeScript build process as usual using the `tsconfig.json` file. diff --git a/docs/ts/with-addons.md b/docs/ts/with-addons.md index 0ca46b574..c9f5e14e5 100644 --- a/docs/ts/with-addons.md +++ b/docs/ts/with-addons.md @@ -54,8 +54,6 @@ compilerOptions: { [In-repo addons](https://ember-cli.com/extending/#detailed-list-of-blueprints-and-their-use) work in much the same way as linked ones. Their `.ts` files are managed automatically by `ember-cli-typescript` in their `dependencies`, and you can ensure imports resolve correctly from the host by adding entries in `paths` in the base `tsconfig.json` file. -Note that the `in-repo-addon` blueprint should automatically add these entries if you have `ember-cli-typescript-blueprints` installed when you run it. - ```javascript compilerOptions: { // ...other options From 50f43fba66076e77edf5768b7ac1d9c868663c7b Mon Sep 17 00:00:00 2001 From: Dan Freeman Date: Wed, 26 Oct 2022 13:15:46 +0200 Subject: [PATCH 3/6] Remove `ember-cli-typescript-blueprints` from devDeps (cherry picked from commit f929bfbbe8ef2d3aafec3db9a89690d880b5486b) --- package.json | 1 - yarn.lock | 46 +++------------------------------------------- 2 files changed, 3 insertions(+), 44 deletions(-) diff --git a/package.json b/package.json index e9ed76ef2..933feba8f 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,6 @@ "ember-cli-htmlbars": "5.3.1", "ember-cli-inject-live-reload": "2.0.2", "ember-cli-sri": "2.1.1", - "ember-cli-typescript-blueprints": "3.0.0", "ember-cli-uglify": "3.0.0", "ember-cli-update": "0.54.6", "ember-disable-prototype-extensions": "1.1.3", diff --git a/yarn.lock b/yarn.lock index b26d37ccb..c00c9c924 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4831,7 +4831,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, em resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879" integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw== -ember-cli-babel@7.23.0, ember-cli-babel@^7.0.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.7.3: +ember-cli-babel@7.23.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.7.3: version "7.23.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.23.0.tgz#ec580aa2c115d0810e454dd5c2fffce238284b92" integrity sha512-ix58DlRDAbGITtdJoRUPcAoQwKLYr/x/kIXjU9u1ATyhmuUjqb+0FDXghOWbkNihGiNOqBBR49+LBgK9AeBcNw== @@ -5009,18 +5009,11 @@ ember-cli-sri@2.1.1: dependencies: broccoli-sri-hash "^2.1.0" -ember-cli-string-utils@^1.0.0, ember-cli-string-utils@^1.1.0: +ember-cli-string-utils@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1" integrity sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE= -ember-cli-test-info@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-test-info/-/ember-cli-test-info-1.0.0.tgz#ed4e960f249e97523cf891e4aed2072ce84577b4" - integrity sha1-7U6WDySel1I8+JHkrtIHLOhFd7Q= - dependencies: - ember-cli-string-utils "^1.0.0" - ember-cli-test-loader@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-2.2.0.tgz#3fb8d5d1357e4460d3f0a092f5375e71b6f7c243" @@ -5028,27 +5021,6 @@ ember-cli-test-loader@^2.2.0: dependencies: ember-cli-babel "^6.8.1" -ember-cli-typescript-blueprints@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-typescript-blueprints/-/ember-cli-typescript-blueprints-3.0.0.tgz#88595df71ddca9a7cb3ef1fb1626a1c2528da1b6" - integrity sha512-nJScjIjwDY96q9eiIBse9npLht/1FNmDRMpoTLJUrgSTzmx7/S6JhlH4BrMELkLCvtPkWoduDNBGiGBdCqf9FA== - dependencies: - chalk "^2.4.1" - ember-cli-babel "^7.0.0" - ember-cli-get-component-path-option "^1.0.0" - ember-cli-is-package-missing "^1.0.0" - ember-cli-normalize-entity-name "^1.0.0" - ember-cli-path-utils "^1.0.0" - ember-cli-string-utils "^1.1.0" - ember-cli-test-info "^1.0.0" - ember-cli-valid-component-name "^1.0.0" - ember-cli-version-checker "^3.0.0" - ember-router-generator "^2.0.0" - exists-sync "^0.1.0" - fs-extra "^8.0.0" - inflection "^1.12.0" - silent-error "^1.1.0" - ember-cli-typescript@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.0.0.tgz#3b838d1ce9e4d22a98e68da22ceac6dc0cfd9bfc" @@ -5109,13 +5081,6 @@ ember-cli-update@0.54.6: update-notifier "^4.0.0" yargs "^15.1.0" -ember-cli-valid-component-name@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-valid-component-name/-/ember-cli-valid-component-name-1.0.0.tgz#71550ce387e0233065f30b30b1510aa2dfbe87ef" - integrity sha1-cVUM44fgIzBl8wswsVEKot++h+8= - dependencies: - silent-error "^1.0.0" - ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.1, ember-cli-version-checker@^2.1.2: version "2.2.0" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3" @@ -5124,7 +5089,7 @@ ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.1, ember-cli-ve resolve "^1.3.3" semver "^5.3.0" -ember-cli-version-checker@^3.0.0, ember-cli-version-checker@^3.1.3: +ember-cli-version-checker@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-3.1.3.tgz#7c9b4f5ff30fdebcd480b1c06c4de43bb51c522c" integrity sha512-PZNSvpzwWgv68hcXxyjREpj3WWb81A7rtYNQq1lLEgrWIchF8ApKJjWP3NBpHjaatwILkZAV8klair5WFlXAKg== @@ -5914,11 +5879,6 @@ exists-sync@0.0.4: resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.4.tgz#9744c2c428cc03b01060db454d4b12f0ef3c8879" integrity sha1-l0TCxCjMA7AQYNtFTUsS8O88iHk= -exists-sync@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.1.0.tgz#318d545213d2b2a31499e92c35f74c94196a22f7" - integrity sha512-qEfFekfBVid4b14FNug/RNY1nv+BADnlzKGHulc+t6ZLqGY4kdHGh1iFha8lnE3sJU/1WzMzKRNxS6EvSakJUg== - exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" From 461674937a303de422ec07c3e362059aaef3739c Mon Sep 17 00:00:00 2001 From: Dan Freeman Date: Wed, 26 Oct 2022 13:29:44 +0200 Subject: [PATCH 4/6] Always use local e-c-ts, regardless of transitive dependencies (cherry picked from commit be7b567d44e14a89e3343625d45eeaedd66a7708) --- package.json | 3 +- yarn.lock | 110 ++++++++++++--------------------------------------- 2 files changed, 27 insertions(+), 86 deletions(-) diff --git a/package.json b/package.json index 933feba8f..f67a36cfa 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,8 @@ "typescript": "4.5.5" }, "resolutions": { - "hawk": "7" + "hawk": "7", + "ember-cli-typescript": "link:." }, "engines": { "node": ">= 12.*" diff --git a/yarn.lock b/yarn.lock index c00c9c924..4d006ec3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -70,16 +70,18 @@ browserslist "^4.12.0" semver "^5.5.0" -"@babel/helper-create-class-features-plugin@^7.10.5", "@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.5.5": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e" - integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w== - dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-member-expression-to-functions" "^7.12.1" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.10.4" +"@babel/helper-create-class-features-plugin@^7.10.5", "@babel/helper-create-class-features-plugin@^7.12.1": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b" + integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-create-regexp-features-plugin@^7.12.1": version "7.12.1" @@ -270,7 +272,7 @@ "@babel/helper-remap-async-to-generator" "^7.12.1" "@babel/plugin-syntax-async-generators" "^7.8.0" -"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.12.1": +"@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de" integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w== @@ -468,7 +470,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-typescript@^7.12.1", "@babel/plugin-syntax-typescript@^7.2.0": +"@babel/plugin-syntax-typescript@^7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz#460ba9d77077653803c3dd2e673f76d66b4029e5" integrity sha512-UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA== @@ -736,23 +738,6 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-typescript" "^7.12.1" -"@babel/plugin-transform-typescript@~7.4.0": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz#ab3351ba35307b79981993536c93ff8be050ba28" - integrity sha512-RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-typescript" "^7.2.0" - -"@babel/plugin-transform-typescript@~7.5.0": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz#6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8" - integrity sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.5.5" - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-typescript" "^7.2.0" - "@babel/plugin-transform-unicode-escapes@^7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709" @@ -1891,7 +1876,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: "@types/color-name" "^1.1.1" color-convert "^2.0.1" -ansi-to-html@^0.6.15, ansi-to-html@^0.6.6: +ansi-to-html@^0.6.15: version "0.6.15" resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.15.tgz#ac6ad4798a00f6aa045535d7f6a9cb9294eebea7" integrity sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ== @@ -4826,7 +4811,7 @@ ember-cli-app-version@4.0.0: ember-cli-babel "^7.22.1" git-repo-info "^2.1.1" -ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, ember-cli-babel-plugin-helpers@^1.1.1: +ember-cli-babel-plugin-helpers@^1.1.0, ember-cli-babel-plugin-helpers@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879" integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw== @@ -5022,39 +5007,16 @@ ember-cli-test-loader@^2.2.0: ember-cli-babel "^6.8.1" ember-cli-typescript@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.0.0.tgz#3b838d1ce9e4d22a98e68da22ceac6dc0cfd9bfc" - integrity sha512-lo5YArbJzJi5ssvaGqTt6+FnhTALnSvYVuxM7lfyL1UCMudyNJ94ovH5C7n5il7ATd6WsNiAPRUO/v+s5Jq/aA== - dependencies: - "@babel/plugin-transform-typescript" "~7.5.0" - ansi-to-html "^0.6.6" - debug "^4.0.0" - ember-cli-babel-plugin-helpers "^1.0.0" - execa "^2.0.0" - fs-extra "^8.0.0" - resolve "^1.5.0" - rsvp "^4.8.1" - semver "^6.0.0" - stagehand "^1.0.0" - walk-sync "^2.0.0" + version "0.0.0" + uid "" ember-cli-typescript@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.2.tgz#464984131fbdc05655eb61d1c3cdd911d3137f0d" - integrity sha512-7I5azCTxOgRDN8aSSnJZIKSqr+MGnT+jLTUbBYqF8wu6ojs2DUnTePxUcQMcvNh3Q3B1ySv7Q/uZFSjdU9gSjA== - dependencies: - "@babel/plugin-proposal-class-properties" "^7.1.0" - "@babel/plugin-transform-typescript" "~7.4.0" - ansi-to-html "^0.6.6" - debug "^4.0.0" - ember-cli-babel-plugin-helpers "^1.0.0" - execa "^1.0.0" - fs-extra "^7.0.0" - resolve "^1.5.0" - rsvp "^4.8.1" - semver "^6.0.0" - stagehand "^1.0.0" - walk-sync "^1.0.0" + version "0.0.0" + uid "" + +"ember-cli-typescript@link:.": + version "0.0.0" + uid "" ember-cli-uglify@3.0.0: version "3.0.0" @@ -5823,21 +5785,6 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99" - integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw== - dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^3.0.0" - onetime "^5.1.0" - p-finally "^2.0.0" - signal-exit "^3.0.2" - strip-final-newline "^2.0.0" - execa@^3.0.0, execa@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89" @@ -9248,13 +9195,6 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npm-run-path@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5" - integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg== - dependencies: - path-key "^3.0.0" - npm-run-path@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" @@ -12382,7 +12322,7 @@ walk-sync@^1.0.0, walk-sync@^1.1.3: ensure-posix-path "^1.1.0" matcher-collection "^1.1.1" -walk-sync@^2.0.0, walk-sync@^2.0.2, walk-sync@^2.2.0: +walk-sync@^2.0.2, walk-sync@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a" integrity sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg== From 6c443fab02b8a27a2e0c1a47cc3b977439127e4b Mon Sep 17 00:00:00 2001 From: Chris Krycho Date: Wed, 26 Oct 2022 08:20:55 -0600 Subject: [PATCH 5/6] v5.2.1 --- CHANGELOG.md | 7 ++++++- package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96d65c0dd..6940ea36b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ## [Unreleased] +## [5.2.1] - 2022-10-26 + +- Add back missing function expected from `ember-cli-typescript-blueprints` [#1537](https://github.com/typed-ember/ember-cli-typescript/pull/1537), ([@dfreeman](https://github.com/dfreeman)) + ## [5.2.0] - 2022-10-25 ### Added ⭐️ @@ -902,7 +906,8 @@ We now use Babel 7's support for TypeScript to build apps and addons. Most of th - Basic, semi-working functionality. [ember-cli-typify]: https://github.com/winding-lines/ember-cli-typify -[unreleased]: https://github.com/typed-ember/ember-cli-typescript/compare/v5.2.0...HEAD +[unreleased]: https://github.com/typed-ember/ember-cli-typescript/compare/v5.2.1...HEAD +[5.2.1]: https://github.com/typed-ember/ember-cli-typescript/compare/v5.2.0...v5.2.1 [5.2.0]: https://github.com/typed-ember/ember-cli-typescript/compare/v5.1.1...v5.2.0 [5.1.1]: https://github.com/typed-ember/ember-cli-typescript/compare/v5.1.0...v5.1.1 [5.1.0]: https://github.com/typed-ember/ember-cli-typescript/compare/v5.0.0...v5.1.0 diff --git a/package.json b/package.json index f67a36cfa..61a423ed5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli-typescript", - "version": "5.2.0", + "version": "5.2.1", "description": "Allow Ember apps to use TypeScript files.", "keywords": [ "ember-addon", From 2ae8f3fbad32263bdb08eb8cdc31c3b0d18b2c83 Mon Sep 17 00:00:00 2001 From: Chris Krycho Date: Wed, 26 Oct 2022 08:22:08 -0600 Subject: [PATCH 6/6] Fix CHANGELOG for 5.2.1 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6940ea36b..4693b2f98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ## [5.2.1] - 2022-10-26 +### Fixed 🔧 + - Add back missing function expected from `ember-cli-typescript-blueprints` [#1537](https://github.com/typed-ember/ember-cli-typescript/pull/1537), ([@dfreeman](https://github.com/dfreeman)) ## [5.2.0] - 2022-10-25