Commit 43fbabb
Hristo Hristov
Fixed most module cyclic references. There is one left for ios and android: (NativeScript#4978)
- http -> http-request -> image-source
that can't be fixed easily and will be removed once we delete image-source module because it is obsolete anyway.
There is one more for android:
- frame -> fragment that could be removed if we use global object.
Updated madge bersion1 parent 729b068 commit 43fbabb
19 files changed
Lines changed: 227 additions & 236 deletions
File tree
- tns-core-modules
- application
- file-system
- file-name-resolver
- http
- image-source
- ui
- core
- bindable
- view-base
- view
- frame
- styling
- utils
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -27,7 +27,7 @@ | |||
| 27 | 27 | "grunt-ts": "6.0.0-beta.11", | |
| 28 | 28 | "grunt-typedoc": "0.2.4", | |
| 29 | 29 | "http-server": "^0.9.0", | |
| 30 | - "madge": "^2.0.0", | ||
| 30 | + "madge": "^2.2.0", | ||
| 31 | 31 | "markdown-snippet-injector": "0.2.2", | |
| 32 | 32 | "mocha": "^3.5.0", | |
| 33 | 33 | "mocha-typescript": "^1.1.9", | |
@@ -80,6 +80,8 @@ | |||
| 80 | 80 | "test-tsc-es2016": "npm run tsc -- -p tsconfig.public.es2016.json", | |
| 81 | 81 | "tslint": "tslint --config build/tslint.json 'tns-core-modules/**/*.ts' 'tests/**/*.ts' 'apps/**/*.ts' -e '**/node_modules/**' -e '**/platforms/**'", | |
| 82 | 82 | "madge-ios": "tsc --skipLibCheck && tns prepare ios --path tests && madge --circular tests/platforms/ios/tests/app/tns_modules/tns-core-modules", | |
| 83 | - "madge-android": "tsc --skipLibCheck && tns prepare android --path tests && madge --circular tests/platforms/android/src/main/assets/app/tns_modules/tns-core-modules" | ||
| 83 | + "madge-ios-image": "tsc --skipLibCheck && tns prepare ios --path tests && madge --image graph-tests-ios.svg tests/platforms/ios/tests/app/tns_modules/tns-core-modules", | ||
| 84 | + "madge-android": "tsc --skipLibCheck && tns prepare android --path tests && madge --circular tests/platforms/android/src/main/assets/app/tns_modules/tns-core-modules", | ||
| 85 | + "madge-android-image": "tsc --skipLibCheck && tns prepare android --path tests && madge --image graph-tests-android.svg tests/platforms/android/src/main/assets/app/tns_modules/tns-core-modules" | ||
| 84 | 86 | } | |
| 85 | 87 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -19,6 +19,8 @@ export { Observable }; | |||
| 19 | 19 | ||
| 20 | 20 | import { UnhandledErrorEventData, iOSApplication, AndroidApplication, CssChangedEventData, LoadAppCSSEventData } from "."; | |
| 21 | 21 | ||
| 22 | + export { UnhandledErrorEventData, CssChangedEventData, LoadAppCSSEventData }; | ||
| 23 | + | ||
| 22 | 24 | export const launchEvent = "launch"; | |
| 23 | 25 | export const suspendEvent = "suspend"; | |
| 24 | 26 | export const displayedEvent = "displayed"; | |
@@ -54,7 +56,11 @@ export function setApplication(instance: iOSApplication | AndroidApplication): v | |||
| 54 | 56 | } | |
| 55 | 57 | ||
| 56 | 58 | export function livesync() { | |
| 57 | - events.notify(<EventData>{ eventName: "livesync", object: app }); | ||
| 59 | + events.notify(<EventData>{ eventName: "livesync", object: app }); | ||
| 60 | + const liveSyncCore = global.__onLiveSyncCore; | ||
| 61 | + if (liveSyncCore) { | ||
| 62 | + liveSyncCore(); | ||
| 63 | + } | ||
| 58 | 64 | } | |
| 59 | 65 | ||
| 60 | 66 | export function setCssFileName(cssFileName: string) { | |
@@ -76,4 +82,4 @@ export function addCss(cssText: string): void { | |||
| 76 | 82 | ||
| 77 | 83 | global.__onUncaughtError = function (error: NativeScriptError) { | |
| 78 | 84 | events.notify(<UnhandledErrorEventData>{ eventName: uncaughtErrorEvent, object: app, android: error, ios: error, error: error }); | |
| 79 | - } | ||
| 85 | + } | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,7 +2,7 @@ import { PlatformContext, FileNameResolver as FileNameResolverDefinition } from | |||
| 2 | 2 | import { screen, device } from "../../platform"; | |
| 3 | 3 | import { path as fsPath, Folder, File } from "../file-system"; | |
| 4 | 4 | import * as trace from "../../trace"; | |
| 5 | - import * as appModule from "../../application"; | ||
| 5 | + import * as appCommonModule from "../../application/application-common"; | ||
| 6 | 6 | ||
| 7 | 7 | const MIN_WH: string = "minWH"; | |
| 8 | 8 | const MIN_W: string = "minW"; | |
@@ -234,5 +234,5 @@ export function resolveFileName(path: string, ext: string): string { | |||
| 234 | 234 | return resolverInstance.resolveFileName(path, ext); | |
| 235 | 235 | } | |
| 236 | 236 | ||
| 237 | - appModule.on("cssChanged", args => resolverInstance = undefined); | ||
| 238 | - appModule.on("livesync", args => resolverInstance && resolverInstance.clearCache()); | ||
| 237 | + appCommonModule.on("cssChanged", args => resolverInstance = undefined); | ||
| 238 | + appCommonModule.on("livesync", args => resolverInstance && resolverInstance.clearCache()); | ||
0 commit comments