Skip to content

Commit

Permalink
chore(repo): do not replace legacy package mentions in binary files
Browse files Browse the repository at this point in the history
  • Loading branch information
FrozenPandaz committed Apr 25, 2023
1 parent 4e0df09 commit 8d8bca8
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 36 deletions.
37 changes: 2 additions & 35 deletions packages/devkit/src/generators/generate-files.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,10 @@ import { readFileSync, readdirSync, statSync } from 'fs';
import * as path from 'path';
import type { Tree } from 'nx/src/generators/tree';
import { requireNx } from '../../nx';
import { binaryExtensions } from '../utils/binary-extensions';

const { logger } = requireNx();

const binaryExts = new Set([
// // Image types originally from https://github.com/sindresorhus/image-type/blob/5541b6a/index.js
'.jpg',
'.jpeg',
'.png',
'.gif',
'.webp',
'.flif',
'.cr2',
'.tif',
'.bmp',
'.jxr',
'.psd',
'.ico',
'.bpg',
'.jp2',
'.jpm',
'.jpx',
'.heic',
'.cur',
'.tgz',

// Java files
'.jar',
'.keystore',

// Font files
'.ttf',
'.otf',
'.woff',
'.woff2',
'.eot',
]);

/**
* Generates a folder of files based on provided templates.
*
Expand Down Expand Up @@ -84,7 +51,7 @@ export function generateFiles(
substitutions
);

if (binaryExts.has(path.extname(filePath))) {
if (binaryExtensions.has(path.extname(filePath))) {
newContent = readFileSync(filePath);
} else {
const template = readFileSync(filePath, 'utf-8');
Expand Down
33 changes: 33 additions & 0 deletions packages/devkit/src/utils/binary-extensions.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
export const binaryExtensions = new Set([
// // Image types originally from https://github.com/sindresorhus/image-type/blob/5541b6a/index.js
'.jpg',
'.jpeg',
'.png',
'.gif',
'.webp',
'.flif',
'.cr2',
'.tif',
'.bmp',
'.jxr',
'.psd',
'.ico',
'.bpg',
'.jp2',
'.jpm',
'.jpx',
'.heic',
'.cur',
'.tgz',

// Java files
'.jar',
'.keystore',

// Font files
'.ttf',
'.otf',
'.woff',
'.woff2',
'.eot',
]);
7 changes: 6 additions & 1 deletion packages/devkit/src/utils/replace-package.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import type { PackageJson } from 'nx/src/utils/package-json';
import { requireNx } from '../../nx';
import { NX_VERSION } from './package-json';
import { visitNotIgnoredFiles } from '../generators/visit-not-ignored-files';
import { basename } from 'path';
import { basename, extname } from 'path';
import { binaryExtensions } from './binary-extensions';

const {
getProjects,
Expand Down Expand Up @@ -148,6 +149,10 @@ function replaceMentions(
newPackageName: string
) {
visitNotIgnoredFiles(tree, '.', (path) => {
if (binaryExtensions.has(extname(path))) {
return;
}

const ignoredFiles = [
'yarn.lock',
'package-lock.json',
Expand Down

0 comments on commit 8d8bca8

Please sign in to comment.