tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Version dumped

pull/1/head
Sebastian 9 years ago
parent
ed7a2ed10a
commit
a5d56c0dfd
6 changed files with 53 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/Squidex/app-config/webpack.config.js
  2. 3
      src/Squidex/app-config/webpack.run.dev.js
  3. 5
      src/Squidex/app-config/webpack.run.prod.js
  4. 4
      src/Squidex/app/framework/services/notification.service.spec.ts
  5. 2
      src/Squidex/app/shared/components/app-form.component.scss
  6. 76
      src/Squidex/package.json

8
src/Squidex/app-config/webpack.config.js
View File

@ -79,7 +79,10 @@ module.exports = {
use: [{
loader: 'raw-loader'
}, {
loader: 'sass-loader'
loader: 'sass-loader',
options: {
includePaths: [helpers.root('app', 'theme')]
}
}],
exclude: helpers.root('app', 'theme')
}
@ -109,9 +112,6 @@ module.exports = {
*/
root: helpers.root('app', 'images')
},
sassLoader: {
includePaths: [helpers.root('app', 'theme')]
},
context: '/'
}
}),

3
src/Squidex/app-config/webpack.run.dev.js
View File

@ -43,6 +43,9 @@ module.exports = webpackMerge(runConfig, {
loader: 'css-loader'
}, {
loader: 'sass-loader?sourceMap',
options: {
includePaths: [helpers.root('app', 'theme')]
}
}],
include: helpers.root('app', 'theme')
}

5
src/Squidex/app-config/webpack.run.prod.js
View File

@ -70,7 +70,10 @@ module.exports = webpackMerge(runConfig, {
}, {
loader: helpers.root('app-config', 'clean-css-loader')
}, {
loader: 'sass-loader'
loader: 'sass-loader',
options: {
includePaths: [helpers.root('app', 'theme')]
}
}],
exclude: helpers.root('app', 'theme'),
}, {

4
src/Squidex/app/framework/services/notification.service.spec.ts
View File

@ -27,7 +27,7 @@ describe('NotificationService', () => {
it('should create error', () => {
const notification = Notification.error('MyError');
expect(notification.displayTime).toBe(10000);
expect(notification.displayTime).toBe(5000);
expect(notification.message).toBe('MyError');
expect(notification.messageType).toBe('error');
});
@ -35,7 +35,7 @@ describe('NotificationService', () => {
it('should create info', () => {
const notification = Notification.info('MyInfo');
expect(notification.displayTime).toBe(10000);
expect(notification.displayTime).toBe(5000);
expect(notification.message).toBe('MyInfo');
expect(notification.messageType).toBe('info');
});

2
src/Squidex/app/shared/components/app-form.component.scss
View File

@ -0,0 +1,2 @@
@import '_vars';
@import '_mixins';

76
src/Squidex/package.json
View File

@ -14,45 +14,45 @@
"build:clean": "rimraf wwwroot/build"
},
"dependencies": {
"@angular/common": "2.4.5",
"@angular/compiler": "2.4.5",
"@angular/core": "2.4.5",
"@angular/forms": "2.4.5",
"@angular/http": "2.4.5",
"@angular/platform-browser": "2.4.5",
"@angular/platform-browser-dynamic": "2.4.5",
"@angular/router": "3.4.5",
"babel-polyfill": "^6.22.0",
"@angular/common": "2.4.9",
"@angular/compiler": "2.4.9",
"@angular/core": "2.4.9",
"@angular/forms": "2.4.9",
"@angular/http": "2.4.9",
"@angular/platform-browser": "2.4.9",
"@angular/platform-browser-dynamic": "2.4.9",
"@angular/router": "3.4.9",
"babel-polyfill": "^6.23.0",
"bootstrap": "^4.0.0-alpha.2",
"core-js": "^2.4.1",
"moment": "^2.17.1",
"mousetrap": "^1.6.0",
"oidc-client": "^1.2.2",
"oidc-client": "1.3.0-beta.3",
"pikaday": "^1.5.1",
"rxjs": "5.0.3",
"zone.js": "^0.7.6"
"rxjs": "5.2.0",
"zone.js": "^0.7.7"
},
"devDependencies": {
"@angular/compiler-cli": "2.4.5",
"@angular/tsc-wrapped": "0.5.1",
"@ngtools/webpack": "^1.2.4",
"@angular/compiler-cli": "2.4.9",
"@angular/tsc-wrapped": "0.5.2",
"@ngtools/webpack": "^1.2.12",
"@types/core-js": "^0.9.35",
"@types/jasmine": "^2.5.41",
"@types/jasmine": "^2.5.43",
"@types/mousetrap": "^1.5.33",
"@types/node": "^7.0.4",
"angular2-router-loader": "^0.3.4",
"angular2-template-loader": "^0.6.0",
"awesome-typescript-loader": "^3.0.0-beta.18",
"@types/node": "^7.0.5",
"angular2-router-loader": "^0.3.5",
"angular2-template-loader": "^0.6.2",
"awesome-typescript-loader": "^3.1.2",
"cpx": "^1.5.0",
"css-loader": "^0.26.1",
"exports-loader": "^0.6.3",
"extract-text-webpack-plugin": "^2.0.0-beta.4",
"file-loader": "^0.10.0",
"html-loader": "^0.4.4",
"html-webpack-plugin": "^2.26.0",
"css-loader": "^0.26.2",
"exports-loader": "^0.6.4",
"extract-text-webpack-plugin": "^2.1.0",
"file-loader": "^0.10.1",
"html-loader": "^0.4.5",
"html-webpack-plugin": "^2.28.0",
"istanbul-instrumenter-loader": "^0.2.0",
"jasmine-core": "^2.5.2",
"karma": "^1.4.0",
"karma": "^1.5.0",
"karma-chrome-launcher": "^2.0.0",
"karma-cli": "^1.0.1",
"karma-coverage": "^1.1.1",
@ -62,21 +62,21 @@
"karma-phantomjs-launcher": "^1.0.2",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.2",
"node-sass": "^4.4.0",
"node-sass": "^4.5.0",
"null-loader": "^0.1.1",
"phantomjs-prebuilt": "^2.1.14",
"raw-loader": "^0.5.1",
"rimraf": "^2.5.4",
"rimraf": "^2.6.1",
"sass-lint": "^1.10.2",
"sass-loader": "^4.1.1",
"style-loader": "^0.13.1",
"tslint": "^4.4.2",
"tslint-loader": "^3.3.0",
"typemoq": "^1.1.0",
"typescript": "2.1.5",
"sass-loader": "^6.0.2",
"style-loader": "^0.13.2",
"tslint": "^4.5.1",
"tslint-loader": "^3.4.3",
"typemoq": "^1.2.1",
"typescript": "2.2.1",
"underscore": "^1.8.3",
"webpack": "2.2.0",
"webpack-dev-server": "2.2.0",
"webpack-merge": "^2.6.0"
"webpack": "2.2.1",
"webpack-dev-server": "2.4.1",
"webpack-merge": "^4.0.0"
}
}

Write Preview
Loading…
Cancel
Save