Skip to content
Prev Previous commit
Next Next commit
Make repo apps compatible with --bundle (#1857)
* chore: upgrade app to latest versions and webpack * chore: fix incorrect temlateUrl in component chore: update karma config for latest CLI beta 6.0.0 * chore: make `router-tab-view` example webpack compatible * chore: make `nested-router-tab-view` example webpack compatible * chore: fix lazy loaded component not loading * chore: make `modal-navigation-ng` example webpack compatible * chore: add webpack config due to issue in CLI that disregards the `nsconfig.json` * chore: update test app with latest deps and remove not used d.ts * chore: update karma config * chore: resolve issue caused by overrding `global.__extends ` * chore: update Angular deps * chore: update `nativescript-dev-webpack` to next * refactor: unit-test configs * test: update webpack config
  • Loading branch information
VladimirAmiorkov authored Jun 25, 2019
commit 1cb3675e8e950ed63c57ce1c290326d127caa784
28 changes: 14 additions & 14 deletions e2e/animation-examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,29 @@
"version": "latest"
},
"tns-android": {
"version": "5.4.0-2019-05-02-235338-05"
"version": "latest"
}
},
"dependencies": {
"@angular/animations": "8.0.0",
"@angular/common": "8.0.0",
"@angular/compiler": "8.0.0",
"@angular/core": "8.0.0",
"@angular/forms": "8.0.0",
"@angular/animations": "~8.0.0",
"@angular/common": "~8.0.0",
"@angular/compiler": "~8.0.0",
"@angular/core": "~8.0.0",
"@angular/forms": "~8.0.0",
"@angular/http": "8.0.0-beta.10",
"@angular/platform-browser": "8.0.0",
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/router": "8.0.0",
"@angular/platform-browser": "~8.0.0",
"@angular/platform-browser-dynamic": "~8.0.0",
"@angular/router": "~8.0.0",
"nativescript-angular": "file:../../nativescript-angular",
"nativescript-theme-core": "~1.0.2",
"reflect-metadata": "~0.1.8",
"rxjs": "^6.3.3",
"tns-core-modules": "^5.4.0-next-2019-05-01-141636-02",
"tns-core-modules": "next",
"zone.js": "^0.9.1"
},
"devDependencies": {
"@angular/compiler-cli": "8.0.0",
"@ngtools/webpack": "8.0.0",
"@angular/compiler-cli": "~8.0.0",
"@ngtools/webpack": "~8.0.0",
"@types/chai": "~4.1.7",
"@types/mocha": "~5.2.5",
"@types/node": "~10.12.18",
Expand All @@ -43,8 +43,8 @@
"mochawesome": "~3.1.2",
"nativescript-css-loader": "~0.26.0",
"nativescript-dev-appium": "next",
"nativescript-dev-typescript": "^0.9.1-next-2019-03-12-162713-03",
"nativescript-dev-webpack": "^0.22.0-next-2019-04-17-111030-01",
"nativescript-dev-typescript": "next",
"nativescript-dev-webpack": "next",
"typescript": "~3.4.5"
},
"scripts": {
Expand Down
21 changes: 11 additions & 10 deletions e2e/modal-navigation-ng/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,26 @@
}
},
"dependencies": {
"@angular/animations": "8.0.0",
"@angular/common": "8.0.0",
"@angular/compiler": "8.0.0",
"@angular/core": "8.0.0",
"@angular/forms": "8.0.0",
"@angular/animations": "~8.0.0",
"@angular/common": "~8.0.0",
"@angular/compiler": "~8.0.0",
"@angular/core": "~8.0.0",
"@angular/forms": "~8.0.0",
"@angular/http": "8.0.0-beta.10",
"@angular/platform-browser": "8.0.0",
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/router": "8.0.0",
"@angular/platform-browser": "~8.0.0",
"@angular/platform-browser-dynamic": "~8.0.0",
"@angular/router": "~8.0.0",
"nativescript-angular": "file:../../nativescript-angular",
"nativescript-dev-webpack": "next",
"nativescript-theme-core": "~1.0.4",
"reflect-metadata": "~0.1.8",
"rxjs": "~6.3.3",
"tns-core-modules": "next",
"zone.js": "^0.9.1"
},
"devDependencies": {
"@angular/compiler-cli": "8.0.0",
"@ngtools/webpack": "8.0.0",
"@angular/compiler-cli": "~8.0.0",
"@ngtools/webpack": "~8.0.0",
"@types/chai": "~4.1.7",
"@types/mocha": "~5.2.5",
"@types/node": "~10.12.18",
Expand Down
10 changes: 9 additions & 1 deletion e2e/modal-navigation-ng/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,16 @@
]
}
},
"include": [
"../../nativescript-angular",
"**/*"
],
"exclude": [
"../../nativescript-angular/node_modules",
"../../nativescript-angular/**/*.d.ts",
"node_modules",
"platforms"
"platforms",
"**/*.aot",
"e2e"
]
}
6 changes: 4 additions & 2 deletions e2e/nested-router-tab-view/app/app.routing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { TeamDetailComponent } from "./team/team-detail.component";
import { LoginComponent } from "./login/login.component";
import { TabsComponent } from "./tabs/tabs.component";
import { HomeComponent } from "./home/home.component";
import { HomeLazyModule } from "./home-lazy/home-lazy.module";
import { CustomTabsModule } from "./custom-tabs/custom-tabs.module"
import { AboutComponent } from "./about/about.component";
import { AboutNestedComponent } from "./about/about-nested.component";

