Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(build): Move to webpack for bundling/building #103

Merged
merged 1 commit into from
Feb 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ npm-debug.log
coverage
aws-credentials.json
.awspublish*
stats.json
2 changes: 1 addition & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "stylelint-config-standard",
"rules": {
"indentation": [4, [4]]
"indentation": 4
}
}
1 change: 0 additions & 1 deletion gulpfile.js

This file was deleted.

56 changes: 30 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,41 @@
"license": "MIT",
"repository": "https://github.com/NiXXeD/chatty",
"scripts": {
"build": "gulp clean && gulp build",
"watch": "gulp",
"start": "npm run build && gulp server"
"start": "webpack-dev-server --progress --colors --display-error-details --inline",
"build": "webpack",
"stats": "webpack --profile --json > stats.json",
"server": "http-server build --cors -p 3000"
},
"engines": {
"node": ">= 4.2.1 <= 5",
"npm": ">= 2 <= 3"
},
"dependencies": {
"angular2": "2.0.0-beta.1",
"browser-sync": "2.11.0",
"concurrently": "1.0.0",
"cssnano": "3.4.0",
"del": "2.2.0",
"angular2": "2.0.0-beta.0",
"es6-promise": "3.0.2",
"es6-shim": "0.33.3",
"gulp": "3.9.0",
"gulp-concat": "2.6.0",
"gulp-postcss": "6.0.1",
"gulp-rename": "1.2.2",
"gulp-sourcemaps": "1.6.0",
"gulp-typescript": "2.10.0",
"gulp-util": "3.0.7",
"lodash": "3.10.1",
"merge2": "0.3.6",
"postcss-discard-comments": "2.0.3",
"postcss-reporter": "1.3.0",
"precss": "1.4.0",
"reflect-metadata": "0.1.2",
"require-directory": "2.1.1",
"es7-reflect-metadata": "1.5.5",
"rxjs": "5.0.0-beta.0",
"stylelint": "3.2.3",
"stylelint-config-standard": "0.2.0",
"systemjs": "0.19.16",
"zone.js": "0.5.10",
"lodash": "3.10.1"
},
"devDependencies": {
"clean-webpack-plugin": "0.1.8",
"copy-webpack-plugin": "0.3.3",
"css-loader": "0.23.1",
"extract-text-webpack-plugin": "1.0.1",
"html-webpack-plugin": "2.7.2",
"http-server": "0.8.5",
"postcss-loader": "0.8.0",
"precss": "1.4.0",
"raw-loader": "0.5.1",
"style-loader": "0.13.0",
"stylelint": "4.3.3",
"stylelint-config-standard": "3.0.0",
"ts-loader": "0.8.0",
"typescript": "1.7.5",
"zone.js": "0.5.10"
"webpack": "1.12.12",
"webpack-dev-server": "1.14.1",
"webpack-merge": "0.7.3"
}
}
13 changes: 11 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Features above standard chatty:
* Reflow action: Re-sorts the chatty instantly, active posts on top, no http call required.
* Live filtering. No more reposts! Filter works without API call in the background (against live threads only).
* Content embed in-post for: raw images, imgur (gifv, albums), gfycat, youtube, vimeo.
* Tabs support:
* Tabs support:
* Save a post, author, filter, etc for later quick filtering.
* Default tabs include: Chatty (all threads), Frontpage (Shacknews posts), Mine (threads containing your username)
* Collapsed post ids are stored in the cloud. Compatible with any other WinChatty V2 cloud collapse using app.
Expand All @@ -19,7 +19,7 @@ http://chatty.nixxed.com
##### How to run:
---------
Notes
1. Uses browser-sync, IE not a real web server
1. Uses webpack-dev-server, not a real web server
2. Access it at http://localhost:3000
~~~~
npm start
Expand All @@ -34,6 +34,15 @@ Notes:
npm run build
~~~~

##### How to test production build locally:
---------
Notes:
1. Hosts whatever is in the 'build' directory
2. Access it at http://localhost:3000
~~~~
npm run server
~~~~

##### Technology Used
---------------------

