Builds are now created from babel transpiled code
Except for the esnext builds, which use the original code. Fixes #866
This commit is contained in:
parent
40e7ee1ae6
commit
9333415640
|
@ -1,6 +1,10 @@
|
|||
# Changelog
|
||||
|
||||
## 3.1.0 ((2017-07-05))
|
||||
## 3.2.0 (Unreleased)
|
||||
|
||||
- #866 Add babel in order to support ES2015 syntax
|
||||
|
||||
## 3.1.0 (2017-07-05)
|
||||
|
||||
### API changes
|
||||
- Deprecate the `updateSettings` method in favour of
|
||||
|
|
14
Makefile
14
Makefile
|
@ -150,7 +150,11 @@ watch: stamp-bundler
|
|||
|
||||
.PHONY: watchjs
|
||||
watchjs: stamp-npm
|
||||
$(BABEL) --source-maps --watch=./src --out-dir=./build
|
||||
$(BABEL) --source-maps --watch=./src --out-dir=./builds
|
||||
|
||||
.PHONY: transpile
|
||||
transpile: stamp-npm
|
||||
$(BABEL) --source-maps --out-dir=./builds ./src
|
||||
|
||||
BUILDS = dist/converse.js \
|
||||
dist/converse.min.js \
|
||||
|
@ -169,6 +173,14 @@ dist/converse.min.js: src locale node_modules *.js
|
|||
$(RJS) -o src/build.js include=converse out=dist/converse.min.js
|
||||
dist/converse.js: src locale node_modules *.js
|
||||
$(RJS) -o src/build.js include=converse out=dist/converse.js optimize=none
|
||||
dist/converse-esnext.min.js: src locale node_modules *.js transpile
|
||||
$(RJS) -o src/build-esnext.js include=converse out=dist/converse-esnext.min.js
|
||||
dist/converse-esnext.js: src locale node_modules *.js transpile
|
||||
$(RJS) -o src/build-esnext.js include=converse out=dist/converse-esnext.js optimize=none
|
||||
dist/inverse-esnext.js: src locale node_modules *.js
|
||||
$(RJS) -o src/build-inverse-esnext.js include=inverse out=dist/inverse-esnext.js optimize=none
|
||||
dist/inverse-esnext.min.js: src locale node_modules *.js
|
||||
$(RJS) -o src/build-inverse-esnext.js include=inverse out=dist/inverse-esnext.min.js
|
||||
dist/inverse.js: src locale node_modules *.js
|
||||
$(RJS) -o src/build-inverse.js include=inverse out=dist/inverse.js optimize=none
|
||||
dist/inverse.min.js: src locale node_modules *.js
|
||||
|
|
|
@ -67,7 +67,6 @@
|
|||
"pluggable.js": "https://github.com/jcbrand/pluggable.js.git#8f8c8235816f44cda0f855d6ca879445aaa486a1",
|
||||
"po2json": "^0.4.4",
|
||||
"requirejs": "2.3.3",
|
||||
"requirejs-babel": "0.0.9",
|
||||
"run-headless-chromium": "^0.1.1",
|
||||
"sinon": "^2.1.0",
|
||||
"snyk": "^1.21.2",
|
||||
|
|
|
@ -2,6 +2,28 @@
|
|||
baseUrl: "../",
|
||||
name: "almond",
|
||||
mainConfigFile: 'config.js',
|
||||
paths: {
|
||||
"converse-bookmarks": "builds/converse-bookmarks",
|
||||
"converse-chatview": "builds/converse-chatview",
|
||||
"converse-controlbox": "builds/converse-controlbox",
|
||||
"converse-core": "builds/converse-core",
|
||||
"converse-dragresize": "builds/converse-dragresize",
|
||||
"converse-headline": "builds/converse-headline",
|
||||
"converse-inverse": "builds/converse-inverse",
|
||||
"converse-mam": "builds/converse-mam",
|
||||
"converse-minimize": "builds/converse-minimize",
|
||||
"converse-muc": "builds/converse-muc",
|
||||
"converse-muc-embedded": "builds/converse-muc-embedded",
|
||||
"converse-notification": "builds/converse-notification",
|
||||
"converse-otr": "builds/converse-otr",
|
||||
"converse-ping": "builds/converse-ping",
|
||||
"converse-register": "builds/converse-register",
|
||||
"converse-roomslist": "builds/converse-roomslist",
|
||||
"converse-rosterview": "builds/converse-rosterview",
|
||||
"converse-singleton": "builds/converse-singleton",
|
||||
"converse-vcard": "builds/converse-vcard",
|
||||
"utils": "builds/utils"
|
||||
},
|
||||
wrap: {
|
||||
startFile: "start.frag",
|
||||
endFile: "inverse-end.frag"
|
||||
|
|
|
@ -38,6 +38,28 @@
|
|||
"otr",
|
||||
"lodash"
|
||||
],
|
||||
paths: {
|
||||
"converse-bookmarks": "builds/converse-bookmarks",
|
||||
"converse-chatview": "builds/converse-chatview",
|
||||
"converse-controlbox": "builds/converse-controlbox",
|
||||
"converse-core": "builds/converse-core",
|
||||
"converse-dragresize": "builds/converse-dragresize",
|
||||
"converse-headline": "builds/converse-headline",
|
||||
"converse-inverse": "builds/converse-inverse",
|
||||
"converse-mam": "builds/converse-mam",
|
||||
"converse-minimize": "builds/converse-minimize",
|
||||
"converse-muc": "builds/converse-muc",
|
||||
"converse-muc-embedded": "builds/converse-muc-embedded",
|
||||
"converse-notification": "builds/converse-notification",
|
||||
"converse-otr": "builds/converse-otr",
|
||||
"converse-ping": "builds/converse-ping",
|
||||
"converse-register": "builds/converse-register",
|
||||
"converse-roomslist": "builds/converse-roomslist",
|
||||
"converse-rosterview": "builds/converse-rosterview",
|
||||
"converse-singleton": "builds/converse-singleton",
|
||||
"converse-vcard": "builds/converse-vcard",
|
||||
"utils": "builds/utils"
|
||||
},
|
||||
wrap: {
|
||||
startFile: "start.frag",
|
||||
endFile: "end-no-dependencies.frag"
|
||||
|
|
22
src/build.js
22
src/build.js
|
@ -2,6 +2,28 @@
|
|||
baseUrl: "../",
|
||||
name: "almond",
|
||||
mainConfigFile: 'config.js',
|
||||
paths: {
|
||||
"converse-bookmarks": "builds/converse-bookmarks",
|
||||
"converse-chatview": "builds/converse-chatview",
|
||||
"converse-controlbox": "builds/converse-controlbox",
|
||||
"converse-core": "builds/converse-core",
|
||||
"converse-dragresize": "builds/converse-dragresize",
|
||||
"converse-headline": "builds/converse-headline",
|
||||
"converse-inverse": "builds/converse-inverse",
|
||||
"converse-mam": "builds/converse-mam",
|
||||
"converse-minimize": "builds/converse-minimize",
|
||||
"converse-muc": "builds/converse-muc",
|
||||
"converse-muc-embedded": "builds/converse-muc-embedded",
|
||||
"converse-notification": "builds/converse-notification",
|
||||
"converse-otr": "builds/converse-otr",
|
||||
"converse-ping": "builds/converse-ping",
|
||||
"converse-register": "builds/converse-register",
|
||||
"converse-roomslist": "builds/converse-roomslist",
|
||||
"converse-rosterview": "builds/converse-rosterview",
|
||||
"converse-singleton": "builds/converse-singleton",
|
||||
"converse-vcard": "builds/converse-vcard",
|
||||
"utils": "builds/utils"
|
||||
},
|
||||
wrap: {
|
||||
startFile: "start.frag",
|
||||
endFile: "end.frag"
|
||||
|
|
|
@ -22,7 +22,6 @@ require.config({
|
|||
"backbone.noconflict": "src/backbone.noconflict",
|
||||
"backbone.browserStorage": "node_modules/backbone.browserStorage/backbone.browserStorage",
|
||||
"backbone.overview": "node_modules/backbone.overview/backbone.overview",
|
||||
"es6": "node_modules/requirejs-babel/es6",
|
||||
"eventemitter": "node_modules/otr/build/dep/eventemitter",
|
||||
"es6-promise": "node_modules/es6-promise/dist/es6-promise",
|
||||
"jquery": "node_modules/jquery/dist/jquery",
|
||||
|
|
Loading…
Reference in New Issue