Merge branch 'v2'

Author: deusprogrammer

.editorconfig

@@ -1,7 +1,7 @@
 {
-  "rules": {
-    "no-console": "off",
-    "global-require": "off",
-    "import/no-dynamic-require": "off"
-  }
+    "rules": {
+        "no-console": "off",
+        "global-require": "off",
+        "import/no-dynamic-require": "off"
+    }
 }

.erb/configs/.eslintrc

@@ -7,47 +7,47 @@ import webpackPaths from './webpack.paths';
 import { dependencies as externals } from '../../release/app/package.json';
 
 const configuration: webpack.Configuration = {
-  externals: [...Object.keys(externals || {})],
-
-  stats: 'errors-only',
-
-  module: {
-    rules: [
-      {
-        test: /\.[jt]sx?$/,
-        exclude: /node_modules/,
-        use: {
-          loader: 'ts-loader',
-          options: {
-            // Remove this line to enable type checking in webpack builds
-            transpileOnly: true,
-          },
+    externals: [...Object.keys(externals || {})],
+
+    stats: 'errors-only',
+
+    module: {
+        rules: [
+            {
+                test: /\.[jt]sx?$/,
+                exclude: /node_modules/,
+                use: {
+                    loader: 'ts-loader',
+                    options: {
+                        // Remove this line to enable type checking in webpack builds
+                        transpileOnly: true,
+                    },
+                },
+            },
+        ],
+    },
+
+    output: {
+        path: webpackPaths.srcPath,
+        // https://github.com/webpack/webpack/issues/1114
+        library: {
+            type: 'commonjs2',
         },
-      },
-    ],
-  },
+    },
 
-  output: {
-    path: webpackPaths.srcPath,
-    // https://github.com/webpack/webpack/issues/1114
-    library: {
-      type: 'commonjs2',
+    /**
+     * Determine the array of extensions that should be used to resolve modules.
+     */
+    resolve: {
+        extensions: ['.js', '.jsx', '.json', '.ts', '.tsx'],
+        modules: [webpackPaths.srcPath, 'node_modules'],
     },
-  },
-
-  /**
-   * Determine the array of extensions that should be used to resolve modules.
-   */
-  resolve: {
-    extensions: ['.js', '.jsx', '.json', '.ts', '.tsx'],
-    modules: [webpackPaths.srcPath, 'node_modules'],
-  },
-
-  plugins: [
-    new webpack.EnvironmentPlugin({
-      NODE_ENV: 'production',
-    }),
-  ],
+
+    plugins: [
+        new webpack.EnvironmentPlugin({
+            NODE_ENV: 'production',
+        }),
+    ],
 };
 
 export default configuration;

.erb/configs/webpack.config.base.ts

@@ -16,67 +16,72 @@ checkNodeEnv('production');
 deleteSourceMaps();
 
 const devtoolsConfig =
-  process.env.DEBUG_PROD === 'true'
-    ? {
-        devtool: 'source-map',
-      }
-    : {};
+    process.env.DEBUG_PROD === 'true'
+        ? {
+              devtool: 'source-map',
+          }
+        : {};
 
 const configuration: webpack.Configuration = {
-  ...devtoolsConfig,
+    ...devtoolsConfig,
 
-  mode: 'production',
+    mode: 'production',
 
-  target: 'electron-main',
+    target: 'electron-main',
 
-  entry: {
-    main: path.join(webpackPaths.srcMainPath, 'main.ts'),
-    preload: path.join(webpackPaths.srcMainPath, 'preload.ts'),
-  },
+    entry: {
+        main: path.join(webpackPaths.srcMainPath, 'main.ts'),
+        preload: path.join(webpackPaths.srcMainPath, 'preload.ts'),
+    },
 
-  output: {
-    path: webpackPaths.distMainPath,
-    filename: '[name].js',
-  },
+    output: {
+        path: webpackPaths.distMainPath,
+        filename: '[name].js',
+    },
 
-  optimization: {
-    minimizer: [
-      new TerserPlugin({
-        parallel: true,
-      }),
-    ],
-  },
+    optimization: {
+        minimizer: [
+            new TerserPlugin({
+                parallel: true,
+            }),
+        ],
+    },
+
+    plugins: [
+        new BundleAnalyzerPlugin({
+            analyzerMode:
+                process.env.ANALYZE === 'true' ? 'server' : 'disabled',
+        }),
 
-  plugins: [
-    new BundleAnalyzerPlugin({
-      analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
-    }),
+        /**
+         * Create global constants which can be configured at compile time.
+         *
+         * Useful for allowing different behaviour between development builds and
+         * release builds
+         *
+         * NODE_ENV should be production so that modules do not perform certain
+         * development checks
+         */
+        new webpack.DefinePlugin({
+            'process.env.FLUENTFFMPEG_COV': false
+        }),
+        
+        new webpack.EnvironmentPlugin({
+            NODE_ENV: 'production',
+            DEBUG_PROD: false,
+            START_MINIMIZED: false,
+        }),
+    ],
 
     /**
-     * Create global constants which can be configured at compile time.
-     *
-     * Useful for allowing different behaviour between development builds and
-     * release builds
-     *
-     * NODE_ENV should be production so that modules do not perform certain
-     * development checks
+     * Disables webpack processing of __dirname and __filename.
+     * If you run the bundle in node.js it falls back to these values of node.js.
+     * https://github.com/webpack/webpack/issues/2010
      */
-    new webpack.EnvironmentPlugin({
-      NODE_ENV: 'production',
-      DEBUG_PROD: false,
-      START_MINIMIZED: false,
-    }),
-  ],
-
-  /**
-   * Disables webpack processing of __dirname and __filename.
-   * If you run the bundle in node.js it falls back to these values of node.js.
-   * https://github.com/webpack/webpack/issues/2010
-   */
-  node: {
-    __dirname: false,
-    __filename: false,
-  },
+    node: {
+        __dirname: false,
+        __filename: false,
+    },
 };
 
 export default merge(baseConfig, configuration);

.erb/configs/webpack.config.main.prod.ts

@@ -9,60 +9,65 @@ import checkNodeEnv from '../scripts/check-node-env';
 // When an ESLint server is running, we can't set the NODE_ENV so we'll check if it's
 // at the dev webpack config is not accidentally run in a production environment
 if (process.env.NODE_ENV === 'production') {
-  checkNodeEnv('development');
+    checkNodeEnv('development');
 }
 
 const configuration: webpack.Configuration = {
-  devtool: 'inline-source-map',
+    devtool: 'inline-source-map',
 
-  mode: 'development',
+    mode: 'development',
 
-  target: 'electron-preload',
+    target: 'electron-preload',
 
-  entry: path.join(webpackPaths.srcMainPath, 'preload.ts'),
+    entry: path.join(webpackPaths.srcMainPath, 'preload.ts'),
 
-  output: {
-    path: webpackPaths.dllPath,
-    filename: 'preload.js',
-  },
+    output: {
+        path: webpackPaths.dllPath,
+        filename: 'preload.js',
+    },
 
-  plugins: [
-    new BundleAnalyzerPlugin({
-      analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
-    }),
+    plugins: [
+        new BundleAnalyzerPlugin({
+            analyzerMode:
+                process.env.ANALYZE === 'true' ? 'server' : 'disabled',
+        }),
 
-    /**
-     * Create global constants which can be configured at compile time.
-     *
-     * Useful for allowing different behaviour between development builds and
-     * release builds
-     *
-     * NODE_ENV should be production so that modules do not perform certain
-     * development checks
-     *
-     * By default, use 'development' as NODE_ENV. This can be overriden with
-     * 'staging', for example, by changing the ENV variables in the npm scripts
-     */
-    new webpack.EnvironmentPlugin({
-      NODE_ENV: 'development',
-    }),
+        /**
+         * Create global constants which can be configured at compile time.
+         *
+         * Useful for allowing different behaviour between development builds and
+         * release builds
+         *
+         * NODE_ENV should be production so that modules do not perform certain
+         * development checks
+         *
+         * By default, use 'development' as NODE_ENV. This can be overriden with
+         * 'staging', for example, by changing the ENV variables in the npm scripts
+         */
+        new webpack.DefinePlugin({
+            'process.env.FLUENTFFMPEG_COV': false
+        }),
+        
+        new webpack.EnvironmentPlugin({
+            NODE_ENV: 'development',
+        }),
 
-    new webpack.LoaderOptionsPlugin({
-      debug: true,
-    }),
-  ],
+        new webpack.LoaderOptionsPlugin({
+            debug: true,
+        }),
+    ],
 
-  /**
-   * Disables webpack processing of __dirname and __filename.
-   * If you run the bundle in node.js it falls back to these values of node.js.
-   * https://github.com/webpack/webpack/issues/2010
-   */
-  node: {
-    __dirname: false,
-    __filename: false,
-  },
+    /**
+     * Disables webpack processing of __dirname and __filename.
+     * If you run the bundle in node.js it falls back to these values of node.js.
+     * https://github.com/webpack/webpack/issues/2010
+     */
+    node: {
+        __dirname: false,
+        __filename: false,
+    },
 
-  watch: true,
+    watch: true,
 };
 
 export default merge(baseConfig, configuration);