From aebcaeb2ced6aede19b822d9ae1361ef21c8a875 Mon Sep 17 00:00:00 2001 From: Nedyalko Nikolov Date: Thu, 22 Dec 2016 14:43:41 +0200 Subject: [PATCH] Make plugin commonjs again. --- .gitignore | 1 + compile.sh | 4 +-- example/app/app.js | 5 --- example/app/app.js.map | 1 - example/app/main-page.js | 40 ---------------------- example/app/main-page.js.map | 1 - example/app/main-page.ts | 59 ++++++++++++++++++-------------- example/package.json | 8 ++--- src/nativescript-intl-common.ts | 2 +- src/nativescript-intl.android.ts | 2 +- src/nativescript-intl.ios.ts | 2 +- src/package.json | 2 -- src/tsconfig.json | 12 ++----- 13 files changed, 47 insertions(+), 92 deletions(-) delete mode 100644 example/app/app.js delete mode 100644 example/app/app.js.map delete mode 100644 example/app/main-page.js delete mode 100644 example/app/main-page.js.map diff --git a/.gitignore b/.gitignore index 5b21769..8b7eaf6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,6 @@ tests/platforms/ tests/node_modules/ example/node_modules/ example/platforms/ +example/**/*.js dist/ src/**/*.js diff --git a/compile.sh b/compile.sh index 97c8cc7..b018d7a 100755 --- a/compile.sh +++ b/compile.sh @@ -25,9 +25,9 @@ node_modules/.bin/tsc -p "$SOURCE_DIR" --outDir "$PACK_DIR" node_modules/tslint/bin/tslint --project "$SOURCE_DIR"/tsconfig.json --config "$SOURCE_DIR"/tslint.json # make commonjs bundle for ANDROID -node_modules/rollup/bin/rollup -c --environment PLATFORM:$ANDROID +# node_modules/rollup/bin/rollup -c --environment PLATFORM:$ANDROID # make commonjs bundle for IOS -node_modules/rollup/bin/rollup -c --environment PLATFORM:$IOS +# node_modules/rollup/bin/rollup -c --environment PLATFORM:$IOS copy_package_files diff --git a/example/app/app.js b/example/app/app.js deleted file mode 100644 index 1a5a466..0000000 --- a/example/app/app.js +++ /dev/null @@ -1,5 +0,0 @@ -"use strict"; -require("./bundle-config"); -var app = require('application'); -app.start({ moduleName: 'main-page' }); -//# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/example/app/app.js.map b/example/app/app.js.map deleted file mode 100644 index 393f269..0000000 --- a/example/app/app.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["app.ts"],"names":[],"mappings":";AAAA,QAAO,iBAAiB,CAAC,CAAA;AACzB,IAAY,GAAG,WAAM,aAAa,CAAC,CAAA;AAEnC,GAAG,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC"} \ No newline at end of file diff --git a/example/app/main-page.js b/example/app/main-page.js deleted file mode 100644 index 5d1a932..0000000 --- a/example/app/main-page.js +++ /dev/null @@ -1,40 +0,0 @@ -"use strict"; -var nativescript_intl_1 = require("nativescript-intl"); -var observable_1 = require("data/observable"); -var model; -function onNavigating(args) { - var page = args.object; - model = observable_1.fromObject({ "mediumDateTimeOptions": "", "longDateOptions": "", "fullDateOptions": "", "shortDateTimeOptions": "" }); - page.bindingContext = model; -} -exports.onNavigating = onNavigating; -function onTap() { - var mediumDateTimeOptions = { - "year": "numeric", - "month": "short", - "day": "numeric", - "hour": "numeric", - "minute": "2-digit", - "second": "numeric" - }; - model.set("mediumDateTimeOptions", new nativescript_intl_1.DateTimeFormat("en-US", mediumDateTimeOptions).format(new Date())); - var longDateOptions = { "year": "numeric", "month": "long", "day": "numeric" }; - model.set("longDateOptions", new nativescript_intl_1.DateTimeFormat("en-US", longDateOptions).format(new Date())); - var fullDateOptions = { - "year": "numeric", - "month": "long", - "day": "numeric", - "weekday": "long" - }; - model.set("fullDateOptions", new nativescript_intl_1.DateTimeFormat("en-US", fullDateOptions).format(new Date())); - var shortDateTimeOptions = { - "year": "numeric", - "month": "numeric", - "day": "numeric", - "hour": "numeric", - "minute": "numeric" - }; - model.set("shortDateTimeOptions", new nativescript_intl_1.DateTimeFormat("en-US", fullDateOptions).format(new Date())); -} -exports.onTap = onTap; -//# sourceMappingURL=main-page.js.map \ No newline at end of file diff --git a/example/app/main-page.js.map b/example/app/main-page.js.map deleted file mode 100644 index 07b78e4..0000000 --- a/example/app/main-page.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"main-page.js","sourceRoot":"","sources":["main-page.ts"],"names":[],"mappings":";AAEA,kCAA+B,mBAAmB,CAAC,CAAA;AACnD,2BAAuC,iBAAiB,CAAC,CAAA;AAEzD,IAAI,KAAiB,CAAC;AAEtB,sBAA6B,IAAe;IACxC,IAAI,IAAI,GAAS,IAAI,CAAC,MAAM,CAAC;IAC7B,KAAK,GAAG,uBAAU,CAAC,EAAC,uBAAuB,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAC,CAAC,CAAC;IAC5H,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;AAChC,CAAC;AAJe,oBAAY,eAI3B,CAAA;AAED;IACI,IAAI,qBAAqB,GAAG;QACxB,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,OAAO;QAChB,KAAK,EAAE,SAAS;QAChB,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,SAAS;KACtB,CAAC;IACF,KAAK,CAAC,GAAG,CAAC,uBAAuB,EAAE,IAAI,kCAAc,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAC1G,IAAI,eAAe,GAAG,EAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAC,CAAC;IAC7E,KAAK,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,kCAAc,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9F,IAAI,eAAe,GAAG;QAClB,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,MAAM;QACf,KAAK,EAAE,SAAS;QAChB,SAAS,EAAE,MAAM;KACpB,CAAC;IACF,KAAK,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,kCAAc,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9F,IAAI,oBAAoB,GAAG;QACvB,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,SAAS;QAClB,KAAK,EAAE,SAAS;QAChB,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,SAAS;KACtB,CAAC;IACF,KAAK,CAAC,GAAG,CAAC,sBAAsB,EAAE,IAAI,kCAAc,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;AACvG,CAAC;AA3Be,aAAK,QA2BpB,CAAA"} \ No newline at end of file diff --git a/example/app/main-page.ts b/example/app/main-page.ts index 5a3bc17..e3f6681 100644 --- a/example/app/main-page.ts +++ b/example/app/main-page.ts @@ -3,39 +3,48 @@ import { Page } from "ui/page"; import { DateTimeFormat } from "nativescript-intl"; import { fromObject, Observable } from "data/observable"; -var model: Observable; +let model: Observable; +let mediumDateTimeOptions = { + "year": "numeric", + "month": "short", + "day": "numeric", + "hour": "numeric", + "minute": "2-digit", + "second": "numeric" +}; +let longDateOptions = { + "year": "numeric", + "month": "long", + "day": "numeric" +}; +let fullDateOptions = { + "year": "numeric", + "month": "long", + "day": "numeric", + "weekday": "long" +}; +let shortDateTimeOptions = { + "year": "numeric", + "month": "numeric", + "day": "numeric", + "hour": "numeric", + "minute": "numeric" +}; export function onNavigating(args: EventData) { let page = args.object; - model = fromObject({"mediumDateTimeOptions": "", "longDateOptions": "", "fullDateOptions": "", "shortDateTimeOptions": ""}); + model = fromObject({ + "mediumDateTimeOptions": "", + "longDateOptions": "", + "fullDateOptions": "", + "shortDateTimeOptions": "" + }); page.bindingContext = model; } export function onTap() { - var mediumDateTimeOptions = { - "year": "numeric", - "month": "short", - "day": "numeric", - "hour": "numeric", - "minute": "2-digit", - "second": "numeric" - }; model.set("mediumDateTimeOptions", new DateTimeFormat("en-US", mediumDateTimeOptions).format(new Date())); - var longDateOptions = {"year": "numeric", "month": "long", "day": "numeric"}; model.set("longDateOptions", new DateTimeFormat("en-US", longDateOptions).format(new Date())); - var fullDateOptions = { - "year": "numeric", - "month": "long", - "day": "numeric", - "weekday": "long" - }; model.set("fullDateOptions", new DateTimeFormat("en-US", fullDateOptions).format(new Date())); - var shortDateTimeOptions = { - "year": "numeric", - "month": "numeric", - "day": "numeric", - "hour": "numeric", - "minute": "numeric" - }; - model.set("shortDateTimeOptions", new DateTimeFormat("en-US", fullDateOptions).format(new Date())); + model.set("shortDateTimeOptions", new DateTimeFormat("en-US", shortDateTimeOptions).format(new Date())); } \ No newline at end of file diff --git a/example/package.json b/example/package.json index 6dfc1e6..1061722 100644 --- a/example/package.json +++ b/example/package.json @@ -6,13 +6,13 @@ "nativescript": { "id": "org.nativescript.example", "tns-android": { - "version": "2.4.0" + "version": "2.5.0-next-2016-12-19-1539" } }, "dependencies": { + "nativescript-intl": "file:..\\dist\\nativescript-intl-0.0.9.tgz", "nativescript-theme-core": "^0.2.1", - "tns-core-modules": "2.4.0", - "nativescript-intl": "file:..\\dist\\nativescript-intl-0.0.9.tgz" + "tns-core-modules": "2.4.0" }, "devDependencies": { "babel-traverse": "6.19.0", @@ -23,4 +23,4 @@ "nativescript-dev-typescript": "^0.3.2", "typescript": "^2.0.10" } -} \ No newline at end of file +} diff --git a/src/nativescript-intl-common.ts b/src/nativescript-intl-common.ts index 018fdcf..69ff5cc 100644 --- a/src/nativescript-intl-common.ts +++ b/src/nativescript-intl-common.ts @@ -3,7 +3,7 @@ import { DateTimeFormatOptions as intlDateTimeFormatOptions, NumberFormat as intlNumberFormat, NumberFormatOptions as intlNumberFormatOptions -} from "nativescript-intl"; +} from "./nativescript-intl"; export const NUMERIC = "numeric"; export const LONG = "long"; diff --git a/src/nativescript-intl.android.ts b/src/nativescript-intl.android.ts index 6800244..73f7942 100644 --- a/src/nativescript-intl.android.ts +++ b/src/nativescript-intl.android.ts @@ -3,7 +3,7 @@ import { NumberFormat as commonNumberFormat, FULL } from "./nativescript-intl-common"; -import { NumberFormatOptions } from "nativescript-intl"; +import { NumberFormatOptions } from "./nativescript-intl"; let localesCache: Map = new Map(); diff --git a/src/nativescript-intl.ios.ts b/src/nativescript-intl.ios.ts index 46cd392..0cbc5bb 100644 --- a/src/nativescript-intl.ios.ts +++ b/src/nativescript-intl.ios.ts @@ -3,7 +3,7 @@ import { NumberFormat as commonNumberFormat, FULL } from "./nativescript-intl-common"; -import { NumberFormatOptions } from "nativescript-intl"; +import { NumberFormatOptions } from "./nativescript-intl"; export class DateTimeFormat extends commonDateTimeFormat { public getNativePattern(patternDefinition: {date?: string, time?: string}, locale?: string): string { diff --git a/src/package.json b/src/package.json index 2839ec2..ff2455a 100644 --- a/src/package.json +++ b/src/package.json @@ -2,8 +2,6 @@ "name": "nativescript-intl", "version": "0.0.9", "description": "Provides API for using Native date, time and number formatting with an API similar to Intl.js", - "main": "bundle", - "module": "index", "nativescript": { "platforms": { "android": "2.3.0", diff --git a/src/tsconfig.json b/src/tsconfig.json index 286f7ee..8df964c 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { - "module": "es6", - "target": "es6", + "module": "commonjs", + "target": "es5", "noImplicitAny": false, "removeComments": true, "preserveConstEnums": true, @@ -13,14 +13,8 @@ }, "filesGlob": [ "./**/*.ts", + "./**/*.d.ts", "!./node_modules/**/*.ts" ], - "files": [ - "references.d.ts", - "nativescript-intl-common.ts", - "nativescript-intl.android.ts", - "nativescript-intl.ios.ts", - "index.ts" - ], "exclude": [] }