From acd271974d37c62acf1994cc597ff18908bd8e63 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Sat, 21 May 2016 01:46:56 +0300 Subject: [PATCH] Use jassl lib --- dev/App/User.jsx | 4 +- dev/Common/Booter.jsx | 15 +- dev/Common/Loader.jsx | 25 -- dev/boot.jsx | 6 +- npm-shrinkwrap.json | 577 ++++++++++++++++++++++++++++++++++++++++++ package.json | 3 +- webpack.config.js | 10 +- 7 files changed, 601 insertions(+), 39 deletions(-) delete mode 100644 dev/Common/Loader.jsx diff --git a/dev/App/User.jsx b/dev/App/User.jsx index e23e4d00e..8540bda51 100644 --- a/dev/App/User.jsx +++ b/dev/App/User.jsx @@ -1280,7 +1280,7 @@ class AppUser extends AbstractApp kn.routeOn(); } - if (window.jsloader && window.crypto && window.crypto.getRandomValues && Settings.capa(Enums.Capa.OpenPGP)) + if (window.jassl && window.crypto && window.crypto.getRandomValues && Settings.capa(Enums.Capa.OpenPGP)) { const openpgpCallback = (openpgp) => { @@ -1312,7 +1312,7 @@ class AppUser extends AbstractApp } else { - window.jsloader(Links.openPgpJs()).then(() => { + window.jassl(Links.openPgpJs()).then(() => { if (window.openpgp) { openpgpCallback(window.openpgp); diff --git a/dev/Common/Booter.jsx b/dev/Common/Booter.jsx index 039d38cae..33ece579f 100644 --- a/dev/Common/Booter.jsx +++ b/dev/Common/Booter.jsx @@ -1,6 +1,5 @@ import window from 'window'; -import $ from '$'; import progressJs from 'progressJs'; import rainLoopStorage from 'Storage/RainLoop'; @@ -152,7 +151,7 @@ function runApp() { const appData = window.__rlah_data(); - if (window.jsloader && progressJs && appData && appData.TemplatesLink && appData.LangLink && + if (window.jassl && progressJs && appData && appData.TemplatesLink && appData.LangLink && appData.StaticLibJsLink && appData.StaticAppJsLink && appData.StaticEditorJsLink) { const p = progressJs; @@ -161,7 +160,7 @@ function runApp() p.start().set(5); const - libs = window.jsloader(appData.StaticLibJsLink).then(() => { + libs = window.jassl(appData.StaticLibJsLink).then(() => { if (window.$) { if (!window.$('#rl-check').is(':visible')) @@ -183,18 +182,18 @@ function runApp() } }), common = window.Promise.all([ - window.jsloader(appData.TemplatesLink), - window.jsloader(appData.LangLink) + window.jassl(appData.TemplatesLink), + window.jassl(appData.LangLink) ]) ; window.Promise.all([libs, common]) .then(() => { p.set(30); - return window.jsloader(appData.StaticAppJsLink); + return window.jassl(appData.StaticAppJsLink); }).then(() => { p.set(50); - return appData.PluginsLink ? window.jsloader(appData.PluginsLink) : window.Promise.resolve(); + return appData.PluginsLink ? window.jassl(appData.PluginsLink) : window.Promise.resolve(); }).then(() => { p.set(70); runMainBoot(false); @@ -202,7 +201,7 @@ function runApp() runMainBoot(true); throw e; }).then(() => { - return window.jsloader(appData.StaticEditorJsLink); + return window.jassl(appData.StaticEditorJsLink); }).then(() => { if (window.CKEDITOR && window.__initEditor) { window.__initEditor(); diff --git a/dev/Common/Loader.jsx b/dev/Common/Loader.jsx deleted file mode 100644 index f4417d5a6..000000000 --- a/dev/Common/Loader.jsx +++ /dev/null @@ -1,25 +0,0 @@ - -import window from 'window'; -import {Promise} from 'es6-promise-polyfill/promise.js'; - -window.Promise = window.Promise || Promise; - -export default (url) => { - return new window.Promise((resolve, reject) => { - - const element = document.createElement('script'); - - element.onload = () => { - resolve(url); - }; - - element.onerror = () => { - reject(new Error(url)); - }; - - element.async = true; - element.src = url; - - document.body.appendChild(element); - }); -}; diff --git a/dev/boot.jsx b/dev/boot.jsx index 16d8c2049..b09d8223e 100644 --- a/dev/boot.jsx +++ b/dev/boot.jsx @@ -1,10 +1,12 @@ import window from 'window'; -import jsloader from 'Common/Loader'; +import {Promise} from 'es6-promise-polyfill/promise.js'; import {progressJs} from 'progress.js/src/progress.js'; +import jassl from 'jassl'; -window.jsloader = jsloader; +window.Promise = window.Promise || Promise; window.progressJs = window.progressJs || progressJs(); +window.jassl = jassl; window.progressJs.onbeforeend(() => { if (window.$) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 777e921b4..09bd1304e 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -181,6 +181,38 @@ } } }, + "babel-eslint": { + "version": "4.1.8", + "from": "babel-eslint@>=4.1.5 <5.0.0", + "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-4.1.8.tgz", + "dependencies": { + "babel-core": { + "version": "5.8.38", + "from": "babel-core@>=5.8.33 <6.0.0", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz" + }, + "babylon": { + "version": "5.8.38", + "from": "babylon@>=5.8.38 <6.0.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz" + }, + "globals": { + "version": "6.4.1", + "from": "globals@>=6.4.0 <7.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz" + }, + "js-tokens": { + "version": "1.0.1", + "from": "js-tokens@1.0.1", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz" + }, + "lodash": { + "version": "3.10.1", + "from": "lodash@>=3.10.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" + } + } + }, "babel-generator": { "version": "6.7.5", "from": "babel-generator@>=6.7.5 <7.0.0", @@ -376,6 +408,11 @@ } } }, + "babel-loader": { + "version": "6.2.4", + "from": "babel-loader@>=6.1.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-6.2.4.tgz" + }, "babel-messages": { "version": "6.7.2", "from": "babel-messages@>=6.7.2 <7.0.0", @@ -938,6 +975,11 @@ } } }, + "babel-plugin-transform-runtime": { + "version": "6.8.0", + "from": "babel-plugin-transform-runtime@>=6.1.18 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.8.0.tgz" + }, "babel-plugin-transform-strict-mode": { "version": "6.6.5", "from": "babel-plugin-transform-strict-mode@>=6.6.5 <7.0.0", @@ -960,6 +1002,21 @@ "from": "babel-plugin-undefined-to-void@>=1.1.6 <2.0.0", "resolved": "https://registry.npmjs.org/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz" }, + "babel-preset-es2015": { + "version": "6.6.0", + "from": "babel-preset-es2015@*", + "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.6.0.tgz" + }, + "babel-preset-es2015-loose": { + "version": "7.0.0", + "from": "babel-preset-es2015-loose@>=7.0.0 <8.0.0", + "resolved": "https://registry.npmjs.org/babel-preset-es2015-loose/-/babel-preset-es2015-loose-7.0.0.tgz" + }, + "babel-preset-stage-0": { + "version": "6.5.0", + "from": "babel-preset-stage-0@>=6.1.18 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.5.0.tgz" + }, "babel-preset-stage-1": { "version": "6.5.0", "from": "babel-preset-stage-1@>=6.3.13 <7.0.0", @@ -2032,6 +2089,328 @@ "from": "growly@>=1.2.0 <2.0.0", "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz" }, + "gulp": { + "version": "3.9.1", + "from": "gulp@>=3.9.0 <3.10.0", + "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz" + }, + "gulp-autoprefixer": { + "version": "3.1.0", + "from": "gulp-autoprefixer@*", + "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-3.1.0.tgz" + }, + "gulp-beautify": { + "version": "2.0.0", + "from": "gulp-beautify@*", + "resolved": "https://registry.npmjs.org/gulp-beautify/-/gulp-beautify-2.0.0.tgz" + }, + "gulp-clean-css": { + "version": "2.0.7", + "from": "gulp-clean-css@>=2.0.7 <3.0.0", + "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-2.0.7.tgz", + "dependencies": { + "clean-css": { + "version": "3.4.12", + "from": "clean-css@>=3.4.12 <4.0.0", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.12.tgz" + }, + "commander": { + "version": "2.8.1", + "from": "commander@>=2.8.0 <2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz" + }, + "source-map": { + "version": "0.4.4", + "from": "source-map@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz" + } + } + }, + "gulp-concat-util": { + "version": "0.5.5", + "from": "gulp-concat-util@*", + "resolved": "https://registry.npmjs.org/gulp-concat-util/-/gulp-concat-util-0.5.5.tgz", + "dependencies": { + "gulp-if": { + "version": "2.0.1", + "from": "gulp-if@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-2.0.1.tgz" + } + } + }, + "gulp-csscomb": { + "version": "3.0.7", + "from": "gulp-csscomb@*", + "resolved": "https://registry.npmjs.org/gulp-csscomb/-/gulp-csscomb-3.0.7.tgz" + }, + "gulp-csslint": { + "version": "0.3.0", + "from": "gulp-csslint@*", + "resolved": "https://registry.npmjs.org/gulp-csslint/-/gulp-csslint-0.3.0.tgz" + }, + "gulp-eol": { + "version": "0.1.2", + "from": "gulp-eol@*", + "resolved": "https://registry.npmjs.org/gulp-eol/-/gulp-eol-0.1.2.tgz", + "dependencies": { + "ansi-regex": { + "version": "0.2.1", + "from": "ansi-regex@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" + }, + "ansi-styles": { + "version": "1.1.0", + "from": "ansi-styles@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz" + }, + "chalk": { + "version": "0.5.1", + "from": "chalk@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz" + }, + "gulp-util": { + "version": "2.2.20", + "from": "gulp-util@>=2.2.0 <2.3.0", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz", + "dependencies": { + "through2": { + "version": "0.5.1", + "from": "through2@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz" + } + } + }, + "has-ansi": { + "version": "0.1.0", + "from": "has-ansi@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz" + }, + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + }, + "lodash._reinterpolate": { + "version": "2.4.1", + "from": "lodash._reinterpolate@>=2.4.1 <3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz" + }, + "lodash.escape": { + "version": "2.4.1", + "from": "lodash.escape@>=2.4.1 <2.5.0", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz" + }, + "lodash.keys": { + "version": "2.4.1", + "from": "lodash.keys@>=2.4.1 <2.5.0", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz" + }, + "lodash.template": { + "version": "2.4.1", + "from": "lodash.template@>=2.4.1 <3.0.0", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz" + }, + "lodash.templatesettings": { + "version": "2.4.1", + "from": "lodash.templatesettings@>=2.4.1 <2.5.0", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz" + }, + "minimist": { + "version": "0.2.0", + "from": "minimist@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz" + }, + "readable-stream": { + "version": "1.0.34", + "from": "readable-stream@>=1.0.17 <1.1.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" + }, + "strip-ansi": { + "version": "0.3.0", + "from": "strip-ansi@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz" + }, + "supports-color": { + "version": "0.2.0", + "from": "supports-color@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz" + }, + "through2": { + "version": "0.4.2", + "from": "through2@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", + "dependencies": { + "xtend": { + "version": "2.1.2", + "from": "xtend@>=2.1.1 <2.2.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz" + } + } + }, + "vinyl": { + "version": "0.2.3", + "from": "vinyl@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz" + }, + "xtend": { + "version": "3.0.0", + "from": "xtend@>=3.0.0 <3.1.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" + } + } + }, + "gulp-eslint": { + "version": "1.1.1", + "from": "gulp-eslint@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-1.1.1.tgz" + }, + "gulp-header": { + "version": "1.8.2", + "from": "gulp-header@*", + "resolved": "https://registry.npmjs.org/gulp-header/-/gulp-header-1.8.2.tgz" + }, + "gulp-if": { + "version": "1.2.5", + "from": "gulp-if@>=1.2.5 <1.3.0", + "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-1.2.5.tgz", + "dependencies": { + "gulp-match": { + "version": "0.2.1", + "from": "gulp-match@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-0.2.1.tgz" + }, + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1" + }, + "merge-stream": { + "version": "0.1.8", + "from": "merge-stream@>=0.1.6 <0.2.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz" + }, + "minimatch": { + "version": "1.0.0", + "from": "minimatch@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz" + }, + "readable-stream": { + "version": "1.0.34", + "from": "readable-stream@>=1.0.33-1 <1.1.0-0" + }, + "ternary-stream": { + "version": "1.2.3", + "from": "ternary-stream@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-1.2.3.tgz" + }, + "through2": { + "version": "0.6.5", + "from": "through2@>=0.6.2 <0.7.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz" + } + } + }, + "gulp-jshint": { + "version": "2.0.0", + "from": "gulp-jshint@*", + "resolved": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-2.0.0.tgz", + "dependencies": { + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1" + }, + "rcloader": { + "version": "0.1.2", + "from": "rcloader@0.1.2", + "resolved": "https://registry.npmjs.org/rcloader/-/rcloader-0.1.2.tgz", + "dependencies": { + "lodash": { + "version": "2.4.2", + "from": "lodash@>=2.4.1 <2.5.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" + } + } + }, + "readable-stream": { + "version": "1.0.34", + "from": "readable-stream@>=1.0.33-1 <1.1.0-0" + }, + "through2": { + "version": "0.6.5", + "from": "through2@>=0.6.1 <0.7.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz" + } + } + }, + "gulp-less": { + "version": "1.3.6", + "from": "gulp-less@1.3.6", + "resolved": "https://registry.npmjs.org/gulp-less/-/gulp-less-1.3.6.tgz", + "dependencies": { + "convert-source-map": { + "version": "0.4.1", + "from": "convert-source-map@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.4.1.tgz" + }, + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1" + }, + "readable-stream": { + "version": "1.0.34", + "from": "readable-stream@>=1.0.17 <1.1.0" + }, + "source-map": { + "version": "0.1.43", + "from": "source-map@>=0.1.39 <0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz" + }, + "through2": { + "version": "0.5.1", + "from": "through2@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz" + }, + "vinyl-sourcemaps-apply": { + "version": "0.1.4", + "from": "vinyl-sourcemaps-apply@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.1.4.tgz" + }, + "xtend": { + "version": "3.0.0", + "from": "xtend@>=3.0.0 <3.1.0" + } + } + }, + "gulp-livereload": { + "version": "3.8.1", + "from": "gulp-livereload@>=3.8.0 <3.9.0", + "resolved": "https://registry.npmjs.org/gulp-livereload/-/gulp-livereload-3.8.1.tgz", + "dependencies": { + "ansi-regex": { + "version": "0.2.1", + "from": "ansi-regex@>=0.2.0 <0.3.0" + }, + "ansi-styles": { + "version": "1.1.0", + "from": "ansi-styles@>=1.1.0 <2.0.0" + }, + "chalk": { + "version": "0.5.1", + "from": "chalk@>=0.5.1 <0.6.0" + }, + "has-ansi": { + "version": "0.1.0", + "from": "has-ansi@>=0.1.0 <0.2.0" + }, + "strip-ansi": { + "version": "0.3.0", + "from": "strip-ansi@>=0.3.0 <0.4.0" + }, + "supports-color": { + "version": "0.2.0", + "from": "supports-color@>=0.2.0 <0.3.0" + } + } + }, "gulp-match": { "version": "1.0.2", "from": "gulp-match@>=1.0.2 <2.0.0", @@ -2044,6 +2423,124 @@ } } }, + "gulp-notify": { + "version": "2.2.0", + "from": "gulp-notify@>=2.2.0 <2.3.0", + "resolved": "https://registry.npmjs.org/gulp-notify/-/gulp-notify-2.2.0.tgz", + "dependencies": { + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1" + }, + "readable-stream": { + "version": "1.0.34", + "from": "readable-stream@>=1.0.33-1 <1.1.0-0" + }, + "through2": { + "version": "0.6.5", + "from": "through2@>=0.6.3 <0.7.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz" + } + } + }, + "gulp-plumber": { + "version": "1.1.0", + "from": "gulp-plumber@*", + "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.1.0.tgz" + }, + "gulp-rename": { + "version": "1.2.2", + "from": "gulp-rename@*", + "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz" + }, + "gulp-replace": { + "version": "0.5.4", + "from": "gulp-replace@*", + "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.5.4.tgz" + }, + "gulp-rimraf": { + "version": "0.2.0", + "from": "gulp-rimraf@*", + "resolved": "https://registry.npmjs.org/gulp-rimraf/-/gulp-rimraf-0.2.0.tgz" + }, + "gulp-stripbom": { + "version": "1.0.4", + "from": "gulp-stripbom@*", + "resolved": "https://registry.npmjs.org/gulp-stripbom/-/gulp-stripbom-1.0.4.tgz", + "dependencies": { + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1" + }, + "readable-stream": { + "version": "1.0.34", + "from": "readable-stream@>=1.0.17 <1.1.0" + }, + "strip-bom": { + "version": "1.0.0", + "from": "strip-bom@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz" + }, + "through2": { + "version": "0.5.1", + "from": "through2@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz" + }, + "xtend": { + "version": "3.0.0", + "from": "xtend@>=3.0.0 <3.1.0" + } + } + }, + "gulp-through": { + "version": "0.3.2", + "from": "gulp-through@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/gulp-through/-/gulp-through-0.3.2.tgz", + "dependencies": { + "ansi-regex": { + "version": "0.2.1", + "from": "ansi-regex@>=0.2.0 <0.3.0" + }, + "ansi-styles": { + "version": "1.1.0", + "from": "ansi-styles@>=1.1.0 <2.0.0" + }, + "chalk": { + "version": "0.5.1", + "from": "chalk@>=0.5.1 <0.6.0" + }, + "has-ansi": { + "version": "0.1.0", + "from": "has-ansi@>=0.1.0 <0.2.0" + }, + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1" + }, + "readable-stream": { + "version": "1.0.34", + "from": "readable-stream@>=1.0.33-1 <1.1.0-0" + }, + "strip-ansi": { + "version": "0.3.0", + "from": "strip-ansi@>=0.3.0 <0.4.0" + }, + "supports-color": { + "version": "0.2.0", + "from": "supports-color@>=0.2.0 <0.3.0" + }, + "through2": { + "version": "0.6.5", + "from": "through2@>=0.6.1 <0.7.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz" + } + } + }, + "gulp-uglify": { + "version": "1.5.3", + "from": "gulp-uglify@*", + "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-1.5.3.tgz" + }, "gulp-util": { "version": "3.0.7", "from": "gulp-util@*", @@ -2056,6 +2553,11 @@ } } }, + "gulp-zip": { + "version": "3.2.0", + "from": "gulp-zip@*", + "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-3.2.0.tgz" + }, "gulplog": { "version": "1.0.0", "from": "gulplog@>=1.0.0 <2.0.0", @@ -2364,6 +2866,11 @@ "from": "istextorbinary@1.0.2", "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-1.0.2.tgz" }, + "jassl": { + "version": "1.0.0", + "from": "rainloop/jassl", + "resolved": "git://github.com/rainloop/jassl.git#c25ef96e2f4cd84cb812f4119da16daa81c3bf99" + }, "js-base64": { "version": "2.1.9", "from": "js-base64@>=2.1.9 <3.0.0", @@ -2396,6 +2903,45 @@ "from": "jsesc@>=0.5.0 <0.6.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz" }, + "jshint": { + "version": "2.9.2", + "from": "jshint@*", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.2.tgz", + "dependencies": { + "lodash": { + "version": "3.7.0", + "from": "lodash@>=3.7.0 <3.8.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz" + }, + "shelljs": { + "version": "0.3.0", + "from": "shelljs@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz" + } + } + }, + "jshint-summary": { + "version": "0.4.0", + "from": "jshint-summary@*", + "resolved": "https://registry.npmjs.org/jshint-summary/-/jshint-summary-0.4.0.tgz", + "dependencies": { + "ansi-styles": { + "version": "1.0.0", + "from": "ansi-styles@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz" + }, + "chalk": { + "version": "0.4.0", + "from": "chalk@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz" + }, + "strip-ansi": { + "version": "0.1.1", + "from": "strip-ansi@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz" + } + } + }, "json-stable-stringify": { "version": "1.0.1", "from": "json-stable-stringify@>=1.0.0 <2.0.0", @@ -2910,6 +3456,11 @@ "from": "node-emoji@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-0.1.0.tgz" }, + "node-fs": { + "version": "0.1.7", + "from": "node-fs@*", + "resolved": "https://registry.npmjs.org/node-fs/-/node-fs-0.1.7.tgz" + }, "node-libs-browser": { "version": "0.5.3", "from": "node-libs-browser@>=0.4.0 <=0.6.0", @@ -3233,6 +3784,10 @@ } } }, + "raw-loader": { + "version": "0.5.1", + "from": "raw-loader@*" + }, "rcfinder": { "version": "0.1.8", "from": "rcfinder@>=0.1.6 <0.2.0", @@ -3958,6 +4513,28 @@ } } }, + "webpack": { + "version": "1.13.0", + "from": "webpack@*", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.13.0.tgz", + "dependencies": { + "acorn": { + "version": "3.1.0", + "from": "acorn@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.1.0.tgz" + }, + "interpret": { + "version": "0.6.6", + "from": "interpret@>=0.6.4 <0.7.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz" + }, + "supports-color": { + "version": "3.1.2", + "from": "supports-color@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz" + } + } + }, "webpack-core": { "version": "0.6.8", "from": "webpack-core@>=0.6.0 <0.7.0", diff --git a/package.json b/package.json index dbd53aabf..b3947627f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.10.0", - "release": "114", + "release": "115", "ownCloudPackageVersion": "4.16", "description": "Simple, modern & fast web-based email client", "homepage": "http://rainloop.net", @@ -79,6 +79,7 @@ "gulp-uglify": "*", "gulp-util": "*", "gulp-zip": "*", + "jassl": "github:rainloop/jassl", "jshint": "*", "jshint-summary": "*", "lodash": "~3.9.3", diff --git a/webpack.config.js b/webpack.config.js index af4006c0f..a9c721ce6 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -36,13 +36,21 @@ module.exports = { test: /\.html$/, loader: 'raw' }, + { + test: /(jassl)/, + loader: 'babel', + exclude: /(bower_components)/, + query: { + cacheDirectory: true, + presets: ['es2015-loose', 'stage-0'] + } + }, { test: /\.jsx$/, loader: 'babel', exclude: /(node_modules|bower_components)/, query: { cacheDirectory: true, -// plugins: ['transform-runtime'], presets: ['es2015-loose', 'stage-0'] } }