feat: Removed node sass fork, bumped packages to support no 16 (#79)

bigcommerce · Dec 30, 2022 · 969f98c · 969f98c
1 parent e0dbbe7
commit 969f98c
Show file tree

Hide file tree

Showing 11 changed files with 2,030 additions and 3,424 deletions.
diff --git a/.github/workflows/pull-request-review.yml b/.github/workflows/pull-request-review.yml
@@ -10,7 +10,7 @@ jobs:
     build:
         strategy:
             matrix:
-                node: [14.x]
+                node: [16.x]
                 os: ['ubuntu-latest', 'windows-2019', 'macos-latest']
 
         runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v2
               with:
-                  node-version: '14.x'
+                  node-version: '16.x'
             - run: npm ci
             # Setup .npmrc file to publish to npm registry
             - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14.19
+16.
diff --git a/.travis.yml b/.travis.yml
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/lib/ScssCompiler.js b/lib/ScssCompiler.js
@@ -1,6 +1,5 @@
 const _ = require('lodash');
 const path = require('path');
-const Fiber = require('fibers');
 const { promisify } = require('util');
 
 class ScssCompiler {
@@ -18,10 +17,6 @@ class ScssCompiler {
         this._wasUsed = false;
     }
 
-    activateNodeSassForkEngine() {
-        this.engine = require('@bigcommerce/node-sass');
-    }
-
     activateNodeSassEngine() {
         this.engine = require('node-sass');
     }
@@ -75,7 +70,6 @@ class ScssCompiler {
             files: options.files,
             sourceMap: options.sourceMap,
             sourceMapEmbed: options.sourceMap,
-            fiber: Fiber,
             functions: this.getScssFunctions(options.themeSettings),
             importer: this.scssImporter.bind(this),
             quietDeps: true, // suppress deprecation warnings

diff --git a/lib/styles.js b/lib/styles.js
@@ -45,12 +45,10 @@ class StencilStyles {
     }
 
     activateEngine(engine) {
-        if (engine === 'node-sass') {
-            this.compilers['scss'].activateNodeSassEngine();
-        } else if (engine === 'node-sass-fork') {
-            this.compilers['scss'].activateNodeSassForkEngine();
-        } else if (engine === 'dart-sass') {
+        if (engine === 'dart-sass') {
             this.compilers['scss'].activateDartSassEngine();
+        } else {
+            this.compilers['scss'].activateNodeSassEngine();
         }
     }
 }