Expand Down Expand Up @@ -46,11 +48,11 @@ const routes: Routes = [
},
{
path: "home-lazy",
loadChildren: "./home-lazy/home-lazy.module#HomeLazyModule",
loadChildren: () => HomeLazyModule,
},
{
path: "custom-tabs",
loadChildren: "./custom-tabs/custom-tabs.module#CustomTabsModule",
loadChildren: () => CustomTabsModule,
},
{
path: "tabs", component: TabsComponent, children: [
Expand Down
21 changes: 11 additions & 10 deletions e2e/nested-router-tab-view/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,26 @@
}
},
"dependencies": {
"@angular/animations": "8.0.0",
"@angular/common": "8.0.0",
"@angular/compiler": "8.0.0",
"@angular/core": "8.0.0",
"@angular/forms": "8.0.0",
"@angular/animations": "~8.0.0",
"@angular/common": "~8.0.0",
"@angular/compiler": "~8.0.0",
"@angular/core": "~8.0.0",
"@angular/forms": "~8.0.0",
"@angular/http": "8.0.0-beta.10",
"@angular/platform-browser": "8.0.0",
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/router": "8.0.0",
"@angular/platform-browser": "~8.0.0",
"@angular/platform-browser-dynamic": "~8.0.0",
"@angular/router": "~8.0.0",
"nativescript-angular": "file:../../nativescript-angular",
"nativescript-dev-webpack": "next",
"nativescript-theme-core": "~1.0.4",
"reflect-metadata": "~0.1.8",
"rxjs": "~6.3.3",
"tns-core-modules": "next",
"zone.js": "^0.9.1"
},
"devDependencies": {
"@angular/compiler-cli": "8.0.0",
"@ngtools/webpack": "8.0.0",
"@angular/compiler-cli": "~8.0.0",
"@ngtools/webpack": "~8.0.0",
"@types/chai": "~4.1.7",
"@types/mocha": "~5.2.5",
"@types/node": "~10.12.18",
Expand Down
11 changes: 9 additions & 2 deletions e2e/nested-router-tab-view/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"emitDecoratorMetadata": true,
"noEmitHelpers": true,
"noEmitOnError": true,
"sourceMap": true,
"lib": [
"es6",
"dom",
Expand All @@ -23,8 +22,16 @@
]
}
},
"include": [
"../../nativescript-angular",
"**/*"
],
"exclude": [
"../../nativescript-angular/node_modules",
"../../nativescript-angular/**/*.d.ts",
"node_modules",
"platforms"
"platforms",
"**/*.aot",
"e2e"
]
}
18 changes: 9 additions & 9 deletions e2e/renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
"id": "org.nativescript.renderer"
},
"dependencies": {
"@angular/common": "8.0.0",
"@angular/compiler": "8.0.0",
"@angular/core": "8.0.0",
"@angular/forms": "8.0.0",
"@angular/common": "~8.0.0",
"@angular/compiler": "~8.0.0",
"@angular/core": "~8.0.0",
"@angular/forms": "~8.0.0",
"@angular/http": "8.0.0-beta.10",
"@angular/platform-browser": "8.0.0",
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/router": "8.0.0",
"@angular/platform-browser": "~8.0.0",
"@angular/platform-browser-dynamic": "~8.0.0",
"@angular/router": "~8.0.0",
"nativescript-angular": "file:../../nativescript-angular",
"nativescript-intl": "^3.0.0",
"reflect-metadata": "~0.1.8",
Expand All @@ -23,8 +23,8 @@
"zone.js": "^0.9.1"
},
"devDependencies": {
"@angular/compiler-cli": "8.0.0",
"@ngtools/webpack": "8.0.0",
"@angular/compiler-cli": "~8.0.0",
"@ngtools/webpack": "~8.0.0",
"@types/chai": "~4.1.7",
"@types/mocha": "~5.2.5",
"@types/node": "~10.12.18",
Expand Down
20 changes: 10 additions & 10 deletions e2e/routable-animations/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
"id": "org.nativescript.nsroanimations"
},
"dependencies": {
"@angular/animations": "8.0.0",
"@angular/common": "8.0.0",
"@angular/compiler": "8.0.0",
"@angular/core": "8.0.0",
"@angular/forms": "8.0.0",
"@angular/animations": "~8.0.0",
"@angular/common": "~8.0.0",
"@angular/compiler": "~8.0.0",
"@angular/core": "~8.0.0",
"@angular/forms": "~8.0.0",
"@angular/http": "8.0.0-beta.10",
"@angular/platform-browser": "8.0.0",
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/router": "8.0.0",
"@angular/platform-browser": "~8.0.0",
"@angular/platform-browser-dynamic": "~8.0.0",
"@angular/router": "~8.0.0",
"nativescript-angular": "next",
"nativescript-theme-core": "~1.0.2",
"reflect-metadata": "~0.1.8",
Expand All @@ -24,8 +24,8 @@
"zone.js": "^0.9.1"
},
"devDependencies": {
"@ngtools/webpack": "8.0.0",
"@angular/compiler-cli": "8.0.0",
"@ngtools/webpack": "~8.0.0",
"@angular/compiler-cli": "~8.0.0",
"@types/chai": "~4.1.3",
"@types/mocha": "~5.2.1",
"@types/node": "^7.0.5",
Expand Down
21 changes: 12 additions & 9 deletions e2e/router-tab-view/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@
}
},
"dependencies": {
"@angular/animations": "8.0.0",
"@angular/common": "8.0.0",
"@angular/compiler": "8.0.0",
"@angular/core": "8.0.0",
"@angular/forms": "8.0.0",
"@angular/animations": "~8.0.0",
"@angular/common": "~8.0.0",
"@angular/compiler": "~8.0.0",
"@angular/core": "~8.0.0",
"@angular/forms": "~8.0.0",
"@angular/http": "8.0.0-beta.10",
"@angular/platform-browser": "8.0.0",
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/router": "8.0.0",
"@angular/platform-browser": "~8.0.0",
"@angular/platform-browser-dynamic": "~8.0.0",
"@angular/router": "~8.0.0",
"nativescript-angular": "file:../../nativescript-angular",
"nativescript-dev-webpack": "next",
"nativescript-theme-core": "~1.0.4",
"reflect-metadata": "~0.1.8",
"rxjs": "~6.3.3",
Expand All @@ -41,7 +42,9 @@
"mochawesome": "~3.1.2",
"nativescript-dev-appium": "next",
"nativescript-dev-typescript": "next",
"typescript": "~3.4.5"
"typescript": "~3.4.5",
"@angular/compiler-cli": "8.0.0",
"@ngtools/webpack": "8.0.0"
},
"scripts": {
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
Expand Down
13 changes: 12 additions & 1 deletion e2e/router-tab-view/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,22 @@
"*": [
"./node_modules/tns-core-modules/*",
"./node_modules/*"
],
"~/*": [
"app/*"
]
}
},
"include": [
"../../nativescript-angular",
"**/*"
],
"exclude": [
"../../nativescript-angular/node_modules",
"../../nativescript-angular/**/*.d.ts",
"node_modules",
"platforms"
"platforms",
"**/*.aot",
"e2e"
]
}
20 changes: 10 additions & 10 deletions e2e/router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
}
},
"dependencies": {
"@angular/animations": "8.0.0",
"@angular/common": "8.0.0",
"@angular/compiler": "8.0.0",
"@angular/core": "8.0.0",
"@angular/forms": "8.0.0",
"@angular/animations": "~8.0.0",
"@angular/common": "~8.0.0",
"@angular/compiler": "~8.0.0",
"@angular/core": "~8.0.0",
"@angular/forms": "~8.0.0",
"@angular/http": "8.0.0-beta.10",
"@angular/platform-browser": "8.0.0",
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/router": "8.0.0",
"@angular/platform-browser": "~8.0.0",
"@angular/platform-browser-dynamic": "~8.0.0",
"@angular/router": "~8.0.0",
"nativescript-angular": "file:../../nativescript-angular",
"nativescript-intl": "^3.0.0",
"reflect-metadata": "~0.1.8",
Expand All @@ -27,8 +27,8 @@
"zone.js": "^0.9.1"
},
"devDependencies": {
"@angular/compiler-cli": "8.0.0",
"@ngtools/webpack": "8.0.0",
"@angular/compiler-cli": "~8.0.0",
"@ngtools/webpack": "~8.0.0",
"@types/chai": "~4.1.7",
"@types/mocha": "~5.2.5",
"@types/node": "^10.12.12",
Expand Down
20 changes: 10 additions & 10 deletions e2e/single-page/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
}
},
"dependencies": {
"@angular/animations": "8.0.0",
"@angular/common": "8.0.0",
"@angular/compiler": "8.0.0",
"@angular/core": "8.0.0",
"@angular/forms": "8.0.0",
"@angular/animations": "~8.0.0",
"@angular/common": "~8.0.0",
"@angular/compiler": "~8.0.0",
"@angular/core": "~8.0.0",
"@angular/forms": "~8.0.0",
"@angular/http": "8.0.0-beta.10",
"@angular/platform-browser": "8.0.0",
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/router": "8.0.0",
"@angular/platform-browser": "~8.0.0",
"@angular/platform-browser-dynamic": "~8.0.0",
"@angular/router": "~8.0.0",
"nativescript-angular": "file:../../nativescript-angular",
"nativescript-intl": "^3.0.0",
"reflect-metadata": "~0.1.8",
Expand All @@ -30,8 +30,8 @@
"zone.js": "^0.9.1"
},
"devDependencies": {
"@angular/compiler-cli": "8.0.0",
"@ngtools/webpack": "8.0.0",
"@angular/compiler-cli": "~8.0.0",
"@ngtools/webpack": "~8.0.0",
"@types/chai": "~4.1.7",
"@types/mocha": "~5.2.5",
"@types/node": "~10.12.18",
Expand Down
Loading