diff --git a/.gitignore b/.gitignore index bb631a0971..b89c0e745f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,10 @@ tmp/ log.txt *.log +## Build +/dist +montage.min.js + ## jsdoc /doc diff --git a/.jshintignore b/.jshintignore index f3bb5771d4..fdadfade24 100644 --- a/.jshintignore +++ b/.jshintignore @@ -3,3 +3,6 @@ **/test/spec/** **/report/** **/tools/** +montage.min.js +montage2.js +webpack.config.js \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b6c851687e..7c5abfa824 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/composer/press-composer.info/sample/index.html b/composer/press-composer.info/sample/index.html index 300157f913..d27881b1b8 100644 --- a/composer/press-composer.info/sample/index.html +++ b/composer/press-composer.info/sample/index.html @@ -4,7 +4,7 @@ Press Composer Sample - + + + + + + + diff --git a/test/spec/montage-custom-element-spec.js b/test/spec/montage-custom-element-spec.js index d4615e15c3..54f6f599a7 100644 --- a/test/spec/montage-custom-element-spec.js +++ b/test/spec/montage-custom-element-spec.js @@ -1,14 +1,7 @@ -var Montage = require("montage").Montage, - TestPageLoader = require("montage-testing/testpageloader").TestPageLoader, - Template = require("montage/core/template").Template, - Application = require("montage/core/application").application; +var TestPageLoader = require("montage-testing/testpageloader").TestPageLoader; TestPageLoader.queueTest("custom-elements/custom-elements", function (testPage) { describe("montage-custom-element-spec", function () { - var eventManager, - application, - delegate; - var querySelector = function (s) { return testPage.querySelector(s); }; @@ -16,14 +9,7 @@ TestPageLoader.queueTest("custom-elements/custom-elements", function (testPage) return testPage.querySelectorAll(s); }; - beforeEach(function () { - application = testPage.global.mr("montage/core/application").application; - eventManager = application.eventManager; - delegate = application.delegate; - }); - describe('montage-text', function () { - it("should be instantiated", function () { var textLabel1 = querySelector(".textLabel1"); expect(textLabel1).toBeDefined(); @@ -94,7 +80,6 @@ TestPageLoader.queueTest("custom-elements/custom-elements", function (testPage) }); describe('my-button', function () { - it("should be instantiated", function () { var myButton = querySelector(".myButton"); expect(myButton).toBeDefined(); diff --git a/ui/anchor.info/sample/index.html b/ui/anchor.info/sample/index.html index 2e20589864..44c2960e33 100644 --- a/ui/anchor.info/sample/index.html +++ b/ui/anchor.info/sample/index.html @@ -5,7 +5,7 @@ Anchor Sample - + + + + + + - diff --git a/ui/label.info/sample/package.json b/ui/label.info/sample/package.json index daae48b583..abd921c551 100644 --- a/ui/label.info/sample/package.json +++ b/ui/label.info/sample/package.json @@ -6,6 +6,6 @@ "montage": "*" }, "mappings": { - "montage": "../../../../" + "montage": "../../../" } } diff --git a/ui/label.info/sample/main.reel/main.css b/ui/label.info/sample/ui/main.reel/main.css similarity index 100% rename from ui/label.info/sample/main.reel/main.css rename to ui/label.info/sample/ui/main.reel/main.css diff --git a/ui/label.info/sample/main.reel/main.html b/ui/label.info/sample/ui/main.reel/main.html similarity index 100% rename from ui/label.info/sample/main.reel/main.html rename to ui/label.info/sample/ui/main.reel/main.html diff --git a/ui/label.info/sample/main.reel/main.js b/ui/label.info/sample/ui/main.reel/main.js similarity index 100% rename from ui/label.info/sample/main.reel/main.js rename to ui/label.info/sample/ui/main.reel/main.js diff --git a/ui/loader.reel/loader.js b/ui/loader.reel/loader.js index c11c08e66f..860be73212 100644 --- a/ui/loader.reel/loader.js +++ b/ui/loader.reel/loader.js @@ -341,7 +341,7 @@ exports.Loader = Component.specialize( /** @lends Loader.prototype # */ { this.isLoadingMainComponent = true; var self = this; - return global.require.async(this.mainModule).then(function (exports) { + return global.mr.async(this.mainModule).then(function (exports) { if (!(self.mainName in exports)) { throw new Error(self.mainName + " was not found in " + self.mainModule); } diff --git a/ui/number-field.info/sample/index.html b/ui/number-field.info/sample/index.html index 59b9cbfb16..e8a426fb59 100644 --- a/ui/number-field.info/sample/index.html +++ b/ui/number-field.info/sample/index.html @@ -4,7 +4,7 @@ Number Field Sample - + + + + + diff --git a/ui/slot.info/sample/package.json b/ui/slot.info/sample/package.json index 6fb75fb995..a398fa1d74 100644 --- a/ui/slot.info/sample/package.json +++ b/ui/slot.info/sample/package.json @@ -2,6 +2,9 @@ "name": "slot.info", "private": true, "dependencies": { - "montage": "../.." + "montage": "*" + }, + "mappings": { + "montage": "../../../" } } \ No newline at end of file diff --git a/ui/slot.info/sample/main.reel/main.css b/ui/slot.info/sample/ui/main.reel/main.css similarity index 100% rename from ui/slot.info/sample/main.reel/main.css rename to ui/slot.info/sample/ui/main.reel/main.css diff --git a/ui/slot.info/sample/main.reel/main.html b/ui/slot.info/sample/ui/main.reel/main.html similarity index 100% rename from ui/slot.info/sample/main.reel/main.html rename to ui/slot.info/sample/ui/main.reel/main.html diff --git a/ui/slot.info/sample/main.reel/main.js b/ui/slot.info/sample/ui/main.reel/main.js similarity index 100% rename from ui/slot.info/sample/main.reel/main.js rename to ui/slot.info/sample/ui/main.reel/main.js diff --git a/ui/slot.info/sample/photo-viewer.reel/photo-viewer.html b/ui/slot.info/sample/ui/photo-viewer.reel/photo-viewer.html similarity index 100% rename from ui/slot.info/sample/photo-viewer.reel/photo-viewer.html rename to ui/slot.info/sample/ui/photo-viewer.reel/photo-viewer.html diff --git a/ui/slot.info/sample/photo-viewer.reel/photo-viewer.js b/ui/slot.info/sample/ui/photo-viewer.reel/photo-viewer.js similarity index 100% rename from ui/slot.info/sample/photo-viewer.reel/photo-viewer.js rename to ui/slot.info/sample/ui/photo-viewer.reel/photo-viewer.js diff --git a/ui/slot.info/sample/video-viewer.reel/video-viewer.html b/ui/slot.info/sample/ui/video-viewer.reel/video-viewer.html similarity index 100% rename from ui/slot.info/sample/video-viewer.reel/video-viewer.html rename to ui/slot.info/sample/ui/video-viewer.reel/video-viewer.html diff --git a/ui/slot.info/sample/video-viewer.reel/video-viewer.js b/ui/slot.info/sample/ui/video-viewer.reel/video-viewer.js similarity index 100% rename from ui/slot.info/sample/video-viewer.reel/video-viewer.js rename to ui/slot.info/sample/ui/video-viewer.reel/video-viewer.js diff --git a/ui/substitution.info/index.html b/ui/substitution.info/sample/index.html similarity index 52% rename from ui/substitution.info/index.html rename to ui/substitution.info/sample/index.html index fd758b066b..eb8baf334e 100644 --- a/ui/substitution.info/index.html +++ b/ui/substitution.info/sample/index.html @@ -5,14 +5,11 @@ substitution.info - + diff --git a/ui/substitution.info/package.json b/ui/substitution.info/sample/package.json similarity index 54% rename from ui/substitution.info/package.json rename to ui/substitution.info/sample/package.json index 7d0d601a2b..70eb0c8fb9 100644 --- a/ui/substitution.info/package.json +++ b/ui/substitution.info/sample/package.json @@ -2,6 +2,9 @@ "name": "substitution.info", "private": true, "dependencies": { - "montage": "../.." + "montage": "*" + }, + "mappings": { + "montage": "../../../" } } \ No newline at end of file diff --git a/ui/substitution.info/sample/foo.reel/foo.html b/ui/substitution.info/sample/ui/foo.reel/foo.html similarity index 100% rename from ui/substitution.info/sample/foo.reel/foo.html rename to ui/substitution.info/sample/ui/foo.reel/foo.html diff --git a/ui/substitution.info/sample/foo.reel/foo.js b/ui/substitution.info/sample/ui/foo.reel/foo.js similarity index 100% rename from ui/substitution.info/sample/foo.reel/foo.js rename to ui/substitution.info/sample/ui/foo.reel/foo.js diff --git a/ui/substitution.info/sample/main.reel/main.css b/ui/substitution.info/sample/ui/main.reel/main.css similarity index 100% rename from ui/substitution.info/sample/main.reel/main.css rename to ui/substitution.info/sample/ui/main.reel/main.css diff --git a/ui/substitution.info/sample/main.reel/main.html b/ui/substitution.info/sample/ui/main.reel/main.html similarity index 61% rename from ui/substitution.info/sample/main.reel/main.html rename to ui/substitution.info/sample/ui/main.reel/main.html index 283f9953d9..975fdc76a5 100644 --- a/ui/substitution.info/sample/main.reel/main.html +++ b/ui/substitution.info/sample/ui/main.reel/main.html @@ -5,7 +5,9 @@ -
-
-

Title 1

+
+
+
+

Title 1

+
+
+

Title 2

+
-
-

Title 2

+ +
+
+

Title 1

+
+
+

Title 2

+
-
- -
-
-

Title 1

+ +
+
+
-
-

Title 2

+ + +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
-
- -
-
-
-
- - -
-
- -
-
-
-
- -
-
-
-
- -
-
-
\ No newline at end of file diff --git a/ui/substitution.info/sample/main.reel/main.js b/ui/substitution.info/sample/ui/main.reel/main.js similarity index 100% rename from ui/substitution.info/sample/main.reel/main.js rename to ui/substitution.info/sample/ui/main.reel/main.js diff --git a/ui/succession.info/sample/index.html b/ui/succession.info/sample/index.html index 4457450a03..c9f18c64cf 100644 --- a/ui/succession.info/sample/index.html +++ b/ui/succession.info/sample/index.html @@ -5,7 +5,7 @@ succession.info - + +