85 lines
3.2 KiB
Diff
85 lines
3.2 KiB
Diff
|
From aad3d4521c3098fb255fb2db8f2e1d691a033665 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vlad Filippov <vlad.filippov@gmail.com>
|
||
|
|
Date: Sun, 10 Apr 2022 23:16:06 -0400
|
||
|
|
Subject: [PATCH] Update dependencies, tests...
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/lib/grunt/file.js b/lib/grunt/file.js
|
||
|
|
index 863617f..f0a2d6e 100644
|
||
|
|
--- a/lib/grunt/file.js
|
||
|
|
+++ b/lib/grunt/file.js
|
||
|
|
@@ -303,8 +303,11 @@ file.write = function(filepath, contents, options) {
|
||
|
|
// Read a file, optionally processing its content, then write the output.
|
||
|
|
// Or read a directory, recursively creating directories, reading files,
|
||
|
|
// processing content, writing output.
|
||
|
|
+// Handles symlinks by coping them as files or directories.
|
||
|
|
file.copy = function copy(srcpath, destpath, options) {
|
||
|
|
- if (file.isDir(srcpath)) {
|
||
|
|
+ if (file._isSymbolicLink(srcpath)) {
|
||
|
|
+ file._copySymbolicLink(srcpath, destpath);
|
||
|
|
+ } else if (file.isDir(srcpath)) {
|
||
|
|
// Copy a directory, recursively.
|
||
|
|
// Explicitly create new dest directory.
|
||
|
|
file.mkdir(destpath);
|
||
|
|
@@ -452,6 +455,24 @@ file.isPathCwd = function() {
|
||
|
|
}
|
||
|
|
};
|
||
|
|
|
||
|
|
+file._isSymbolicLink = function() {
|
||
|
|
+ var filepath = path.join.apply(path, arguments);
|
||
|
|
+ return fs.lstatSync(filepath).isSymbolicLink();
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
+file._copySymbolicLink = function(srcpath, destpath) {
|
||
|
|
+ var destdir = path.join(destpath, '..');
|
||
|
|
+ var fileBase = path.basename(srcpath);
|
||
|
|
+ // Use the correct relative path for the symlink
|
||
|
|
+ if (!grunt.file.isPathAbsolute(srcpath)) {
|
||
|
|
+ srcpath = path.relative(destdir, srcpath) || '.';
|
||
|
|
+ }
|
||
|
|
+ file.mkdir(destdir);
|
||
|
|
+ var mode = grunt.file.isDir(srcpath) ? 'dir' : 'file';
|
||
|
|
+ var destpath = path.join(destpath, fileBase);
|
||
|
|
+ return fs.symlinkSync(srcpath, destpath, mode);
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
// Test to see if a filepath is contained within the CWD.
|
||
|
|
file.isPathInCwd = function() {
|
||
|
|
var filepath = path.join.apply(path, arguments);
|
||
|
|
diff --git a/test/grunt/file_test.js b/test/grunt/file_test.js
|
||
|
|
index 5110f04..41f1c2d 100644
|
||
|
|
--- a/test/grunt/file_test.js
|
||
|
|
+++ b/test/grunt/file_test.js
|
||
|
|
@@ -888,5 +888,28 @@ exports.file = {
|
||
|
|
test.ok(grunt.file.isPathInCwd(path.resolve('deep')), 'subdirectory is in cwd');
|
||
|
|
test.done();
|
||
|
|
},
|
||
|
|
+ 'symbolicLinkCopy': function(test) {
|
||
|
|
+ test.expect(4);
|
||
|
|
+ var srcfile = new Tempdir();
|
||
|
|
+ fs.symlinkSync(path.resolve('test/fixtures/octocat.png'), path.join(srcfile.path, 'octocat.png'), 'file');
|
||
|
|
+ // test symlink copy for files
|
||
|
|
+ var destdir = new Tempdir();
|
||
|
|
+ grunt.file.copy(path.join(srcfile.path, 'octocat.png'), destdir.path);
|
||
|
|
+ test.ok(fs.lstatSync(path.join(srcfile.path, 'octocat.png')).isSymbolicLink());
|
||
|
|
+ test.ok(fs.lstatSync(path.join(destdir.path, 'octocat.png')).isSymbolicLink());
|
||
|
|
+
|
||
|
|
+ // test symlink copy for directories
|
||
|
|
+ var srcdir = new Tempdir();
|
||
|
|
+ var destdir = new Tempdir();
|
||
|
|
+ var fixtures = path.resolve('test/fixtures');
|
||
|
|
+ var symlinkSource = path.join(srcdir.path, path.basename(fixtures));
|
||
|
|
+ console.log('symlinkSource', symlinkSource);
|
||
|
|
+ fs.symlinkSync(fixtures, symlinkSource, 'dir');
|
||
|
|
+
|
||
|
|
+ grunt.file.copy(symlinkSource, destdir.path);
|
||
|
|
+ test.ok(fs.lstatSync(symlinkSource).isSymbolicLink());
|
||
|
|
+ test.ok(fs.lstatSync(path.join(destdir.path, path.basename(fixtures))).isSymbolicLink());
|
||
|
|
+ test.done();
|
||
|
|
+ },
|
||
|
|
}
|
||
|
|
};
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|