Skip to content

Commit

Permalink
1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Arne Deruwe committed Apr 14, 2018
1 parent fa5c7cc commit 02c7140
Show file tree
Hide file tree
Showing 383 changed files with 3,902 additions and 3,122 deletions.
34 changes: 17 additions & 17 deletions bundles/bundle.js

Large diffs are not rendered by default.

604 changes: 304 additions & 300 deletions config.js

Large diffs are not rendered by default.

610 changes: 307 additions & 303 deletions config2.js

Large diffs are not rendered by default.

136 changes: 68 additions & 68 deletions jspm_packages/.dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,13 @@
"process": "github:jspm/nodelibs-process@^0.1.0"
},
"npm:indexof@0.0.1": {},
"npm:aurelia-history@1.0.0": {},
"npm:aurelia-logging-console@1.0.0": {
"aurelia-logging": "npm:aurelia-logging@^1.0.0"
},
"npm:aurelia-loader@1.0.0": {
"aurelia-metadata": "npm:aurelia-metadata@^1.0.0",
"aurelia-path": "npm:aurelia-path@^1.0.0"
},
"npm:aurelia-history-browser@1.0.0": {
"aurelia-history": "npm:aurelia-history@^1.0.0",
"aurelia-pal": "npm:aurelia-pal@^1.0.0"
},
"npm:aurelia-route-recognizer@1.1.0": {
"aurelia-path": "npm:aurelia-path@^1.0.0"
},
"npm:aurelia-metadata@1.0.3": {
"aurelia-pal": "npm:aurelia-pal@^1.0.0"
},
Expand Down Expand Up @@ -82,60 +74,87 @@
"aurelia-task-queue": "npm:aurelia-task-queue@^1.0.0",
"aurelia-templating": "npm:aurelia-templating@^1.0.0"
},
"npm:ieee754@1.1.8": {},
"npm:aurelia-templating-binding@1.3.0": {
"aurelia-binding": "npm:aurelia-binding@^1.1.0",
"aurelia-logging": "npm:aurelia-logging@^1.0.0",
"aurelia-templating": "npm:aurelia-templating@^1.3.0"
"npm:process@0.11.10": {
"assert": "github:jspm/nodelibs-assert@^0.1.0",
"vm": "github:jspm/nodelibs-vm@^0.1.0",
"fs": "github:jspm/nodelibs-fs@^0.1.0"
},
"npm:aurelia-task-queue@1.2.0": {
"github:jspm/nodelibs-buffer@0.1.1": {
"buffer": "npm:buffer@^5.0.6"
},
"npm:aurelia-dependency-injection@1.3.2": {
"aurelia-metadata": "npm:aurelia-metadata@^1.0.0",
"aurelia-pal": "npm:aurelia-pal@^1.0.0"
},
"npm:aurelia-templating-router@1.1.0": {
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.0.0",
"npm:aurelia-pal@1.7.0": {},
"npm:aurelia-history@1.1.0": {},
"npm:aurelia-logging@1.4.0": {},
"npm:aurelia-task-queue@1.2.1": {
"aurelia-pal": "npm:aurelia-pal@^1.0.0"
},
"npm:aurelia-templating-binding@1.4.1": {
"aurelia-binding": "npm:aurelia-binding@^1.3.0",
"aurelia-logging": "npm:aurelia-logging@^1.0.0",
"aurelia-templating": "npm:aurelia-templating@^1.3.0"
},
"npm:aurelia-animator-css@1.0.4": {
"aurelia-metadata": "npm:aurelia-metadata@^1.0.0",
"aurelia-pal": "npm:aurelia-pal@^1.3.0",
"aurelia-path": "npm:aurelia-path@^1.0.0",
"aurelia-router": "npm:aurelia-router@^1.0.1",
"aurelia-templating": "npm:aurelia-templating@^1.3.0",
"aurelia-binding": "npm:aurelia-binding@^1.0.9"
"aurelia-pal": "npm:aurelia-pal@^1.0.0",
"aurelia-templating": "npm:aurelia-templating@^1.0.0"
},
"npm:aurelia-loader-default@1.0.2": {
"npm:aurelia-loader-default@1.0.4": {
"aurelia-loader": "npm:aurelia-loader@^1.0.0",
"aurelia-metadata": "npm:aurelia-metadata@^1.0.0",
"aurelia-pal": "npm:aurelia-pal@^1.0.0"
},
"npm:aurelia-logging@1.3.1": {},
"npm:aurelia-animator-css@1.0.2": {
"aurelia-metadata": "npm:aurelia-metadata@^1.0.0",
"aurelia-pal": "npm:aurelia-pal@^1.0.0",
"aurelia-templating": "npm:aurelia-templating@^1.0.0"
"npm:aurelia-polyfills@1.3.0": {
"aurelia-pal": "npm:aurelia-pal@^1.0.0"
},
"npm:aurelia-http-client@1.1.1": {
"aurelia-pal": "npm:aurelia-pal@^1.0.0",
"npm:aurelia-pal-browser@1.7.0": {
"aurelia-pal": "npm:aurelia-pal@^1.4.0"
},
"npm:aurelia-history-browser@1.1.1": {
"aurelia-history": "npm:aurelia-history@^1.0.0",
"aurelia-pal": "npm:aurelia-pal@^1.0.0"
},
"npm:aurelia-route-recognizer@1.1.1": {
"aurelia-path": "npm:aurelia-path@^1.0.0"
},
"npm:aurelia-router@1.3.0": {
"npm:aurelia-fetch-client@1.3.1": {},
"npm:aurelia-http-client@1.2.1": {
"aurelia-pal": "npm:aurelia-pal@^1.0.0",
"aurelia-path": "npm:aurelia-path@^1.1.1"
},
"npm:aurelia-templating-router@1.3.1": {
"aurelia-binding": "npm:aurelia-binding@^1.3.0",
"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",
"aurelia-pal": "npm:aurelia-pal@^1.3.0",
"aurelia-path": "npm:aurelia-path@^1.0.0",
"aurelia-router": "npm:aurelia-router@^1.5.0",
"aurelia-templating": "npm:aurelia-templating@^1.5.0"
},
"npm:aurelia-router@1.5.0": {
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.0.0",
"aurelia-event-aggregator": "npm:aurelia-event-aggregator@^1.0.0",
"aurelia-history": "npm:aurelia-history@^1.0.0",
"aurelia-history": "npm:aurelia-history@^1.1.0",
"aurelia-logging": "npm:aurelia-logging@^1.0.0",
"aurelia-path": "npm:aurelia-path@^1.0.0",
"aurelia-route-recognizer": "npm:aurelia-route-recognizer@^1.0.0"
},
"npm:aurelia-templating-resources@1.4.0": {
"aurelia-binding": "npm:aurelia-binding@^1.1.0",
"npm:aurelia-framework@1.2.0": {
"aurelia-binding": "npm:aurelia-binding@^1.0.0",
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.0.0",
"aurelia-loader": "npm:aurelia-loader@^1.0.0",
"aurelia-logging": "npm:aurelia-logging@^1.0.0",
"aurelia-metadata": "npm:aurelia-metadata@^1.0.0",
"aurelia-pal": "npm:aurelia-pal@^1.3.0",
"aurelia-pal": "npm:aurelia-pal@^1.0.0",
"aurelia-path": "npm:aurelia-path@^1.0.0",
"aurelia-task-queue": "npm:aurelia-task-queue@^1.0.0",
"aurelia-templating": "npm:aurelia-templating@^1.3.0"
"aurelia-templating": "npm:aurelia-templating@^1.0.0"
},
"npm:aurelia-templating@1.4.2": {
"npm:aurelia-templating@1.7.0": {
"aurelia-binding": "npm:aurelia-binding@^1.0.0",
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.0.0",
"aurelia-loader": "npm:aurelia-loader@^1.0.0",
Expand All @@ -145,50 +164,25 @@
"aurelia-path": "npm:aurelia-path@^1.0.0",
"aurelia-task-queue": "npm:aurelia-task-queue@^1.1.0"
},
"npm:process@0.11.10": {
"assert": "github:jspm/nodelibs-assert@^0.1.0",
"vm": "github:jspm/nodelibs-vm@^0.1.0",
"fs": "github:jspm/nodelibs-fs@^0.1.0"
},
"github:jspm/nodelibs-buffer@0.1.1": {
"buffer": "npm:buffer@^5.0.6"
},
"npm:base64-js@1.2.1": {},
"npm:aurelia-polyfills@1.2.2": {
"aurelia-pal": "npm:aurelia-pal@^1.0.0"
},
"npm:aurelia-framework@1.1.4": {
"aurelia-binding": "npm:aurelia-binding@^1.0.0",
"npm:aurelia-templating-resources@1.6.0": {
"aurelia-binding": "npm:aurelia-binding@^1.7.1",
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.0.0",
"aurelia-loader": "npm:aurelia-loader@^1.0.0",
"aurelia-logging": "npm:aurelia-logging@^1.0.0",
"aurelia-metadata": "npm:aurelia-metadata@^1.0.0",
"aurelia-pal": "npm:aurelia-pal@^1.0.0",
"aurelia-pal": "npm:aurelia-pal@^1.3.0",
"aurelia-path": "npm:aurelia-path@^1.0.0",
"aurelia-task-queue": "npm:aurelia-task-queue@^1.0.0",
"aurelia-templating": "npm:aurelia-templating@^1.0.0"
},
"npm:buffer@5.0.7": {
"base64-js": "npm:base64-js@^1.0.2",
"ieee754": "npm:ieee754@^1.1.4"
"aurelia-templating": "npm:aurelia-templating@^1.5.0"
},
"npm:aurelia-pal@1.4.0": {},
"npm:aurelia-pal-browser@1.3.0": {
"aurelia-pal": "npm:aurelia-pal@^1.4.0"
},
"npm:aurelia-dependency-injection@1.3.2": {
"aurelia-metadata": "npm:aurelia-metadata@^1.0.0",
"aurelia-pal": "npm:aurelia-pal@^1.0.0"
},
"npm:aurelia-fetch-client@1.1.3": {},
"github:systemjs/plugin-css@0.1.36": {},
"npm:aurelia-binding@1.2.2": {
"github:systemjs/plugin-css@0.1.37": {},
"npm:aurelia-binding@1.7.1": {
"aurelia-logging": "npm:aurelia-logging@^1.0.0",
"aurelia-metadata": "npm:aurelia-metadata@^1.0.0",
"aurelia-pal": "npm:aurelia-pal@^1.0.0",
"aurelia-task-queue": "npm:aurelia-task-queue@^1.0.0"
},
"npm:aurelia-kendoui-bridge@1.6.5": {
"npm:aurelia-kendoui-bridge@1.7.0": {
"aurelia-binding": "npm:aurelia-binding@^1.0.4",
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.0.0",
"aurelia-logging": "npm:aurelia-logging@^1.0.0",
Expand All @@ -198,5 +192,11 @@
"aurelia-task-queue": "npm:aurelia-task-queue@^1.0.0",
"aurelia-templating": "npm:aurelia-templating@^1.1.0",
"aurelia-templating-resources": "npm:aurelia-templating-resources@^1.0.0"
},
"npm:ieee754@1.1.11": {},
"npm:base64-js@1.2.3": {},
"npm:buffer@5.1.0": {
"base64-js": "npm:base64-js@^1.0.2",
"ieee754": "npm:ieee754@^1.1.4"
}
}
1 change: 0 additions & 1 deletion jspm_packages/github/systemjs/plugin-css@0.1.36.js

This file was deleted.

1 change: 0 additions & 1 deletion jspm_packages/github/systemjs/plugin-css@0.1.36/.jspm-hash

This file was deleted.

1 change: 1 addition & 0 deletions jspm_packages/github/systemjs/plugin-css@0.1.37.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("github:systemjs/plugin-css@0.1.37/css");
1 change: 1 addition & 0 deletions jspm_packages/github/systemjs/plugin-css@0.1.37/.jspm-hash
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12e6185a60ee79f1d757834740a6e24d9ea497f999914b932bd37a50b983c5e7c90ae93bjspm-github@0.13.10.16.1
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ exports.bundle = function(loads, compileOpts, outputOpts) {
}
}), atUrl({
url: function(fileName, decl, from, dirname, to, options, result) {
if ((absUrl(fileName) && fileName.charAt(0) !== '/') || fileName.match(/^%23/))
if ((absUrl(fileName) && (!loader.browserRootURL || fileName.charAt(0) !== '/')) || fileName.match(/^%23/))
return fileName;

// dirname may be renormalized to cwd
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "systemjs-plugin-css",
"version": "0.1.36",
"version": "0.1.37",
"main": "css",
"registry": "jspm",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,41 @@ describe('CSS Builder', function() {
});
});

describe('with a browserRootURL config', function () {
it('should preprend it to a relative url(...) reference', function () {
var builder = new Builder();
builder.config(System.getConfig());
builder.config({
browserRootURL: 'https://example.com/',
rootURL: './test'
});
return builder.compile('test/data/test.css!', {minify: false}).then((results) => {
return expect(results.source).to.contain("body{background-color:red;background-image:url(https://example.com/data/x.png)}");
});
});

it('should preprend it to a root-relative url(...) reference', function () {
var builder = new Builder();
builder.config(System.getConfig());
builder.config({
browserRootURL: 'https://example.com/',
rootURL: './test'
});
return builder.compile('test/data/rootRelative.css!', {minify: false}).then((results) => {
return expect(results.source).to.contain("body{background-color:red;background-image:url(https://example.com/path/to/x.png)}");
});
});
});

// https://github.com/systemjs/plugin-css/pull/135#commitcomment-24415595
it('should handle a root-relative url when no rootURL and no browserRootURL are configured', function () {
var builder = new Builder();
builder.config(System.getConfig());
return builder.compile('test/data/rootRelative.css!', {minify: false}).then((results) => {
return expect(results.source).to.contain("body{background-color:red;background-image:url(/path/to/x.png)}");
});
});

it('Should support buildCSS: false', function() {
var builder = new Builder();
builder.config(System.getConfig());
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import "./dep.css";

body {
background-color: red;
background-image: url(/path/to/x.png);
}
3 changes: 0 additions & 3 deletions jspm_packages/npm/aurelia-animator-css@1.0.2.js

This file was deleted.

1 change: 0 additions & 1 deletion jspm_packages/npm/aurelia-animator-css@1.0.2/.jspm-hash

This file was deleted.

3 changes: 3 additions & 0 deletions jspm_packages/npm/aurelia-animator-css@1.0.4.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
define(["npm:aurelia-animator-css@1.0.4/aurelia-animator-css"], function(main) {
return main;
});
1 change: 1 addition & 0 deletions jspm_packages/npm/aurelia-animator-css@1.0.4/.jspm-hash
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8336ab84f9a8bf60a4536e99145e73a80c0f0dac99914b932bd37a50b983c5e7c90ae93bjspm-npm@0.260.16.1
Loading

0 comments on commit 02c7140

Please sign in to comment.