Expand Down
41 changes: 0 additions & 41 deletions src/gulp/gulp-config.js

This file was deleted.

45 changes: 0 additions & 45 deletions src/gulp/tasks/build-css.js

This file was deleted.

22 changes: 0 additions & 22 deletions src/gulp/tasks/build-static.js

This file was deleted.

15 changes: 0 additions & 15 deletions src/gulp/tasks/build-ts.js

This file was deleted.

3 changes: 0 additions & 3 deletions src/gulp/tasks/build.js

This file was deleted.

7 changes: 0 additions & 7 deletions src/gulp/tasks/clean.js

This file was deleted.

3 changes: 0 additions & 3 deletions src/gulp/tasks/default.js

This file was deleted.

23 changes: 0 additions & 23 deletions src/gulp/tasks/server.js

This file was deleted.

8 changes: 0 additions & 8 deletions src/gulp/tasks/watch.js

This file was deleted.

15 changes: 0 additions & 15 deletions src/main/app/boot.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/app/chatty/SimpleChatty.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {Thread} from '../thread/Thread'
import {Toast} from '../toast/Toast'

@Component({
templateUrl: 'app/chatty/simpleChatty.html',
template: require('./simpleChatty.html'),
directives: [Navbar, Post, Thread, Toast]
})
export class SimpleChatty implements OnInit {
Expand Down
5 changes: 4 additions & 1 deletion src/main/app/chatty/SplitChatty.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ import {Post} from '../post/Post'
import {Thread} from '../thread/Thread'
import {Toast} from '../toast/Toast'

import './body.scss';
import './chatty.scss';

@Component({
templateUrl: 'app/chatty/splitChatty.html',
template: require('./splitChatty.html'),
directives: [Navbar, Post, Thread, Toast]
})
export class SplitChatty implements OnInit {
Expand Down
4 changes: 3 additions & 1 deletion src/main/app/comments/Comments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ import {Post} from '../post/Post'
import {ReplyBox} from '../replybox/ReplyBox'
import {ScrollIntoView} from '../directives/ScrollIntoView'

import './comments.scss';

@Component({
selector: 'comments',
templateUrl: './app/comments/comments.html',
template: require('./comments.html'),
directives: [Comments, Post, ReplyBox, ScrollIntoView]
})
export class Comments {
Expand Down
2 changes: 1 addition & 1 deletion src/main/app/embedContent/EmbedContent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {Component, Input} from 'angular2/core'

@Component({
selector: 'embed-content',
templateUrl: 'app/embedContent/embedContent.html'
template: require('./embedContent.html')
})
export class EmbedContent {
public visible = false
Expand Down
4 changes: 3 additions & 1 deletion src/main/app/navbar/Navbar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import {TabService} from '../services/TabService'
import {ModelService} from '../services/ModelService'
import {ReplyBox} from '../replybox/ReplyBox'

import './navbar.scss';

@Component({
selector: 'navbar',
templateUrl: 'app/navbar/navbar.html',
template: require('./navbar.html'),
directives: [DisableHotkeys, ReplyBox]
})
export class Navbar implements OnInit {
Expand Down
6 changes: 5 additions & 1 deletion src/main/app/post/Post.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ import {SettingsService} from '../services/SettingsService'
import {TabService} from '../services/TabService'
import {EmbedContent} from '../embedContent/EmbedContent'

import './post.scss';
import './shacktags.scss';
import './tags.scss';

@Component({
selector: 'post',
templateUrl: 'app/post/post.html',
template: require('./post.html'),
directives: [EmbedContent]
})
export class Post {
Expand Down
5 changes: 4 additions & 1 deletion src/main/app/replybox/ReplyBox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ import {PostService} from '../services/PostService'
import {AutoFocus} from '../directives/AutoFocus'
import {DisableHotkeys} from '../directives/DisableHotkeys'

import './replybox.scss';
import './tagLegend.scss';

@Component({
selector: 'replybox',
templateUrl: 'app/replybox/replybox.html',
template: require('./replybox.html'),
directives: [AutoFocus, DisableHotkeys]
})
export class ReplyBox {
Expand Down
Loading