Skip to content

feat(@angular-devkit/build-angular): use sass instead of node-sass #13950

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

Merged
merged 2 commits into from
Mar 20, 2019
Merged

feat(@angular-devkit/build-angular): use sass instead of node-sass #13950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c19300a
feat(@angular-devkit/build-angular): use `sass` instead of `node-sass`
alan-agius4 Mar 19, 2019
8b11a91
test: update e2e for sass implementation
Mar 20, 2019
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
4 changes: 1 addition & 3 deletions packages/angular_devkit/build_angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"postcss-loader": "3.0.0",
"raw-loader": "1.0.0",
"rxjs": "6.4.0",
"sass": "1.17.3",
"sass-loader": "7.1.0",
"semver": "5.6.0",
"source-map-support": "0.5.11",
Expand All @@ -52,9 +53,6 @@
"webpack-sources": "1.3.0",
"webpack-subresource-integrity": "1.1.0-rc.6"
},
"optionalDependencies": {
"node-sass": "4.11.0"
},
"devDependencies": {
"@angular/animations": "^8.0.0-beta.9",
"@angular/cdk": "^7.3.4",
Expand Down
12 changes: 6 additions & 6 deletions packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,14 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
}
}

let dartSass: {} | undefined;
let sassImplementation: {} | undefined;
let fiber: {} | undefined;
try {
// tslint:disable-next-line:no-implicit-dependencies
dartSass = require('sass');
} catch { }
sassImplementation = require('node-sass');
} catch {
sassImplementation = require('sass');

let fiber: {} | undefined;
if (dartSass) {
try {
// tslint:disable-next-line:no-implicit-dependencies
fiber = require('fibers');
Expand All @@ -142,7 +142,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
use: [{
loader: 'sass-loader',
options: {
implementation: dartSass,
implementation: sassImplementation,
fiber,
sourceMap: cssSourceMap,
// bootstrap-sass requires a minimum precision of 8
Expand Down
6 changes: 4 additions & 2 deletions ...y-cli/e2e/tests/build/styles/dart-sass.ts → ...y-cli/e2e/tests/build/styles/node-sass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ export default async function () {
await replaceInFile('src/app/app.component.ts', './app.component.css', './app.component.scss');

await silentExec('rm', '-rf', 'node_modules/node-sass');
await silentExec('rm', '-rf', 'node_modules/sass');
await expectToFail(() => ng('build', '--extract-css', '--source-map'));

await silentNpm('install', 'sass');
await silentExec('rm', '-rf', 'node_modules/node-sass');
await silentNpm('install', 'node-sass');
await silentExec('rm', '-rf', 'node_modules/sass');
await ng('build', '--extract-css', '--source-map');

await expectFileToMatch('dist/test-project/styles.css', /body\s*{\s*background-color: blue;\s*}/);
Expand All @@ -42,6 +43,7 @@ export default async function () {

await silentNpm('install', 'node-gyp');
await silentNpm('install', 'fibers');
await silentNpm('install', 'sass');
await silentExec('rm', '-rf', 'node_modules/node-sass');
await ng('build', '--extract-css', '--source-map');

Expand Down
32 changes: 7 additions & 25 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6355,31 +6355,6 @@ node-sass-tilde-importer@^1.0.0:
dependencies:
find-parent-dir "^0.3.0"

node-sass@4.11.0:
version "4.11.0"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
dependencies:
async-foreach "^0.1.3"
chalk "^1.1.1"
cross-spawn "^3.0.0"
gaze "^1.0.0"
get-stdin "^4.0.1"
glob "^7.0.3"
in-publish "^2.0.0"
lodash.assign "^4.2.0"
lodash.clonedeep "^4.3.2"
lodash.mergewith "^4.6.0"
meow "^3.7.0"
mkdirp "^0.5.1"
nan "^2.10.0"
node-gyp "^3.8.0"
npmlog "^4.0.0"
request "^2.88.0"
sass-graph "^2.2.4"
stdout-stream "^1.4.0"
"true-case-path" "^1.0.2"

node-sass@^4.9.3:
version "4.9.4"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.4.tgz#349bd7f1c89422ffe7e1e4b60f2055a69fbc5512"
Expand Down Expand Up @@ -8076,6 +8051,13 @@ sass-loader@7.1.0:
pify "^3.0.0"
semver "^5.5.0"

sass@1.17.3:
version "1.17.3"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.17.3.tgz#19f9164cf8653b9fca670a64e53285272c96d192"
integrity sha512-S4vJawbrNUxJUBiHLXPYUKZCoO6cvq3/3ZFBV66a+PafTxcDEFJB+FHLDFl0P+rUfha/703ajEXMuGTYhJESkQ==
dependencies:
chokidar "^2.0.0"

sauce-connect-launcher@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sauce-connect-launcher/-/sauce-connect-launcher-1.2.4.tgz#8d38f85242a9fbede1b2303b559f7e20c5609a1c"
Expand Down