chore(emscripten): upgrade to emscripten 1.39.0

rodneyrehm · rodneyrehm · commit ba7befa30aa2 · 2019-10-20T14:56:32.000+02:00
diff --git a/libsass/build.sh b/libsass/build.sh
@@ -25,9 +25,10 @@ cp ./exported_runtime_methods.json ./libsass/exported_runtime_methods.json
 cp ./emterpreter_whitelist.json ./libsass/emterpreter_whitelist.json
 
 # build
+EMSCRIPTEN_TAG="sdk-tag-1.39.0-64bit"
 echo "  initializing emscripten"
 if [ "${2:-}" = "debug" ]; then
-  docker run --rm --volume "$(pwd)/libsass:/src" --user="emscripten" trzeci/emscripten:latest emmake make js-debug
+  docker run --rm --volume "$(pwd)/libsass:/src" --user="emscripten" trzeci/emscripten:${EMSCRIPTEN_TAG} emmake make js-debug
 else
-  docker run --rm --volume "$(pwd)/libsass:/src" --user="emscripten" trzeci/emscripten:latest emmake make js
+  docker run --rm --volume "$(pwd)/libsass:/src" --user="emscripten" trzeci/emscripten:${EMSCRIPTEN_TAG} emmake make js
 fi
diff --git a/src/sass.importer.js b/src/sass.importer.js
@@ -1,4 +1,4 @@
-/*global FS, PATH, Sass, stringToPointer*/
+/*global FS, PATH, PATH_FS, Sass, stringToPointer*/
 /*jshint strict:false*/
 
 var Importer = {
@@ -14,7 +14,7 @@ var Importer = {
     Importer._running = true;
     Importer._result = null;
 
-    var resolved = PATH.resolve(previous === 'stdin' ? Sass._path : PATH.dirname(previous), current);
+    var resolved = PATH_FS.resolve(previous === 'stdin' ? Sass._path : PATH.dirname(previous), current);
     var found = Sass.findPathVariation(FS.stat, resolved);
     var done = function done(result) {
       Importer._result = result;
@@ -58,4 +58,4 @@ var Importer = {
     return Importer._result && Importer._result[key] !== undefined && stringToPointer(Importer._result[key]) || 0;
   },
 
-};
+};
diff --git a/src/sass.resolve-paths.js b/src/sass.resolve-paths.js
@@ -1,4 +1,4 @@
-/*global PATH, Sass*/
+/*global PATH, PATH_FS, Sass*/
 /*jshint strict:false*/
 
 function isAbsolutePath (path) {
@@ -18,17 +18,17 @@ Sass.getPathVariations = function(path) {
     // (1) filename as given
     path,
     // (2) underscore + given
-    PATH.resolve(directory, '_' + basename)
+    PATH_FS.resolve(directory, '_' + basename)
   ].concat(extensions.map(function(extension) {
     // (3) underscore + given + extension
-    return PATH.resolve(directory, '_' + basename + extension);
+    return PATH_FS.resolve(directory, '_' + basename + extension);
   })).concat(extensions.map(function(extension) {
     // (4) given + extension
-    return PATH.resolve(directory, basename + extension);
+    return PATH_FS.resolve(directory, basename + extension);
   }));
 
   if (!isAbsolutePath(path)) {
-    // PATH.resolve() makes everything absolute, revert that
+    // PATH_FS.resolve() makes everything absolute, revert that
     list = list.map(function(item) {
       return isAbsolutePath(item)
         ? item.slice(1)
