From f1f5c30b942e4c0771e9236b0f86962754a1bfbb Mon Sep 17 00:00:00 2001 From: TheGoddessInari Date: Tue, 12 Mar 2019 10:13:57 -0700 Subject: [PATCH] Update Sencha bits to need 6.7.0, update README. Sencha CMD 6.7.0 finally fixes the problem with arrow functions, so they'll finally be able to be used in the source if desirable. --- .sencha/app/Boot.js | 2 +- .sencha/app/sencha.cfg | 2 +- README.md | 12 ++++---- app.json | 13 ++++++--- ext/ext-bootstrap.js | 65 ------------------------------------------ 5 files changed, 18 insertions(+), 76 deletions(-) delete mode 100644 ext/ext-bootstrap.js diff --git a/.sencha/app/Boot.js b/.sencha/app/Boot.js index 285dd26d..47edd871 100644 --- a/.sencha/app/Boot.js +++ b/.sencha/app/Boot.js @@ -558,7 +558,7 @@ Ext.Boot = Ext.Boot || (function (emptyFn) { Boot.isIE10m = true; } else { - Boot.isIE10 = (new Function('/*@cc_on return @_jscript_version @*/')()) === 10; + Boot.isIE10 = navigator.appVersion.indexOf('MSIE 10') !== -1; Boot.isIE10m = Boot.isIE10 || Boot.isIE9 || Boot.isIE8; } diff --git a/.sencha/app/sencha.cfg b/.sencha/app/sencha.cfg index 053cef27..ef1f3818 100644 --- a/.sencha/app/sencha.cfg +++ b/.sencha/app/sencha.cfg @@ -43,4 +43,4 @@ app.resource.paths=${app.dir}/resources app.framework.version=5.1.1.451 -app.cmd.version=6.6.0.13 +app.cmd.version=6.7.0.37 diff --git a/README.md b/README.md index 94d893e0..15796800 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@
Rambox-OS
- Rambox-OS + Rambox-OS, soon to be renamed to Hamsket.

@@ -212,10 +212,12 @@ Keep in mind, I'm not pushing this. I'll do my best regardless. ## Compiling To build your own copy, you need: + - An 8.0 version of the [Java SE Development Kit](http://www.oracle.com/technetwork/java/javase/downloads/index.html). -- A recent version of [Ruby](https://www.ruby-lang.org/en/downloads/). -- A recent version of [Sencha CMD](https://www.sencha.com/products/extjs/cmd-download/), and to install it with the Compass extension. -- A recent version of [NodeJS](https://nodejs.org/en/download/) with npm. +- [Ruby](https://www.ruby-lang.org/en/downloads/) 2.3 or newer. +- [Sencha CMD](https://www.sencha.com/products/extjs/cmd-download/) 6.7.0 or newer, and to install it with the Compass extension. +- [NodeJS](https://nodejs.org/en/download/) 8.5.0 (10.0+ preferred) or newer with npm. + These **need** to be added to your PATH. ```shell @@ -233,7 +235,7 @@ npm run setup This step instead of **repack** will create an installer appropriate to your platform in '**dist**'. You can place unpacked files over where the installers normally place their files for development/testing purposes. -**NOTE:** Win32 builds are **deprecated** by electron-builder and are likely to be removed at some point in the future. +**NOTE:** 32-bit builds are **deprecated** by electron-builder and are likely to be removed at some point in the future. ## [Contributing](./CONTRIBUTING.md) diff --git a/app.json b/app.json index c9152974..3aac40ac 100644 --- a/app.json +++ b/app.json @@ -42,6 +42,13 @@ "requires": [ "ext-locale" ], + "language": + { + "js":{ + "input": "ES8", + "output": "ES8" + } + }, /** * Sass configuration properties. @@ -173,7 +180,8 @@ */ "production": { "compressor": { - "type": "cmd", + "type": "closure", + "compression": "simple", "polyfills": "none" } }, @@ -255,9 +263,6 @@ "base": "${workspace.build.dir}/${build.environment}/${app.name}", "appCache": { "enable": true - }, - "js": { - "version": "ES6" } }, diff --git a/ext/ext-bootstrap.js b/ext/ext-bootstrap.js deleted file mode 100644 index f01e2e96..00000000 --- a/ext/ext-bootstrap.js +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Load the library located at the same path with this file - * - * Will automatically load ext-all-debug.js if any of these conditions is true: - * - Current hostname is localhost - * - Current hostname is an IP v4 address - * - Current protocol is "file:" - * - Query string has `debug` parameter passed (http://foo/test.html?debug) - * - * If none of the above is true or the `nodebug` query string parameter is present (http://foo/test.html?nodebug), - * ext-all.js will be loaded. - */ -(function() { - var scripts = document.getElementsByTagName('script'), - localhostTests = [ - /^localhost$/, - /\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(:\d{1,5})?\b/ // IP v4 - ], - host = window.location.hostname, - isDevelopment = null, - queryString = window.location.search, - test, path, i, ln, scriptSrc, match; - - for (i = 0, ln = scripts.length; i < ln; i++) { - scriptSrc = scripts[i].src; - - match = scriptSrc.match(/ext-bootstrap\.js$/); - - if (match) { - /** - * use a path without the ext-bootstrap.js file on it. http://path/to/ext/ext-bootstrap.js will become - * http://path/to/ext/ - */ - path = scriptSrc.substring(0, scriptSrc.length - match[0].length); - break; - } - } - - if (isDevelopment === null) { - for (i = 0, ln = localhostTests.length; i < ln; i++) { - test = localhostTests[i]; - - if (host.search(test) !== -1) { - //host is localhost or an IP address - isDevelopment = true; - break; - } - } - } - - if (isDevelopment === null && window.location.protocol === 'file:') { - isDevelopment = true; - } - - if (!isDevelopment && queryString.match('(\\?|&)debug') !== null) { - //debug is present in the query string - isDevelopment = true; - } else if (isDevelopment && queryString.match('(\\?|&)nodebug') !== null) { - //nodebug is present in the query string - isDevelopment = false; - } - - document.write(''); -})();