remove cpr (#194)

* try using fs.cp

available in Node 16.7

* catch exit(1) in integration tests

* correctly check installed deps count when reporting stats

* Update build.yml

* fs.cp w recursive and force is roughly cpr w overwrite

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [ 16.x, 18.x, 20.x ]
+        node-version: [ 16.x, 18.x, 20.x, 22.x ]
         os: [ windows-latest, ubuntu-latest, macOS-latest ]
 
     # Go

package.json

@@ -39,7 +39,6 @@
     "@architect/utils": "~4.0.6",
     "acorn-loose": "~8.4.0",
     "chalk": "4.1.2",
-    "cpr": "~3.0.1",
     "esquery": "~1.6.0",
     "glob": "10.4.5",
     "minimist": "~1.2.8",

src/actions/autoinstall/index.js

@@ -54,8 +54,8 @@ module.exports = function autoinstaller (params) {
       `Scanned ${projectDirs} project dirs`,
       `Inspected ${projectFiles} project files`,
     ]
-    if (nodeDeps.length) stats.push(`Installed ${nodeDeps} Node.js dependencies`)
-    if (pyDeps.length) stats.push(`Installed ${pyDeps} Python dependencies`)
+    if (nodeDeps > 0) stats.push(`Installed ${nodeDeps} Node.js dependencies`)
+    if (pyDeps > 0) stats.push(`Installed ${pyDeps} Python dependencies`)
     stats.push(`Found a total of ${totalDeps} dependencies to install`)
     update.status('Dependency analysis', ...stats)
     update.done(`Completed in ${Date.now() - start}ms`)

src/shared/copy.js

@@ -1,5 +1,4 @@
-let cp = require('cpr')
-let { mkdirSync } = require('fs')
+let { cp, mkdirSync } = require('fs')
 let { dirname } = require('path')
 let { sync: symlinkOrCopy } = require('symlink-or-copy')
 let { destroyPath } = require('../lib')
@@ -17,7 +16,7 @@ module.exports = function copy (source, destination, params, callback) {
       callback()
     }
     else {
-      cp(source, destination, { overwrite: true }, callback)
+      cp(source, destination, { recursive: true, force: true }, callback)
     }
   }
   catch (err) {

test/integration/_shared.js

@@ -1,6 +1,5 @@
 let { dirname, join } = require('path')
-let { existsSync } = require('fs')
-let cp = require('cpr')
+let { cp, existsSync } = require('fs')
 let { globSync } = require('glob')
 let { pathToUnix } = require('@architect/utils')
 let { destroyPath } = require('../../src/lib')
@@ -153,7 +152,7 @@ let viewsArtifactsDisabled = [
 function reset (t, callback) {
   process.chdir(join(__dirname, '..'))
   destroyPath(mockTmp)
-  cp(mockSource, mockTmp, { overwrite: true }, function (err) {
+  cp(mockSource, mockTmp, { recursive: true, force: true }, function (err) {
     if (err) t.fail(err)
     else {
       process.chdir(mockTmp)
@@ -163,31 +162,31 @@ function reset (t, callback) {
 }
 function resetAndCopyShared (t, callback) {
   reset(t, function () {
-    cp('_shared', 'src', { overwrite: true }, function done (err) {
+    cp('_shared', 'src', { recursive: true, force: true }, function done (err) {
       if (err) t.fail(err)
       else callback()
     })
   })
 }
 function resetAndCopySharedAutoinstall (t, callback) {
   reset(t, function () {
-    cp('_shared-autoinstall', '.', { overwrite: true }, function done (err) {
+    cp('_shared-autoinstall', '.', { recursive: true, force: true }, function done (err) {
       if (err) t.fail(err)
       else callback()
     })
   })
 }
 function resetAndCopySharedCustom (t, callback) {
   reset(t, function () {
-    cp('_shared-custom', '.', { overwrite: true }, function done (err) {
+    cp('_shared-custom', '.', { recursive: true, force: true }, function done (err) {
       if (err) t.fail(err)
       else callback()
     })
   })
 }
 function resetAndCopySharedPlugins (t, callback) {
   reset(t, function () {
-    cp('_shared-plugins', 'src', { overwrite: true }, function done (err) {
+    cp('_shared-plugins', 'src', { recursive: true, force: true }, function done (err) {
       if (err) t.fail(err)
       else callback()
     })

test/integration/default/install-tests.js

@@ -32,6 +32,11 @@ let {
 let hydrate = require('../../..')
 process.env.CI = true // Suppresses tape issues with progress indicator
 
+test('Does not exit code 1', t => {
+  process.on('exit', code => { if (code === 1) t.fail('Exited code 1!') })
+  t.end()
+})
+
 test(`[Default (file copying)] install() hydrates all Functions', shared and views dependencies (autoinstall enabled)`, t => {
   let count =
     pythonDependencies.length +

test/integration/default/shared-tests.js

@@ -1,13 +1,13 @@
 let { dirname, join } = require('path')
 let {
+  cp,
   existsSync,
   lstatSync,
   mkdirSync,
   readFileSync,
   renameSync,
   writeFileSync,
 } = require('fs')
-let cp = require('cpr')
 let test = require('tape')
 let {
   resetAndCopyShared,
@@ -26,6 +26,11 @@ let {
 let hydrate = require('../../..')
 process.env.CI = true // Suppresses tape issues with progress indicator
 
+test('Does not exit code 1', t => {
+  process.on('exit', code => { if (code === 1) t.fail('Exited code 1!') })
+  t.end()
+})
+
 test(`[Shared file copying (default paths)] shared() never uses symlinks by default`, t => {
   t.plan(2)
   resetAndCopyShared(t, function () {
@@ -102,7 +107,7 @@ test(`[Shared file copying with plugins (default paths)] shared() copies shared
     pluginArtifacts.length + 1,
   )
   resetAndCopySharedPlugins(t, function () {
-    cp(join('src', 'app.plugins'), join('.', 'app.arc'), { overwrite: true },
+    cp(join('src', 'app.plugins'), join('.', 'app.arc'), { recursive: true, force: true },
       function (err) {
         if (err) t.fail(err)
         else {
@@ -177,7 +182,7 @@ test(`[Shared file copying (custom paths)] shared() copies shared and views (unl
 test(`[Shared file copying (default paths)] shared() views to only @views (unless disabled or folder not found)`, t => {
   t.plan(viewsArtifacts.length + viewsArtifactsDisabled.length + 1)
   resetAndCopyShared(t, function () {
-    cp(join('src', 'app.arc-views'), join('.', 'app.arc'), { overwrite: true }, function (err) {
+    cp(join('src', 'app.arc-views'), join('.', 'app.arc'), { recursive: true, force: true }, function (err) {
       if (err) t.fail(err)
       else {
         hydrate.shared({}, function (err) {
@@ -206,7 +211,7 @@ test(`[Shared file copying (default paths)] shared() views to only @views (unles
 test(`[Shared file copying (custom paths)] shared() views to only @views (unless disabled or folder not found)`, t => {
   t.plan(viewsArtifacts.length + viewsArtifactsDisabled.length + 1)
   resetAndCopySharedCustom(t, function () {
-    cp(join('_shared-custom', 'app.arc-views'), join('.', 'app.arc'), { overwrite: true }, function (err) {
+    cp(join('_shared-custom', 'app.arc-views'), join('.', 'app.arc'), { recursive: true, force: true }, function (err) {
       if (err) t.fail(err)
       else {
         hydrate.shared({}, function (err) {

test/integration/default/update-tests.js

@@ -11,6 +11,11 @@ let {
 let hydrate = require('../../..')
 process.env.CI = true // Suppresses tape issues with progress indicator
 
+test('Does not exit code 1', t => {
+  process.on('exit', code => { if (code === 1) t.fail('Exited code 1!') })
+  t.end()
+})
+
 test(`[Default (file copying)] update() bumps installed dependencies to newer versions`, t => {
   t.plan(4)
   reset(t, function () {

test/integration/symlink/install-tests.js

@@ -33,6 +33,11 @@ let hydrate = require('../../..')
 process.env.CI = true // Suppresses tape issues with progress indicator
 let symlink = true
 
+test('Does not exit code 1', t => {
+  process.on('exit', code => { if (code === 1) t.fail('Exited code 1!') })
+  t.end()
+})
+
 // As of late 2020, this test passes GHCI in both windows-latest and windows-2016
 // This is strange, bc windows-2016 should be running a pre-Windows-symlink build (10.0.14393 Build 3930)
 // See: https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10/

test/integration/symlink/shared-tests.js

@@ -1,13 +1,13 @@
 let { dirname, join } = require('path')
 let {
+  cp,
   existsSync,
   lstatSync,
   mkdirSync,
   readFileSync,
   renameSync,
   writeFileSync,
 } = require('fs')
-let cp = require('cpr')
 let test = require('tape')
 let {
   resetAndCopyShared,
@@ -27,6 +27,11 @@ let hydrate = require('../../..')
 process.env.CI = true // Suppresses tape issues with progress indicator
 let symlink = true
 
+test('Does not exit code 1', t => {
+  process.on('exit', code => { if (code === 1) t.fail('Exited code 1!') })
+  t.end()
+})
+
 // As of late 2020, this test passes GHCI in both windows-latest and windows-2016
 // This is strange, bc windows-2016 should be running a pre-Windows-symlink build (10.0.14393 Build 3930)
 // See: https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10/
@@ -106,7 +111,7 @@ test(`[Shared file symlinking with plugins (default paths)] shared() copies shar
     pluginArtifacts.length + 1,
   )
   resetAndCopySharedPlugins(t, function () {
-    cp(join('src', 'app.plugins'), join('.', 'app.arc'), { overwrite: true },
+    cp(join('src', 'app.plugins'), join('.', 'app.arc'), { recursive: true, force: true },
       function (err) {
         if (err) t.fail(err)
         else {
@@ -181,7 +186,7 @@ test(`[Shared file symlinking (custom paths)] shared() copies shared and views (
 test(`[Shared file symlinking (default paths)] shared() views to only @views (unless disabled or folder not found)`, t => {
   t.plan(viewsArtifacts.length + viewsArtifactsDisabled.length + 1)
   resetAndCopyShared(t, function () {
-    cp(join('src', 'app.arc-views'), join('.', 'app.arc'), { overwrite: true }, function (err) {
+    cp(join('src', 'app.arc-views'), join('.', 'app.arc'), { recursive: true, force: true }, function (err) {
       if (err) t.fail(err)
       else {
         hydrate.shared({ symlink }, function (err) {
@@ -210,7 +215,7 @@ test(`[Shared file symlinking (default paths)] shared() views to only @views (un
 test(`[Shared file symlinking (custom paths)] shared() views to only @views (unless disabled or folder not found)`, t => {
   t.plan(viewsArtifacts.length + viewsArtifactsDisabled.length + 1)
   resetAndCopySharedCustom(t, function () {
-    cp(join('_shared-custom', 'app.arc-views'), join('.', 'app.arc'), { overwrite: true }, function (err) {
+    cp(join('_shared-custom', 'app.arc-views'), join('.', 'app.arc'), { recursive: true, force: true }, function (err) {
       if (err) t.fail(err)
       else {
         hydrate.shared({ symlink }, function (err) {

test/integration/symlink/update-tests.js

@@ -14,6 +14,11 @@ let hydrate = require('../../..')
 process.env.CI = true // Suppresses tape issues with progress indicator
 let symlink = true
 
+test('Does not exit code 1', t => {
+  process.on('exit', code => { if (code === 1) t.fail('Exited code 1!') })
+  t.end()
+})
+
 // As of late 2020, this test passes GHCI in both windows-latest and windows-2016
 // This is strange, bc windows-2016 should be running a pre-Windows-symlink build (10.0.14393 Build 3930)
 // See: https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10/