Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit cb64c6c

Browse files
committed
chore(app): update several components
Part of #2691 
1 parent ada9f23 commit cb64c6c

File tree

5 files changed

+23
-22
lines changed

5 files changed

+23
-22
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"mem-fs-editor": "4.0.0",
8888
"merge-stream": "^1.0.0",
8989
"minimatch": "^3.0.2",
90-
"mocha": "^3.1.2",
90+
"mocha": "^5.2.0",
9191
"q": "^1.0.1",
9292
"recursive-readdir": "^2.0.0",
9393
"run-sequence": "^2.1.0",

‎src/test/main.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ describe('angular-fullstack:app', function() {
159159
dir = _dir;
160160
lintResult = runCmd('npm run lint');
161161
clientTestResult = runCmd('npm run test:client');
162-
serverTestResult = runCmd('npm run test:server');
163162
});
164163
});
165164

@@ -178,6 +177,7 @@ describe('angular-fullstack:app', function() {
178177
});
179178

180179
it('passes server tests', function() {
180+
serverTestResult = runCmd('npm run test:server');
181181
return serverTestResult.should.be.fulfilled();
182182
});
183183
});
@@ -206,7 +206,6 @@ describe('angular-fullstack:app', function() {
206206
dir = _dir;
207207
lintResult = runCmd('npm run lint');
208208
clientTestResult = runCmd('npm run test:client');
209-
serverTestResult = runCmd('npm run test:server');
210209
});
211210
});
212211

@@ -225,6 +224,7 @@ describe('angular-fullstack:app', function() {
225224
});
226225

227226
it('should run server tests successfully', function() {
227+
serverTestResult = runCmd('npm run test:server');
228228
return serverTestResult.should.be.fulfilled();
229229
});
230230

@@ -350,7 +350,6 @@ describe('angular-fullstack:app', function() {
350350
dir = _dir;
351351
lintResult = runCmd('npm run lint');
352352
clientTestResult = runCmd('npm run test:client');
353-
serverTestResult = runCmd('npm run test:server');
354353
});
355354
});
356355

@@ -369,6 +368,7 @@ describe('angular-fullstack:app', function() {
369368
});
370369

371370
it('should run server tests successfully', function() {
371+
serverTestResult = runCmd('npm run test:server');
372372
return serverTestResult.should.be.fulfilled();
373373
});
374374

