diff --git a/applications/debug/unit_tests/resources/unit_tests/js/basic.js b/applications/debug/unit_tests/resources/unit_tests/js/basic.js index a08041e9f..b1e7dcc84 100644 --- a/applications/debug/unit_tests/resources/unit_tests/js/basic.js +++ b/applications/debug/unit_tests/resources/unit_tests/js/basic.js @@ -10,6 +10,6 @@ tests.assert_eq("firmwareTooNew", sdkCompatibilityStatus(-100500, 0)); tests.assert_eq(true, doesSdkSupport(["baseline"])); tests.assert_eq(false, doesSdkSupport(["abobus", "other-nonexistent-feature"])); -tests.assert_eq("flipperdevices", flipper.firmwareVendor); +tests.assert_eq("momentum", flipper.firmwareVendor); tests.assert_eq(0, flipper.jsSdkVersion[0]); tests.assert_eq(1, flipper.jsSdkVersion[1]); diff --git a/applications/system/js_app/packages/create-fz-app/README.md b/applications/system/js_app/packages/create-fz-app/README.md index cf6ddbc91..fa0a6401a 100644 --- a/applications/system/js_app/packages/create-fz-app/README.md +++ b/applications/system/js_app/packages/create-fz-app/README.md @@ -5,7 +5,7 @@ application for Flipper Zero. ## Getting started Create your application using the interactive wizard: ```shell -npx @flipperdevices/create-fz-app@latest +npx @next-flip/create-fz-app-mntm@latest ``` Then, enter the directory with your application and launch it: diff --git a/applications/system/js_app/packages/create-fz-app/package.json b/applications/system/js_app/packages/create-fz-app/package.json index 216423396..e3b15cc05 100644 --- a/applications/system/js_app/packages/create-fz-app/package.json +++ b/applications/system/js_app/packages/create-fz-app/package.json @@ -1,5 +1,5 @@ { - "name": "@flipperdevices/create-fz-app", + "name": "@next-flip/create-fz-app-mntm", "version": "0.1.0", "description": "Template package for JS apps Flipper Zero", "bin": "index.js", @@ -12,7 +12,7 @@ "license": "GPL-3.0-only", "repository": { "type": "git", - "url": "git+https://github.com/flipperdevices/flipperzero-firmware.git", + "url": "git+https://github.com/Next-Flip/Momentum-Firmware.git", "directory": "applications/system/js_app/packages/create-fz-app" }, "dependencies": { diff --git a/applications/system/js_app/packages/create-fz-app/template/index.ts b/applications/system/js_app/packages/create-fz-app/template/index.ts index 6291e3e13..424141145 100644 --- a/applications/system/js_app/packages/create-fz-app/template/index.ts +++ b/applications/system/js_app/packages/create-fz-app/template/index.ts @@ -1,9 +1,9 @@ // import modules // caution: `eventLoop` HAS to be imported before `gui`, and `gui` HAS to be // imported before any `gui` submodules. -import * as eventLoop from "@flipperdevices/fz-sdk/event_loop"; -import * as gui from "@flipperdevices/fz-sdk/gui"; -import * as dialog from "@flipperdevices/fz-sdk/gui/dialog"; +import * as eventLoop from "@next-flip/fz-sdk-mntm/event_loop"; +import * as gui from "@next-flip/fz-sdk-mntm/gui"; +import * as dialog from "@next-flip/fz-sdk-mntm/gui/dialog"; // a common pattern is to declare all the views that your app uses on one object const views = { diff --git a/applications/system/js_app/packages/create-fz-app/template/package.json b/applications/system/js_app/packages/create-fz-app/template/package.json index 7acdeccaa..ee23f1c1f 100644 --- a/applications/system/js_app/packages/create-fz-app/template/package.json +++ b/applications/system/js_app/packages/create-fz-app/template/package.json @@ -2,11 +2,11 @@ "name": "", "version": "1.0.0", "scripts": { - "build": "tsc && node node_modules/@flipperdevices/fz-sdk/sdk.js build", - "start": "npm run build && node node_modules/@flipperdevices/fz-sdk/sdk.js upload" + "build": "tsc && node node_modules/@next-flip/fz-sdk-mntm/sdk.js build", + "start": "npm run build && node node_modules/@next-flip/fz-sdk-mntm/sdk.js upload" }, "devDependencies": { - "@flipperdevices/fz-sdk": "^0.1", + "@next-flip/fz-sdk-mntm": "^0.1", "typescript": "^5.6.3" } } \ No newline at end of file diff --git a/applications/system/js_app/packages/create-fz-app/template/tsconfig.json b/applications/system/js_app/packages/create-fz-app/template/tsconfig.json index c7b83cd5d..bc639a5e7 100644 --- a/applications/system/js_app/packages/create-fz-app/template/tsconfig.json +++ b/applications/system/js_app/packages/create-fz-app/template/tsconfig.json @@ -7,7 +7,7 @@ "target": "ES2015", }, "files": [ - "./node_modules/@flipperdevices/fz-sdk/global.d.ts", + "./node_modules/@next-flip/fz-sdk-mntm/global.d.ts", ], "include": [ "./**/*.ts", diff --git a/applications/system/js_app/packages/fz-sdk/README.md b/applications/system/js_app/packages/fz-sdk/README.md index 3234f68aa..0cc362ca5 100644 --- a/applications/system/js_app/packages/fz-sdk/README.md +++ b/applications/system/js_app/packages/fz-sdk/README.md @@ -5,7 +5,7 @@ applications in JavaScript. ## Getting started Create your application using the interactive wizard: ```shell -npx @flipperdevices/create-fz-app@latest +npx @next-flip/create-fz-app-mntm@latest ``` Then, enter the directory with your application and launch it: diff --git a/applications/system/js_app/packages/fz-sdk/flipper/index.d.ts b/applications/system/js_app/packages/fz-sdk/flipper/index.d.ts index 2dac4204b..1c154165b 100644 --- a/applications/system/js_app/packages/fz-sdk/flipper/index.d.ts +++ b/applications/system/js_app/packages/fz-sdk/flipper/index.d.ts @@ -26,7 +26,7 @@ export declare function getBatteryCharge(): number; * @warning Do **NOT** use this to check the presence or absence of features. If * you do, I'm gonna be sad :( Instead, refer to `checkSdkFeatures` and * other similar mechanisms. - * @note Original firmware reports `"flipperdevices"`. + * @note Momentum firmware reports `"momentum"`. * @version Added in JS SDK 0.1 */ export declare const firmwareVendor: string; diff --git a/applications/system/js_app/packages/fz-sdk/package.json b/applications/system/js_app/packages/fz-sdk/package.json index 4d18f3f20..e02516e7f 100644 --- a/applications/system/js_app/packages/fz-sdk/package.json +++ b/applications/system/js_app/packages/fz-sdk/package.json @@ -1,5 +1,5 @@ { - "name": "@flipperdevices/fz-sdk", + "name": "@next-flip/fz-sdk-mntm", "version": "0.1.1", "description": "Type declarations and documentation for native JS modules available on Flipper Zero", "keywords": [ @@ -11,7 +11,7 @@ "license": "GPL-3.0-only", "repository": { "type": "git", - "url": "git+https://github.com/flipperdevices/flipperzero-firmware.git", + "url": "git+https://github.com/Next-Flip/Momentum-Firmware.git", "directory": "applications/system/js_app/packages/fz-sdk" }, "type": "module", diff --git a/applications/system/js_app/packages/fz-sdk/sdk.js b/applications/system/js_app/packages/fz-sdk/sdk.js index 2eecf032d..e3de684ab 100644 --- a/applications/system/js_app/packages/fz-sdk/sdk.js +++ b/applications/system/js_app/packages/fz-sdk/sdk.js @@ -19,7 +19,7 @@ async function build(config) { bundle: true, minify: config.minify, external: [ - "@flipperdevices/fz-sdk/*" + "@next-flip/fz-sdk-mntm/*" ], supported: { "array-spread": false, @@ -74,6 +74,8 @@ async function build(config) { let outContents = fs.readFileSync(config.output, "utf8"); outContents = "let exports = {};\n" + outContents; + // TODO: Transform CFW SDK name to OFW SDK name so all firmwares understand it + if (config.enforceSdkVersion) { const version = json5.parse(fs.readFileSync(path.join(__dirname, "package.json"), "utf8")).version; let [major, minor, _] = version.split(".");