solve conflicts

Author: davidmeirlevy

template/.npmignore

@@ -0,0 +1,7 @@
+# IntelliJ project files
+.idea/
+src/
+config/
+environment/
+karma.*.js
+webpack.*.js

template/config/webpack.config.module.js

@@ -0,0 +1,99 @@
+const glob = require('glob'),
+  path = require('path'),
+  CompressionPlugin = require('compression-webpack-plugin'),
+  ExtractTextPlugin = require('extract-text-webpack-plugin'),
+  PurifyCSSPlugin = require('purifycss-webpack'),
+  autoprefixer = require('autoprefixer'),
+  webpackConfig = require('./webpack.config.base'),
+  helpers = require('./helpers'),
+  DefinePlugin = require('webpack/lib/DefinePlugin'),
+  env = require('../environment/prod.env');
+
+const extractSass = new ExtractTextPlugin({
+  filename: 'css/[name].[contenthash].css',
+  disable: process.env.NODE_ENV === 'development'
+});
+
+const purifyCss = new PurifyCSSPlugin({
+  paths: glob.sync(path.join(__dirname, '../src/**/*.html')),
+  purifyOptions: {
+    info: true,
+    whitelist: []
+  }
+});
+
+webpackConfig.output = {
+  path: helpers.root('/dist'),
+  filename: 'index.js',
+  library: '[name]',
+  libraryTarget: 'umd',
+  umdNamedDefine: true
+};
+
+webpackConfig.externals = {
+  'axios': 'axios',
+  'vue': 'vue',
+  'vue-class-component': 'vue-class-component',
+  'vue-property-decorator': 'vue-property-decorator',
+  'vue-router': 'vue-router'
+};
+
+webpackConfig.module.rules = [...webpackConfig.module.rules,
+  {
+    test: /\.scss$/,
+    use: extractSass.extract({
+      use: [{
+        loader: 'css-loader',
+        options: {
+          minimize: true,
+          sourceMap: true,
+          importLoaders: 2
+        }
+      },
+        {
+          loader: 'postcss-loader',
+          options: {
+            plugins: () => [autoprefixer]
+          }
+        },
+        {
+          loader: 'sass-loader',
+          options: {
+            outputStyle: 'expanded',
+            sourceMap: true,
+            sourceMapContents: true
+          }
+        }
+      ],
+      // use style-loader in development
+      fallback: 'style-loader'
+    })
+  },
+  {
+    test: /\.(jpg|png|gif)$/,
+    loader: 'file-loader?name=assets/img/[name].[ext]'
+  },
+  {
+    test: /\.(eot|svg|ttf|woff|woff2)$/,
+    loader: 'file-loader?name=fonts/[name].[ext]'
+  }
+];
+
+// ensure ts lint fails the build
+webpackConfig.module.rules[0].options = {
+  failOnHint: true
+};
+
+webpackConfig.plugins = [...webpackConfig.plugins,
+  extractSass,
+  purifyCss,
+  new CompressionPlugin({
+    asset: '[path].gz[query]',
+    test: /\.min\.js$/
+  }),
+  new DefinePlugin({
+    'process.env': env
+  })
+];
+
+module.exports = webpackConfig;

template/package.json

@@ -4,29 +4,37 @@
   "version": "1.0.0",
   "author": "{{ author }}",
   "private": true,
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=6",
     "npm": ">=3"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production npm run clean && npm run test && npm run compile",
+    "module": "cross-env NODE_ENV=production npm run clean && npm run test && npm run compile:module",
+    "build:parts": "npm run sass && npm run compile",
     "ci:teamcity": "karma --env=tc start config/karma.coverage.js && npm run coverage:remap",
     "ci:jenkins": "karma --env=jk start config/karma.coverage.js && npm run coverage:remap",
     "clean": "rimraf dist && rimraf coverage",
     "compile": "webpack --config config/webpack.config.prod.js",
+    "compile:module": "webpack --config config/webpack.config.module.js",
+    "prepublishOnly": "npm run module",
+    "node-module": "webpack --config config/webpack.config.module.js",
     "coverage": "npm run coverage:run && npm run coverage:remap && npm run coverage:open",
     "coverage:open": "opn coverage/html-ts/index.html",
     "coverage:remap": "remap-istanbul -i coverage/json/coverage-final.json -o coverage/html-ts -t html",
     "coverage:run": "cross-env NODE_ENV=development karma start config/karma.coverage.js",
     "dev": "webpack-dev-server --config config/webpack.config.dev.js --hot --inline",
     "lint": "tslint src/**/*.ts",
-    "serve": "http-server dist/ -g -o",
+    "serve": "superstatic dist --port 8080 --host 0.0.0.0 --config superstatic.json",
     "test": "cross-env NODE_ENV=development karma start config/karma.unit.js",
     "test:debug": "cross-env NODE_ENV=development karma start config/karma.debug.js",
     "test:watch": "cross-env NODE_ENV=development karma start config/karma.unit.js --singleRun=false --auto-watch"
   },
   "dependencies": {
     "axios": "~0.17.1",
+    "superstatic": "^5.0.1",
     "uiv": "~0.17.0",
     "vue": "~2.5.13",
     "vue-class-component": "~6.1.2",
@@ -52,7 +60,6 @@
     "favicons-webpack-plugin": "0.0.7",
     "file-loader": "~1.1.6",
     "html-webpack-plugin": "~2.30.1",
-    "http-server": "~0.11.1",
     "istanbul-instrumenter-loader": "~3.0.0",
     "json-loader": "~0.5.7",
     "karma": "~2.0.0",