‎templates/app/_package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -117,23 +117,23 @@
117117
"babel-preset-env": "^1.6.1",
118118
"cors": "^2.8.4",
119119
"cross-env": "^5.1.1",
120-
"eslint": "^4.19.1",
120+
"eslint": "^5.2.0",
121121
"del": "^3.0.0",
122122
"gulp": "^3.9.1",
123123
"gulp-babel": "^7.0.0",<% if(filters.ts) { %>
124124
"gulp-typescript": "~3.2.2",
125125
"gulp-tslint": "^8.0.0",<% } %>
126126
"gulp-env": "^0.4.0",
127-
"gulp-eslint": "^2.0.0",
128-
"gulp-imagemin": "^3.0.1",
127+
"gulp-eslint": "^5.0.0",
128+
"gulp-imagemin": "^4.1.0",
129129
"gulp-inject": "^4.0.0",
130130
"gulp-istanbul": "^1.1.1",
131131
"gulp-istanbul-enforcer": "^1.0.3",
132132
"gulp-load-plugins": "^1.0.0-rc.1",
133-
"gulp-mocha": "^4.3.1",
133+
"gulp-mocha": "^6.0.0",
134134
<%# "gulp-node-inspector": "^0.1.0", %>
135135
"gulp-plumber": "^1.0.1",
136-
"gulp-protractor": "^3.0.0",
136+
"gulp-protractor": "^4.1.0",
137137
"gulp-rev": "^8.0.0",
138138
"gulp-rev-replace": "^0.4.2",
139139
"gulp-sort": "^2.0.0",
@@ -143,15 +143,15 @@
143143
"gulp-stylint": "^4.0.0",
144144
"grunt": "^1.0.1",
145145
"grunt-build-control": "^0.7.0",
146-
"isparta": "^4.0.0",
146+
"isparta": "^4.1.0",
147147
"nodemon": "^1.18.1",
148148
"run-sequence": "^2.1.0",
149149
"lazypipe": "^1.0.1",
150150
<%# WEBPACK %>
151151
"compression-webpack-plugin": "^1.1.11",
152-
"webpack": "^4.12.0",
153-
"webpack-cli": "^3.0.6",
154-
"webpack-dev-server": "^3.1.4",
152+
"webpack": "^4.16.2",
153+
"webpack-cli": "^3.1.0",
154+
"webpack-dev-server": "^3.1.5",
155155
"extract-text-webpack-plugin": "4.0.0-beta.0",
156156
"html-webpack-plugin": "^3.2.0",
157157
"html-webpack-harddisk-plugin": "~0.2.0",
@@ -172,8 +172,8 @@
172172
"raw-loader": "^0.5.1",
173173
"style-loader": "^0.18.2",
174174
<%_ if(filters.sass) { _%>
175-
"node-sass": "^4.5.3",
176-
"sass-loader": "^6.0.6",<% } %>
175+
"node-sass": "^4.9.2",
176+
"sass-loader": "^7.0.3",<% } %>
177177
<%_ if(filters.less) { _%>
178178
"less": "^2.7.1",
179179
"less-loader": "^4.0.5",<% } %>
@@ -184,23 +184,23 @@
184184
"to-string-loader": "^1.1.5",
185185
<%# END WEBPACK %>
186186
"through2": "^2.0.1",
187-
"open": "~0.0.5",
187+
"opn": "^5.3.0",
188188
"protractor": "^5.3.0",
189189
"istanbul": "1.1.0-alpha.1",
190190
"chai": "^4.1.2",
191-
"sinon": "^3.2.1",
191+
"sinon": "^6.1.4",
192192
"chai-as-promised": "^7.1.1",
193193
"chai-things": "^0.2.0",
194-
"karma": "^1.7.1",
194+
"karma": "^2.0.4",
195195
"karma-firefox-launcher": "^1.0.0",
196196
"karma-script-launcher": "^1.0.0",
197197
"karma-coverage": "^1.0.0",
198198
"karma-chrome-launcher": "^2.0.0",
199199
"karma-phantomjs-launcher": "~1.0.0",
200200
"karma-spec-reporter": "~0.0.20",
201201
"karma-sourcemap-loader": "~0.3.7",
202-
"sinon-chai": "^2.8.0",
203-
"mocha": "^3.0.2",<% if(filters.mocha) { %>
202+
"sinon-chai": "^3.2.0",
203+
"mocha": "^5.2.0",<% if(filters.mocha) { %>
204204
"karma-mocha": "^1.0.1",
205205
"karma-chai-plugins": "~0.9.0",<% } if(filters.jasmine) { %>
206206
"jasmine-core": "^2.3.4",

‎templates/app/client/components/util.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export function urlParse(url) {
2929

3030
// Special treatment for IE, see http://stackoverflow.com/a/13405933 for details
3131
if (a.host === '') {
32+
// eslint-disable-next-line no-self-assign
3233
a.href = a.href;
3334
}
3435

‎templates/app/gulpfile.babel.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import path from 'path';
77
import through2 from 'through2';
88
import gulpLoadPlugins from 'gulp-load-plugins';
99
import http from 'http';
10-
import open from 'open';
10+
import opn from 'opn';
1111
import lazypipe from 'lazypipe';
1212
import nodemon from 'nodemon';
1313
import {Server as KarmaServer} from 'karma';
@@ -290,7 +290,7 @@ gulp.task('clean:tmp', () => del(['.tmp/**/*'], {dot: true}));
290290

291291
gulp.task('start:client', cb => {
292292
return require('./webpack.server').start(config.clientPort).then(() => {
293-
open(`http://localhost:${config.clientPort}`);
293+
opn(`http://localhost:${config.clientPort}`);
294294
cb();
295295
});
296296
});

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /