Skip to content

Commit

Permalink
Merge pull request #790 from jawa-the-hutt/master
Browse files Browse the repository at this point in the history 
Removed Lexer() from template-gatherer due to aurelia-binding 2.0.0
  • Loading branch information
@arnederuwe
arnederuwe authored Jul 25, 2018
2 parents 73f4356 + e9fb091 commit cc5731c
Show file tree
Hide file tree
Showing 6 changed files with 109 additions and 95 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ vendors
build/reports
devbuild
temp
package-lock.json
92 changes: 49 additions & 43 deletions config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ System.config({
},

map: {
"aurelia-binding": "npm:aurelia-binding@1.2.1",
"aurelia-binding": "npm:aurelia-binding@2.1.1",
"aurelia-dependency-injection": "npm:[email protected]",
"aurelia-logging": "npm:aurelia-logging@1.3.1",
"aurelia-metadata": "npm:[email protected].3",
"aurelia-pal": "npm:aurelia-pal@1.3.0",
"aurelia-logging": "npm:aurelia-logging@1.5.0",
"aurelia-metadata": "npm:[email protected].4",
"aurelia-pal": "npm:aurelia-pal@1.8.0",
"aurelia-pal-browser": "npm:[email protected]",
"aurelia-polyfills": "npm:[email protected]",
"aurelia-router": "npm:[email protected]",
"aurelia-task-queue": "npm:aurelia-task-queue@1.2.0",
"aurelia-task-queue": "npm:aurelia-task-queue@1.3.1",
"aurelia-templating": "npm:[email protected]",
"aurelia-templating-resources": "npm:[email protected]",
"aurelia-testing": "npm:[email protected]",
Expand Down Expand Up @@ -59,10 +59,16 @@ System.config({
"util": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-logging": "npm:[email protected]",
"aurelia-metadata": "npm:[email protected]",
"aurelia-pal": "npm:[email protected]",
"aurelia-task-queue": "npm:[email protected]"
"aurelia-logging": "npm:[email protected]",
"aurelia-metadata": "npm:[email protected]",
"aurelia-pal": "npm:[email protected]",
"aurelia-task-queue": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-logging": "npm:[email protected]",
"aurelia-metadata": "npm:[email protected]",
"aurelia-pal": "npm:[email protected]",
"aurelia-task-queue": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-event-aggregator": "npm:[email protected]",
Expand All @@ -71,7 +77,7 @@ System.config({
"aurelia-history-browser": "npm:[email protected]",
"aurelia-loader-default": "npm:[email protected]",
"aurelia-logging-console": "npm:[email protected]",
"aurelia-pal": "npm:aurelia-pal@1.3.0",
"aurelia-pal": "npm:aurelia-pal@1.8.0",
"aurelia-pal-browser": "npm:[email protected]",
"aurelia-polyfills": "npm:[email protected]",
"aurelia-router": "npm:[email protected]",
Expand All @@ -81,47 +87,47 @@ System.config({
"aurelia-templating-router": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-metadata": "npm:[email protected].3",
"aurelia-pal": "npm:aurelia-pal@1.3.0"
"aurelia-metadata": "npm:[email protected].4",
"aurelia-pal": "npm:aurelia-pal@1.8.0"
},
"npm:[email protected]": {
"aurelia-logging": "npm:aurelia-logging@1.3.1"
"aurelia-logging": "npm:aurelia-logging@1.5.0"
},
"npm:[email protected]": {
"aurelia-binding": "npm:[email protected]",
"aurelia-dependency-injection": "npm:[email protected]",
"aurelia-loader": "npm:[email protected]",
"aurelia-logging": "npm:aurelia-logging@1.3.1",
"aurelia-metadata": "npm:[email protected].3",
"aurelia-pal": "npm:aurelia-pal@1.3.0",
"aurelia-logging": "npm:aurelia-logging@1.5.0",
"aurelia-metadata": "npm:[email protected].4",
"aurelia-pal": "npm:aurelia-pal@1.8.0",
"aurelia-path": "npm:[email protected]",
"aurelia-task-queue": "npm:aurelia-task-queue@1.2.0",
"aurelia-task-queue": "npm:aurelia-task-queue@1.3.1",
"aurelia-templating": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-history": "npm:[email protected]",
"aurelia-pal": "npm:aurelia-pal@1.3.0"
"aurelia-pal": "npm:aurelia-pal@1.8.0"
},
"npm:[email protected]": {
"aurelia-loader": "npm:[email protected]",
"aurelia-metadata": "npm:[email protected].3",
"aurelia-pal": "npm:aurelia-pal@1.3.0"
"aurelia-metadata": "npm:[email protected].4",
"aurelia-pal": "npm:aurelia-pal@1.8.0"
},
"npm:[email protected]": {
"aurelia-metadata": "npm:[email protected].3",
"aurelia-metadata": "npm:[email protected].4",
"aurelia-path": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-logging": "npm:aurelia-logging@1.3.1"
"aurelia-logging": "npm:aurelia-logging@1.5.0"
},
"npm:[email protected].3": {
"aurelia-pal": "npm:aurelia-pal@1.3.0"
"npm:[email protected].4": {
"aurelia-pal": "npm:aurelia-pal@1.8.0"
},
"npm:[email protected]": {
"aurelia-pal": "npm:aurelia-pal@1.3.0"
"aurelia-pal": "npm:aurelia-pal@1.8.0"
},
"npm:[email protected]": {
"aurelia-pal": "npm:aurelia-pal@1.3.0"
"aurelia-pal": "npm:aurelia-pal@1.8.0"
},
"npm:[email protected]": {
"aurelia-path": "npm:[email protected]"
Expand All @@ -130,35 +136,35 @@ System.config({
"aurelia-dependency-injection": "npm:[email protected]",
"aurelia-event-aggregator": "npm:[email protected]",
"aurelia-history": "npm:[email protected]",
"aurelia-logging": "npm:aurelia-logging@1.3.1",
"aurelia-logging": "npm:aurelia-logging@1.5.0",
"aurelia-path": "npm:[email protected]",
"aurelia-route-recognizer": "npm:[email protected]"
},
"npm:aurelia-task-queue@1.2.0": {
"aurelia-pal": "npm:aurelia-pal@1.3.0"
"npm:aurelia-task-queue@1.3.1": {
"aurelia-pal": "npm:aurelia-pal@1.8.0"
},
"npm:[email protected]": {
"aurelia-binding": "npm:[email protected]",
"aurelia-logging": "npm:aurelia-logging@1.3.1",
"aurelia-logging": "npm:aurelia-logging@1.5.0",
"aurelia-templating": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-binding": "npm:[email protected]",
"aurelia-dependency-injection": "npm:[email protected]",
"aurelia-loader": "npm:[email protected]",
"aurelia-logging": "npm:aurelia-logging@1.3.1",
"aurelia-metadata": "npm:[email protected].3",
"aurelia-pal": "npm:aurelia-pal@1.3.0",
"aurelia-logging": "npm:aurelia-logging@1.5.0",
"aurelia-metadata": "npm:[email protected].4",
"aurelia-pal": "npm:aurelia-pal@1.8.0",
"aurelia-path": "npm:[email protected]",
"aurelia-task-queue": "npm:aurelia-task-queue@1.2.0",
"aurelia-task-queue": "npm:aurelia-task-queue@1.3.1",
"aurelia-templating": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-binding": "npm:[email protected]",
"aurelia-dependency-injection": "npm:[email protected]",
"aurelia-logging": "npm:aurelia-logging@1.3.1",
"aurelia-metadata": "npm:[email protected].3",
"aurelia-pal": "npm:aurelia-pal@1.3.0",
"aurelia-logging": "npm:aurelia-logging@1.5.0",
"aurelia-metadata": "npm:[email protected].4",
"aurelia-pal": "npm:aurelia-pal@1.8.0",
"aurelia-path": "npm:[email protected]",
"aurelia-router": "npm:[email protected]",
"aurelia-templating": "npm:[email protected]"
Expand All @@ -167,18 +173,18 @@ System.config({
"aurelia-binding": "npm:[email protected]",
"aurelia-dependency-injection": "npm:[email protected]",
"aurelia-loader": "npm:[email protected]",
"aurelia-logging": "npm:aurelia-logging@1.3.1",
"aurelia-metadata": "npm:[email protected].3",
"aurelia-pal": "npm:aurelia-pal@1.3.0",
"aurelia-logging": "npm:aurelia-logging@1.5.0",
"aurelia-metadata": "npm:[email protected].4",
"aurelia-pal": "npm:aurelia-pal@1.8.0",
"aurelia-path": "npm:[email protected]",
"aurelia-task-queue": "npm:aurelia-task-queue@1.2.0"
"aurelia-task-queue": "npm:aurelia-task-queue@1.3.1"
},
"npm:[email protected]": {
"aurelia-bootstrapper": "npm:[email protected]",
"aurelia-dependency-injection": "npm:[email protected]",
"aurelia-framework": "npm:[email protected]",
"aurelia-logging": "npm:aurelia-logging@1.3.1",
"aurelia-pal": "npm:aurelia-pal@1.3.0",
"aurelia-logging": "npm:aurelia-logging@1.5.0",
"aurelia-pal": "npm:aurelia-pal@1.8.0",
"aurelia-templating": "npm:[email protected]"
},
"npm:[email protected]": {
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"lib": "dist/amd"
},
"dependencies": {
"aurelia-binding": "npm:aurelia-binding@^1.0.4",
"aurelia-binding": "npm:aurelia-binding@2.1.1",
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.0.0",
"aurelia-logging": "npm:aurelia-logging@^1.0.0",
"aurelia-metadata": "npm:aurelia-metadata@^1.0.0",
Expand All @@ -61,7 +61,7 @@
}
},
"dependencies": {
"aurelia-binding": "^1.0.4",
"aurelia-binding": "^2.1.1",
"aurelia-dependency-injection": "^1.0.0",
"aurelia-logging": "^1.0.0",
"aurelia-metadata": "^1.0.0",
Expand Down Expand Up @@ -147,14 +147,14 @@
"aurelia-kendoui-bridge/button/button",
"aurelia-kendoui-bridge/buttongroup/buttongroup",
"aurelia-kendoui-bridge/calendar/calendar",
"aurelia-kendoui-bridge/chat/chat",
"aurelia-kendoui-bridge/chat/chat",
"aurelia-kendoui-bridge/colorpicker/colorpicker",
"aurelia-kendoui-bridge/colorpalette/colorpalette",
"aurelia-kendoui-bridge/combobox/combobox",
"aurelia-kendoui-bridge/contextmenu/contextmenu",
"aurelia-kendoui-bridge/dialog/dialog",
"aurelia-kendoui-bridge/dropdownlist/dropdownlist",
"aurelia-kendoui-bridge/dropdowntree/dropdowntree",
"aurelia-kendoui-bridge/dropdowntree/dropdowntree",
"aurelia-kendoui-bridge/datetimepicker/datetimepicker",
"aurelia-kendoui-bridge/datepicker/datepicker",
"aurelia-kendoui-bridge/draggable/draggable",
Expand All @@ -168,7 +168,7 @@
"aurelia-kendoui-bridge/notification/notification",
"aurelia-kendoui-bridge/notification/notification-template",
"aurelia-kendoui-bridge/numerictextbox/numerictextbox",
"aurelia-kendoui-bridge/pager/pager",
"aurelia-kendoui-bridge/pager/pager",
"aurelia-kendoui-bridge/panelbar/panelbar",
"aurelia-kendoui-bridge/popup/popup",
"aurelia-kendoui-bridge/progressbar/progressbar",
Expand Down
Loading

0 comments on commit cc5731c

Please sign in to comment.