Skip to content

Commit bb2358a

Browse files
authored
Merge branch 'master' into niliev/switch
2 parents 0d6b3a1 + 8532d5d commit bb2358a

File tree

7 files changed

+17
-37
lines changed

7 files changed

+17
-37
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ tags
1515

1616
tsconfig.tns.json
1717
package-lock.json
18+
verify*

app/ng-framework-modules-category/application/application-events/application-events.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Component } from "@angular/core";
2-
32
import {
43
on,
54
ApplicationEventData,

app/ng-framework-modules-category/application/application-examples.module.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ export const routerConfig = [
4545
NativeScriptRouterModule.forChild(routerConfig)
4646
],
4747
declarations: [
48+
ApplicationEventsComponent,
4849
ApplicationExamplesComponent,
4950
AppCheckingTargetExampleComponent,
5051
AppUsingAndroidExampleComponent,

package.json

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
"nativescript": {
2323
"id": "org.nativescript.nativescriptsdkexamplesng",
2424
"tns-ios": {
25-
"version": "5.4.0-2019-03-26-093523-01"
25+
"version": "next"
2626
},
2727
"tns-android": {
28-
"version": "5.3.1"
28+
"version": "next"
2929
}
3030
},
3131
"dependencies": {
@@ -37,14 +37,14 @@
3737
"@angular/platform-browser": "~7.2.0",
3838
"@angular/platform-browser-dynamic": "~7.2.0",
3939
"@angular/router": "~7.2.0",
40-
"nativescript-angular": "^7.2.3",
40+
"nativescript-angular": "next",
4141
"nativescript-camera": "^4.4.0",
4242
"nativescript-geolocation": "^5.0.0",
4343
"nativescript-intl": "~3.0.0",
4444
"nativescript-theme-core": "^1.0.4",
4545
"reflect-metadata": "~0.1.12",
4646
"rxjs": "^6.3.3",
47-
"tns-core-modules": "^5.2.2",
47+
"tns-core-modules": "next",
4848
"zone.js": "^0.8.4"
4949
},
5050
"devDependencies": {
@@ -55,12 +55,12 @@
5555
"glob": "^7.1.3",
5656
"lazy": "1.0.11",
5757
"markdown-snippet-injector": "^0.2.2",
58-
"nativescript-dev-typescript": "^0.9.0",
59-
"nativescript-dev-webpack": "^0.22.0-next-2019-04-17-111030-01",
58+
"nativescript-dev-typescript": "next",
59+
"nativescript-dev-webpack": "next",
6060
"opener": "^1.4.1",
6161
"rimraf": "^2.5.3",
6262
"tar.gz": "^1.0.5",
63-
"tns-platform-declarations": "^5.2.2",
63+
"tns-platform-declarations": "next",
6464
"tslint": "^5.11.0",
6565
"typescript": "~3.1.1"
6666
},
@@ -75,6 +75,8 @@
7575
"inject": "mdinject --root=app --docsroot=dist/code-samples --sourceext=\".ts|.css|.html\" --snippettitles=\"TypeScript|CSS|HTML\"",
7676
"archive": "node scripts/archive.js",
7777
"update-webpack": "./node_modules/.bin/update-ns-webpack --deps --configs",
78-
"update-angular": "./node_modules/.bin/update-app-ng-deps"
78+
"update-angular": "./node_modules/.bin/update-app-ng-deps",
79+
"update-app-ng-deps": "update-app-ng-deps",
80+
"ns-verify-bundle": "ns-verify-bundle"
7981
}
8082
}

tsconfig.esm.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

tsconfig.json

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,18 @@
11
{
22
"compilerOptions": {
3-
"noEmitOnError": true,
4-
"noEmitHelpers": true,
5-
"target": "es5",
63
"module": "commonjs",
7-
"declaration": false,
8-
"noImplicitAny": false,
9-
"noImplicitUseStrict": true,
4+
"target": "es5",
105
"experimentalDecorators": true,
116
"emitDecoratorMetadata": true,
12-
"pretty": true,
13-
"skipLibCheck": true,
7+
"noEmitHelpers": true,
8+
"noEmitOnError": true,
149
"lib": [
1510
"es6",
1611
"dom",
1712
"es2015.iterable"
1813
],
1914
"baseUrl": ".",
2015
"paths": {
21-
"*": [
22-
"./node_modules/tns-core-modules/*",
23-
"./node_modules/*"
24-
],
2516
"~/*": [
2617
"app/*"
2718
]

webpack.config.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -255,15 +255,8 @@ module.exports = env => {
255255
"global.TNS_WEBPACK": "true",
256256
"process": undefined,
257257
}),
258-
// Copy native app resources to out dir.
259-
new CopyWebpackPlugin([
260-
{
261-
from: `${appResourcesFullPath}/${appResourcesPlatformDir}`,
262-
to: `${dist}/App_Resources/${appResourcesPlatformDir}`,
263-
context: projectRoot
264-
},
265-
]),
266-
258+
// Remove all files from the out dir.
259+
new CleanWebpackPlugin([`${dist}/**/*`]),
267260
// Copy assets to out dir. Add your own globs as needed.
268261
new CopyWebpackPlugin([
269262
{ from: { glob: "ng-ui-widgets-category/web-view/web-view-html/*.html"} },

0 commit comments

Comments
 (0)