Merge branch 'master' of https://github.com/nstudio/nativescript-loading-indicator

Author: bradmartin

.github/workflows/build.yml

@@ -0,0 +1,48 @@
+name: Build CI
+
+# Trigger the workflow on push or pull request
+on: [push]
+
+jobs:
+  build:
+    name: Build
+
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Set Node.js 10.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: "10.x"
+
+      - name: Build Plugin Source
+        run: cd src && npm i && npm i -g typescript && tsc
+
+      - name: Lint
+        run: cd src && npm run tslint
+
+      - name: Setup JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Install PIP
+        run: |
+          sudo pip install --upgrade pip
+          sudo pip install six
+
+      - name: Setup NativeScript CLI
+        run: |
+          echo no | npm i -g nativescript
+          tns usage-reporting disable
+          tns error-reporting disable
+
+      - name: Build Android Demo App
+        run: |
+          cd demo
+          tns build android --env.uglify
+      - name: Build iOS Demo App
+        run: |
+          cd demo
+          tns build ios --env.uglify

.travis.yml

@@ -6,6 +6,9 @@ NativeScript-Loading-Indicator is a plugin for NativeScript which overlays a loa
 </h4>
 
 <p align="center">
+ <a href="https://www.npmjs.com/package/@nstudio/nativescript-loading-indicator">
+        <img src="https://github.com/nstudio/nativescript-loading-indicator/workflows/Build%20CI/badge.svg" alt="Action Build">
+    </a>
     <a href="https://www.npmjs.com/package/@nstudio/nativescript-loading-indicator">
         <img src="https://img.shields.io/npm/v/@nstudio/nativescript-loading-indicator.svg" alt="npm">
     </a>
@@ -26,6 +29,7 @@ NativeScript-Loading-Indicator is a plugin for NativeScript which overlays a loa
     </a>
     <h5 align="center">Do you need assistance on your project or plugin? Contact the nStudio team anytime at <a href="mailto:[email protected]">[email protected]</a> to get up to speed with the best practices in mobile and web app development.
     </h5>
+
 </p>
 
 ---

README.md

@@ -1,2 +1,2 @@
-import * as app from 'tns-core-modules/application';
+import * as app from '@nativescript/core/application';
 app.run({ moduleName: 'app-root' });

blank.yml

