Skip to content
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

chore(): update stencil/ionicons #16720

Merged
merged 2 commits into from
Dec 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion angular/src/app-initialize.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import '@ionic/core/dist/ionic/svg';
import { defineCustomElements } from '@ionic/core/loader';
import { addIcons } from 'ionicons';
import { ICON_PATHS } from 'ionicons/icons';

import { Config } from './providers/config';
import { IonicWindow } from './types/interfaces';
Expand All @@ -9,6 +10,7 @@ export function appInitialize(config: Config) {
const win: IonicWindow | undefined = window as any;
if (typeof win !== 'undefined') {
const Ionic = win.Ionic = win.Ionic || {};
addIcons(ICON_PATHS);

Ionic.config = config;
Ionic.asyncQueue = false;
Expand All @@ -28,6 +30,7 @@ export function appInitialize(config: Config) {
elm.removeEventListener(eventName, cb, opts);
}
};

return defineCustomElements(win, {
exclude: ['ion-tabs', 'ion-tab']
});
Expand Down
4 changes: 4 additions & 0 deletions angular/test/test-app/scripts/sync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ cp -a ../../dist node_modules/@ionic/angular/dist
# Copy core dist
rm -rf node_modules/@ionic/core/dist
cp -a ../../../core/dist node_modules/@ionic/core/dist

# Copy ionicons
rm -rf node_modules/ionicons
cp -a ../../../core/node_modules/ionicons node_modules/ionicons
Loading