Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

fix: avoid getting js template in a ts project #717

Merged
merged 3 commits into from
Dec 1, 2018
Merged

fix: avoid getting js template in a ts project #717

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fa8c73
fix: avoid getting `js` template in a `ts` project as we don't have a…
DimitarTachev Nov 20, 2018
e3b661b
fix: generate tsconfig based on the nativescript-dev-webpack dependency
DimitarTachev Nov 21, 2018
cf7f635
Merge branch 'master' into tachev/fix-yarn-ts-projects-creation
Dec 1, 2018
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
10 changes: 6 additions & 4 deletions projectHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ const isTypeScript = ({ projectDir, packageJson } = {}) => {

return (
packageJson.dependencies &&
packageJson.dependencies.hasOwnProperty("typescript")
(packageJson.dependencies.hasOwnProperty("nativescript-dev-typescript") ||
packageJson.dependencies.hasOwnProperty("typescript"))
) || (
packageJson.devDependencies &&
packageJson.devDependencies.hasOwnProperty("typescript")
) || isAngular({ packageJson });
packageJson.devDependencies &&
(packageJson.devDependencies.hasOwnProperty("nativescript-dev-typescript") ||
packageJson.devDependencies.hasOwnProperty("typescript"))
) || isAngular({ packageJson });
};

const isAngular = ({ projectDir, packageJson } = {}) => {
Expand Down