Skip to content

Commit 1cb3675

Browse files
VladimirAmiorkovVladimirAmiorkov
authored
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
1 parent f506b3c commit 1cb3675

File tree

27 files changed

+558
-150
lines changed

27 files changed

+558
-150
lines changed

‎e2e/animation-examples/package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@
99
"version": "latest"
1010
},
1111
"tns-android": {
12-
"version": "5.4.0-2019-05-02-235338-05"
12+
"version": "latest"
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "8.0.0",
17-
"@angular/common": "8.0.0",
18-
"@angular/compiler": "8.0.0",
19-
"@angular/core": "8.0.0",
20-
"@angular/forms": "8.0.0",
16+
"@angular/animations": "~8.0.0",
17+
"@angular/common": "~8.0.0",
18+
"@angular/compiler": "~8.0.0",
19+
"@angular/core": "~8.0.0",
20+
"@angular/forms": "~8.0.0",
2121
"@angular/http": "8.0.0-beta.10",
22-
"@angular/platform-browser": "8.0.0",
23-
"@angular/platform-browser-dynamic": "8.0.0",
24-
"@angular/router": "8.0.0",
22+
"@angular/platform-browser": "~8.0.0",
23+
"@angular/platform-browser-dynamic": "~8.0.0",
24+
"@angular/router": "~8.0.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-theme-core": "~1.0.2",
2727
"reflect-metadata": "~0.1.8",
2828
"rxjs": "^6.3.3",
29-
"tns-core-modules": "^5.4.0-next-2019-05-01-141636-02",
29+
"tns-core-modules": "next",
3030
"zone.js": "^0.9.1"
3131
},
3232
"devDependencies": {
33-
"@angular/compiler-cli": "8.0.0",
34-
"@ngtools/webpack": "8.0.0",
33+
"@angular/compiler-cli": "~8.0.0",
34+
"@ngtools/webpack": "~8.0.0",
3535
"@types/chai": "~4.1.7",
3636
"@types/mocha": "~5.2.5",
3737
"@types/node": "~10.12.18",
@@ -43,8 +43,8 @@
4343
"mochawesome": "~3.1.2",
4444
"nativescript-css-loader": "~0.26.0",
4545
"nativescript-dev-appium": "next",
46-
"nativescript-dev-typescript": "^0.9.1-next-2019-03-12-162713-03",
47-
"nativescript-dev-webpack": "^0.22.0-next-2019-04-17-111030-01",
46+
"nativescript-dev-typescript": "next",
47+
"nativescript-dev-webpack": "next",
4848
"typescript": "~3.4.5"
4949
},
5050
"scripts": {

‎e2e/modal-navigation-ng/package.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,26 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "8.0.0",
17-
"@angular/common": "8.0.0",
18-
"@angular/compiler": "8.0.0",
19-
"@angular/core": "8.0.0",
20-
"@angular/forms": "8.0.0",
16+
"@angular/animations": "~8.0.0",
17+
"@angular/common": "~8.0.0",
18+
"@angular/compiler": "~8.0.0",
19+
"@angular/core": "~8.0.0",
20+
"@angular/forms": "~8.0.0",
2121
"@angular/http": "8.0.0-beta.10",
22-
"@angular/platform-browser": "8.0.0",
23-
"@angular/platform-browser-dynamic": "8.0.0",
24-
"@angular/router": "8.0.0",
22+
"@angular/platform-browser": "~8.0.0",
23+
"@angular/platform-browser-dynamic": "~8.0.0",
24+
"@angular/router": "~8.0.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
26+
"nativescript-dev-webpack": "next",
2627
"nativescript-theme-core": "~1.0.4",
2728
"reflect-metadata": "~0.1.8",
2829
"rxjs": "~6.3.3",
2930
"tns-core-modules": "next",
3031
"zone.js": "^0.9.1"
3132
},
3233
"devDependencies": {
33-
"@angular/compiler-cli": "8.0.0",
34-
"@ngtools/webpack": "8.0.0",
34+
"@angular/compiler-cli": "~8.0.0",
35+
"@ngtools/webpack": "~8.0.0",
3536
"@types/chai": "~4.1.7",
3637
"@types/mocha": "~5.2.5",
3738
"@types/node": "~10.12.18",

‎e2e/modal-navigation-ng/tsconfig.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,16 @@
2222
]
2323
}
2424
},
25+
"include": [
26+
"../../nativescript-angular",
27+
"**/*"
28+
],
2529
"exclude": [
30+
"../../nativescript-angular/node_modules",
31+
"../../nativescript-angular/**/*.d.ts",
2632
"node_modules",
27-
"platforms"
33+
"platforms",
34+
"**/*.aot",
35+
"e2e"
2836
]
2937
}

