Merge pull request #250 from MatteoGabriele/refactor/compiler

MatteoGabriele · web-flow · commit ab32a532aa14 · 2019-11-12T21:02:28.000+01:00
Refactor/compiler
diff --git a/.babelrc b/.babelrc
@@ -1,4 +1,3 @@
 {
-  "presets": ["blue"],
-  "plugins": ["transform-runtime"]
+  "presets": ["@babel/preset-env"]
 }
diff --git a/config/base.config.js b/config/base.config.js
diff --git a/config/scripts/build.js b/config/scripts/build.js
diff --git a/config/scripts/dev.js b/config/scripts/dev.js
diff --git a/jest.config.js b/jest.config.js
@@ -1,9 +1,7 @@
-const blueJest = require('blue-jest')
-
-module.exports = Object.assign({}, blueJest, {
-  moduleNameMapper: Object.assign({}, blueJest.moduleNameMapper, {
+module.exports = {
+  moduleNameMapper: {
     '^lib/(.*)$': '<rootDir>/src/lib/$1',
     '^directives/(.*)$': '<rootDir>/src/directives/$1',
     'vue$': 'vue/dist/vue.min.js'
-  })
-})
+  }
+}
diff --git a/package.json b/package.json
@@ -8,12 +8,11 @@
   },
   "scripts": {
     "commit": "git-cz",
-    "dev": "node ./config/scripts/dev.js",
-    "build": "node ./config/scripts/build.js",
-    "prepublish": "node ./config/scripts/build.js",
-    "test": "jest --config ./jest.config.js",
-    "test:watch": "jest --config ./jest.config.js --watch --verbose",
-    "semantic-release": "semantic-release pre && npm publish && semantic-release post"
+    "build": "webpack --mode production",
+    "dev": "webpack --mode development --watch",
+    "test": "jest",
+    "prepublish": "webpack --mode production",
+    "semantic-release": "semantic-release"
   },
   "config": {
     "commitizen": {
@@ -44,25 +43,18 @@
   },
   "homepage": "https://github.com/MatteoGabriele/vue-analytics#readme",
   "devDependencies": {
-    "babel-core": "^6.24.1",
-    "babel-loader": "^7.0.0",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-blue": "^1.0.0-beta.29",
-    "blue-jest": "^1.5.0",
-    "commitizen": "^2.9.6",
-    "compression-webpack-plugin": "^0.4.0",
-    "cz-conventional-changelog": "2.0.0",
-    "friendly-errors-webpack-plugin": "^1.6.1",
-    "jest": "^20.0.0",
-    "jest-cli": "^21.2.1",
-    "ora": "^1.2.0",
-    "semantic-release": "^7.0.1",
-    "vue": "^2.5.9",
-    "vue-loader": "^13.5.0",
-    "vue-router": "^2.7.0",
-    "vue-template-compiler": "^2.5.9",
-    "webpack": "^3.4.1",
-    "webpack-merge": "^4.1.0"
-  },
-  "dependencies": {}
+    "@babel/core": "^7.7.2",
+    "@babel/preset-env": "^7.7.1",
+    "babel-loader": "^8.0.6",
+    "commitizen": "^4.0.3",
+    "compression-webpack-plugin": "^3.0.0",
+    "cz-conventional-changelog": "^3.0.2",
+    "jest": "^24.9.0",
+    "terser-webpack-plugin": "^2.2.1",
+    "vue": "^2.6.10",
+    "vue-router": "^3.1.3",
+    "webpack": "^4.41.2",
+    "webpack-cli": "^3.3.10",
+    "semantic-release": "^15.13.30"
+  }
 }
diff --git a/src/bootstrap.js b/src/bootstrap.js
@@ -2,7 +2,7 @@ import { promisify, loadScript, shouldGaLoad } from './helpers'
 import config, { update } from './config'
 import createTrackers from './create-trackers'
 import collectors from './collectors'
-import { autoTracking } from 'lib/page'
+import { autoTracking } from './lib/page'
 import untracked from './untracked'
 import noga from './no-ga'
 
