Skip to content

N
nexpie-grafana-theme
Commit 9ee343f3 by Torkel Ödegaard
Options

tech: systemjs upgrade

parent 5373a602
Showing with 48 additions and 36 deletions
package.json
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
"grunt-postcss": "^0.8.0", "grunt-postcss": "^0.8.0",
"grunt-sass": "^2.0.0", "grunt-sass": "^2.0.0",
"grunt-string-replace": "~1.3.1", "grunt-string-replace": "~1.3.1",
"grunt-systemjs-builder": "^0.2.7",
"grunt-usemin": "3.1.1", "grunt-usemin": "3.1.1",
"jshint-stylish": "~2.2.1", "jshint-stylish": "~2.2.1",
"karma": "1.3.0", "karma": "1.3.0",
...@@ -52,7 +51,7 @@ ...@@ -52,7 +51,7 @@
"reflect-metadata": "0.1.8", "reflect-metadata": "0.1.8",
"rxjs": "^5.4.3", "rxjs": "^5.4.3",
"sass-lint": "^1.10.2", "sass-lint": "^1.10.2",
"systemjs": "0.19.41", "systemjs": "0.20.19",
"zone.js": "^0.7.2" "zone.js": "^0.7.2"
}, },
"scripts": { "scripts": {
...@@ -86,7 +85,7 @@ ...@@ -86,7 +85,7 @@
"react-test-renderer": "^15.6.1", "react-test-renderer": "^15.6.1",
"remarkable": "^1.7.1", "remarkable": "^1.7.1",
"sinon": "1.17.6", "sinon": "1.17.6",
"systemjs-builder": "^0.15.34", "systemjs-builder": "^0.16.10",
"tether": "^1.4.0", "tether": "^1.4.0",
"tether-drop": "https://github.com/torkelo/drop", "tether-drop": "https://github.com/torkelo/drop",
"tslint": "^5.7.0", "tslint": "^5.7.0",
......
public/app/system.conf.js
System.config({ System.config({
defaultJSExtenions: true, warnings: true,
defaultExtenion: 'js',
baseURL: 'public', baseURL: 'public',
paths: { paths: {
'react': 'vendor/npm/react/dist/react.js', 'react': 'vendor/npm/react/dist/react.js',
...@@ -52,6 +53,11 @@ System.config({ ...@@ -52,6 +53,11 @@ System.config({
test: { test: {
defaultExtension: 'js', defaultExtension: 'js',
}, },
'angular-strap': {
meta: {
deps: ['angular']
}
}
}, },
map: { map: {
...@@ -60,6 +66,9 @@ System.config({ ...@@ -60,6 +66,9 @@ System.config({
}, },
meta: { meta: {
'vendor/angular-other/angular-strap.js': {
deps: ['angular']
},
'vendor/npm/virtual-scroll/src/indx.js': { 'vendor/npm/virtual-scroll/src/indx.js': {
format: 'cjs', format: 'cjs',
exports: 'VirtualScroll', exports: 'VirtualScroll',
......
yarn.lock
...@@ -318,7 +318,7 @@ babel-code-frame@^6.22.0: ...@@ -318,7 +318,7 @@ babel-code-frame@^6.22.0:
esutils "^2.0.2" esutils "^2.0.2"
js-tokens "^3.0.0" js-tokens "^3.0.0"
babel-core@^6.24.1, babel-core@^6.9.0: babel-core@^6.24.1:
version "6.25.0" version "6.25.0"
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729"
dependencies: dependencies:
...@@ -375,9 +375,19 @@ babel-messages@^6.23.0: ...@@ -375,9 +375,19 @@ babel-messages@^6.23.0:
dependencies: dependencies:
babel-runtime "^6.22.0" babel-runtime "^6.22.0"
babel-plugin-transform-cjs-system-wrapper@^0.3.0: babel-plugin-syntax-dynamic-import@^6.18.0:
version "0.3.0" version "6.18.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-cjs-system-wrapper/-/babel-plugin-transform-cjs-system-wrapper-0.3.0.tgz#f5759f29becd356faab7af52c99cde8e7bad0b21" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
babel-plugin-transform-amd-system-wrapper@^0.3.7:
version "0.3.7"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-amd-system-wrapper/-/babel-plugin-transform-amd-system-wrapper-0.3.7.tgz#521c782d35644491c979ea683e8a5e1caff0ba42"
dependencies:
babel-template "^6.9.0"
babel-plugin-transform-cjs-system-wrapper@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-cjs-system-wrapper/-/babel-plugin-transform-cjs-system-wrapper-0.6.2.tgz#bd7494775289424ff493b6ed455de495bd71ba1d"
dependencies: dependencies:
babel-template "^6.9.0" babel-template "^6.9.0"
...@@ -389,13 +399,13 @@ babel-plugin-transform-es2015-modules-systemjs@^6.6.5: ...@@ -389,13 +399,13 @@ babel-plugin-transform-es2015-modules-systemjs@^6.6.5:
babel-runtime "^6.22.0" babel-runtime "^6.22.0"
babel-template "^6.24.1" babel-template "^6.24.1"
babel-plugin-transform-global-system-wrapper@0.0.1: babel-plugin-transform-global-system-wrapper@^0.3.4:
version "0.0.1" version "0.3.4"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-global-system-wrapper/-/babel-plugin-transform-global-system-wrapper-0.0.1.tgz#afb469cec0e04689b9fe7e8b1fd280fc94a6d8f2" resolved "https://registry.yarnpkg.com/babel-plugin-transform-global-system-wrapper/-/babel-plugin-transform-global-system-wrapper-0.3.4.tgz#948dd7d29fc21447e39bd3447f2debc7f2f73aac"
dependencies: dependencies:
babel-template "^6.9.0" babel-template "^6.9.0"
babel-plugin-transform-system-register@0.0.1: babel-plugin-transform-system-register@^0.0.1:
version "0.0.1" version "0.0.1"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-system-register/-/babel-plugin-transform-system-register-0.0.1.tgz#9dff40390c2763ac518f0b2ad7c5ea4f65a5be25" resolved "https://registry.yarnpkg.com/babel-plugin-transform-system-register/-/babel-plugin-transform-system-register-0.0.1.tgz#9dff40390c2763ac518f0b2ad7c5ea4f65a5be25"
...@@ -1772,7 +1782,7 @@ glob@7.0.5: ...@@ -1772,7 +1782,7 @@ glob@7.0.5:
once "^1.3.0" once "^1.3.0"
path-is-absolute "^1.0.0" path-is-absolute "^1.0.0"
glob@^7.0.0, glob@^7.1.1, glob@~7.1.1: glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@~7.1.1:
version "7.1.2" version "7.1.2"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
dependencies: dependencies:
...@@ -1783,7 +1793,7 @@ glob@^7.0.0, glob@^7.1.1, glob@~7.1.1: ...@@ -1783,7 +1793,7 @@ glob@^7.0.0, glob@^7.1.1, glob@~7.1.1:
once "^1.3.0" once "^1.3.0"
path-is-absolute "^1.0.0" path-is-absolute "^1.0.0"
glob@^7.0.3, glob@^7.0.5, glob@~7.0.0: glob@^7.0.5, glob@~7.0.0:
version "7.0.6" version "7.0.6"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a" resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
dependencies: dependencies:
...@@ -2065,12 +2075,6 @@ grunt-sync@^0.6.2: ...@@ -2065,12 +2075,6 @@ grunt-sync@^0.6.2:
md5-file "^2.0.3" md5-file "^2.0.3"
promised-io "0.3.5" promised-io "0.3.5"
grunt-systemjs-builder@^0.2.7:
version "0.2.7"
resolved "https://registry.yarnpkg.com/grunt-systemjs-builder/-/grunt-systemjs-builder-0.2.7.tgz#e1ba74ec95dd03f7706ae2e22cf4ef0e1bd29cc9"
dependencies:
systemjs-builder "0.14.11 - 0.15.x"
grunt-usemin@3.1.1: grunt-usemin@3.1.1:
version "3.1.1" version "3.1.1"
resolved "https://registry.yarnpkg.com/grunt-usemin/-/grunt-usemin-3.1.1.tgz#5ab679510d672cea566cc717abe8b8a009f641c2" resolved "https://registry.yarnpkg.com/grunt-usemin/-/grunt-usemin-3.1.1.tgz#5ab679510d672cea566cc717abe8b8a009f641c2"
...@@ -4484,15 +4488,17 @@ symbol-observable@^1.0.1: ...@@ -4484,15 +4488,17 @@ symbol-observable@^1.0.1:
version "1.0.4" version "1.0.4"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
"systemjs-builder@0.14.11 - 0.15.x", systemjs-builder@^0.15.34: systemjs-builder@^0.16.10:
version "0.15.36" version "0.16.11"
resolved "https://registry.yarnpkg.com/systemjs-builder/-/systemjs-builder-0.15.36.tgz#30b02372d4227cf37880f580fe67cb4edb7f1420" resolved "https://registry.yarnpkg.com/systemjs-builder/-/systemjs-builder-0.16.11.tgz#8b091687ef3dd6127eefe7d2781ed16edbce89a1"
dependencies: dependencies:
babel-core "^6.9.0" babel-core "^6.24.1"
babel-plugin-transform-cjs-system-wrapper "^0.3.0" babel-plugin-syntax-dynamic-import "^6.18.0"
babel-plugin-transform-amd-system-wrapper "^0.3.7"
babel-plugin-transform-cjs-system-wrapper "^0.6.2"
babel-plugin-transform-es2015-modules-systemjs "^6.6.5" babel-plugin-transform-es2015-modules-systemjs "^6.6.5"
babel-plugin-transform-global-system-wrapper "0.0.1" babel-plugin-transform-global-system-wrapper "^0.3.4"
babel-plugin-transform-system-register "0.0.1" babel-plugin-transform-system-register "^0.0.1"
bluebird "^3.3.4" bluebird "^3.3.4"
data-uri-to-buffer "0.0.4" data-uri-to-buffer "0.0.4"
es6-template-strings "^2.0.0" es6-template-strings "^2.0.0"
...@@ -4500,17 +4506,15 @@ symbol-observable@^1.0.1: ...@@ -4500,17 +4506,15 @@ symbol-observable@^1.0.1:
mkdirp "^0.5.1" mkdirp "^0.5.1"
rollup "^0.36.3" rollup "^0.36.3"
source-map "^0.5.3" source-map "^0.5.3"
systemjs "^0.19.43" systemjs "^0.19.46"
traceur "0.0.105" traceur "0.0.105"
uglify-js "~2.7.5" uglify-js "^2.6.1"
systemjs@0.19.41: systemjs@0.20.19:
version "0.19.41" version "0.20.19"
resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.19.41.tgz#835d2c0f10bf403b551fedc875f84bb44a02c4eb" resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.20.19.tgz#c2b9e79c19f4bea53a19b1ed3f974ffb463be949"
dependencies:
when "^3.7.5"
systemjs@^0.19.43: systemjs@^0.19.46:
version "0.19.47" version "0.19.47"
resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.19.47.tgz#c8c93937180f3f5481c769cd2720763fb4a31c6f" resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.19.47.tgz#c8c93937180f3f5481c769cd2720763fb4a31c6f"
dependencies: dependencies:
...@@ -4732,7 +4736,7 @@ uglify-js@2.6.x: ...@@ -4732,7 +4736,7 @@ uglify-js@2.6.x:
uglify-to-browserify "~1.0.0" uglify-to-browserify "~1.0.0"
yargs "~3.10.0" yargs "~3.10.0"
uglify-js@2.7.x, uglify-js@^2.6, uglify-js@~2.7.0, uglify-js@~2.7.5: uglify-js@2.7.x, uglify-js@^2.6, uglify-js@^2.6.1, uglify-js@~2.7.0:
version "2.7.5" version "2.7.5"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
dependencies: dependencies:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment