Skip to content

Commit 9ad165e

Browse files
committed
WIP
1 parent 2061d97 commit 9ad165e

File tree

8 files changed

+16
-618
lines changed

8 files changed

+16
-618
lines changed

src/test/get-expected-files.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ export function app(options) {
4646

4747
/* Core Files */
4848
files = files.concat([
49-
'client/.htaccess',
5049
'client/favicon.ico',
5150
'client/robots.txt',
5251
'client/_index.html',
@@ -165,16 +164,16 @@ export function app(options) {
165164
/* Authentication */
166165
if (options.auth) {
167166
files = files.concat([
168-
'client/app/account/index.' + script,
167+
'client/app/account/account.module.' + script,
169168
'client/app/account/account.routes.' + script,
170169
'client/app/account/login/login.' + markup,
171-
'client/app/account/login/index.' + script,
172-
'client/app/account/login/login.controller.' + script,
170+
'client/app/account/login/login.module.' + script,
171+
'client/app/account/login/login.component.' + script,
173172
'client/app/account/settings/settings.' + markup,
174-
'client/app/account/settings/index.' + script,
173+
'client/app/account/settings/settings.module.' + script,
175174
'client/app/account/settings/settings.controller.' + script,
176175
'client/app/account/signup/signup.' + markup,
177-
'client/app/account/signup/index.' + script,
176+
'client/app/account/signup/signup.module.' + script,
178177
'client/app/account/signup/signup.controller.' + script,
179178
'client/app/admin/index.' + script,
180179
'client/app/admin/admin.' + markup,

templates/app/client/.htaccess

Lines changed: 0 additions & 543 deletions
This file was deleted.

templates/app/client/app/account(auth)/index.js

Lines changed: 0 additions & 44 deletions
This file was deleted.

templates/app/client/app/account(auth)/login/index.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

templates/app/client/app/account(auth)/settings/index.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

templates/app/client/app/main/main.component.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Component, OnInit<% if(filters.socketio) { %>, OnDestroy<% } %> } from '@angular/core';
22
import { Http } from '@angular/http';
3+
import { Observable } from 'rxjs/Observable';
34
import { SocketService } from '../../components/socket/socket.service';
45

56
@Component({

templates/app/typings(ts).json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
{
2-
"ambientDependencies": {
3-
"angular": "registry:dt/angular#1.5.0+20160412133217",
4-
"angular-resource": "registry:dt/angular-resource#1.5.0+20160613142217",
5-
"jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
6-
"lodash": "github:DefinitelyTyped/DefinitelyTyped/lodash/lodash.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
7-
"socket.io-client": "github:DefinitelyTyped/DefinitelyTyped/socket.io-client/socket.io-client.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
8-
"core-js": "registry:dt/core-js#0.0.0+20160317120654",
9-
"node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#8cf8164641be73e8f1e652c2a5b967c7210b6729",
10-
"webpack": "github:DefinitelyTyped/DefinitelyTyped/webpack/webpack.d.ts#95c02169ba8fa58ac1092422efbd2e3174a206f4"
11-
},
122
"ambientDevDependencies": {
133
"selenium-webdriver": "github:DefinitelyTyped/DefinitelyTyped/selenium-webdriver/selenium-webdriver.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
144
<%_ if(filters.mocha) { _%>
@@ -19,5 +9,14 @@
199
"sinon-chai": "github:DefinitelyTyped/DefinitelyTyped/sinon-chai/sinon-chai.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe"<% } %>
2010
<%_ if(filters.jasmine) { _%>
2111
"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe"<% } %>
12+
},
13+
"dependencies": {
14+
"lodash": "registry:npm/lodash#4.0.0+20161015015725",
15+
"webpack": "registry:npm/webpack#1.12.9+20160418172948"
16+
},
17+
"globalDependencies": {
18+
"core-js": "registry:dt/core-js#0.9.0+20170310221640",
19+
"node": "registry:env/node#6.0.0+20170213133316",
20+
"socket.io-client": "registry:dt/socket.io-client#1.4.4+20161116080703"
2221
}
2322
}

templates/app/webpack.make.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ module.exports = function makeWebpackConfig(options) {
157157
// Reference: https://github.com/willyelm/pug-html-loader
158158
// Allow loading Pug throw js
159159
test: /\.(jade|pug)$/,
160-
use: ['raw-loaer', 'pug-html-loader']
160+
use: ['raw-loader', 'pug-html-loader']
161161
}, {<% } %>
162162
<%_ if(filters.html) { _%>
163163
// HTML LOADER

0 commit comments

Comments
 (0)