diff --git a/src/collectors.js b/src/collectors.js
@@ -1,12 +1,12 @@
-import _require from 'lib/require'
-import set from 'lib/set'
+import _require from './lib/require'
+import set from './lib/set'
 import config from './config'
 
 export const setters = function () {
   config.set.forEach(({ field, value }) => {
     if (typeof field === 'undefined' || typeof value === 'undefined') {
       throw new Error(
-        '[vue-analytics] Wrong configuration in the plugin options.\n' + 
+        '[vue-analytics] Wrong configuration in the plugin options.\n' +
         'The "set" array requires each item to have a "field" and a "value" property.'
       )
     }
@@ -46,5 +46,5 @@ export const requires = function () {
 
 export default function () {
   setters()
-  requires() 
+  requires()
 }
diff --git a/src/create-trackers.js b/src/create-trackers.js
@@ -1,5 +1,5 @@
-import set from 'lib/set'
-import query from 'lib/query'
+import set from './lib/set'
+import query from './lib/query'
 import config, { getId } from './config'
 import { getTracker } from './helpers'
 
diff --git a/src/index.js b/src/index.js
@@ -2,8 +2,8 @@ import bootstrap from './bootstrap'
 import lib from './lib'
 import { update } from './config'
 import * as helpers from './helpers'
-import ga from 'directives/ga'
-import { autotracking as expectionAutotracking } from 'lib/exception'
+import ga from './directives/ga'
+import { autotracking as expectionAutotracking } from './lib/exception'
 import vuexMiddleware from './vuex-middleware'
 
 export default function install (Vue, options = {}) {
diff --git a/src/lib/ecommerce.js b/src/lib/ecommerce.js
@@ -1,15 +1,15 @@
-import query from 'lib/query'
+import query from './query'
 import config from '../config'
 
 const getMethod = function (name) {
   return `${config.ecommerce.enhanced ? 'ec' : 'ecommerce'}:${name}`
 }
 
 const featuresList = [
-  'addItem', 
-  'addTransaction', 
-  'addProduct', 
-  'addImpression', 
+  'addItem',
+  'addTransaction',
+  'addProduct',
+  'addImpression',
   'setAction',
   'addPromo',
   'send'
diff --git a/src/lib/event.js b/src/lib/event.js
@@ -1,4 +1,4 @@
-import query from 'lib/query'
+import query from './query'
 
 export default function event (...args) {
   query('send', 'event', ...args)
diff --git a/src/lib/exception.js b/src/lib/exception.js
@@ -1,4 +1,4 @@
-import query from 'lib/query'
+import query from './query'
 import config from '../config'
 
 const exception = (error, fatal = false) => {
diff --git a/src/lib/index.js b/src/lib/index.js
@@ -1,13 +1,13 @@
-import event from 'lib/event'
-import exception from 'lib/exception'
-import page from 'lib/page'
-import query from 'lib/query'
-import require from 'lib/require'
-import set from 'lib/set'
-import social from 'lib/social'
-import time from 'lib/time'
-import ecommerce from 'lib/ecommerce'
-import screenview from 'lib/screenview'
+import event from './event'
+import exception from './exception'
+import page from './page'
+import query from './query'
+import require from './require'
+import set from './set'
+import social from './social'
+import time from './time'
+import ecommerce from './ecommerce'
+import screenview from './screenview'
 import config from '../config'
 import noga from '../no-ga'
 
diff --git a/src/lib/page.js b/src/lib/page.js
@@ -1,7 +1,7 @@
 import config from '../config'
-import set from 'lib/set'
-import screenview from 'lib/screenview'
-import query from 'lib/query'
+import set from './set'
+import screenview from './screenview'
+import query from './query'
 import {
   getQueryString,
   isRouteIgnored,
diff --git a/src/lib/require.js b/src/lib/require.js
@@ -1,4 +1,4 @@
-import query from 'lib/query'
+import query from './query'
 
 export default function (...args) {
   if (args.length == 2) {
diff --git a/src/lib/screenview.js b/src/lib/screenview.js
@@ -1,4 +1,4 @@
-import query from 'lib/query'
+import query from './query'
 
 export default function screenview (...args) {
   const [screenName] = args
diff --git a/src/lib/set.js b/src/lib/set.js
@@ -1,4 +1,4 @@
-import query from 'lib/query'
+import query from './query'
 
 export default function set (...args) {
   if (typeof args[0] === 'object' && args[0].constructor === Object) {
diff --git a/src/lib/social.js b/src/lib/social.js
@@ -1,4 +1,4 @@
-import query from 'lib/query'
+import query from './query'
 
 export default function social (...args) {
   query('send', 'social', ...args)
diff --git a/src/lib/time.js b/src/lib/time.js
@@ -1,4 +1,4 @@
-import query from 'lib/query'
+import query from './query'
 
 export default function time (...args) {
   query('send', 'timing', ...args)
diff --git a/webpack.config.js b/webpack.config.js
@@ -0,0 +1,26 @@
+const TerserPlugin = require('terser-webpack-plugin')
+const CompressionPlugin = require('compression-webpack-plugin')
+
+module.exports = function (env, argv) {
+  const isProduction = argv.mode === 'production'
+
+  return {
+    output: {
+      libraryTarget: 'umd',
+      filename: 'vue-analytics.js'
+    },
+    optimization: {
+      minimize: isProduction,
+      minimizer: [
+        new TerserPlugin({
+          terserOptions: {
+            compress: isProduction
+          }
+        })
+      ]
+    },
+    plugins: [
+      ...(isProduction ? [new CompressionPlugin()] : [])
+    ]
+  }
+}
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`{`
`2`		`- "presets": ["blue"],`
`3`		`- "plugins": ["transform-runtime"]`
	`2`	`+ "presets": ["@babel/preset-env"]`
`4`	`3`	`}`