@@ -1,8 +1,8 @@
-import { LoadingIndicator, Mode } from 'nativescript-loading-indicator';
-import { Observable } from 'tns-core-modules/data/observable';
-import { confirm } from 'tns-core-modules/ui/dialogs';
-import { Page } from 'tns-core-modules/ui/page';
-import { openUrl } from 'tns-core-modules/utils/utils';
+import { Observable } from '@nativescript/core/data/observable';
+import { confirm } from '@nativescript/core/ui/dialogs';
+import { Page } from '@nativescript/core/ui/page';
+import { openUrl } from '@nativescript/core/utils/utils';
+import { LoadingIndicator, Mode } from '@nstudio/nativescript-loading-indicator';
 
 export class LoadingTest extends Observable {
   private indicator: LoadingIndicator;

demo/app/app.ts

@@ -1,5 +1,9 @@
 {
-  "name": "tns-template-hello-world-ts",
+  "android": {
+    "v8Flags": "--expose_gc",
+    "markingMode": "none"
+  },
   "main": "app.js",
-  "version": "1.6.0"
+  "name": "tns-template-hello-world",
+  "version": "3.2.0"
 }

demo/app/main-view-model.ts

@@ -1,57 +1,70 @@
-module.exports = function(config) {
+module.exports = function (config) {
   const options = {
+
     // base path that will be used to resolve all patterns (eg. files, exclude)
-    basePath: "",
+    basePath: '',
+
 
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
     frameworks: ["jasmine"],
 
+
     // list of files / patterns to load in the browser
-    files: ["app/tests/**/*.*"],
+    files: ['app/tests/**/*.*'],
+
 
     // list of files to exclude
-    exclude: [],
+    exclude: [
+    ],
+
 
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-    preprocessors: {},
+    preprocessors: {
+    },
+
 
     // test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ["progress"],
+    reporters: ['progress'],
+
 
     // web server port
     port: 9876,
 
+
     // enable / disable colors in the output (reporters and logs)
     colors: true,
 
+
     // level of logging
     // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
     logLevel: config.LOG_INFO,
 
+
     // enable / disable watching file and executing tests whenever any file changes
     autoWatch: true,
 
+
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
     browsers: [],
 
     customLaunchers: {
       android: {
-        base: "NS",
-        platform: "android"
+        base: 'NS',
+        platform: 'android'
       },
       ios: {
-        base: "NS",
-        platform: "ios"
+        base: 'NS',
+        platform: 'ios'
       },
       ios_simulator: {
-        base: "NS",
-        platform: "ios",
-        arguments: ["--emulator"]
+        base: 'NS',
+        platform: 'ios',
+        arguments: ['--emulator']
       }
     },
 
@@ -64,7 +77,7 @@ module.exports = function(config) {
   setWebpack(config, options);
 
   config.set(options);
-};
+}
 
 function setWebpackPreprocessor(config, options) {
   if (config && config.bundle) {
@@ -76,7 +89,7 @@ function setWebpackPreprocessor(config, options) {
       if (!options.preprocessors[file]) {
         options.preprocessors[file] = [];
       }
-      options.preprocessors[file].push("webpack");
+      options.preprocessors[file].push('webpack');
     });
   }
 }
@@ -86,15 +99,11 @@ function setWebpack(config, options) {
     const env = {};
     env[config.platform] = true;
     env.sourceMap = config.debugBrk;
-    options.webpack = require("./webpack.config")(env);
+    env.appPath = config.appPath;
+    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)
-    );
+    const invalidPluginsForUnitTesting = ["GenerateBundleStarterPlugin", "GenerateNativeScriptEntryPointsPlugin"];
+    options.webpack.plugins = options.webpack.plugins.filter(p => !invalidPluginsForUnitTesting.includes(p.constructor.name));
   }
 }

demo/app/package.json

@@ -1,29 +1,29 @@
 {
   "nativescript": {
     "id": "org.nativescript.demo",
-    "tns-ios": {
-      "version": "6.0.0-rc-2019-06-28-105002-01"
-    },
     "tns-android": {
-      "version": "6.0.0-rc-2019-06-27-172817-03"
+      "version": "6.3.1"
+    },
+    "tns-ios": {
+      "version": "6.3.0"
     }
   },
   "dependencies": {
     "nativescript-theme-core": "^1.0.4",
-    "nativescript-unit-test-runner": "0.6.4",
-    "nativescript-loading-indicator": "file:../src",
-    "tns-core-modules": "6.0.0-rc-2019-07-08-111131-01"
+    "nativescript-unit-test-runner": "0.7.0",
+    "@nstudio/nativescript-loading-indicator": "file:../src",
+    "tns-core-modules": "^6.3.2"
   },
   "devDependencies": {
     "jasmine-core": "^2.5.2",
     "karma": "4.1.0",
     "karma-jasmine": "2.0.1",
     "karma-nativescript-launcher": "^0.4.0",
     "nativescript-css-loader": "~0.26.1",
-    "nativescript-dev-webpack": "1.0.0-rc-2019-07-08-135456-03",
-    "tns-platform-declarations": "6.0.0-rc-2019-06-28-175837-02",
-    "tslint": "~5.12.1",
-    "typescript": "3.4.1",
+    "nativescript-dev-webpack": "1.4.1",
+    "tns-platform-declarations": "6.3.2",
+    "tslint": "~5.20.1",
+    "typescript": "3.7.4",
     "karma-webpack": "3.0.5"
   },
   "scripts": {

demo/karma.conf.js

@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig",
   "compilerOptions": {
-    "module": "es2015",
+    "module": "esNext",
     "moduleResolution": "node"
   }
 }