tech: systemjs upgrade

This commit is contained in:
Torkel Ödegaard 2017-09-28 10:37:33 +02:00
parent 9ee343f33d
commit 487c475a1e
6 changed files with 256 additions and 327 deletions

View File

@ -28,7 +28,6 @@ module.exports = function(config) {
singleRun: true,
autoWatchBatchDelay: 1000,
browserNoActivityTimeout: 60000,
});
};

View File

@ -14,7 +14,7 @@
"@types/react-dom": "^15.5.4",
"autoprefixer": "^6.4.0",
"es6-promise": "^3.0.2",
"es6-shim": "^0.35.1",
"es6-shim": "^0.35.3",
"expect.js": "~0.2.0",
"glob": "~7.0.0",
"grunt": "^0.4.5",
@ -39,20 +39,18 @@
"grunt-string-replace": "~1.3.1",
"grunt-usemin": "3.1.1",
"jshint-stylish": "~2.2.1",
"karma": "1.3.0",
"karma-chrome-launcher": "~2.0.0",
"karma": "1.7.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage": "1.1.1",
"karma-expect": "~1.1.3",
"karma-mocha": "~1.3.0",
"karma-phantomjs-launcher": "1.0.2",
"karma-phantomjs-launcher": "1.0.4",
"load-grunt-tasks": "3.5.2",
"mocha": "3.2.0",
"phantomjs-prebuilt": "^2.1.14",
"reflect-metadata": "0.1.8",
"mocha": "3.5.0",
"phantomjs-prebuilt": "^2.1.15",
"rxjs": "^5.4.3",
"sass-lint": "^1.10.2",
"systemjs": "0.20.19",
"zone.js": "^0.7.2"
"systemjs": "0.20.19"
},
"scripts": {
"build": "./node_modules/grunt-cli/bin/grunt",

View File

@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';
import coreModule from '../core_module';
export interface IProps {
@ -36,3 +36,4 @@ export class PasswordStrength extends React.Component<IProps, any> {
coreModule.directive('passwordStrength', function(reactDirective) {
return reactDirective(PasswordStrength, ['password']);
});

View File

@ -53,11 +53,6 @@ System.config({
test: {
defaultExtension: 'js',
},
'angular-strap': {
meta: {
deps: ['angular']
}
}
},
map: {

View File

@ -8,7 +8,7 @@
System.config({
baseURL: '/base/',
defaultJSExtensions: true,
defaultExtension: 'js',
paths: {
'react': 'vendor/npm/react/dist/react.js',
'react-dom': 'vendor/npm/react-dom/dist/react-dom.js',
@ -55,12 +55,18 @@
vendor: {
defaultExtension: 'js',
},
test: {
defaultExtension: 'js',
}
},
map: {
},
meta: {
'vendor/angular-other/angular-strap.js': {
deps: ['angular']
},
'vendor/npm/angular/angular.js': {
format: 'global',
deps: ['jquery'],

550
yarn.lock

File diff suppressed because it is too large Load Diff