Browse Source

Updated packages and got rid of warnings.

pull/337/head
Sebastian Stehle 7 years ago
parent
commit
e636f3ca07
  1. 2
      src/Squidex/.vscode/settings.json
  2. 6
      src/Squidex/Areas/Frontend/Middlewares/WebpackMiddleware.cs
  3. 21
      src/Squidex/app-config/karma.coverage.conf.js
  4. 15
      src/Squidex/app-config/webpack.config.js
  5. 4
      src/Squidex/app-config/webpack.run.dev.js
  6. 2
      src/Squidex/app-config/webpack.run.prod.js
  7. 18
      src/Squidex/app/declarations.d.ts
  8. 2
      src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts
  9. 3
      src/Squidex/app/framework/angular/forms/checkbox-group.component.ts
  10. 4
      src/Squidex/app/framework/angular/forms/date-time-editor.component.ts
  11. 2
      src/Squidex/app/framework/angular/forms/progress-bar.component.ts
  12. 2
      src/Squidex/app/framework/angular/sorted.directive.ts
  13. 4
      src/Squidex/app/framework/services/shortcut.service.ts
  14. 1193
      src/Squidex/package-lock.json
  15. 60
      src/Squidex/package.json

2
src/Squidex/.vscode/settings.json

@ -23,6 +23,8 @@
"**/*.user": true, "**/*.user": true,
"**/*.xproj": true, "**/*.xproj": true,
"**/*.gitattributes": true, "**/*.gitattributes": true,
"appsetttings.Development.json",
"appsetttings.Production.json",
".awcache": true, ".awcache": true,
".vs:": true, ".vs:": true,
".vscode:": true ".vscode:": true

6
src/Squidex/Areas/Frontend/Middlewares/WebpackMiddleware.cs

@ -17,7 +17,7 @@ namespace Squidex.Areas.Frontend.Middlewares
{ {
private const string Host = "localhost"; private const string Host = "localhost";
private const string Port = "3000"; private const string Port = "3000";
private static readonly string[] Scripts = { "shims.js", "app.js" }; private static readonly string[] Scripts = { "shims", "app" };
private static readonly string[] Styles = Array.Empty<string>(); private static readonly string[] Styles = Array.Empty<string>();
private readonly RequestDelegate next; private readonly RequestDelegate next;
@ -81,7 +81,7 @@ namespace Squidex.Areas.Frontend.Middlewares
foreach (var file in Styles) foreach (var file in Styles)
{ {
sb.AppendLine($"<link href=\"http://{Host}:{Port}/{file}\" rel=\"stylesheet\">"); sb.AppendLine($"<link href=\"http://{Host}:{Port}/{file}.css\" rel=\"stylesheet\">");
} }
response = response.Replace("</head>", $"{sb}</head>"); response = response.Replace("</head>", $"{sb}</head>");
@ -100,7 +100,7 @@ namespace Squidex.Areas.Frontend.Middlewares
foreach (var file in Scripts) foreach (var file in Scripts)
{ {
sb.AppendLine($"<script type=\"text/javascript\" src=\"http://{Host}:{Port}/{file}\"></script>"); sb.AppendLine($"<script type=\"text/javascript\" src=\"http://{Host}:{Port}/{file}.js\"></script>");
} }
response = response.Replace("</body>", $"{sb}</body>"); response = response.Replace("</body>", $"{sb}</body>");

21
src/Squidex/app-config/karma.coverage.conf.js

@ -36,7 +36,7 @@ module.exports = function (config) {
/* /*
* Use a mocha style console reporter, html reporter and the code coverage reporter * Use a mocha style console reporter, html reporter and the code coverage reporter
*/ */
reporters: ['mocha', 'html', 'coverage'], reporters: ['mocha', 'html', 'coverage-istanbul'],
// HtmlReporter configuration // HtmlReporter configuration
htmlReporter: { htmlReporter: {
@ -52,13 +52,16 @@ module.exports = function (config) {
groupSuites: true groupSuites: true
}, },
coverageReporter: { coverageIstanbulReporter: {
type: 'html', dir: require('path').join(__dirname, '../_test-output/coverage'),
/**
* Use the same folder like the html report for coverage reports reports: [
*/ 'html',
dir: '_test-output/coverage' 'lcovonly'
}, ],
fixWebpackSourcePaths: true
},
/** /**
* Disable continuous Integration mode, run only one time * Disable continuous Integration mode, run only one time
@ -71,7 +74,7 @@ module.exports = function (config) {
// We must disable the Chrome sandbox (Chrome's sandbox needs more permissions than Docker allows by default) // We must disable the Chrome sandbox (Chrome's sandbox needs more permissions than Docker allows by default)
flags: ['--no-sandbox'] flags: ['--no-sandbox']
} }
}, },
/** /**
* Run with chrome because phantom js does not provide all types, e.g. DragEvent * Run with chrome because phantom js does not provide all types, e.g. DragEvent

15
src/Squidex/app-config/webpack.config.js

@ -50,6 +50,11 @@ module.exports = {
test: /\.mjs$/, test: /\.mjs$/,
type: "javascript/auto", type: "javascript/auto",
include: [/node_modules/], include: [/node_modules/],
}, {
test: /[\/\\]@angular[\/\\]core[\/\\].+\.js$/,
parser: { system: true },
include: [/node_modules/]
}, { }, {
test: /\.ts$/, test: /\.ts$/,
use: [{ use: [{
@ -135,16 +140,6 @@ module.exports = {
* Path to a configuration file. * Path to a configuration file.
*/ */
config: helpers.root('tslint.json') config: helpers.root('tslint.json')
}),
/**
* Shim additional libraries
*
* See: https://webpack.js.org/plugins/provide-plugin/
*/
new webpack.ProvidePlugin({
// Mouse trap handles shortcut management
'Mousetrap': 'mousetrap/mousetrap'
}) })
] ]
}; };

