Merge pull request #741 from bryceosterhaus/700

bryceosterhaus · web-flow · commit 51ef19264f66 · 2021-11-11T09:33:21.000-08:00
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -19,7 +19,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [12.x]
+                node-version: [14.x]
 
         steps:
             - uses: actions/checkout@v2
diff --git a/.github/workflows/guidelines.yml b/.github/workflows/guidelines.yml
@@ -21,7 +21,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [12.x]
+                node-version: [14.x]
 
         steps:
             - uses: actions/checkout@v2
diff --git a/.github/workflows/js-toolkit-v2.yml b/.github/workflows/js-toolkit-v2.yml
@@ -23,7 +23,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [12.x]
+                node-version: [14.x]
 
         steps:
             - uses: actions/checkout@v2
@@ -46,7 +46,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [12.x]
+                node-version: [14.x]
 
         steps:
             - uses: actions/checkout@v2
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -27,7 +27,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [12.x]
+                node-version: [14.x]
 
         steps:
             - uses: actions/checkout@v2
diff --git a/.github/workflows/lockfile.yml b/.github/workflows/lockfile.yml
@@ -19,7 +19,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [12.x]
+                node-version: [14.x]
 
         steps:
             - uses: actions/checkout@v2
diff --git a/.github/workflows/projects.yml b/.github/workflows/projects.yml
@@ -31,7 +31,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [12.x]
+                node-version: [14.x]
 
         steps:
             - uses: actions/checkout@v2
@@ -53,7 +53,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [12.x]
+                node-version: [14.x]
 
         steps:
             - uses: actions/checkout@v2
diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/package.json b/projects/js-themes-toolkit/packages/liferay-theme-tasks/package.json
@@ -17,7 +17,7 @@
 		"gulp-postcss": "^8.0.0",
 		"gulp-rename": "^1.2.0",
 		"gulp-replace-task": "^0.11.0",
-		"gulp-sass": "^3.2.0",
+		"gulp-sass": "^5.0.0",
 		"gulp-sourcemaps": "1.6.0",
 		"gulp-terser": "^2.0.0",
 		"gulp-util": "^3.0.8",
@@ -46,10 +46,11 @@
 	"description": "A set of tasks for building and deploying Liferay Portal themes.",
 	"devDependencies": {
 		"liferay-frontend-theme-styled": "6.0.6",
-		"liferay-frontend-theme-unstyled": "6.0.6"
+		"liferay-frontend-theme-unstyled": "6.0.6",
+		"node-sass": "^6.0.1"
 	},
 	"engines": {
-		"node": ">=8.0.0"
+		"node": ">=14.0.0"
 	},
 	"keywords": [
 		"liferay",
diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/tasks/__tests__/build.test.js b/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/tasks/__tests__/build.test.js
@@ -122,6 +122,8 @@ describe('using lib_sass', () => {
 					sassOptions: (defaults) => {
 						sassOptionsCalled = true;
 
+						defaults.dartSass = false;
+
 						assertTruthy(defaults.includePaths);
 
 						return defaults;
@@ -152,7 +154,6 @@ describe('using lib_sass', () => {
 					distName: 'base-theme',
 					gulp: new Gulp(),
 					hookFn: buildHookFn,
-					sassOptions: {dartSass: true},
 				}),
 			namespace: 'dart_sass_build_task',
 			themeConfig: {},
diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/tasks/__tests__/deploy.test.js b/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/tasks/__tests__/deploy.test.js
@@ -34,6 +34,9 @@ beforeEach(() => {
 			registerTasks({
 				distName: 'base-theme',
 				gulp: new Gulp(),
+				sassOptions: {
+					dartSass: false,
+				},
 			}),
 		namespace: 'deploy_task',
 		themeName: 'base-theme-7-2',
diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/tasks/__tests__/kickstart.test.js b/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/tasks/__tests__/kickstart.test.js
@@ -33,7 +33,11 @@ describe('globally installed theme', () => {
 
 	beforeEach(() => {
 		tempTheme = setupTempTheme({
-			init: () => registerTasks({gulp: new Gulp()}),
+			init: () =>
+				registerTasks({
+					gulp: new Gulp(),
+					sassOptions: {dartSass: false},
+				}),
 			namespace: 'kickstart_task_global',
 			themeName: 'base-theme',
 			version: '7.1',
@@ -96,7 +100,11 @@ describe('npm theme', () => {
 
 	beforeEach(() => {
 		tempTheme = setupTempTheme({
-			init: () => registerTasks({gulp: new Gulp()}),
+			init: () =>
+				registerTasks({
+					gulp: new Gulp(),
+					sassOptions: {dartSass: false},
+				}),
 			namespace: 'kickstart_task_npm',
 		});
 
diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/tasks/__tests__/status.test.js b/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/tasks/__tests__/status.test.js
@@ -14,7 +14,8 @@ let tempTheme;
 
 beforeEach(() => {
 	tempTheme = setupTempTheme({
-		init: () => registerTasks({gulp: new Gulp()}),
+		init: () =>
+			registerTasks({gulp: new Gulp(), sassOptions: {dartSass: false}}),
 		namespace: 'status_task',
 	});
 });
diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/tasks/build/compile-css.js b/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/tasks/build/compile-css.js
@@ -35,15 +35,28 @@ module.exports = function () {
 		const {options} = project;
 
 		const sassOptions = getSassOptions(options.sassOptions, {
-			dartSass: false,
+			dartSass: true,
 			includePaths: getSassIncludePaths(),
 			sourceMap: true,
 		});
 
+		let nodeSass;
+
+		if (!sassOptions.dartSass) {
+			try {
+				nodeSass = require('node-sass');
+			}
+			catch (_error) {
+				console.error(
+					'`node-sass` is not found. Try installing it first `npm install node-sass`.'
+				);
+			}
+		}
+
 		const gulpIf = require('gulp-if');
 		const gulpSass = sassOptions.dartSass
 			? require('./sass')
-			: require('gulp-sass');
+			: require('gulp-sass')(nodeSass);
 		const gulpSourceMaps = require('gulp-sourcemaps');
 
 		const postCSSOptions = getPostCSSOptions(options.postcss);
diff --git a/projects/npm-tools/packages/npm-scripts/src/scripts/format.js b/projects/npm-tools/packages/npm-scripts/src/scripts/format.js
@@ -101,7 +101,7 @@ async function format(options = {}) {
 					}
 					else {
 						const formatted = await format(source, prettierOptions);
-						fs.writeFileSync(filepath, formatted);
+						fs.writeFileSync(filepath, formatted || '');
 						fixed++;
 					}
 				}
diff --git a/yarn.lock b/yarn.lock
