Merge branch 'master' of https://github.com/zxing-js/ngx-scanner

zxing-js · Feb 7, 2020 · a28b478 · a28b478
2 parents 356d8c3 + 24bead5
commit a28b478
Show file tree

Hide file tree

Showing 11 changed files with 10,837 additions and 6,102 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ sudo: required
 language: node_js
 
 node_js:
-  - '11'
+  - '13'
   - '10'
 
 addons:

diff --git a/angular.json b/angular.json
@@ -14,6 +14,11 @@
           "options": {
             "tsConfig": "projects/zxing-scanner/tsconfig.lib.json",
             "project": "projects/zxing-scanner/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "projects/zxing-scanner/tsconfig.lib.prod.json"
+            }
           }
         },
         "test": {
@@ -48,6 +53,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "aot": true,
             "outputPath": "dist/zxing-scanner-demo",
             "index": "projects/zxing-scanner-demo/src/index.html",
             "main": "projects/zxing-scanner-demo/src/main.ts",
@@ -87,6 +93,10 @@
                   "type": "initial",
                   "maximumWarning": "2mb",
                   "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
                 }
               ],
               "serviceWorker": true,
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ sudo: required @@
     language: node_js
     node_js:
-      - '11'
+      - '13'
       - '10'
     addons:
@@ Expand Down @@