‎e2e/nested-router-tab-view/app/app.routing.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import { TeamDetailComponent } from "./team/team-detail.component";
99
import { LoginComponent } from "./login/login.component";
1010
import { TabsComponent } from "./tabs/tabs.component";
1111
import { HomeComponent } from "./home/home.component";
12+
import { HomeLazyModule } from "./home-lazy/home-lazy.module";
13+
import { CustomTabsModule } from "./custom-tabs/custom-tabs.module"
1214
import { AboutComponent } from "./about/about.component";
1315
import { AboutNestedComponent } from "./about/about-nested.component";
1416

@@ -46,11 +48,11 @@ const routes: Routes = [
4648
},
4749
{
4850
path: "home-lazy",
49-
loadChildren: "./home-lazy/home-lazy.module#HomeLazyModule",
51+
loadChildren: () => HomeLazyModule,
5052
},
5153
{
5254
path: "custom-tabs",
53-
loadChildren: "./custom-tabs/custom-tabs.module#CustomTabsModule",
55+
loadChildren: () => CustomTabsModule,
5456
},
5557
{
5658
path: "tabs", component: TabsComponent, children: [

‎e2e/nested-router-tab-view/package.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,26 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "8.0.0",
17-
"@angular/common": "8.0.0",
18-
"@angular/compiler": "8.0.0",
19-
"@angular/core": "8.0.0",
20-
"@angular/forms": "8.0.0",
16+
"@angular/animations": "~8.0.0",
17+
"@angular/common": "~8.0.0",
18+
"@angular/compiler": "~8.0.0",
19+
"@angular/core": "~8.0.0",
20+
"@angular/forms": "~8.0.0",
2121
"@angular/http": "8.0.0-beta.10",
22-
"@angular/platform-browser": "8.0.0",
23-
"@angular/platform-browser-dynamic": "8.0.0",
24-
"@angular/router": "8.0.0",
22+
"@angular/platform-browser": "~8.0.0",
23+
"@angular/platform-browser-dynamic": "~8.0.0",
24+
"@angular/router": "~8.0.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
26+
"nativescript-dev-webpack": "next",
2627
"nativescript-theme-core": "~1.0.4",
2728
"reflect-metadata": "~0.1.8",
2829
"rxjs": "~6.3.3",
2930
"tns-core-modules": "next",
3031
"zone.js": "^0.9.1"
3132
},
3233
"devDependencies": {
33-
"@angular/compiler-cli": "8.0.0",
34-
"@ngtools/webpack": "8.0.0",
34+
"@angular/compiler-cli": "~8.0.0",
35+
"@ngtools/webpack": "~8.0.0",
3536
"@types/chai": "~4.1.7",
3637
"@types/mocha": "~5.2.5",
3738
"@types/node": "~10.12.18",

‎e2e/nested-router-tab-view/tsconfig.json‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"emitDecoratorMetadata": true,
77
"noEmitHelpers": true,
88
"noEmitOnError": true,
9-
"sourceMap": true,
109
"lib": [
1110
"es6",
1211
"dom",
@@ -23,8 +22,16 @@
2322
]
2423
}
2524
},
25+
"include": [
26+
"../../nativescript-angular",
27+
"**/*"
28+
],
2629
"exclude": [
30+
"../../nativescript-angular/node_modules",
31+
"../../nativescript-angular/**/*.d.ts",
2732
"node_modules",
28-
"platforms"
33+
"platforms",
34+
"**/*.aot",
35+
"e2e"
2936
]
3037
}

