New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: update template for angular 9 #11852
Conversation
Tests:
|
android/templates/app/angular-default/template/platform/android/res/values/colors.xml
Outdated
Show resolved
Hide resolved
@@ -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 => { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Curious why this was added. Won't eslint ignore the passed in file if it's in the .eslintignore
file anyways?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes and no. Before eslint will ignore a file, it tries to load all applicable config files. For files in the Angular template directory this would include the .eslintrc.js. This fails because it contains a plugin and parser which we don't have installed, which then fails the pre-commit hook.
@@ -2,6 +2,10 @@ | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't seem to comment on the image above, but looks to me like you removed the templates/app/angular-default/template/DefaultIcon.png
which actually ha date Angular image and put back the red titanium logo? Was that intentional?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same with templates/app/angular-default/template/src/assets/android/appicon.png
below and android/templates/app/angular-default/template/src/assets/android/appicon.png
above. So I assume this is intentional. Just curious why you wouldn't align the launch icons and the app icons.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wasn't really happy with having only one logo. Previously it was only the Angular logo, but then our Titanium logo is completely missing which i didn't like. I then only used the Titanium logo, but then nothing indicated that this was an Angular app, which i also wasn't happy with. So i settled for the Titanium logo as the app icon, and the Angular logo as the launch logo.
Now that i'm thinking about it again, it maybe useful to have kind of a mashup logo that has both our Titanium Logo and the Angular logo in it. I'll ask marketing if they can come up with something.
@ewanharris @sgtcoolguy addressed review comments and updated the PR to use a shared post-create hook from #11858 |
06d8299
to
e1140cc
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes look good to me. Should this land after #11858 now that it has a dependency on the post-create hook from that PR?
@ewanharris Yup, that's the plan! |
8d0261e
to
956a4ab
Compare
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Check out the target branch
git checkout 9_3_X
# Check out your branch
git checkout -b backport-11852-to-9_3_X
# Apply the commits from the PR
curl -s https://github.com/appcelerator/titanium_mobile/commit/a08973a1f61de3f2ee416d61a2277e4b4a58dd56.patch | git am -3 --ignore-whitespace
curl -s https://github.com/appcelerator/titanium_mobile/commit/504412e86b35334316eb6faa2cb0dfafb0de8904.patch | git am -3 --ignore-whitespace
curl -s https://github.com/appcelerator/titanium_mobile/commit/e1140ccc90d613ad12230674c772b7fe1fde1ef1.patch | git am -3 --ignore-whitespace
curl -s https://github.com/appcelerator/titanium_mobile/commit/a11d097ccc233dc53b39b11cea7f9a2b37126bdf.patch | git am -3 --ignore-whitespace
curl -s https://github.com/appcelerator/titanium_mobile/commit/57b9c0ffca74c83424626e7071d33fd2338b9d33.patch | git am -3 --ignore-whitespace
curl -s https://github.com/appcelerator/titanium_mobile/commit/956a4ab3a082432d8db1a1ff557960f2d76cb443.patch | git am -3 --ignore-whitespace
# Push it to GitHub
git push --set-upstream origin backport-11852-to-9_3_X Then, create a pull request where the |
* update readme and use shared post-create hook * split dev dependencies * unify app icon and launch image * vscode settings Fixes TIMOB-27856
JIRA: https://jira.appcelerator.org/browse/TIMOB-27856
Optional Description:
Updated template for Titanium Angular with support for the new Webpack build pipeline and Angular 9.
Test case:
ti create --template angular-default
orappc new --ng