-
Notifications
You must be signed in to change notification settings - Fork 99
Airlift updatePathsForAddon from the blueprints package
#1537
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
75f589e
Airlift `updatePathsForAddon` from the blueprints package
dfreeman e3d1227
Remove assumption of `ember-cli-typescript-blueprints` from docs
dfreeman f929bfb
Remove `ember-cli-typescript-blueprints` from devDeps
dfreeman be7b567
Always use local e-c-ts, regardless of transitive dependencies
dfreeman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
ts/blueprints/ember-cli-typescript/update-paths-for-addon.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; | ||
| } | ||
| } | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Huh, is this a standard Yarn pattern for self-resolution? I hadn't seen it before.
On reading the lock file changes, how does this impact consumers (if at all)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure if it's "standard" but it's definitely one I've used in a few places. In principle it could blow up on us in a future where we make big breaking changes here and our dependencies that rely on
ember-cli-typescriptaren't ready for that but are having it forced on them anyway. Since I don't think we're super likely to be making any changes like that, though... ¯\_(ツ)_/¯I don't think it should impact consumers at all, since
resolutionsonly apply in your project's ownpackage.json, not your dependencies'.