Skip to content
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.

Sign up for GitHub

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

CLI: Do not use modern TS assets in legacy TS projects #20458

Merged
merged 9 commits into from
Feb 13, 2023
Merged

CLI: Do not use modern TS assets in legacy TS projects #20458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5534062
CLI: Do not use modern TS assets in legacy TS projects
IanVS Dec 30, 2022
01426e5
Merge branch 'next' into typescript-assets
ndelangen Jan 14, 2023
a530dcd
Merge remote-tracking branch 'origin/next' into typescript-assets
IanVS Jan 25, 2023
62a3dea
Rename ts and ts-legacy
IanVS Jan 25, 2023
4d2f226
Use logger, fix test
IanVS Jan 26, 2023
141ff42
Merge remote-tracking branch 'origin/next' into typescript-assets
IanVS Feb 3, 2023
719eee0
Merge remote-tracking branch 'origin/next' into typescript-assets
IanVS Feb 6, 2023
84afa44
Merge remote-tracking branch 'origin/next' into typescript-assets
IanVS Feb 13, 2023
2d9f6a7
Fix enum usage
IanVS Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions code/lib/cli/src/helpers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,14 @@ describe('Helpers', () => {
});

it.each`
language | exists | expected
${'javascript'} | ${['js', 'ts']} | ${'/js'}
${'typescript'} | ${['js', 'ts']} | ${'/ts'}
${'typescript'} | ${['js']} | ${'/js'}
${'javascript'} | ${[]} | ${''}
${'typescript'} | ${[]} | ${''}
language | exists | expected
${'javascript'} | ${['js', 'ts']} | ${'/js'}
${'typescript'} | ${['js', 'ts']} | ${'/ts'}
${'typescript-legacy'} | ${['js', 'ts', 'ts-legacy']} | ${'/ts-legacy'}
${'typescript-legacy'} | ${['js', 'ts']} | ${'/js'}
${'typescript'} | ${['js']} | ${'/js'}
${'javascript'} | ${[]} | ${''}
${'typescript'} | ${[]} | ${''}
`(
`should copy $expected when folder $exists exists for language $language`,
async ({ language, exists, expected }) => {
Expand Down
5 changes: 1 addition & 4 deletions code/lib/cli/src/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,17 +205,14 @@ export async function copyComponents(
assetsDir,
languageFolderMapping[SupportedLanguage.TYPESCRIPT_LEGACY]
);
const assetsTS = join(assetsDir, languageFolderMapping[SupportedLanguage.TYPESCRIPT]);

if (await fse.pathExists(assetsLanguage)) {
return assetsLanguage;
}
// Use fallback legacy typescript assets if new ones aren't available
if (language === SupportedLanguage.TYPESCRIPT && (await fse.pathExists(assetsTSLegacy))) {
return assetsTSLegacy;
}
if (language === SupportedLanguage.TYPESCRIPT_LEGACY && (await fse.pathExists(assetsTS))) {
return assetsTS;
}
if (await fse.pathExists(assetsJS)) {
return assetsJS;
}
Expand Down