mirror of
https://github.com/akveo/ngx-admin.git
synced 2025-12-17 07:50:12 +01:00
fix(dependencies): update angular to 2.4.7
This commit is contained in:
parent
cd7520ed40
commit
1cce1b5f75
10 changed files with 309 additions and 536 deletions
|
|
@ -21,9 +21,10 @@ addons:
|
||||||
before_install:
|
before_install:
|
||||||
- curl -o- -L https://yarnpkg.com/install.sh | bash
|
- curl -o- -L https://yarnpkg.com/install.sh | bash
|
||||||
- export PATH=$HOME/.yarn/bin:$PATH
|
- export PATH=$HOME/.yarn/bin:$PATH
|
||||||
|
|
||||||
- npm config set spin false
|
- npm config set spin false
|
||||||
- npm i -g npm@latest
|
|
||||||
|
before_script:
|
||||||
|
- npm i -g npm@4
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- yarn
|
- yarn
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,6 @@ module.exports = function (options) {
|
||||||
name: 'zone.js',
|
name: 'zone.js',
|
||||||
path: 'zone.js/dist/long-stack-trace-zone.js'
|
path: 'zone.js/dist/long-stack-trace-zone.js'
|
||||||
},
|
},
|
||||||
'ts-helpers',
|
|
||||||
],
|
],
|
||||||
vendor: [
|
vendor: [
|
||||||
'@angular/platform-browser',
|
'@angular/platform-browser',
|
||||||
|
|
|
||||||
79
package.json
79
package.json
|
|
@ -6,15 +6,15 @@
|
||||||
"homepage": "http://akveo.github.io/ng2-admin/",
|
"homepage": "http://akveo.github.io/ng2-admin/",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/common": "2.4.4",
|
"@angular/common": "2.4.7",
|
||||||
"@angular/compiler": "2.4.4",
|
"@angular/compiler": "2.4.7",
|
||||||
"@angular/core": "2.4.4",
|
"@angular/core": "2.4.7",
|
||||||
"@angular/forms": "2.4.4",
|
"@angular/forms": "2.4.7",
|
||||||
"@angular/http": "2.4.4",
|
"@angular/http": "2.4.7",
|
||||||
"@angular/platform-browser": "2.4.4",
|
"@angular/platform-browser": "2.4.7",
|
||||||
"@angular/platform-browser-dynamic": "2.4.4",
|
"@angular/platform-browser-dynamic": "2.4.7",
|
||||||
"@angular/platform-server": "2.4.4",
|
"@angular/platform-server": "2.4.7",
|
||||||
"@angular/router": "3.4.4",
|
"@angular/router": "3.4.7",
|
||||||
"@angularclass/conventions-loader": "1.0.13",
|
"@angularclass/conventions-loader": "1.0.13",
|
||||||
"@angularclass/hmr": "1.2.2",
|
"@angularclass/hmr": "1.2.2",
|
||||||
"@angularclass/hmr-loader": "3.0.2",
|
"@angularclass/hmr-loader": "3.0.2",
|
||||||
|
|
@ -39,30 +39,30 @@
|
||||||
"jquery-slimscroll": "1.3.8",
|
"jquery-slimscroll": "1.3.8",
|
||||||
"leaflet": "0.7.7",
|
"leaflet": "0.7.7",
|
||||||
"leaflet-map": "0.2.1",
|
"leaflet-map": "0.2.1",
|
||||||
"lodash": "4.16.4",
|
"lodash": "4.17.4",
|
||||||
"ng2-bootstrap": "1.3.3",
|
"ng2-bootstrap": "1.3.3",
|
||||||
"ng2-ckeditor": "1.1.5",
|
"ng2-ckeditor": "1.1.5",
|
||||||
"ng2-completer": "1.0.0",
|
"ng2-completer": "1.1.0",
|
||||||
"ng2-smart-table": "0.5.3-0",
|
"ng2-smart-table": "0.5.3-0",
|
||||||
"ng2-tree": "2.0.0-alpha.0",
|
"ng2-tree": "2.0.0-alpha.3",
|
||||||
"ngx-uploader": "2.1.6",
|
"ngx-uploader": "2.1.6",
|
||||||
"normalize.css": "4.2.0",
|
"normalize.css": "5.0.0",
|
||||||
"reflect-metadata": "0.1.2",
|
"reflect-metadata": "0.1.9",
|
||||||
"rxjs": "5.0.3",
|
"rxjs": "5.1.1",
|
||||||
"tether": "1.4.0",
|
"tether": "1.4.0",
|
||||||
"zone.js": "0.7.6"
|
"zone.js": "0.7.7"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular/compiler-cli": "2.4.4",
|
"@angular/compiler-cli": "2.4.7",
|
||||||
"@angular/tsc-wrapped": "0.5.1",
|
"@angular/tsc-wrapped": "0.5.2",
|
||||||
"@types/electron": "1.3.20",
|
"@types/electron": "1.4.32",
|
||||||
"@types/fullcalendar": "2.7.36",
|
"@types/fullcalendar": "2.7.37",
|
||||||
"@types/hammerjs": "2.0.34",
|
"@types/hammerjs": "2.0.34",
|
||||||
"@types/jquery ": "2.0.40",
|
"@types/jquery ": "2.0.40",
|
||||||
"@types/jquery.slimscroll": "1.3.30",
|
"@types/jquery.slimscroll": "1.3.30",
|
||||||
"@types/lodash": "0.0.28",
|
"@types/lodash": "4.14.52",
|
||||||
"@types/node": "6.0.38",
|
"@types/node": "6.0.63",
|
||||||
"@types/source-map": "0.1.29",
|
"@types/source-map": "0.5.0",
|
||||||
"@types/uglify-js": "2.6.28",
|
"@types/uglify-js": "2.6.28",
|
||||||
"@types/webpack": "2.2.5",
|
"@types/webpack": "2.2.5",
|
||||||
"add-asset-html-webpack-plugin": "1.0.2",
|
"add-asset-html-webpack-plugin": "1.0.2",
|
||||||
|
|
@ -71,20 +71,20 @@
|
||||||
"awesome-typescript-loader": "3.0.3",
|
"awesome-typescript-loader": "3.0.3",
|
||||||
"bootstrap-loader": "2.0.0-beta.18",
|
"bootstrap-loader": "2.0.0-beta.18",
|
||||||
"codelyzer": "2.0.0",
|
"codelyzer": "2.0.0",
|
||||||
"compression-webpack-plugin": "0.3.1",
|
"compression-webpack-plugin": "0.3.2",
|
||||||
"copy-webpack-plugin": "4.0.1",
|
"copy-webpack-plugin": "4.0.1",
|
||||||
"css-loader": "0.26.1",
|
"css-loader": "0.26.1",
|
||||||
"electron": "1.4.0",
|
"electron": "1.6.0",
|
||||||
"es6-promise": "3.3.1",
|
"es6-promise": "4.0.5",
|
||||||
"es6-shim": "0.35.3",
|
"es6-shim": "0.35.3",
|
||||||
"es7-reflect-metadata": "1.6.0",
|
"es7-reflect-metadata": "1.6.0",
|
||||||
"exports-loader": "0.6.3",
|
"exports-loader": "0.6.3",
|
||||||
"expose-loader": "0.7.1",
|
"expose-loader": "0.7.2",
|
||||||
"extract-text-webpack-plugin": "2.0.0-beta.5",
|
"extract-text-webpack-plugin": "2.0.0-rc.3",
|
||||||
"file-loader": "0.9.0",
|
"file-loader": "0.10.0",
|
||||||
"find-root": "1.0.0",
|
"find-root": "1.0.0",
|
||||||
"gh-pages": "0.11.0",
|
"gh-pages": "0.12.0",
|
||||||
"html-webpack-plugin": "2.26.0",
|
"html-webpack-plugin": "2.28.0",
|
||||||
"imports-loader": "0.7.0",
|
"imports-loader": "0.7.0",
|
||||||
"json-loader": "0.5.4",
|
"json-loader": "0.5.4",
|
||||||
"ng-router-loader": "2.1.0",
|
"ng-router-loader": "2.1.0",
|
||||||
|
|
@ -98,23 +98,22 @@
|
||||||
"resolve-url-loader": "1.6.1",
|
"resolve-url-loader": "1.6.1",
|
||||||
"rimraf": "2.5.4",
|
"rimraf": "2.5.4",
|
||||||
"sass-loader": "4.1.1",
|
"sass-loader": "4.1.1",
|
||||||
"script-ext-html-webpack-plugin": "1.5.0",
|
"script-ext-html-webpack-plugin": "1.7.1",
|
||||||
"source-map-loader": "0.1.6",
|
"source-map-loader": "0.1.6",
|
||||||
"string-replace-loader": "1.0.5",
|
"string-replace-loader": "1.0.5",
|
||||||
"style-loader": "0.13.1",
|
"style-loader": "0.13.1",
|
||||||
"to-string-loader": "1.1.5",
|
"to-string-loader": "1.1.5",
|
||||||
"ts-helpers": "1.1.2",
|
"ts-node": "2.1.0",
|
||||||
"ts-node": "2.0.0",
|
"tslib": "1.5.0",
|
||||||
"tslint": "4.4.2",
|
"tslint": "4.4.2",
|
||||||
"typedoc": "0.5.5",
|
"typedoc": "0.5.5",
|
||||||
"typescript": "2.1.5",
|
"typescript": "2.1.6",
|
||||||
"url-loader": "0.5.7",
|
"url-loader": "0.5.7",
|
||||||
"webpack": "2.2.0",
|
"webpack": "2.2.1",
|
||||||
"webpack-dashboard": "0.2.1",
|
"webpack-dev-middleware": "1.10.0",
|
||||||
"webpack-dev-middleware": "1.9.0",
|
"webpack-dev-server": "2.3.0",
|
||||||
"webpack-dev-server": "2.2.0",
|
|
||||||
"webpack-dll-bundles-plugin": "1.0.0-beta.5",
|
"webpack-dll-bundles-plugin": "1.0.0-beta.5",
|
||||||
"webpack-merge": "2.6.0"
|
"webpack-merge": "2.6.1"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"rimraf": "rimraf",
|
"rimraf": "rimraf",
|
||||||
|
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
import { PAGES_MENU } from './pages/pages.menu';
|
|
||||||
|
|
||||||
export const MENU = [
|
|
||||||
...PAGES_MENU
|
|
||||||
];
|
|
||||||
|
|
@ -2,7 +2,7 @@ import { Component } from '@angular/core';
|
||||||
import { Routes } from '@angular/router';
|
import { Routes } from '@angular/router';
|
||||||
|
|
||||||
import { BaMenuService } from '../theme';
|
import { BaMenuService } from '../theme';
|
||||||
import { MENU } from '../app.menu';
|
import { PAGES_MENU } from './pages.menu';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'pages',
|
selector: 'pages',
|
||||||
|
|
@ -36,6 +36,6 @@ export class Pages {
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this._menuService.updateMenuByRoutes(<Routes>MENU);
|
this._menuService.updateMenuByRoutes(<Routes>PAGES_MENU);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
import {Injectable} from '@angular/core';
|
import {Injectable} from '@angular/core';
|
||||||
import {Router, Routes} from '@angular/router';
|
import {Router, Routes} from '@angular/router';
|
||||||
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
|
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,9 +28,6 @@ import 'core-js/es6/reflect';
|
||||||
import 'core-js/es7/reflect';
|
import 'core-js/es7/reflect';
|
||||||
import 'zone.js/dist/zone';
|
import 'zone.js/dist/zone';
|
||||||
|
|
||||||
// Typescript emit helpers polyfill
|
|
||||||
import 'ts-helpers';
|
|
||||||
|
|
||||||
if ('production' === ENV) {
|
if ('production' === ENV) {
|
||||||
// Production
|
// Production
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,13 +5,15 @@
|
||||||
"moduleResolution": "node",
|
"moduleResolution": "node",
|
||||||
"emitDecoratorMetadata": true,
|
"emitDecoratorMetadata": true,
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
|
"allowSyntheticDefaultImports": true,
|
||||||
"sourceMap": true,
|
"sourceMap": true,
|
||||||
"baseUrl": "./src",
|
"noEmit": true,
|
||||||
"paths": {
|
"noEmitHelpers": true,
|
||||||
},
|
"importHelpers": true,
|
||||||
|
"strictNullChecks": false,
|
||||||
"lib": [
|
"lib": [
|
||||||
"es2015",
|
"dom",
|
||||||
"dom"
|
"es6"
|
||||||
],
|
],
|
||||||
"typeRoots": [
|
"typeRoots": [
|
||||||
"node_modules/@types"
|
"node_modules/@types"
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,16 @@
|
||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "es5",
|
"target": "es5",
|
||||||
"module": "commonjs",
|
"module": "es2015",
|
||||||
"moduleResolution": "node",
|
"moduleResolution": "node",
|
||||||
"emitDecoratorMetadata": true,
|
"emitDecoratorMetadata": true,
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
|
"allowSyntheticDefaultImports": true,
|
||||||
"sourceMap": true,
|
"sourceMap": true,
|
||||||
"baseUrl": "./src",
|
"noEmit": true,
|
||||||
"outDir": "compiled",
|
"noEmitHelpers": true,
|
||||||
"paths": {
|
"importHelpers": true,
|
||||||
},
|
"strictNullChecks": false,
|
||||||
"lib": [
|
"lib": [
|
||||||
"es2015",
|
"es2015",
|
||||||
"dom"
|
"dom"
|
||||||
|
|
@ -21,7 +22,6 @@
|
||||||
"exclude": [
|
"exclude": [
|
||||||
"node_modules",
|
"node_modules",
|
||||||
"dist",
|
"dist",
|
||||||
"compiled",
|
|
||||||
"src/**/*.spec.ts",
|
"src/**/*.spec.ts",
|
||||||
"src/**/*.e2e.ts"
|
"src/**/*.e2e.ts"
|
||||||
],
|
],
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
"useWebpackText": true
|
"useWebpackText": true
|
||||||
},
|
},
|
||||||
"angularCompilerOptions": {
|
"angularCompilerOptions": {
|
||||||
"genDir": "compiled",
|
"genDir": "./compiled",
|
||||||
"skipMetadataEmit": true
|
"skipMetadataEmit": true
|
||||||
},
|
},
|
||||||
"compileOnSave": false,
|
"compileOnSave": false,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue