feat: update template for angular 9 (9_1_X)

.gitignore

@@ -37,7 +37,10 @@ junit_report.xml
 /iphone/TitaniumKit/build
 /iphone/lib/libTiCore.a
 
-/.vscode
+.vscode/*
+!.vscode/extensions.json
+!.vscode/settings.json
+
 /android/runtime/v8/src/native/V8Snapshots.h
 
 .nyc_output/

android/templates/app/angular-default/template/platform/android/res/drawable-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

android/templates/app/angular-default/template/platform/android/res/drawable-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

android/templates/app/angular-default/template/platform/android/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>

android/templates/app/angular-default/template/platform/android/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>

templates/app/angular-default/template/app/platform/android/res/values/colors.xml → android/templates/app/angular-default/template/platform/android/res/values/colors.xml

@@ -5,4 +5,4 @@
     <color name="angularLightBlue">#63a4ff</color>
     <color name="angularRed">#de0032</color>
     <color name="windowBackground">#fafafa</color>
-</resources>
+</resources>

android/templates/app/angular-default/template/platform/android/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#E82C2A</color>
+</resources>

android/templates/app/angular-default/template/platform/android/res/values/styles.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="TitaniumAngular" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">@color/angularBlue</item>
+        <item name="colorPrimaryDark">@color/angularDarkBlue</item>
+        <item name="colorAccent">@color/angularRed</item>
+        <item name="android:windowBackground">@color/windowBackground</item>
+        <item name="android:textColor">#444</item>
+	</style>
+</resources>

lint-staged.config.js

@@ -1,5 +1,16 @@
 'use strict';
 
+const { ESLint } = require('eslint');
+
+const eslint = new ESLint();
+
+const asyncFilter = async (arr, predicate) => {
+	return arr.reduce(async (acc, value) => {
+		const result = await predicate(value);
+		return [ ...await acc, ...(result ? [ value ] : []) ];
+	}, []);
+};
+
 module.exports = {
 	'android/**/*.java': filenames => {
 		return `./android/gradlew checkJavaStyle -p ./android --console plain -PchangedFiles='${filenames.join(',')}'`;
@@ -10,6 +21,15 @@ module.exports = {
 	'iphone/TitaniumKit/TitaniumKit/Sources/API/TopTiModule.m': [
 		'npm run ios-sanity-check --'
 	],
-	'!(**/locales/**/*).js': 'eslint',
+	'*.js': async files => {
+		const filtered = await asyncFilter(files, async file => {
+			try {
+				return !await eslint.isPathIgnored(file);
+			} catch (e) {
+				return false;
+			}
+		});
+		return `eslint ${filtered.join(' ')}`;
+	},
 	'package-lock.json': 'npm run lint:lockfile'
 };

templates/app/angular-default/hooks/post-create.js

@@ -1,41 +1,6 @@
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
-const spawn = require('child_process').spawn; // eslint-disable-line security/detect-child-process
+const postAppCreate = require('../../../../cli/lib/webpack-post-create');
 
-exports.id = 'com.appcelerator.angular.post-create';
-
-exports.init = (logger, config, cli) => {
-	cli.on('create.post.app', (creator, next) => {
-		const projectName = cli.argv.name;
-		const projectPath = path.join(cli.argv['workspace-dir'], projectName);
-		const packageJsonPath = path.join(projectPath, 'app', 'package.json');
-		if (fs.existsSync(packageJsonPath)) {
-			let packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
-			packageJson.name = projectName;
-			fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 4));
-		}
-
-		logger.info('Installing Angular project dependencies');
-		let errorOutput = '';
-		let npmExecutable = 'npm';
-		const spawnOptions = { cwd: path.dirname(packageJsonPath) };
-		if (process.platform === 'win32') {
-			spawnOptions.shell = true;
-			npmExecutable += '.cmd';
-		}
-		const child = spawn(npmExecutable, [ 'i' ], spawnOptions);
-		child.on('close', code => {
-			if (code !== 0) {
-				logger.error(errorOutput);
-				return next(new Error('Failed to install dependencies.'));
-			}
-
-			next();
-		});
-		child.stderr.on('data', data => {
-			errorOutput += data.toString();
-		});
-	});
-};
+exports.id = 'template.angular.post-create';
+exports.init = postAppCreate(__dirname);

templates/app/angular-default/template/.eslintrc.js

@@ -0,0 +1,37 @@
+module.exports = {
+  root: true,
+  extends: ['plugin:@angular-eslint/recommended'],
+  rules: {
+    '@angular-eslint/directive-selector': [
+      'error',
+      { type: 'attribute', prefix: 'app', style: 'camelCase' }
+    ],
+    '@angular-eslint/component-selector': [
+      'error',
+      { type: 'element', prefix: 'app', style: 'kebab-case' }
+    ]
+  },
+  overrides: [
+    /**
+     * This extra piece of configuration is only necessary if you make use of inline
+     * templates within Component metadata, e.g.:
+     *
+     * @Component({
+     *  template: `<h1>Hello, World!</h1>`
+     * })
+     * ...
+     *
+     * It is not necessary if you only use .html files for templates.
+     */
+    {
+      files: ['*.component.ts'],
+      parser: '@typescript-eslint/parser',
+      parserOptions: {
+        ecmaVersion: 2020,
+        sourceType: 'module'
+      },
+      plugins: ['@angular-eslint/template'],
+      processor: '@angular-eslint/template/extract-inline-html'
+    }
+  ]
+};

templates/app/angular-default/template/.gitignore

@@ -8,7 +8,6 @@ yarn-error.log*
 # Build dirs and files
 /build
 /i18n
-/platform
 /Resources
 
 # Dependency directories

templates/app/angular-default/template/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+	"recommendations": [
+		"axway.vscode-titanium"
+	]
+}