Updates from upstream.

danfuzz · Sep 28, 2023 · 07a835e · 07a835e
1 parent f9df432
commit 07a835e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/scripts/lib/bashy-basics/buildy/ls-files b/scripts/lib/bashy-basics/buildy/ls-files
@@ -68,7 +68,7 @@ for i in "${!paths[@]}"; do
         continue
     }
 
-    if [[ ! (${newPath} =~ ^"${baseDir}/") ]]; then
+    if [[ ! ((${newPath} =~ ^"${baseDir}/") || (${newPath} == ${baseDir})) ]]; then
         error-msg "Not a project path: ${p}"
         error=1
     fi

diff --git a/scripts/lib/bashy-node/node-project/fix-package-json b/scripts/lib/bashy-node/node-project/fix-package-json
@@ -41,7 +41,6 @@ WRANGLER_AWK=$'
     $0 = from;
     if (from ~ /^@this\//) {
         deps[from] = 1;
-        #print from;
     }
 }
 
@@ -79,11 +78,14 @@ function get-deps {
     local files
 
     files=($(
-        find "${srcDir}" \
-            '(' -type d -name tests -prune ')' \
-            -o -name '*.js' -print
-    ))
-    awk "${WRANGLER_AWK}" "${files[@]}"
+        lib buildy ls-files --output=lines --include='\.js$' "${srcDir}"
+    )) \
+    || return "$?"
+
+    if (( ${#files[@]} != 0 )); then
+        awk "${WRANGLER_AWK}" "${files[@]}" \
+        || return "$?"
+    fi
 }
 
 # Runs the fixer on the given file.
@@ -118,7 +120,7 @@ function do-fix {
         version: .version,
         type: "module",
         private: true,
-        license: "Apache-2.0",
+        license: (.license // "UNLICENSED"),
         BLANK_LINE_1: "",
         exports: "./index.js",
         imports: {