Merge pull request #27 from bamlab/various-fixes

Various fixes

Author: Yann Leflour

.npmignore

@@ -3,3 +3,4 @@ src
 .prettierrc
 tsconfig.json
 .vscode
+yarn.lock

src/logo.ts

@@ -1 +1,2 @@
+import 'colors';
 export const logo = '❱m'.bgRed.bold + 'ake'.bgRed;

src/modules/setIcon/ios/service.ts

@@ -1,6 +1,9 @@
 import { config } from './config';
 import { addIosImageSetContents } from '../../../services/ios/service';
-import { checkImageIsSquare, generateResizedAssets } from '../../../services/image.processing';
+import {
+  checkImageIsSquare,
+  generateResizedAssetsWithoutAlpha,
+} from '../../../services/image.processing';
 
 export const addIosIcon = async (iconSource: string) => {
   try {
@@ -17,7 +20,7 @@ const generateIosIcons = (iconSource: string, iosIconFolder: string) =>
     config.iosIconSizes.map(size =>
       Promise.all(
         size.multipliers.map(multiplier =>
-          generateResizedAssets(
+          generateResizedAssetsWithoutAlpha(
             iconSource,
             `${iosIconFolder}/icon-${size.size}@${multiplier}x.png`,
             size.size * multiplier

src/rn-compatibility-layer.ts

@@ -1,28 +1,8 @@
 import { UserDependencyConfig } from '@react-native-community/cli';
-import 'colors';
 import { setIconCommand, setSplashScreenCommand } from './modules';
-import { resolve } from 'path';
-import { createBackwardCompatibleConfig } from './rn-compatibility-layer';
-
-function getRNCliPackageFile() {
-  try {
-    // Yarn module resolution
-    return require(resolve('.', 'node_modules/@react-native-community/cli/package.json'));
-  } catch {
-    // NPM module resolution
-    return require(resolve(
-      '.',
-      'node_modules/react-native/node_modules/@react-native-community/cli/package.json'
-    ));
-  }
-}
 
 const v2Config: UserDependencyConfig = {
   commands: [setIconCommand, setSplashScreenCommand],
 };
 
-const rnCliVersion = getRNCliPackageFile();
-
-const isUsingV1 = !!rnCliVersion.version.match(/^[0-1]\./);
-
-export const rnPluginConfig: any = isUsingV1 ? createBackwardCompatibleConfig(v2Config) : v2Config;
+export const rnPluginConfig: any = v2Config;

src/rn-plugin.config.ts

@@ -17,6 +17,22 @@ export const generateResizedAssets = async (
     .toFile(destinationPath);
 };
 
+export const generateResizedAssetsWithoutAlpha = async (
+  sourcePath: string,
+  destinationPath: string,
+  width: number,
+  height: number = width,
+  options: ResizeOptions = {
+    fit: 'contain',
+  }
+) => {
+  createDirectoryIfNotExists(destinationPath);
+  return sharp(normalize(sourcePath))
+    .resize(width, height, options)
+    .removeAlpha()
+    .toFile(destinationPath);
+};
+
 export const checkImageIsSquare = async (sourcePath: string) => {
   const { width, height } = await sharp(normalize(sourcePath)).metadata();
   if (width !== height) {

src/services/image.processing.ts

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es2019",
+    "target": "es2017",
     "module": "commonjs",
     "moduleResolution": "node",
     "esModuleInterop": true,