Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

18.0.0 beta #1928

Open
wants to merge 123 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
cce4ccb
Merge branch 'jshint' into commonjs
hthetiot Jul 24, 2017
1ad90c4
implement commonjs montage.js boostrap
hthetiot Jul 24, 2017
355940e
various commonjs fix
hthetiot Jul 24, 2017
5317c39
enable Node 6 and 7 on travis to check commonjs support
hthetiot Jul 24, 2017
e21a1c4
fix miniUrl inject and jshint
hthetiot Jul 25, 2017
07c6678
use mr#commonjs branch
hthetiot Jul 25, 2017
cf30dda
update test runner
hthetiot Jul 25, 2017
f8aa655
fix application-sub-type spec
hthetiot Jul 25, 2017
d14f2f4
fix double jshint in package.json
hthetiot Jul 25, 2017
4a1b1ff
merge jshint
hthetiot Jul 26, 2017
8050b2d
use mr#commonjs for mop test
hthetiot Jul 26, 2017
9315037
Merge branch 'master' into commonjs
hthetiot Aug 11, 2017
1ca3828
add webpack build and webpack.config.js
hthetiot Aug 11, 2017
8b53a36
fix montage.js commonjs support
hthetiot Aug 11, 2017
c0bbf4e
update webpack.config.js
hthetiot Aug 11, 2017
d35c9d5
update webpack support
hthetiot Sep 19, 2017
70e06b5
merge master
hthetiot Sep 19, 2017
1d2fd8a
jshint
hthetiot Sep 19, 2017
dd4e9ae
Merge branch 'master' into commonjs
hthetiot Sep 19, 2017
feb6aaa
fix initMontageCustomElement feature detection
hthetiot Sep 19, 2017
cfc8a5f
make dependencies uglify proof and fix possible bad location
hthetiot Sep 19, 2017
c35c1af
Merge branch 'master' into commonjs
hthetiot Sep 19, 2017
4371ce7
fix core/localizer
hthetiot Sep 19, 2017
5f0466c
merge master
hthetiot Sep 20, 2017
6db98c9
Fix montage-custom-elements specs and improvements.
thibaultzanini Sep 21, 2017
9594ac9
merge master
hthetiot Oct 14, 2017
d80b05a
jshinc
hthetiot Oct 14, 2017
64bc471
Use node 8 on Travis instead of 7
hthetiot Oct 16, 2017
35cefb8
Fix old global.require
thibaultzanini Oct 26, 2017
9977c17
Remove duplicate dependencies
thibaultzanini Oct 26, 2017
ad29f00
Add core/promise to the build.
thibaultzanini Oct 26, 2017
af7a885
Update *.info
thibaultzanini Oct 26, 2017
16ae084
Make safer the condition that checks if MontageElement exists
thibaultzanini Oct 26, 2017
bbac455
Fix node tests
thibaultzanini Oct 26, 2017
1077d96
Remove core/promise to the build.
thibaultzanini Oct 26, 2017
7c80ad6
Add test:jasmine-webpack script
thibaultzanini Oct 26, 2017
500ff2b
Update .travis.yml
hthetiot Nov 3, 2017
e3bb626
merge master
hthetiot Nov 29, 2017
2a1c0dd
update min node and nim npm engines in package.json
hthetiot Nov 29, 2017
8b82e17
Editorconfig cleanup
cdebost Dec 7, 2017
55ee333
Improve flat module loading fallback
cdebost Dec 7, 2017
e31a54c
Fix bug where bluebird bundle delays bootstrapping
cdebost Dec 7, 2017
4d4fc82
Fix processing of bundled files
cdebost Dec 7, 2017
53709a7
Prevent creating scripts for modules when inside a bundle
cdebost Dec 7, 2017
9aca3fc
Fix bootstrapping bug that kills the bundled montage hash
cdebost Dec 10, 2017
4642c01
Add a TemplateLoader to montage bootstrap for nodejs
cdebost Dec 16, 2017
4993fe0
Replace node fs with q-io
cdebost Dec 16, 2017
2c3513e
Align commonjs bootstrap with old node.js file
cdebost Dec 18, 2017
7607871
prepare v17.1.1
hthetiot Jan 17, 2018
b807019
Fix conflicts
thibaultzanini Jan 17, 2018
4e8dec9
Merge branch 'master' into commonjs
thibaultzanini Jan 17, 2018
adfb6f4
Remove jshint package from dependencies
thibaultzanini Jan 17, 2018
dd9e1ac
Merge branch 'commonjs' into cdebost/commonjs
cdebost Jan 18, 2018
58af6a9
Rename Promise in bootstrap -> mrPromise
cdebost Jan 18, 2018
033d07c
Add missing helper functions to node bootstrapping
cdebost Jan 18, 2018
6319b45
Make defer function
cdebost Jan 18, 2018
ac6c2cf
Merge branch 'master' into commonjs
hthetiot Feb 26, 2018
5adbc48
Merge branch 'master' into commonjs
hthetiot Feb 28, 2018
7b6a0f7
fix commonjs TypeError
hthetiot Feb 28, 2018
39aa18b
fix undefined self
hthetiot Feb 28, 2018
bc952a0
add data-packages-strategy param support and set defaultStrategy to '…
hthetiot Feb 28, 2018
6245880
add data-packages-strategy param support and set defaultStrategy to '…
hthetiot Feb 28, 2018
4154d2c
merge master
hthetiot Feb 28, 2018
c0fbe9c
Merge remote-tracking branch 'origin/commonjs' into cdebost/commonjs
cdebost Feb 28, 2018
71010b9
lint
cdebost Feb 28, 2018
137b9ea
Node boostrap - Default to ./ if no program given (node 4 & 6)
cdebost Mar 1, 2018
eaf7016
merge master
hthetiot Apr 30, 2018
bce8723
Merge branch 'master' into commonjs
hthetiot Apr 30, 2018
eaef712
initial backport of exports.compileMJSONFile and exports.getMontageDe…
hthetiot Apr 30, 2018
ed19206
fix getMontageDeserializer missing debug
hthetiot Apr 30, 2018
88f4e7d
Fix broken mjson specs
thibaultzanini May 1, 2018
3da258b
Fix JSHINT warning
thibaultzanini May 1, 2018
0aec6f7
Fix karma specs
thibaultzanini May 1, 2018
4a0b76e
Merge pull request #1978 from montagejs/master
hthetiot May 14, 2018
211d5f4
Merge branch 'master' into commonjs
thibaultzanini Oct 23, 2018
5344b8f
Fixes setting the authorization promise property
johnnykahalawai May 16, 2018
fba4c51
Allow clear of authorization for an auth provider
tejaede May 29, 2018
786ddb0
Add authorization API specs
tejaede Jun 14, 2018
e958c31
Reinstate all specs
tejaede Jun 15, 2018
b880525
Fix authorization bugs
tejaede Jun 20, 2018
5ee50b7
Add specs for auth failure and re-auth
tejaede Jun 20, 2018
e521c21
Remove test code
tejaede Jul 15, 2018
59f509e
Fix auth logic, build out auth API
tejaede Aug 8, 2018
df597ba
Remove code irrelevant to PR
tejaede Nov 14, 2018
ca9cd6e
Remove AuthorizationManager.pendingServicesArray in favor of set
tejaede Nov 16, 2018
e3bde04
Remove AuthorizationManagerPanel.instance
tejaede Nov 16, 2018
da883c2
Fix minor montage-data bugs
tejaede Jul 18, 2018
80af2ec
Add inversePropertyName to PropertyDescriptor.
tejaede Aug 20, 2018
cad3a72
Fix lint
tejaede Aug 20, 2018
a945b5a
Add trace to model properties
tejaede Aug 8, 2018
4f2641a
Fix minor data-service bugs, add convenience to data stream
tejaede Nov 14, 2018
6e0ac3e
Fix lint
tejaede Nov 14, 2018
5f54ea2
Deprecate DataStream.withTypeOrSelector
tejaede Nov 20, 2018
88b2686
Fix broken specs
tejaede Dec 10, 2018
c8dd56a
Add initial spec for dataService with multiple auth-services
tejaede Dec 10, 2018
4513650
Adds FRB notion of reverter to mapping rules
johnnykahalawai Apr 23, 2018
453107c
Adds ability to reset data object
johnnykahalawai Jun 6, 2018
48718c5
Prevents creating null SchemaDescriptorReference
tejaede Dec 11, 2018
6580957
Remove debugger statements from data-service, expression-data-mapping
tejaede Dec 11, 2018
7738076
Use console.debug for debug-specific data service logs
tejaede Dec 12, 2018
55097e1
Removes debugger; statetements, includng one active.
marchant Dec 12, 2018
6e1af5b
Merge branch 'commonjs' into cdebost/commonjs
cdebost Jan 4, 2019
c3c72c5
Merge branch 'master' into commonjs
cdebost Jan 4, 2019
f1b6350
Merge branch 'commonjs' into cdebost/commonjs
cdebost Jan 4, 2019
b9c23e7
Merge pull request #1916 from montagejs/cdebost/commonjs
cdebost Jan 4, 2019
d719c7f
Remove legacy bundling option from travis
cdebost Jan 5, 2019
c206227
Remove console.error when .reel doesn't have an .html (e.g. in mop)
cdebost Jan 5, 2019
480ce4c
Add node 9 to travis
cdebost Jan 5, 2019
c571778
Remove overlays, are identical for node & browser
cdebost Jan 22, 2019
249ee29
Merge branch 'master' into commonjs
cdebost Jan 25, 2019
9a14b48
Replace node 9 with 10 in travis, 9 is not LTS
cdebost Jan 25, 2019
3bd702e
Bump version to 18.0.0
cdebost Jan 25, 2019
9c55f4f
Add package-lock.json to source control
cdebost Jan 25, 2019
f9e5720
Update package-lock.json
cdebost Jan 25, 2019
44df33f
Merge branch 'master' into commonjs
cdebost Jan 25, 2019
2679cf6
Read package-lock during dev bootstrap
cdebost Jan 26, 2019
179e7ab
Update package-lock.json
cdebost Jan 26, 2019
697d310
Update package-lock.json
cdebost Jan 28, 2019
90781bc
Update package-lock
cdebost Jan 28, 2019
b2bde62
Update package-lock.json
cdebost Jan 29, 2019
ccd44cc
Upgrade mr and mop-integration
cdebost Jan 29, 2019
3d00483
Upgrade mr
cdebost Jan 29, 2019
72ee798
Use __dirname for location instead of process.cwd() under node
cdebost Jan 29, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ tmp/
log.txt
*.log

