feat: revert to import syntax

telerik · Nov 6, 2024 · f15ed1a · f15ed1a
1 parent 22f9f26
commit f15ed1a
Show file tree

Hide file tree

Showing 11 changed files with 3,116 additions and 1,053 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
     "@commitlint/cli": "^19.0.3",
     "@commitlint/config-conventional": "^19.0.3",
     "@commitlint/core": "^19.0.3",
+    "@progress/kendo-theme-tasks": "^1.17.3",
     "ansi-colors": "^4.1.1",
     "eslint": "^9.2.0",
     "fs-extra": "^11.1.1",
@@ -28,7 +29,7 @@
     "husky": "^9.0.7",
     "lerna": "^8.0.0",
     "lodash": "^4.17.21",
-    "sass": "^1.63.6",
+    "node-sass": "^9.0.0",
     "svg-parser": "^2.0.4",
     "svg2ttf": "^6.0.3",
     "svgo": "^3.0.2",

diff --git a/packages/font-icons/package.json b/packages/font-icons/package.json
@@ -12,7 +12,7 @@
   ],
   "scripts": {
     "prebuild": "node scripts/prepare-font.js && node scripts/prepare-nuget.js",
-    "build": "npx sass scss/all.scss dist/index.css",
+    "build": "node scripts/sass-build.js",
     "prepublishOnly": "npm run build"
   },
   "keywords": [

diff --git a/packages/font-icons/scripts/sass-build.js b/packages/font-icons/scripts/sass-build.js
@@ -0,0 +1,9 @@
+const { sassBuild } = require('@progress/kendo-theme-tasks');
+
+sassBuild({
+    file: 'scss/all.scss',
+    output: {
+        path: 'dist/',
+        filename: 'index.css'
+    }
+});
diff --git a/packages/font-icons/scss/_variables.scss b/packages/font-icons/scss/_variables.scss
@@ -1,5 +1,3 @@
-@use "./_font.scss" as *;
-
 $ki-font-family: "WebComponentsIcons" !default;
 $ki-icon-size: 16px !default;
 

diff --git a/packages/font-icons/scss/all.scss b/packages/font-icons/scss/all.scss
@@ -1,4 +1,3 @@
-@forward "index.scss";
-@use "index.scss" as *;
+@import "index.scss";
 
 @include kendo-font-icon-styles();
diff --git a/packages/font-icons/scss/index.scss b/packages/font-icons/scss/index.scss
@@ -1,8 +1,6 @@
-@forward "_variables.scss";
-
-@use "_font.scss" as *;
-@use "_variables.scss" as *;
-@use "_icon-list.scss" as *;
+@import "_font.scss";
+@import"_variables.scss";
+@import "_icon-list.scss";
 
 @mixin kendo-font-icon-styles() {
 

diff --git a/packages/svg-icons/package.json b/packages/svg-icons/package.json
@@ -16,7 +16,7 @@
   ],
   "scripts": {
     "prebuild": "node scripts/prepare-svg.js && node scripts/prepare-nuget.js",
-    "build": "rollup -c --bundleConfigAsCjs && npx sass scss/all.scss dist/index.css",
+    "build": "rollup -c --bundleConfigAsCjs && node scripts/sass-build.js",
     "prepublishOnly": "npm run build"
   },
   "keywords": [

diff --git a/packages/svg-icons/scripts/sass-build.js b/packages/svg-icons/scripts/sass-build.js
@@ -0,0 +1,9 @@
+const { sassBuild } = require('@progress/kendo-theme-tasks');
+
+sassBuild({
+    file: 'scss/all.scss',
+    output: {
+        path: 'dist/',
+        filename: 'index.css'
+    }
+});
diff --git a/packages/svg-icons/scss/all.scss b/packages/svg-icons/scss/all.scss
@@ -1,4 +1,3 @@
-@forward "index.scss";
-@use "index.scss" as *;
+@import "index.scss";
 
 @include kendo-svg-icon-styles();
diff --git a/packages/svg-icons/scss/index.scss b/packages/svg-icons/scss/index.scss
@@ -1,5 +1,4 @@
-@forward "_variables.scss";
-@use "_variables.scss" as *;
+@import "_variables.scss";
 
 @mixin kendo-svg-icon-styles() {