‎e2e/renderer/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"id": "org.nativescript.renderer"
88
},
99
"dependencies": {
10-
"@angular/common": "8.0.0",
11-
"@angular/compiler": "8.0.0",
12-
"@angular/core": "8.0.0",
13-
"@angular/forms": "8.0.0",
10+
"@angular/common": "~8.0.0",
11+
"@angular/compiler": "~8.0.0",
12+
"@angular/core": "~8.0.0",
13+
"@angular/forms": "~8.0.0",
1414
"@angular/http": "8.0.0-beta.10",
15-
"@angular/platform-browser": "8.0.0",
16-
"@angular/platform-browser-dynamic": "8.0.0",
17-
"@angular/router": "8.0.0",
15+
"@angular/platform-browser": "~8.0.0",
16+
"@angular/platform-browser-dynamic": "~8.0.0",
17+
"@angular/router": "~8.0.0",
1818
"nativescript-angular": "file:../../nativescript-angular",
1919
"nativescript-intl": "^3.0.0",
2020
"reflect-metadata": "~0.1.8",
@@ -23,8 +23,8 @@
2323
"zone.js": "^0.9.1"
2424
},
2525
"devDependencies": {
26-
"@angular/compiler-cli": "8.0.0",
27-
"@ngtools/webpack": "8.0.0",
26+
"@angular/compiler-cli": "~8.0.0",
27+
"@ngtools/webpack": "~8.0.0",
2828
"@types/chai": "~4.1.7",
2929
"@types/mocha": "~5.2.5",
3030
"@types/node": "~10.12.18",

‎e2e/routable-animations/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
"id": "org.nativescript.nsroanimations"
88
},
99
"dependencies": {
10-
"@angular/animations": "8.0.0",
11-
"@angular/common": "8.0.0",
12-
"@angular/compiler": "8.0.0",
13-
"@angular/core": "8.0.0",
14-
"@angular/forms": "8.0.0",
10+
"@angular/animations": "~8.0.0",
11+
"@angular/common": "~8.0.0",
12+
"@angular/compiler": "~8.0.0",
13+
"@angular/core": "~8.0.0",
14+
"@angular/forms": "~8.0.0",
1515
"@angular/http": "8.0.0-beta.10",
16-
"@angular/platform-browser": "8.0.0",
17-
"@angular/platform-browser-dynamic": "8.0.0",
18-
"@angular/router": "8.0.0",
16+
"@angular/platform-browser": "~8.0.0",
17+
"@angular/platform-browser-dynamic": "~8.0.0",
18+
"@angular/router": "~8.0.0",
1919
"nativescript-angular": "next",
2020
"nativescript-theme-core": "~1.0.2",
2121
"reflect-metadata": "~0.1.8",
@@ -24,8 +24,8 @@
2424
"zone.js": "^0.9.1"
2525
},
2626
"devDependencies": {
27-
"@ngtools/webpack": "8.0.0",
28-
"@angular/compiler-cli": "8.0.0",
27+
"@ngtools/webpack": "~8.0.0",
28+
"@angular/compiler-cli": "~8.0.0",
2929
"@types/chai": "~4.1.3",
3030
"@types/mocha": "~5.2.1",
3131
"@types/node": "^7.0.5",

‎e2e/router-tab-view/package.json‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "8.0.0",
17-
"@angular/common": "8.0.0",
18-
"@angular/compiler": "8.0.0",
19-
"@angular/core": "8.0.0",
20-
"@angular/forms": "8.0.0",
16+
"@angular/animations": "~8.0.0",
17+
"@angular/common": "~8.0.0",
18+
"@angular/compiler": "~8.0.0",
19+
"@angular/core": "~8.0.0",
20+
"@angular/forms": "~8.0.0",
2121
"@angular/http": "8.0.0-beta.10",
22-
"@angular/platform-browser": "8.0.0",
23-
"@angular/platform-browser-dynamic": "8.0.0",
24-
"@angular/router": "8.0.0",
22+
"@angular/platform-browser": "~8.0.0",
23+
"@angular/platform-browser-dynamic": "~8.0.0",
24+
"@angular/router": "~8.0.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
26+
"nativescript-dev-webpack": "next",
2627
"nativescript-theme-core": "~1.0.4",
2728
"reflect-metadata": "~0.1.8",
2829
"rxjs": "~6.3.3",
@@ -41,7 +42,9 @@
4142
"mochawesome": "~3.1.2",
4243
"nativescript-dev-appium": "next",
4344
"nativescript-dev-typescript": "next",
44-
"typescript": "~3.4.5"
45+
"typescript": "~3.4.5",
46+
"@angular/compiler-cli": "8.0.0",
47+
"@ngtools/webpack": "8.0.0"
4548
},
4649
"scripts": {
4750
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

‎e2e/router-tab-view/tsconfig.json‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,22 @@
1616
"*": [
1717
"./node_modules/tns-core-modules/*",
1818
"./node_modules/*"
19+
],
20+
"~/*": [
21+
"app/*"
1922
]
2023
}
2124
},
25+
"include": [
26+
"../../nativescript-angular",
27+
"**/*"
28+
],
2229
"exclude": [
30+
"../../nativescript-angular/node_modules",
31+
"../../nativescript-angular/**/*.d.ts",
2332
"node_modules",
24-
"platforms"
33+
"platforms",
34+
"**/*.aot",
35+
"e2e"
2536
]
2637
}

0 commit comments

Comments
 (0)