@ember-tooling/blueprint-model 0.4.1 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/blueprint-model",
-  "version": "0.4.1",
+  "version": "0.6.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -8,7 +8,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "chalk": "^4.1.2",
+    "chalk": "^5.6.2",
     "diff": "^7.0.0",
     "isbinaryfile": "^5.0.4",
     "lodash": "^4.17.21",

package/utilities/edit-file-diff.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const util = require('util');
-const jsdiff = require('diff');
+const { applyPatch, createPatch } = require('diff');
 const quickTemp = require('quick-temp');
 const path = require('path');
 const SilentError = require('silent-error');
@@ -38,7 +38,7 @@ class EditFileDiff {
       diffString: readFile(resultHash.diffPath),
       currentString: readFile(resultHash.outputPath),
     }).then((result) => {
-      let appliedDiff = jsdiff.applyPatch(result.currentString.toString(), result.diffString.toString());
+      let appliedDiff = applyPatch(result.currentString.toString(), result.diffString.toString());
 
       if (!appliedDiff) {
         let message = 'Patch was not cleanly applied.';
@@ -52,7 +52,7 @@ class EditFileDiff {
 
   invokeEditor(result) {
     let info = this.info;
-    let diff = jsdiff.createPatch(info.outputPath, result.output.toString(), result.input);
+    let diff = createPatch(info.outputPath, result.output.toString(), result.input);
     let diffPath = path.join(this.tmpDifferenceDir, 'currentDiff.diff');
 
     return writeFile(diffPath, diff)

package/utilities/experiments.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 
 /*
   If you're here to remove the VITE experiment flag in favor of it being

package/utilities/file-info.js

@@ -2,11 +2,11 @@
 
 const fs = require('fs');
 const util = require('util');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const EditFileDiff = require('./edit-file-diff');
 const EOL = require('os').EOL;
 const rxEOL = new RegExp(EOL, 'g');
-const isBinaryFile = require('isbinaryfile').isBinaryFileSync;
+const { isBinaryFileSync } = require('isbinaryfile');
 const hash = require('promise.hash.helper');
 const canEdit = require('./open-editor').canEdit;
 const processTemplate = require('./process-template');
@@ -58,7 +58,7 @@ class FileInfo {
       /* ignore */
     }
 
-    let canDiff = !isBinaryFile(this.inputPath) && (!outputPathIsFile || !isBinaryFile(this.outputPath));
+    let canDiff = !isBinaryFileSync(this.inputPath) && (!outputPathIsFile || !isBinaryFileSync(this.outputPath));
 
     if (canDiff) {
       promptOptions.choices.push({ key: 'd', name: 'Diff', value: 'diff' });
@@ -73,12 +73,12 @@ class FileInfo {
 
   displayDiff() {
     let info = this,
-      jsdiff = require('diff');
+      { createPatch } = require('diff');
     return hash({
       input: this.render(),
       output: readFile(info.outputPath),
     }).then((result) => {
-      let diff = jsdiff.createPatch(
+      let diff = createPatch(
         info.outputPath,
         result.output.toString().replace(rxEOL, '\n'),
         result.input.replace(rxEOL, '\n')
@@ -106,7 +106,7 @@ class FileInfo {
 
     return readFile(path).then((content) =>
       lstat(path).then((fileStat) => {
-        if (isBinaryFile(content, fileStat.size)) {
+        if (isBinaryFileSync(content, fileStat.size)) {
           return content;
         } else {
           try {