Merge branch 'release-1.64.1'

oat-sa · Dec 9, 2022 · b0bdd9a · b0bdd9a
2 parents ba4fd2f + b1b676c
commit b0bdd9a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/build/rollup.config.js b/build/rollup.config.js
@@ -48,7 +48,8 @@ Handlebars.Visitor.prototype.accept = function() {
 };
 /* --------------------------------------------------------- */
 
-const inputs = glob.sync(path.join(srcDir, '**', '*.js'));
+const globPath = p => p.replace(/\\/g, '/');
+const inputs = glob.sync(globPath(path.join(srcDir, '**', '*.js')));
 
 /**
  * Define all modules as external, so rollup won't bundle them together.

diff --git a/build/scss.js b/build/scss.js
@@ -90,8 +90,9 @@ const writeOutResult = async result => {
  */
 const scssDirectories = [scssVendorDir, srcDir];
 
+const globPath = p => p.replace(/\\/g, '/');
 glob(
-    path.join(rootPath, `+(${scssDirectories.map(dir => path.relative(rootPath, dir)).join('|')})`, '**', '[^_]*.scss'),
+    globPath(path.join(rootPath, `+(${scssDirectories.map(dir => path.relative(rootPath, dir)).join('|')})`, '**', '[^_]*.scss')),
     (err, files) => {
         if (err) {
             throw err;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@oat-sa/tao-core-ui",
-    "version": "1.64.0",
+    "version": "1.64.1",
     "displayName": "TAO Core UI",
     "description": "UI libraries of TAO",
     "scripts": {
@@ -51,8 +51,8 @@
         "@oat-sa/expr-eval": "^1.3.1",
         "@oat-sa/prettier-config": "^0.1.1",
         "@oat-sa/rollup-plugin-wildcard-external": "^0.1.0",
-        "@oat-sa/tao-core-libs": "^0.5.0",
-        "@oat-sa/tao-core-sdk": "^1.21.0",
+        "@oat-sa/tao-core-libs": "^0.5.1",
+        "@oat-sa/tao-core-sdk": "^1.21.1",
         "@oat-sa/tao-core-shared-libs": "^1.4.1",
         "@oat-sa/tao-qunit-testrunner": "^1.0.3",
         "async": "^0.2.10",