wip #20

Author: bradmartin

.github/workflows/build.yml

@@ -1,17 +1,48 @@
-name: CI
+name: Build CI
 
+# Trigger the workflow on push or pull request
 on: [push]
 
 jobs:
   build:
+    name: Build
 
-    runs-on: ubuntu-latest
-
+    runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Run a one-line script
-      run: echo Hello, world!
-    - name: Run a multi-line script
-      run: |
-        echo Add other actions to build,
-        echo test, and deploy your project.
+      - 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

@@ -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 { 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 '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';
 
 export class LoadingTest extends Observable {
   private indicator: LoadingIndicator;

demo/app/app.ts

@@ -1,29 +1,23 @@
 {
   "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"
-    }
+    "id": "org.nativescript.demo"
   },
   "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"
+    "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/app/main-view-model.ts

@@ -3,6 +3,9 @@ const { join, relative, resolve, sep } = require('path');
 const webpack = require('webpack');
 const nsWebpack = require('nativescript-dev-webpack');
 const nativescriptTarget = require('nativescript-dev-webpack/nativescript-target');
+const {
+  getNoEmitOnErrorFromTSConfig
+} = require('nativescript-dev-webpack/utils/tsconfig-utils');
 const CleanWebpackPlugin = require('clean-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
@@ -36,8 +39,7 @@ module.exports = env => {
 
   const {
     // The 'appPath' and 'appResourcesPath' values are fetched from
-    // the nsconfig.json configuration file
-    // when bundling with `tns run android|ios --bundle`.
+    // the nsconfig.json configuration file.
     appPath = 'app',
     appResourcesPath = 'app/App_Resources',
 
@@ -50,12 +52,29 @@ module.exports = env => {
     hiddenSourceMap, // --env.hiddenSourceMap
     hmr, // --env.hmr,
     unitTesting, // --env.unitTesting,
-    verbose // --env.verbose
+    verbose, // --env.verbose
+    snapshotInDocker, // --env.snapshotInDocker
+    skipSnapshotTools, // --env.skipSnapshotTools
+    compileSnapshot // --env.compileSnapshot
   } = env;
+
+  const useLibs = compileSnapshot;
   const isAnySourceMapEnabled = !!sourceMap || !!hiddenSourceMap;
   const externals = nsWebpack.getConvertedExternals(env.externals);
 
   const appFullPath = resolve(projectRoot, appPath);
+  const hasRootLevelScopedModules = nsWebpack.hasRootLevelScopedModules({
+    projectDir: projectRoot
+  });
+  let coreModulesPackageName = 'tns-core-modules';
+  const alias = {
+    '~': appFullPath
+  };
+
+  if (hasRootLevelScopedModules) {
+    coreModulesPackageName = '@nativescript/core';
+    alias['tns-core-modules'] = coreModulesPackageName;
+  }
   const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
 
   const entryModule = nsWebpack.getEntryModule(appFullPath, platform);
@@ -105,6 +124,9 @@ module.exports = env => {
     );
   }
 
+  const noEmitOnErrorFromTSConfig = getNoEmitOnErrorFromTSConfig(tsConfigPath);
+
+  nsWebpack.processAppComponents(appComponents, platform);
   const config = {
     mode: production ? 'production' : 'development',
     context: appFullPath,
@@ -131,14 +153,12 @@ module.exports = env => {
       extensions: ['.ts', '.js', '.scss', '.css'],
       // Resolve {N} system modules from tns-core-modules
       modules: [
-        resolve(__dirname, 'node_modules/tns-core-modules'),
+        resolve(__dirname, `node_modules/${coreModulesPackageName}`),
         resolve(__dirname, 'node_modules'),
-        'node_modules/tns-core-modules',
+        `node_modules/${coreModulesPackageName}`,
         'node_modules'
       ],
-      alias: {
-        '~': appFullPath
-      },
+      alias,
       // resolve symlinks to symlinked modules
       symlinks: true
     },
@@ -161,6 +181,7 @@ module.exports = env => {
       : 'none',
     optimization: {
       runtimeChunk: 'single',
+      noEmitOnErrors: noEmitOnErrorFromTSConfig,
       splitChunks: {
         cacheGroups: {
           vendor: {
@@ -203,7 +224,7 @@ module.exports = env => {
     module: {
       rules: [
         {
-          test: nsWebpack.getEntryPathRegExp(appFullPath, entryPath),
+          include: join(appFullPath, entryPath),
           use: [
             // Require all Android app components
             platform === 'android' && {
@@ -217,7 +238,8 @@ module.exports = env => {
                 loadCss: !snapshot, // load the application css if in debug mode
                 unitTesting,
                 appFullPath,
-                projectRoot
+                projectRoot,
+                ignoredFiles: nsWebpack.getUserDefinedEntries(entries, platform)
               }
             }
           ].filter(loader => !!loader)
@@ -235,15 +257,12 @@ module.exports = env => {
 
         {
           test: /\.css$/,
-          use: { loader: 'css-loader', options: { url: false } }
+          use: 'nativescript-dev-webpack/css2json-loader'
         },
 
         {
           test: /\.scss$/,
-          use: [
-            { loader: 'css-loader', options: { url: false } },
-            'sass-loader'
-          ]
+          use: ['nativescript-dev-webpack/css2json-loader', 'sass-loader']
         },
 
         {
@@ -298,6 +317,7 @@ module.exports = env => {
         tsconfig: tsConfigPath,
         async: false,
         useTypescriptIncrementalApi: true,
+        checkSyntacticErrors: true,
         memoryLimit: 4096
       })
     ]
@@ -322,7 +342,10 @@ module.exports = env => {
         chunk: 'vendor',
         requireModules: ['tns-core-modules/bundle-entry-points'],
         projectRoot,
-        webpackConfig: config
+        webpackConfig: config,
+        snapshotInDocker,
+        skipSnapshotTools,
+        useLibs
       })
     );
   }

demo/package.json

@@ -23,8 +23,8 @@
     "test.ios": "npm run tsc && npm run tslint && cd ../demo && tns build ios && tns test ios --justlaunch",
     "tslint": "cd .. && tslint \"**/*.ts\" --config tslint.json --exclude \"**/node_modules/**\"",
     "plugin.tscwatch": "npm run tsc -- -w",
-    "demo.ios": "npm run tsc && cd ../demo && tns run ios --syncAllFiles --emulator",
-    "demo.android": "npm run tsc && cd ../demo && tns run android --syncAllFiles --emulator",
+    "demo.ios": "npm run tsc && cd ../demo && tns run ios --emulator",
+    "demo.android": "npm run tsc && cd ../demo && tns run android --emulator",
     "demo.reset": "cd ../demo && npx rimraf -- hooks node_modules platforms package-lock.json",
     "plugin.prepare": "npm run build && cd ../demo && tns plugin remove nativescript-loading-indicator && tns plugin add ../src",
     "clean": "npm run demo.reset && npx rimraf -- node_modules package-lock.json && npm i",
@@ -75,17 +75,16 @@
   "homepage": "https://github.com/nstudio/nativescript-loading-indicator",
   "readmeFilename": "README.md",
   "devDependencies": {
-    "husky": "^3.0.0",
-    "lint-staged": "^9.1.0",
-    "prettier": "^1.18.2",
-    "tns-core-modules": "^6.2.0",
-    "tns-platform-declarations": "^6.2.0",
+    "husky": "^4.0.1",
+    "lint-staged": "^9.5.0",
+    "prettier": "^1.19.1",
+    "tns-core-modules": "^6.3.2",
+    "tns-platform-declarations": "^6.3.2",
     "typescript": "~3.3.3",
     "prompt": "^1.0.0",
     "rimraf": "^2.6.3",
-    "tslint": "^5.12.1",
+    "tslint": "^5.20.1",
     "semver": "^5.6.0"
   },
-  "dependencies": {},
-  "bootstrapper": "nativescript-plugin-seed"
+  "dependencies": {}
 }