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

feat(sass): add conditional sass deps for webpack #355

Merged
merged 1 commit into from
Dec 18, 2017
Merged

feat(sass): add conditional sass deps for webpack #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion dependencyManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { isAngular, isTypeScript } = require("./projectHelpers");
const { isAngular, isTypeScript, isSass } = require("./projectHelpers");

const NEW_DEPS_MESSAGE = `\
A few new dependencies were added. \
Expand Down Expand Up @@ -76,6 +76,10 @@ function getRequiredDeps(packageJson) {
Object.assign(deps, { "awesome-typescript-loader": "~3.1.3" });
}

if (isSass({packageJson})) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need also node-sass?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. It turns out node-sass is a dep to sass-loader. :)

Object.assign(deps, { "sass-loader": "~6.0.6" });
}

return deps;
}

Expand Down
13 changes: 13 additions & 0 deletions projectHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,18 @@ const isAngular = ({ projectDir, packageJson } = {}) => {
.some(dependency => /^@angular\b/.test(dependency));
};

const isSass = ({ projectDir, packageJson } = {}) => {
packageJson = packageJson || getPackageJson(projectDir);

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

const getAndroidRuntimeVersion = (projectDir) => {
try {
const projectPackageJSON = getPackageJson(projectDir);
Expand Down Expand Up @@ -105,6 +117,7 @@ const getPackageJsonPath = projectDir => path.resolve(projectDir, "package.json"
module.exports = {
isTypeScript,
isAngular,
isSass,
writePackageJson,
getPackageJson,
getProjectDir,
Expand Down