## Build
/dist
montage.min.js

## jsdoc
/doc

Expand Down
3 changes: 3 additions & 0 deletions .jshintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
**/test/spec/**
**/report/**
**/tools/**
montage.min.js
montage2.js
webpack.config.js
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
language: node_js
node_js:
- "4"
# - "8"
- "6"
- "8"
- "10"
script: npm run $COMMAND
env:
- COMMAND=lint
- COMMAND=build
- COMMAND=test
- COMMAND=test:karma-travis
#- COMMAND=integration MONTAGE_VERSION=. MOP_VERSION=0.13
#- COMMAND=integration MONTAGE_VERSION=. MOP_VERSION=latest
- COMMAND=integration MONTAGE_VERSION=. MOP_VERSION="#master"
- COMMAND=integration MONTAGE_VERSION=. MOP_VERSION="#commonjs"
before_install:
- "npm set legacy-bundling=true"
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
Expand Down
2 changes: 1 addition & 1 deletion composer/press-composer.info/sample/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>Press Composer Sample</title>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<script src="../../../montage.js"></script>
<script src="../../../montage.min.js"></script>
<script type="text/montage-serialization">
{
"owner": {
Expand Down
2 changes: 1 addition & 1 deletion composer/translate-composer.info/sample/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>Translate Composer Sample</title>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<script src="../../../montage.js"></script>
<script src="../../../montage.min.js"></script>
<script type="text/montage-serialization">
{
"owner": {
Expand Down
2 changes: 1 addition & 1 deletion core/event/event-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -3018,4 +3018,4 @@ Object.defineProperty(exports, "defaultEventManager", {
}
return defaultEventManager;
}
});
});
2 changes: 1 addition & 1 deletion core/serialization/deserializer/montage-deserializer.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var Montage = require("../../core").Montage,
MontageContext = require("./montage-interpreter").MontageContext,
MontageReviver = require("./montage-reviver").MontageReviver,
Promise = require("../../promise").Promise,
BindingsModule = require("../bindings"),
Map = require("collections/map").Map,
Promise = require("core/promise").Promise,
deprecate = require("../../deprecate");

var MontageDeserializer = exports.MontageDeserializer = Montage.specialize({
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ <h4>Tests:</h4>
<a href="test/run.html">Run tests</a>
</nav>
</body>
</html>
</html>
Loading