4
src/Squidex/app-config/webpack.run.dev.js

@ -40,6 +40,10 @@ module.exports = webpackMerge(runConfig, {
}] }]
}, },
plugins: [
new webpack.ContextReplacementPlugin(/\@angular(\\|\/)core(\\|\/)fesm5/, helpers.root('./src'), {})
],
devServer: { devServer: {
headers: { headers: {
'Access-Control-Allow-Origin': '*' 'Access-Control-Allow-Origin': '*'

2
src/Squidex/app-config/webpack.run.prod.js

@ -98,7 +98,7 @@ module.exports = webpackMerge(runConfig, {
sourceMap: false, sourceMap: false,
skipSourceGeneration: false, skipSourceGeneration: false,
tsConfigPath: './tsconfig.json' tsConfigPath: './tsconfig.json'
}), }),
], ],
optimization: { optimization: {

18
src/Squidex/app/declarations.d.ts

@ -0,0 +1,18 @@
/*
* Squidex Headless CMS
*
* @license
* Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
*/
declare module 'graphiql';
declare module 'pikaday/pikaday';
declare module 'progressbar.js';
declare module 'sortablejs' {
export default class Sortable {
public destroy(): any;
public static create(element: any, options: any): Sortable;
}
}

2
src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts

@ -12,7 +12,7 @@ import { catchError } from 'rxjs/operators';
import * as React from 'react'; import * as React from 'react';
import * as ReactDOM from 'react-dom'; import * as ReactDOM from 'react-dom';
const GraphiQL = require('graphiql'); import * as GraphiQL from 'graphiql';
import { AppsState, GraphQlService } from '@app/shared'; import { AppsState, GraphQlService } from '@app/shared';

3
src/Squidex/app/framework/angular/forms/checkbox-group.component.ts

@ -9,7 +9,8 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Inpu
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { Types } from '@app/framework/internal'; import { Types } from '@app/framework/internal';
import { MathHelper } from '@app/shared';
import { MathHelper } from '../../utils/math-helper';
export const SQX_CHECKBOX_GROUP_CONTROL_VALUE_ACCESSOR: any = { export const SQX_CHECKBOX_GROUP_CONTROL_VALUE_ACCESSOR: any = {
provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => CheckboxGroupComponent), multi: true provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => CheckboxGroupComponent), multi: true

4
src/Squidex/app/framework/angular/forms/date-time-editor.component.ts

@ -12,7 +12,9 @@ import { Subscription } from 'rxjs';
import { Types } from '@app/framework/internal'; import { Types } from '@app/framework/internal';
let Pikaday = require('pikaday/pikaday'); declare module 'pikaday/pikaday';
import * as Pikaday from 'pikaday/pikaday';
export const SQX_DATE_TIME_EDITOR_CONTROL_VALUE_ACCESSOR: any = { export const SQX_DATE_TIME_EDITOR_CONTROL_VALUE_ACCESSOR: any = {
provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => DateTimeEditorComponent), multi: true provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => DateTimeEditorComponent), multi: true

2
src/Squidex/app/framework/angular/forms/progress-bar.component.ts

@ -7,7 +7,7 @@
import { ChangeDetectionStrategy, Component, ElementRef, Input, OnChanges, OnInit, Renderer2, SimpleChanges } from '@angular/core'; import { ChangeDetectionStrategy, Component, ElementRef, Input, OnChanges, OnInit, Renderer2, SimpleChanges } from '@angular/core';
const ProgressBar = require('progressbar.js'); import * as ProgressBar from 'progressbar.js';
@Component({ @Component({
selector: 'sqx-progress-bar', selector: 'sqx-progress-bar',

2
src/Squidex/app/framework/angular/sorted.directive.ts

@ -7,7 +7,7 @@
import { Directive, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { Directive, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
import Sortable = require('sortablejs'); import Sortable from 'sortablejs';
@Directive({ @Directive({
selector: '[sqxSortModel]' selector: '[sqxSortModel]'

4
src/Squidex/app/framework/services/shortcut.service.ts

@ -7,6 +7,8 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import * as Mousetrap from 'mousetrap';
export const ShortcutServiceFactory = () => { export const ShortcutServiceFactory = () => {
return new ShortcutService(); return new ShortcutService();
}; };
@ -14,7 +16,7 @@ export const ShortcutServiceFactory = () => {
@Injectable() @Injectable()
export class ShortcutService { export class ShortcutService {
public on(keys: string, callback: (e: KeyboardEvent, combo: string) => void) { public on(keys: string, callback: (e: KeyboardEvent, combo: string) => void) {
return Mousetrap.bind(keys, (event, combo) => { return Mousetrap.bind(keys, (event: any, combo: any) => {
return callback(event, combo); return callback(event, combo);
}); });
} }

1193
src/Squidex/package-lock.json

File diff suppressed because it is too large

60
src/Squidex/package.json

@ -16,47 +16,47 @@
"tslint": "tslint -c tslint.json -p tsconfig.json app/**/*.ts" "tslint": "tslint -c tslint.json -p tsconfig.json app/**/*.ts"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "6.1.7", "@angular/animations": "7.1.4",
"@angular/common": "6.1.7", "@angular/common": "7.1.4",
"@angular/core": "6.1.7", "@angular/core": "7.1.4",
"@angular/forms": "6.1.7", "@angular/forms": "7.1.4",
"@angular/http": "6.1.7", "@angular/http": "7.1.4",
"@angular/platform-browser": "6.1.7", "@angular/platform-browser": "7.1.4",
"@angular/platform-browser-dynamic": "6.1.7", "@angular/platform-browser-dynamic": "7.1.4",
"@angular/platform-server": "6.1.7", "@angular/platform-server": "7.1.4",
"@angular/router": "6.1.7", "@angular/router": "7.1.4",
"angular2-chartjs": "0.5.1", "angular2-chartjs": "0.5.1",
"babel-polyfill": "6.26.0", "babel-polyfill": "6.26.0",
"bootstrap": "4.1.3", "bootstrap": "4.1.3",
"core-js": "2.5.7", "core-js": "2.6.1",
"graphiql": "0.11.11", "graphiql": "0.12.0",
"graphql": "14.0.2", "graphql": "14.0.2",
"moment": "2.22.2", "moment": "2.23.0",
"mousetrap": "1.6.2", "mousetrap": "1.6.2",
"ng2-dnd": "5.0.2", "ng2-dnd": "5.0.2",
"ngx-color-picker": "6.7.0", "ngx-color-picker": "7.2.0",
"oidc-client": "1.5.2", "oidc-client": "1.6.0",
"pikaday": "1.7.0", "pikaday": "1.8.0",
"progressbar.js": "1.0.1", "progressbar.js": "1.0.1",
"react": "16.5.0", "react": "16.7.0",
"react-dom": "16.5.0", "react-dom": "16.7.0",
"rxjs": "6.3.2", "rxjs": "6.3.3",
"slugify": "1.3.1", "slugify": "1.3.4",
"sortablejs": "1.7.0", "sortablejs": "1.8.0-rc1",
"tslib": "1.9.3", "tslib": "1.9.3",
"zone.js": "0.8.26" "zone.js": "0.8.26"
}, },
"devDependencies": { "devDependencies": {
"@angular/compiler": "6.1.7", "@angular/compiler": "7.1.4",
"@angular/compiler-cli": "6.1.7", "@angular/compiler-cli": "7.1.4",
"@ngtools/webpack": "6.2.1", "@ngtools/webpack": "7.1.4",
"@types/core-js": "2.5.0", "@types/core-js": "2.5.0",
"@types/jasmine": "3.3.4", "@types/jasmine": "3.3.4",
"@types/mousetrap": "1.6", "@types/mousetrap": "1.6",
"@types/node": "10.9.4", "@types/node": "10.12.18",
"@types/react": "16.4.13", "@types/react": "16.7.17",
"@types/react-dom": "16.0.7", "@types/react-dom": "16.0.11",
"@types/sortablejs": "1.3.32", "@types/sortablejs": "1.7.1",
"angular-router-loader": "0.8.5", "angular-router-loader": "0.8.5",
"angular2-template-loader": "0.6.2", "angular2-template-loader": "0.6.2",
"awesome-typescript-loader": "5.2.1", "awesome-typescript-loader": "5.2.1",
@ -68,12 +68,12 @@
"html-loader": "0.5.5", "html-loader": "0.5.5",
"html-webpack-plugin": "3.2.0", "html-webpack-plugin": "3.2.0",
"ignore-loader": "0.1.2", "ignore-loader": "0.1.2",
"istanbul-instrumenter-loader": "0.2.0", "istanbul-instrumenter-loader": "3.0.1",
"jasmine-core": "3.3.0", "jasmine-core": "3.3.0",
"karma": "3.1.4", "karma": "3.1.4",
"karma-chrome-launcher": "2.2.0", "karma-chrome-launcher": "2.2.0",
"karma-cli": "2.0.0", "karma-cli": "2.0.0",
"karma-coverage": "1.1.2", "karma-coverage-istanbul-reporter": "^2.0.4",
"karma-htmlfile-reporter": "0.3.7", "karma-htmlfile-reporter": "0.3.7",
"karma-jasmine": "2.0.1", "karma-jasmine": "2.0.1",
"karma-jasmine-html-reporter": "1.4.0", "karma-jasmine-html-reporter": "1.4.0",
@ -93,7 +93,7 @@
"tslint": "5.12.0", "tslint": "5.12.0",
"tslint-webpack-plugin": "1.3.0", "tslint-webpack-plugin": "1.3.0",
"typemoq": "2.1.0", "typemoq": "2.1.0",
"typescript": "2.9.1", "typescript": "3.1.1",
"uglifyjs-webpack-plugin": "2.0.1", "uglifyjs-webpack-plugin": "2.0.1",
"underscore": "1.9.1", "underscore": "1.9.1",
"webpack": "4.28.1", "webpack": "4.28.1",

Loading…
Cancel
Save