Merge branch 'master' into vue-2

.eslintrc.json

@@ -0,0 +1,49 @@
+{
+  "env": {
+    "es6": true,
+    "jest": true,
+    "node": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:@typescript-eslint/recommended-requiring-type-checking",
+    "prettier",
+    "prettier/@typescript-eslint"
+  ],
+  "globals": {
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly"
+  },
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "project": ["./tsconfig.lint.json"],
+    "warnOnUnsupportedTypeScriptVersion": false
+  },
+  "plugins": ["@typescript-eslint", "prettier"],
+  "rules": {
+    "curly": ["error"],
+    "linebreak-style": ["error", "unix"],
+    "no-case-declarations": "warn",
+    "prefer-rest-params": "off",
+    "quotes": ["error", "double", { "avoidEscape": true }],
+    "semi": ["error", "always"],
+
+    "@typescript-eslint/ban-ts-comment": "off",
+    "@typescript-eslint/explicit-function-return-type": ["error", { "allowExpressions": true }],
+    "@typescript-eslint/indent": ["error", 2, { "SwitchCase": 1, "ignoredNodes": ["MemberExpression"] }],
+    "@typescript-eslint/interface-name-prefix": "off",
+    "@typescript-eslint/member-ordering": "warn",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-inferrable-types": "off",
+    "@typescript-eslint/no-parameter-properties": "off",
+    "@typescript-eslint/no-unsafe-assignment": "off",
+    "@typescript-eslint/no-unsafe-member-access": "off",
+    "@typescript-eslint/no-unused-vars": "off",
+    "@typescript-eslint/prefer-nullish-coalescing": "warn",
+    "@typescript-eslint/prefer-optional-chain": "warn",
+    "@typescript-eslint/prefer-readonly": ["warn"],
+    "@typescript-eslint/restrict-template-expressions": "off",
+    "@typescript-eslint/typedef": ["warn", { "memberVariableDeclaration": true, "variableDeclaration": true }]
+  }
+}

.github/workflows/ci.yml

@@ -12,15 +12,15 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        node: [10.x, 12.x, 13.x, 14.x]
+        node: [10.x, 12.x, 14.x, 15.x]
       fail-fast: false
 
     steps:
-      # - name: Set git to use LF on Windows
-      #   if: matrix.os == 'windows-latest'
-      #   run: |
-      #     git config --global core.autocrlf false
-      #     git config --global core.eol lf
+      - name: Set git to use LF on Windows
+        if: matrix.os == 'windows-latest'
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
 
       - name: Checkout
         uses: actions/checkout@v2
@@ -37,13 +37,21 @@ jobs:
         run: yarn install --frozen-lockfile
 
       - name: Check outdated dependencies
+        if: github.ref == 'refs/heads/master'
         run: yarn outdated
 
-      # - name: Lint
-      #   run: yarn lint
+      - name: Lint
+        run: yarn lint
 
-      # - name: Test
-      #   run: yarn jest --ci --silent
+      - name: Test
+        run: yarn jest --ci --silent --reporters=default --reporters=jest-junit
+
+      - name: Upload test artifact
+        uses: actions/upload-artifact@v2
+        if: ${{ always() }}
+        with:
+          name: JUnit_${{ matrix.os }}_${{ matrix.node }}_${{ github.sha }}
+          path: junit.xml
 
       - name: Audit dependencies
         run: yarn audit --groups dependencies

.gitignore

@@ -1,129 +1,66 @@
-################################################
-###############  .gitignore   ##################
-################################################
-#
-# This file is only relevant if you are using git.
-#
-# Files which match the splat patterns below will
-# be ignored by git.  This keeps random crap and
-# sensitive credentials from being uploaded to
-# your repository.  It allows you to configure your
-# app for your machine without accidentally
-# committing settings which will smash the local
-# settings of  other developers on your team.
-#
-# Some reasonable defaults are included below,
-# but, of course, you should modify/extend/prune
-# to fit your needs!
-################################################
-
-
-
-
-################################################
-# Local Configuration
-#
-# Explicitly ignore files which contain:
-#
-# 1. Sensitive information you'd rather not push to
-#    your git repository.
-#    e.g., your personal API keys or passwords.
-#
-# 2. Environment-specific configuration
-#    Basically, anything that would be annoying
-#    to have to change every time you do a
-#    `git pull`
-#    e.g., your local development database, or
-#    the S3 bucket you're using for file uploads
-#    development.
-#
-################################################
-
-config/local.js
-misc/java/dist
-
-
-
-
-
-################################################
-# Dependencies
-#
-# When releasing a production app, you may
-# consider including your node_modules and
-# bower_components directory in your git repo,
-# but during development, its best to exclude it,
-# since different developers may be working on
-# different kernels, where dependencies would
-# need to be recompiled anyway.
-#
-# More on that here about node_modules dir:
-# http://www.futurealoof.com/posts/nodemodules-in-git.html
-# (credit Mikeal Rogers, @mikeal)
-#
-# About bower_components dir, you can see this:
-# http://addyosmani.com/blog/checking-in-front-end-dependencies/
-# (credit Addy Osmani, @addyosmani)
-#
-################################################
-
-node_modules
-bower_components
-typings
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
 
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
 
-################################################
-# Sails.js / Waterline / Grunt
-#
-# Files generated by Sails and Grunt, or related
-# tasks and adapters.
-################################################
-.tmp
-dump.rdb
-assets/js/build
-assets/mobile
-assets/desktop
-assets/vueDesktop
-assets/pwa
-views/mailTemplates/html
-.sass-cache
+# Coverage directory used by tools like istanbul
+coverage
 
+junit.xml
 
+# nyc test coverage
+.nyc_output
 
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
 
-################################################
-# Node.js / NPM
-#
-# Common files generated by Node, NPM, and the
-# related ecosystem.
-################################################
-lib-cov
-*.seed
-*.log
-*.out
-*.pid
-npm-debug.log
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
 
+# Optional eslint cache
+.eslintcache
 
+# Optional REPL history
+.node_repl_history
 
+# Output of 'npm pack'
+*.tgz
 
+# Yarn Integrity file
+.yarn-integrity
 
-################################################
-# Miscellaneous
-#
-# Common files generated by text editors,
-# operating systems, file systems, etc.
-################################################
+# dotenv environment variables file
+.env
 
-*~
-*#
-.DS_STORE
-.netbeans
-nbproject
-.idea
-.node_history
-sendgrid.env
-.tscache
+# next.js build output
+.next
 
+# build
 dist

.prettierignore

@@ -1 +1,2 @@
-dist
+coverage/
+dist/

CHANGELOG.md

@@ -1,6 +1,30 @@
 # Next
 
-[diff](https://github.com/mib200/vue-gtm/compare/3.1.1...master)
+[diff](https://github.com/mib200/vue-gtm/compare/3.3.0...master)
+
+# 3.3.0
+
+[diff](https://github.com/mib200/vue-gtm/compare/3.2.1...3.3.0)
+
+- Multiple GTM-container support ([#114])
+
+[#114]: https://github.com/mib200/vue-gtm/pull/114
+
+# 3.2.1
+
+[diff](https://github.com/mib200/vue-gtm/compare/3.2.0...3.2.1)
+
+- Fix $gtm typing ([#111])
+
+[#111]: https://github.com/mib200/vue-gtm/issues/111
+
+# 3.2.0
+
+[diff](https://github.com/mib200/vue-gtm/compare/3.1.1...3.2.0)
+
+- Usable gtm instance in composition API ([#107])
+
+[#107]: https://github.com/mib200/vue-gtm/pull/107
 
 # 3.1.1
 

LICENSE

@@ -187,7 +187,7 @@
       identification within third-party archives.
 
    Copyright 2017-2020 Manish Kumar
-   Copyright 2020 Christopher Quadflieg
+   Copyright 2020-2021 Christopher Quadflieg
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.