Allow PRs to be linked to sass/sass PRs

sass · Oct 6, 2021 · 2d56fe0 · 2d56fe0
1 parent 4379462
commit 2d56fe0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 66 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,12 +36,9 @@ jobs:
       - uses: dart-lang/setup-dart@v1
         with: {sdk: "${{ matrix.dart_channel }}"}
       - run: dart pub get
-      - name: Set up sass-spec
-        run: tool/github-action/check-out-sass-spec.sh
-        env:
-          PR_BRANCH: "${{ github.base_ref }}"
-          CURRENT_REF: "${{ github.ref }}"
-          PR_BODY: "${{ github.event.pull_request.body }}"
+      - name: Check out sass-spec
+        uses: sass/clone-linked-repo@v1
+        with: {repo: sass/sass-spec}
       - uses: actions/setup-node@v2
         with: {node-version: "${{ env.DEFAULT_NODE_VERSION }}"}
       - run: npm install
@@ -86,11 +83,8 @@ jobs:
       - run: npm install
 
       - name: Check out sass-spec
-        run: tool/github-action/check-out-sass-spec.sh
-        env:
-          PR_BRANCH: "${{ github.base_ref }}"
-          CURRENT_REF: "${{ github.ref }}"
-          PR_BODY: "${{ github.event.pull_request.body }}"
+        uses: sass/clone-linked-repo@v1
+        with: {repo: sass/sass-spec}
 
       - name: Build JS
         run: dart pub run grinder pkg-npm-dev
@@ -100,7 +94,10 @@ jobs:
         working-directory: sass-spec
 
       - name: Check out Sass specification
-        run: git clone https://github.com/sass/sass.git language --depth 1
+        uses: sass/clone-linked-repo@v1
+        with:
+          repo: sass/sass
+          path: language
 
       - name: Run tests
         run: npm run js-api-spec -- --sassSassRepo ../language

diff --git a/lib/src/importer/node_to_dart/async_file.dart b/lib/src/importer/node_to_dart/async_file.dart
@@ -47,9 +47,7 @@ class NodeToDartAsyncFileImporter extends AsyncImporter {
           '"$url".'));
     }
 
-    var canonical = _filesystemImporter.canonicalize(resultUrl);
-    if (canonical == null) return null;
-    return canonical;
+    return _filesystemImporter.canonicalize(resultUrl);
   }
 
   ImporterResult? load(Uri url) => _filesystemImporter.load(url);

diff --git a/lib/src/importer/node_to_dart/file.dart b/lib/src/importer/node_to_dart/file.dart
@@ -35,7 +35,7 @@ class NodeToDartFileImporter extends Importer {
 
     if (isPromise(result)) {
       jsThrow(JsError(
-          "The canonicalize() function can't return a Promise for synchronous "
+          "The findFileUrl() function can't return a Promise for synchron "
           "compile functions."));
     } else if (!isJSUrl(result)) {
       jsThrow(JsError("The findFileUrl() method must return a URL."));
@@ -48,9 +48,7 @@ class NodeToDartFileImporter extends Importer {
           '"$url".'));
     }
 
-    var canonical = _filesystemImporter.canonicalize(resultUrl);
-    if (canonical == null) return null;
-    return canonical;
+    return _filesystemImporter.canonicalize(resultUrl);
   }
 
   ImporterResult? load(Uri url) => _filesystemImporter.load(url);

diff --git a/tool/github-action/check-out-sass-spec.sh b/tool/github-action/check-out-sass-spec.sh