javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-15 02:54:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: sass handling

Browse Source
This commit is contained in:
Igor Randjelovic
2020-11-23 13:55:44 +01:00
parent f937940902
commit f09d746cc5
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/webpack5/package.json
View File

@ -22,8 +22,8 @@
"css-loader": "^5.0.1", "css-loader": "^5.0.1",
"loader-utils": "^2.0.0", "loader-utils": "^2.0.0",
"react-refresh": "^0.9.0", "react-refresh": "^0.9.0",
"scss": "^0.2.4", "sass": "^1.29.0",
"scss-loader": "^0.0.1", "sass-loader": "^10.1.0",
"source-map": "^0.7.3", "source-map": "^0.7.3",
"terser-webpack-plugin": "^5.0.3", "terser-webpack-plugin": "^5.0.3",
"ts-dedent": "^2.0.0", "ts-dedent": "^2.0.0",

4
packages/webpack5/src/configuration/base.ts
View File

@ -165,8 +165,8 @@ export default function (config: Config, env: IWebpackEnv): Config {
.use('css2json-loader') .use('css2json-loader')
.loader('css2json-loader') .loader('css2json-loader')
.end() .end()
.use('scss-loader') .use('sass-loader')
.loader('scss-loader'); .loader('sass-loader');
// items to clean // items to clean
config.plugin('CleanWebpackPlugin').use(CleanWebpackPlugin, [ config.plugin('CleanWebpackPlugin').use(CleanWebpackPlugin, [

6
packages/webpack5/src/plugins/WatchStatePlugin.ts
View File

@ -1,4 +1,4 @@
const id = 'WatchStateLoggerPlugin'; const id = 'WatchStatePlugin';
const version = 1; const version = 1;
export enum messages { export enum messages {
@ -14,7 +14,7 @@ export enum messages {
export class WatchStatePlugin { export class WatchStatePlugin {
isRunningWatching: boolean; isRunningWatching: boolean;
apply(compiler) { apply(compiler: any) {
let isWatchMode = false; let isWatchMode = false;
let prevAssets = []; let prevAssets = [];
@ -32,6 +32,7 @@ export class WatchStatePlugin {
isWatchMode ? messages.startWatching : messages.compilationComplete isWatchMode ? messages.startWatching : messages.compilationComplete
); );
// logic taken from CleanWebpackPlugin
const assets = const assets =
compilation.getStats().toJson( compilation.getStats().toJson(
{ {
@ -40,6 +41,7 @@ export class WatchStatePlugin {
true true
).assets || []; ).assets || [];
const assetList = assets.map((asset) => asset.name); const assetList = assets.map((asset) => asset.name);
const emittedAssets = Array.from(compilation.emittedAssets); const emittedAssets = Array.from(compilation.emittedAssets);
const staleAssets = prevAssets.filter((asset) => { const staleAssets = prevAssets.filter((asset) => {
return assetList.includes(asset) === false; return assetList.includes(asset) === false;