bump plugin version & updated demo app to {N} 6 RC

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [3.2.1](https://github.com/EddyVerbruggen/nativescript-barcodescanner/tree/3.2.1) (2019-07-04)
+[Full Changelog](https://github.com/EddyVerbruggen/nativescript-barcodescanner/milestone/41?closed=1)
+
 ## [3.2.0](https://github.com/EddyVerbruggen/nativescript-barcodescanner/tree/3.2.0) (2019-06-07)
 [Full Changelog](https://github.com/EddyVerbruggen/nativescript-barcodescanner/milestone/40?closed=1)
 

demo/app/app.css

@@ -1,4 +1,4 @@
-@import '~/css/core.light.css';
+@import '~nativescript-theme-core/css/core.light.css';
 
 .h3 {
   margin-top: 18;

demo/app/app.ts

@@ -1,3 +1,2 @@
-import "./bundle-config";
-import * as application from 'tns-core-modules/application';
-application.start({ moduleName: "main-page" });
+import * as application from "tns-core-modules/application";
+application.run({ moduleName: "main-page" });

demo/karma.conf.js

@@ -1,5 +1,5 @@
-module.exports = function(config) {
-  config.set({
+module.exports = function (config) {
+  const options = {
 
     // base path that will be used to resolve all patterns (eg. files, exclude)
     basePath: '',
@@ -11,9 +11,7 @@ module.exports = function(config) {
 
 
     // list of files / patterns to load in the browser
-    files: [
-      'app/**/*.js'
-    ],
+    files: ['app/tests/**/*.*'],
 
 
     // list of files to exclude
@@ -72,6 +70,39 @@ module.exports = function(config) {
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
-    singleRun: true
-  });
-};
+    singleRun: false
+  };
+
+  setWebpackPreprocessor(config, options);
+  setWebpack(config, options);
+
+  config.set(options);
+}
+
+function setWebpackPreprocessor(config, options) {
+  if (config && config.bundle) {
+    if (!options.preprocessors) {
+      options.preprocessors = {};
+    }
+
+    options.files.forEach(file => {
+      if (!options.preprocessors[file]) {
+        options.preprocessors[file] = [];
+      }
+      options.preprocessors[file].push('webpack');
+    });
+  }
+}
+
+function setWebpack(config, options) {
+  if (config && config.bundle) {
+    const env = {};
+    env[config.platform] = true;
+    env.sourceMap = config.debugBrk;
+    options.webpack = require('./webpack.config')(env);
+    delete options.webpack.entry;
+    delete options.webpack.output.libraryTarget;
+    const invalidPluginsForUnitTesting = ["GenerateBundleStarterPlugin", "GenerateNativeScriptEntryPointsPlugin"];
+    options.webpack.plugins = options.webpack.plugins.filter(p => !invalidPluginsForUnitTesting.includes(p.constructor.name));
+  }
+}

demo/package.json

@@ -2,29 +2,29 @@
   "nativescript": {
     "id": "org.nativescript.plugindemo.barcodescanner",
     "tns-ios": {
-      "version": "5.0.0"
+      "version": "6.0.0-rc-2019-06-28-105002-01"
     },
     "tns-android": {
-      "version": "5.0.0"
+      "version": "6.0.0-rc-2019-06-27-172817-03"
     }
   },
   "dependencies": {
     "nativescript-barcodescanner": "file:../src",
     "nativescript-theme-core": "^1.0.4",
-    "nativescript-unit-test-runner": "^0.3.4",
-    "tns-core-modules": "~5.1.2"
+    "nativescript-unit-test-runner": "0.6.3",
+    "tns-core-modules": "6.0.0-rc-2019-06-28-175837-02"
   },
   "devDependencies": {
     "jasmine-core": "^2.5.2",
-    "karma": "^1.3.0",
-    "karma-jasmine": "^1.0.2",
+    "karma": "4.1.0",
+    "karma-jasmine": "2.0.1",
     "karma-nativescript-launcher": "^0.4.0",
     "nativescript-css-loader": "~0.26.1",
-    "nativescript-dev-typescript": "~0.7.4",
-    "nativescript-dev-webpack": "~0.17.0",
-    "tns-platform-declarations": "^5.0.0",
+    "nativescript-dev-webpack": "1.0.0-rc-2019-07-02-161545-02",
+    "tns-platform-declarations": "6.0.0-rc-2019-06-28-175837-02",
     "tslint": "~5.11.0",
-    "typescript": "~3.1.2"
+    "typescript": "3.4.1",
+    "karma-webpack": "3.0.5"
   },
   "scripts": {
     "build.plugin": "cd ../src && npm run build"

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-barcodescanner",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Scan QR/barcodes with your NativeScript app.",
   "main": "barcodescanner",
   "typings": "index.d.ts",
@@ -21,12 +21,12 @@
     "plugin.link": "npm link && cd ../demo && npm link nativescript-barcodescanner && cd ../src",
     "plugin.link.ng": "npm link && cd ../demo-ng && npm link nativescript-barcodescanner && cd ../src",
     "plugin.tscwatch": "npm run tsc -- -w",
-    "demo.ios": "npm run build && cd ../demo && tns run ios --syncAllFiles",
+    "demo.ios": "npm run build && cd ../demo && tns run ios",
     "demo.reset": "cd ../demo && rimraf platforms",
     "demo-ng.ios": "npm run build && cd ../demo-ng && tns run ios",
-    "demo.android": "npm run build && cd ../demo && tns run android --syncAllFiles",
-    "demo-vue.ios": "npm run tsc && cd ../demo-vue && tns run ios --bundle --syncAllFiles",
-    "demo-vue.android": "npm run tsc && cd ../demo-vue && tns run android --bundle --syncAllFiles",
+    "demo.android": "npm run build && cd ../demo && tns run android",
+    "demo-vue.ios": "npm run tsc && cd ../demo-vue && tns run ios --bundle",
+    "demo-vue.android": "npm run tsc && cd ../demo-vue && tns run android --bundle",
     "plugin.prepare": "npm run tsc && cd ../demo && tns plugin remove nativescript-barcodescanner && tns plugin add ../src",
     "clean": "cd ../demo && rimraf hooks node_modules platforms && cd ../src && rimraf node_modules && npm run plugin.link",
     "ci.tslint": "npm i && tslint '**/*.ts' --config '../tslint.json' --exclude '**/node_modules/**' --exclude '**/typings/**'"