Merge pull request #3011 from wallabag/2.3

wallabag 2.3.0

3 files changed, 212 insertions, 0 deletions

diff --git a/app/config/webpack/common.js b/app/config/webpack/common.js
new file mode 100644
index 00000000..c497689a
--- /dev/null
+++ b/app/config/webpack/common.js
@@ -0,0 +1,40 @@
+const path = require('path');
+const webpack = require('webpack');
+const StyleLintPlugin = require('stylelint-webpack-plugin');
+
+const rootDir = path.resolve(__dirname, '../../../');
+
+module.exports = function () {
+  return {
+    entry: {
+      material: path.join(rootDir, './app/Resources/static/themes/material/index.js'),
+      baggy: path.join(rootDir, './app/Resources/static/themes/baggy/index.js'),
+      public: path.join(rootDir, './app/Resources/static/themes/_global/share.js'),
+    },
+    output: {
+      filename: '[name].js',
+      path: path.resolve(rootDir, 'web/bundles/wallabagcore'),
+      publicPath: '/bundles/wallabagcore/',
+    },
+    plugins: [
+      new webpack.ProvidePlugin({
+        $: 'jquery',
+        jQuery: 'jquery',
+        'window.$': 'jquery',
+        'window.jQuery': 'jquery',
+      }),
+      new StyleLintPlugin({
+        configFile: '.stylelintrc',
+        failOnError: false,
+        quiet: false,
+        context: 'app/Resources/static/themes',
+        files: '**/*.scss',
+      }),
+    ],
+    resolve: {
+      alias: {
+        jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js'),
+      },
+    },
+  };
+};
diff --git a/app/config/webpack/dev.js b/app/config/webpack/dev.js
new file mode 100644
index 00000000..97abc5eb
--- /dev/null
+++ b/app/config/webpack/dev.js
@@ -0,0 +1,61 @@
+const webpackMerge = require('webpack-merge');
+const webpack = require('webpack');
+const commonConfig = require('./common.js');
+
+module.exports = function () {
+  return webpackMerge(commonConfig(), {
+    devtool: 'eval-source-map',
+    output: {
+      filename: '[name].dev.js',
+    },
+
+    devServer: {
+      hot: true,
+      // enable HMR on the server
+
+      contentBase: './web',
+      // match the output path
+    },
+    plugins: [
+      new webpack.HotModuleReplacementPlugin(),
+    ],
+    module: {
+      rules: [
+        {
+          enforce: 'pre',
+          test: /\.js$/,
+          loader: 'eslint-loader',
+          exclude: /node_modules/,
+        },
+        {
+          test: /\.js$/,
+          exclude: /(node_modules)/,
+          use: {
+            loader: 'babel-loader',
+            options: {
+              presets: ['env'],
+            },
+          },
+        },
+        {
+          test: /\.(s)?css$/,
+          use: [
+            'style-loader',
+            {
+              loader: 'css-loader',
+              options: {
+                importLoaders: 1,
+              },
+            },
+            'postcss-loader',
+            'sass-loader',
+          ],
+        },
+        {
+          test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
+          use: 'url-loader',
+        },
+      ],
+    },
+  });
+};
diff --git a/app/config/webpack/prod.js b/app/config/webpack/prod.js
new file mode 100644
index 00000000..17b8c384
--- /dev/null
+++ b/app/config/webpack/prod.js
@@ -0,0 +1,111 @@
+const webpack = require('webpack');
+const webpackMerge = require('webpack-merge');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const ManifestPlugin = require('webpack-manifest-plugin');
+
+const commonConfig = require('./common.js');
+
+module.exports = function () {
+  return webpackMerge(commonConfig(), {
+    output: {
+      filename: '[name].js',
+    },
+    devtool: 'source-map',
+    plugins: [
+      new webpack.DefinePlugin({
+        'process.env': {
+          'NODE_ENV': JSON.stringify('production'),
+        },
+      }),
+      new webpack.optimize.UglifyJsPlugin({
+        beautify: false,
+        mangle: {
+          screw_ie8: true,
+          keep_fnames: true,
+        },
+        compress: {
+          screw_ie8: true,
+          warnings: false,
+        },
+        comments: false,
+      }),
+      new ExtractTextPlugin('[name].css'),
+      new ManifestPlugin({
+        fileName: 'manifest.json',
+      }),
+    ],
+    module: {
+      rules: [
+        {
+          enforce: 'pre',
+          test: /\.js$/,
+          loader: 'eslint-loader',
+          exclude: /node_modules/,
+        },
+        {
+          test: /\.js$/,
+          exclude: /(node_modules)/,
+          use: {
+            loader: 'babel-loader',
+            options: {
+              presets: ['env'],
+            },
+          },
+        },
+        {
+          test: /\.(s)?css$/,
+          use: ExtractTextPlugin.extract({
+            fallback: 'style-loader',
+            use: [
+              {
+                loader: 'css-loader',
+                options: {
+                  importLoaders: 1,
+                  minimize: {
+                    discardComments: {
+                      removeAll: true,
+                    },
+                    core: true,
+                    minifyFontValues: true,
+                  },
+                },
+              },
+              'postcss-loader',
+              'sass-loader',
+            ],
+          }),
+        },
+        {
+          test: /\.(jpg|png|gif|svg|ico)$/,
+          include: /node_modules/,
+          use: {
+            loader: 'file-loader',
+            options: {
+              name: 'img/[name].[ext]',
+            },
+          },
+        },
+        {
+          test: /\.(jpg|png|gif|svg|ico)$/,
+          exclude: /node_modules/,
+          use: {
+            loader: 'file-loader',
+            options: {
+              context: 'app/Resources/static',
+              name: '[path][name].[ext]',
+            },
+          },
+        },
+        {
+          test: /\.(eot|ttf|woff|woff2)$/,
+          use: {
+            loader: 'file-loader',
+            options: {
+              name: 'fonts/[name].[ext]',
+            },
+          },
+        },
+      ],
+    },
+  });
+};