Skip to content
Open
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
4 changes: 2 additions & 2 deletions core/stencil.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ const getAngularOutputTargets = () => {
return [
angularOutputTarget({
componentCorePackage,
directivesProxyFile: '../packages/angular/src/directives/proxies.ts',
directivesArrayFile: '../packages/angular/src/directives/proxies-list.ts',
directivesProxyFile: '../packages/angular/lazy/src/directives/proxies.ts',
directivesArrayFile: '../packages/angular/lazy/src/directives/proxies-list.ts',
excludeComponents,
outputType: 'component',
}),
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ dist
scripts
test
proxies.ts
src/directives/proxies-list.ts
lazy/src/directives/proxies-list.ts
**/*/angular-component-lib/utils.ts
2 changes: 1 addition & 1 deletion packages/angular/eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = [
// inferred project for them (the ts-eslint 8 equivalent of the old
// createDefaultProgram option).
projectService: {
allowDefaultProject: ['src/ionic-core.ts', 'src/schematics/add/*.ts', 'src/schematics/utils/*.ts'],
allowDefaultProject: ['lazy/src/ionic-core.ts', 'schematics/add/*.ts', 'schematics/utils/*.ts'],
},
tsconfigRootDir: __dirname,
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"lib": {
"entryFile": "src/index.ts"
},
}
}
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/angular/ng-package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "./node_modules/ng-packagr/ng-package.schema.json",
"lib": {
"entryFile": "src/index.ts"
"entryFile": "standalone/src/index.ts"
},
"allowedNonPeerDependencies": ["@ionic/core", "ionicons", "jsonc-parser"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ import { addRootProvider } from '@schematics/angular/utility';
import { getWorkspace } from '@schematics/angular/utility/workspace';

import { addIonicModuleImportToNgModule } from '../utils/ast';

import {
addArchitectBuilder,
addAsset,
addCli,
addSchematics,
addStyle,
getDefaultAngularAppName,
} from './../utils/config';
import { addPackageToPackageJson } from './../utils/package';
} from '../utils/config';
import { addPackageToPackageJson } from '../utils/package';

import { Schema as IonAddOptions } from './schema';

function addIonicAngularToPackageJson(): Rule {
Expand Down Expand Up @@ -86,7 +86,7 @@ function addProvideIonicAngular(projectName: string, projectSourceRoot: Path): R
if (host.exists(appConfig)) {
return addRootProvider(
projectName,
({ code, external }) => code`${external('provideIonicAngular', '@ionic/angular/standalone')}({})`
({ code, external }) => code`${external('provideIonicAngular', '@ionic/angular')}({})`

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You updated this path to @ionic/angular, but the sibling NgModule path got missed. addIonicModuleImportToNgModule in schematics/utils/ast.ts:27 still does insertImport(..., 'IonicModule', '@ionic/angular'), and after this PR IonicModule only lives in @ionic/angular/lazy (the standalone default @ionic/angular doesn't export it). So ng add @ionic/angular on an NgModule app, the branch that runs when app.module.ts exists, generates an import that won't compile. That line should pull IonicModule from @ionic/angular/lazy. CI doesn't catch it because ng add isn't run against a generated app.

);
}
return host;
Expand Down
8 changes: 4 additions & 4 deletions packages/angular/scripts/build-core.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ function buildSchematics(){
}

function copySchematicsJson(){
const src = path.join(__dirname, '..', 'src', 'schematics', 'collection.json');
const fileSrc = path.join(__dirname, '..', 'src', 'schematics', 'add', 'files');
const dst = path.join(__dirname, '..', 'dist','schematics', 'collection.json');
const src = path.join(__dirname, '..', 'schematics', 'collection.json');
const fileSrc = path.join(__dirname, '..', 'schematics', 'add', 'files');
const dst = path.join(__dirname, '..', 'dist', 'schematics', 'collection.json');
const fileDst = path.join(__dirname, '..', 'dist', 'schematics', 'add', 'files');
const schemaSrc = path.join(__dirname, '..', 'src', 'schematics', 'add', 'schema.json');
const schemaSrc = path.join(__dirname, '..', 'schematics', 'add', 'schema.json');
const schemaDst = path.join(__dirname, '..', 'dist', 'schematics', 'add', 'schema.json');

fs.removeSync(dst);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component } from "@angular/core";

import { IonicModule } from "@ionic/angular";
import { IonicModule } from "@ionic/angular/lazy";

import { NavRootComponent } from "./nav-root.component";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { JsonPipe } from "@angular/common";
import { Component, OnInit } from "@angular/core";

import { IonicModule } from "@ionic/angular";
import { IonicModule } from "@ionic/angular/lazy";

/**
* This is used to track if any occurrences of
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, Inject } from '@angular/core';
import { IonButton, IonModalToken } from "@ionic/angular/standalone";
import { IonButton, IonModalToken } from "@ionic/angular";

@Component({
selector: 'app-modal',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from '@angular/core';
import { IonButton } from '@ionic/angular/standalone';
import { IonButton } from '@ionic/angular';
import { ProgrammaticModalService } from './programmatic-modal.service';

@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { inject, Injectable } from '@angular/core';
import { ModalController } from "@ionic/angular/standalone";
import { ModalController } from "@ionic/angular";
import { ModalComponent } from "./modal/modal.component";

@Injectable({
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/test/apps/ng21/src/main-standalone.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { bootstrapApplication } from '@angular/platform-browser';
import { RouteReuseStrategy, provideRouter } from '@angular/router';
import { provideIonicAngular, IonicRouteStrategy } from '@ionic/angular/standalone';
import { provideIonicAngular, IonicRouteStrategy } from '@ionic/angular';

import { AppStandaloneComponent } from './app/app-standalone.component';

Expand Down
2 changes: 1 addition & 1 deletion packages/angular/test/apps/ng22/src/main-standalone.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { bootstrapApplication } from '@angular/platform-browser';
import { RouteReuseStrategy, provideRouter } from '@angular/router';
import { provideIonicAngular, IonicRouteStrategy } from '@ionic/angular/standalone';
import { provideIonicAngular, IonicRouteStrategy } from '@ionic/angular';

import { AppStandaloneComponent } from './app/app-standalone.component';

Expand Down
2 changes: 1 addition & 1 deletion packages/angular/test/base/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { APP_ID, NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { RouteReuseStrategy } from '@angular/router';
import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
import { IonicModule, IonicRouteStrategy } from '@ionic/angular/lazy';
import { AppComponent } from './app.component';
import { AppRoutingModule } from './app-routing.module';
import { AppLandingComponent } from './app-landing/app-landing.component';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { ModalController } from '@ionic/angular/lazy';
import { AccordionModalComponent } from './accordion-modal/accordion-modal.component';

@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, NgZone } from '@angular/core';
import { AlertController } from '@ionic/angular';
import { AlertController } from '@ionic/angular/lazy';

import { assertZoneContext } from '../../zone-assert.util';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ReactiveFormsModule } from '@angular/forms';

import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { IonicModule } from '@ionic/angular';
import { IonicModule } from '@ionic/angular/lazy';
import { FormsModule } from '@angular/forms';
import { InputsComponent } from '../inputs/inputs.component';
import { ModalComponent } from '../modal/modal.component';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { IonicModule } from '@ionic/angular/lazy';

import { RangeRoutingModule } from './range-routing.module';
import { RangeComponent } from './range.component';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, VERSION } from '@angular/core';
import { AnimationBuilder, AnimationController } from '@ionic/angular';
import { AnimationBuilder, AnimationController } from '@ionic/angular/lazy';

@Component({
selector: 'app-home-page',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { IonicModule } from "@ionic/angular";
import { IonicModule } from "@ionic/angular/lazy";
import { OverlayKeepContentsMountedComponentRoutingModule } from "./keep-contents-mounted-routing.module";
import { OverlayKeepContentsMountedComponent } from "./keep-contents-mounted.component";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, ComponentRef, OnDestroy, ViewChild, ViewContainerRef } from "@angular/core";
import { ModalController } from "@ionic/angular";
import { ModalController } from "@ionic/angular/lazy";
import { DynamicComponentWrapperComponent } from "./dynamic-component-wrapper.component";
import { DynamicModalContentComponent } from "./dynamic-modal-content.component";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { IonicModule } from "@ionic/angular";
import { IonicModule } from "@ionic/angular/lazy";
import { DynamicComponentWrapperComponent } from "./dynamic-component-wrapper.component";
import { DynamicModalContentComponent } from "./dynamic-modal-content.component";
import { ModalDynamicWrapperRoutingModule } from "./modal-dynamic-wrapper-routing.module";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Input, OnInit, Optional, signal } from '@angular/core';
import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
import { ModalController, IonNav, ViewWillLeave, ViewDidEnter, ViewDidLeave } from '@ionic/angular';
import { ModalController, IonNav, ViewWillLeave, ViewDidEnter, ViewDidLeave } from '@ionic/angular/lazy';

import { assertZoneContext } from '../../zone-assert.util';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { IonicModule } from "@ionic/angular";
import { IonicModule } from "@ionic/angular/lazy";
import { ModalInlineRoutingModule } from "./modal-inline-routing.module";
import { ModalInlineComponent } from "./modal-inline.component";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, ViewChild } from "@angular/core";
import { IonModal } from "@ionic/angular";
import { IonModal } from "@ionic/angular/lazy";

interface Contact {
name: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { IonicModule } from "@ionic/angular";
import { IonicModule } from "@ionic/angular/lazy";
import { ModalSheetInlineRoutingModule } from "./modal-sheet-inline-routing.module";
import { ModalSheetInlineComponent } from "./modal-sheet-inline.component";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ChangeDetectorRef, Component } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { ModalController } from '@ionic/angular/lazy';
import { ModalExampleComponent } from '../modal-example/modal-example.component';
import { NavComponent } from '../nav/nav.component';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from '@angular/core';
import { NavController } from '@ionic/angular';
import { NavController } from '@ionic/angular/lazy';

let count = 0;
@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from '@angular/core';
import { NavController } from '@ionic/angular';
import { NavController } from '@ionic/angular/lazy';


@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { NavController } from '@ionic/angular';
import { NavController } from '@ionic/angular/lazy';

@Component({
selector: 'app-navigation-page3',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, OnDestroy, OnInit } from '@angular/core';
import { IonRouterOutlet } from '@ionic/angular';
import { IonRouterOutlet } from '@ionic/angular/lazy';

import { assertZoneContext } from '../../zone-assert.util';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { IonicModule } from "@ionic/angular";
import { IonicModule } from "@ionic/angular/lazy";
import { OverlaysInlineRoutingModule } from "./overlays-inline-routing.module";
import { OverlaysInlineComponent } from "./overlays-inline.component";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChangeDetectorRef, Component } from "@angular/core";

import { IonPopover } from "@ionic/angular";
import { IonPopover } from "@ionic/angular/lazy";

/**
* Validates that inline popovers will correctly display
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { IonicModule } from "@ionic/angular";
import { IonicModule } from "@ionic/angular/lazy";
import { PopoverInlineRoutingModule } from "./popover-inline-routing.module";
import { PopoverInlineComponent } from "./popover-inline.component";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
NavController,
DomController,
Config,
} from '@ionic/angular';
} from '@ionic/angular/lazy';

import { assertZoneContext } from '../../zone-assert.util';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, OnInit, signal } from '@angular/core';
import { IonRouterOutlet, ViewDidEnter, ViewDidLeave, ViewWillLeave } from '@ionic/angular';
import { IonRouterOutlet, ViewDidEnter, ViewDidLeave, ViewWillLeave } from '@ionic/angular/lazy';

import { assertZoneContext } from '../../zone-assert.util';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, OnInit, signal } from '@angular/core';
import { NavController, ViewDidEnter, ViewDidLeave, ViewWillEnter, ViewWillLeave } from '@ionic/angular';
import { NavController, ViewDidEnter, ViewDidLeave, ViewWillEnter, ViewWillLeave } from '@ionic/angular/lazy';
import { Router } from '@angular/router';

import { assertZoneContext } from '../../zone-assert.util';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component } from "@angular/core";
import { RouterModule } from "@angular/router";

import { IonicModule } from '@ionic/angular';
import { IonicModule } from '@ionic/angular/lazy';

@Component({
selector: 'app-standalone',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { IonicModule } from "@ionic/angular";
import { IonicModule } from "@ionic/angular/lazy";

import { SearchbarRoutingModule } from "./searchbar-routing.module";
import { SearchbarComponent } from "./searchbar.component";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AfterViewInit, Component, ViewChild } from '@angular/core';
import { IonSlides } from '@ionic/angular';
import { IonSlides } from '@ionic/angular/lazy';

@Component({
selector: 'app-slides',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, ViewChild } from '@angular/core';
import { IonTabBar } from '@ionic/angular';
import { IonTabBar } from '@ionic/angular/lazy';

@Component({
selector: 'app-tabs-basic',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from "@angular/core";
import { NavController } from "@ionic/angular";
import { NavController } from "@ionic/angular/lazy";

/**
* This component is used in conjunction with a tabs router-outlet,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NgModule } from "@angular/core";
import { IonicModule } from "@ionic/angular";
import { IonicModule } from "@ionic/angular/lazy";
import { TabsGlobalRoutingModule } from "./tabs-global-routing.module";
import { TabsGlobalComponent } from "./tabs-global.component";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';

import { TabsLazyRoutingModule } from './tabs-lazy-routing.module';
import { TabsTab3Component } from './tabs-tab3/tabs-tab3.component';
import { IonicModule } from '@ionic/angular';
import { IonicModule } from '@ionic/angular/lazy';
import { TabsTab3NestedComponent } from './tabs-tab3-nested/tabs-tab3-nested.component';

@NgModule({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from "@angular/core";
import { IonicModule } from "@ionic/angular";
import { IonicModule } from "@ionic/angular/lazy";

/**
* Test purpose: Validates that the tab bar is relocated to the
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ActivatedRoute } from '@angular/router';
import { Component, OnInit } from '@angular/core';
import { NavController } from '@ionic/angular';
import { NavController } from '@ionic/angular/lazy';

@Component({
selector: 'app-tabs-tab1-nested',
Expand Down
Loading
Loading