Browse Source

Updated webpack

pull/332/head
Sebastian Stehle 7 years ago
parent
commit
b02c9796e7
  1. 2
      src/Squidex/app/features/administration/pages/users/user-page.component.html
  2. 2
      src/Squidex/app/features/administration/pages/users/user-page.component.scss
  3. 4
      src/Squidex/app/framework/angular/http/http-extensions.ts
  4. 2
      src/Squidex/app/shared/services/auth.service.ts
  5. 24
      src/Squidex/package.json

2
src/Squidex/app/features/administration/pages/users/user-page.component.html

@ -70,6 +70,8 @@
</div> </div>
</div> </div>
<hr />
<div class="form-group"> <div class="form-group">
<label for="permissions">Permissions</label> <label for="permissions">Permissions</label>

2
src/Squidex/app/features/administration/pages/users/user-page.component.scss

@ -7,4 +7,6 @@
textarea { textarea {
height: 200px; height: 200px;
font-size: .9rem;
font-weight: normal;
} }

4
src/Squidex/app/framework/angular/http/http-extensions.ts

@ -63,6 +63,10 @@ export module HTTP {
export const pretifyError = (message: string) => <T>(source: Observable<T>) => export const pretifyError = (message: string) => <T>(source: Observable<T>) =>
source.pipe(catchError((response: HttpErrorResponse) => { source.pipe(catchError((response: HttpErrorResponse) => {
if (Types.is(response, ErrorDto)) {
return throwError(response);
}
let result: ErrorDto | null = null; let result: ErrorDto | null = null;
if (!Types.is(response.error, Error)) { if (!Types.is(response.error, Error)) {

2
src/Squidex/app/shared/services/auth.service.ts

@ -52,7 +52,7 @@ export class Profile {
constructor( constructor(
public readonly user: User public readonly user: User
) { ) {
const permissions = this.user.profile['uri:squidex:permissions']; const permissions = this.user.profile['urn:squidex:permissions'];
if (Types.isArrayOfString(permissions)) { if (Types.isArrayOfString(permissions)) {
this.permissions = permissions.map(x => new Permission(x)); this.permissions = permissions.map(x => new Permission(x));

24
src/Squidex/package.json

@ -9,7 +9,7 @@
"test:coverage": "karma start karma.coverage.conf.js", "test:coverage": "karma start karma.coverage.conf.js",
"test:clean": "rimraf _test-output", "test:clean": "rimraf _test-output",
"dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ && webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000", "dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ && webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000",
"start": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ && webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000", "start": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ && webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000 --hot",
"build": "webpack --config app-config/webpack.run.prod.js", "build": "webpack --config app-config/webpack.run.prod.js",
"build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/", "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/",
"build:clean": "rimraf wwwroot/build", "build:clean": "rimraf wwwroot/build",
@ -60,7 +60,7 @@
"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",
"codelyzer": "4.4.4", "codelyzer": "4.5.0",
"cpx": "1.5.0", "cpx": "1.5.0",
"css-loader": "1.0.0", "css-loader": "1.0.0",
"exports-loader": "0.7.0", "exports-loader": "0.7.0",
@ -70,18 +70,18 @@
"ignore-loader": "0.1.2", "ignore-loader": "0.1.2",
"istanbul-instrumenter-loader": "0.2.0", "istanbul-instrumenter-loader": "0.2.0",
"jasmine-core": "3.2.1", "jasmine-core": "3.2.1",
"karma": "3.0.0", "karma": "3.1.1",
"karma-chrome-launcher": "2.2.0", "karma-chrome-launcher": "2.2.0",
"karma-cli": "1.0.1", "karma-cli": "1.0.1",
"karma-coverage": "1.1.2", "karma-coverage": "1.1.2",
"karma-htmlfile-reporter": "0.3.6", "karma-htmlfile-reporter": "0.3.7",
"karma-jasmine": "1.1.2", "karma-jasmine": "1.1.2",
"karma-jasmine-html-reporter": "1.3.1", "karma-jasmine-html-reporter": "1.3.1",
"karma-mocha-reporter": "2.2.5", "karma-mocha-reporter": "2.2.5",
"karma-sourcemap-loader": "0.3.7", "karma-sourcemap-loader": "0.3.7",
"karma-webpack": "3.0.4", "karma-webpack": "3.0.5",
"mini-css-extract-plugin": "0.4.2", "mini-css-extract-plugin": "0.4.4",
"node-sass": "4.9.3", "node-sass": "4.9.4",
"noop-loader": "1.0.0", "noop-loader": "1.0.0",
"null-loader": "0.1.1", "null-loader": "0.1.1",
"raw-loader": "0.5.1", "raw-loader": "0.5.1",
@ -89,17 +89,17 @@
"rxjs-tslint": "0.1.5", "rxjs-tslint": "0.1.5",
"sass-lint": "1.12.1", "sass-lint": "1.12.1",
"sass-loader": "7.1.0", "sass-loader": "7.1.0",
"style-loader": "0.23.0", "style-loader": "0.23.1",
"tsconfig-paths-webpack-plugin": "3.2.0", "tsconfig-paths-webpack-plugin": "3.2.0",
"tslint": "5.11.0", "tslint": "5.11.0",
"tslint-loader": "3.6.0", "tslint-loader": "3.6.0",
"typemoq": "2.1.0", "typemoq": "2.1.0",
"typescript": "2.9.1", "typescript": "2.9.1",
"uglifyjs-webpack-plugin": "1.3.0", "uglifyjs-webpack-plugin": "2.0.1",
"underscore": "1.9.1", "underscore": "1.9.1",
"webpack": "4.17.2", "webpack": "4.23.1",
"webpack-cli": "3.1.0", "webpack-cli": "3.1.2",
"webpack-dev-server": "3.1.8", "webpack-dev-server": "3.1.10",
"webpack-merge": "4.1.4" "webpack-merge": "4.1.4"
} }
} }

Loading…
Cancel
Save