Merge pull request #22 from pmargreff/master

Refactor webpack file
typeorm · Jul 6, 2018 · 7bd88df · 7bd88df
2 parents 72ee7bf + 2acac88
commit 7bd88df
Showing 1 changed file with 25 additions and 138 deletions.
diff --git a/config/webpack.config.js b/config/webpack.config.js
@@ -7,148 +7,35 @@
  * https://webpack.js.org/configuration/
  */
 
-var path = require('path');
 var webpack = require('webpack');
 var ionicWebpackFactory = require(process.env.IONIC_WEBPACK_FACTORY);
 
 var ModuleConcatPlugin = require('webpack/lib/optimize/ModuleConcatenationPlugin');
 var PurifyPlugin = require('@angular-devkit/build-optimizer').PurifyPlugin;
 
-var optimizedProdLoaders = [
-  {
-    test: /\.json$/,
-    loader: 'json-loader'
-  },
-  {
-    test: /\.js$/,
-    loader: [
-      {
-        loader: process.env.IONIC_CACHE_LOADER
-      },
-
-      {
-        loader: '@angular-devkit/build-optimizer/webpack-loader',
-        options: {
-          sourceMap: true
-        }
-      },
-    ]
-  },
-  {
-    test: /\.ts$/,
-    loader: [
-      {
-        loader: process.env.IONIC_CACHE_LOADER
-      },
-
-      {
-        loader: '@angular-devkit/build-optimizer/webpack-loader',
-        options: {
-          sourceMap: true
-        }
-      },
-
-      {
-        loader: process.env.IONIC_WEBPACK_LOADER
-      }
-    ]
-  }
-];
-
-function getProdLoaders() {
-  if (process.env.IONIC_OPTIMIZE_JS === 'true') {
-    return optimizedProdLoaders;
-  }
-  return devConfig.module.loaders;
-}
-
-var devConfig = {
-  entry: process.env.IONIC_APP_ENTRY_POINT,
-  output: {
-    path: '{{BUILD}}',
-    publicPath: 'build/',
-    filename: '[name].js',
-    devtoolModuleFilenameTemplate: ionicWebpackFactory.getSourceMapperFunction(),
-  },
-  devtool: process.env.IONIC_SOURCE_MAP_TYPE,
-
-  resolve: {
-    extensions: ['.ts', '.js', '.json'],
-    modules: [path.resolve('node_modules')]
-  },
-
-  module: {
-    loaders: [
-      {
-        test: /\.json$/,
-        loader: 'json-loader'
-      },
-      {
-        test: /\.ts$/,
-        loader: process.env.IONIC_WEBPACK_LOADER
-      }
-    ]
-  },
-
-  plugins: [
-    ionicWebpackFactory.getIonicEnvironmentPlugin(),
-    ionicWebpackFactory.getCommonChunksPlugin(),
-    new webpack.NormalModuleReplacementPlugin(/typeorm$/, function (result) {
-      result.request = result.request.replace(/typeorm/, "typeorm/browser");
-    }),
-    new webpack.ProvidePlugin({
-      'window.SQL': 'sql.js/js/sql.js'
-    })
-  ],
-
-  // Some libraries import Node modules but don't use them in the browser.
-  // Tell Webpack to provide empty mocks for them so importing them works.
-  node: {
-    fs: 'empty',
-    net: 'empty',
-    tls: 'empty'
-  }
-};
-
-var prodConfig = {
-  entry: process.env.IONIC_APP_ENTRY_POINT,
-  output: {
-    path: '{{BUILD}}',
-    publicPath: 'build/',
-    filename: '[name].js',
-    devtoolModuleFilenameTemplate: ionicWebpackFactory.getSourceMapperFunction(),
-  },
-  devtool: process.env.IONIC_SOURCE_MAP_TYPE,
-
-  resolve: {
-    extensions: ['.ts', '.js', '.json'],
-    modules: [path.resolve('node_modules')]
-  },
-
-  module: {
-    loaders: getProdLoaders()
-  },
-
-  plugins: [
-    ionicWebpackFactory.getIonicEnvironmentPlugin(),
-    ionicWebpackFactory.getCommonChunksPlugin(),
-    new ModuleConcatPlugin(),
-    new PurifyPlugin(),
-    new webpack.NormalModuleReplacementPlugin(/typeorm$/, function (result) {
-      result.request = result.request.replace(/typeorm/, "typeorm/browser");
-    })
-  ],
-
-  // Some libraries import Node modules but don't use them in the browser.
-  // Tell Webpack to provide empty mocks for them so importing them works.
-  node: {
-    fs: 'empty',
-    net: 'empty',
-    tls: 'empty'
-  }
+var useDefaultConfig = require('@ionic/app-scripts/config/webpack.config.js');
+
+useDefaultConfig.dev.plugins = [
+  ionicWebpackFactory.getIonicEnvironmentPlugin(),
+  ionicWebpackFactory.getCommonChunksPlugin(),
+  new webpack.NormalModuleReplacementPlugin(/typeorm$/, function (result) {
+    result.request = result.request.replace(/typeorm/, "typeorm/browser");
+  }),
+  new webpack.ProvidePlugin({
+    'window.SQL': 'sql.js/js/sql.js'
+  })
+]
+
+useDefaultConfig.prod.plugins = [
+  ionicWebpackFactory.getIonicEnvironmentPlugin(),
+  ionicWebpackFactory.getCommonChunksPlugin(),
+  new ModuleConcatPlugin(),
+  new PurifyPlugin(),
+  new webpack.NormalModuleReplacementPlugin(/typeorm$/, function (result) {
+    result.request = result.request.replace(/typeorm/, "typeorm/browser");
+  })
+]
+
+module.exports = function () {
+  return useDefaultConfig;
 };
-
-module.exports = {
-  dev: devConfig,
-  prod: prodConfig
-}