Skip to content

Commit d51f2bd

Browse files
helfi92owlishDeveloper
authored andcommitted
Upgrade neutrino packages (taskcluster#59)
* Upgrade neutrino packages * Use @mozilla-frontend-infra/node
1 parent 343ecab commit d51f2bd

File tree

8 files changed

+698
-811
lines changed

8 files changed

+698
-811
lines changed

services/web-server/.neutrinorc.js

+3-38
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,8 @@
11
module.exports = {
22
use: [
3-
['@neutrinojs/airbnb-base', {
4-
eslint: {
5-
baseConfig: {
6-
extends: ['eslint-config-prettier'],
7-
},
8-
plugins: ['eslint-plugin-prettier'],
9-
rules: {
10-
'no-nested-ternary': 0,
11-
// Specify the maximum length of a line in your program
12-
'max-len': [
13-
'error',
14-
80,
15-
2,
16-
{
17-
ignoreUrls: true,
18-
ignoreComments: false,
19-
ignoreStrings: true,
20-
ignoreTemplateLiterals: true,
21-
},
22-
],
23-
// Allow console during development, otherwise throw an error
24-
'no-console': process.env.NODE_ENV === 'development' ? 'off' : 'error',
25-
// Our frontend strives to adopt functional programming practices,
26-
// so we prefer const over let
27-
'prefer-const': 'error',
28-
'prettier/prettier': [
29-
'error',
30-
{
31-
singleQuote: true,
32-
trailingComma: 'es5',
33-
bracketSpacing: true,
34-
jsxBracketSameLine: true,
35-
},
36-
],
37-
'class-methods-use-this': 'off',
38-
'no-shadow': 'off',
39-
'babel/new-cap': 'off',
40-
},
3+
['@mozilla-frontend-infra/node-lint', {
4+
rules: {
5+
'no-nested-ternary': 'off',
416
},
427
}],
438
['@neutrinojs/node', {

services/web-server/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@
1919
"devDependencies": {
2020
"@babel/plugin-proposal-class-properties": "^7.1.0",
2121
"@babel/plugin-proposal-decorators": "^7.1.2",
22-
"@neutrinojs/airbnb-base": "^9.0.0-beta.0",
23-
"@neutrinojs/mocha": "^9.0.0-beta.0",
24-
"eslint": "^5.6.1",
22+
"@neutrinojs/mocha": "9.0.0-rc.0",
23+
"@neutrinojs/node": "9.0.0-rc.0",
24+
"eslint": "^5.10.0",
2525
"eslint-config-prettier": "^3.1.0",
2626
"eslint-plugin-prettier": "^3.0.0",
2727
"mocha": "^5.2.0",
28-
"neutrino": "^9.0.0-beta.0",
28+
"neutrino": "9.0.0-rc.0",
2929
"prettier": "^1.14.3",
3030
"raw-loader": "^0.5.1",
3131
"webpack": "^4.25.1",
3232
"webpack-cli": "^3.1.2"
3333
},
3434
"dependencies": {
35-
"@neutrinojs/node": "^9.0.0-beta.0",
35+
"@mozilla-frontend-infra/node-lint": "^1.1.1",
3636
"amqp-match": "^0.0.0",
3737
"apollo-server-express": "^1.3.4",
3838
"async-decorators": "^0.1.5",

services/web-server/src/PulseEngine/EventIterator.js

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export default class EventIterator {
1414
async next() {
1515
const { value, done } = await this.messageIterator.next();
1616
const event = { [this.eventName]: value.payload };
17+
1718
return { value: event, done };
1819
}
1920

services/web-server/src/PulseEngine/MessageIterator.js

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export default class MessageIterator {
1414
async next() {
1515
const { value, done } = await this.messageIterator.next();
1616
const event = { [this.eventName]: value };
17+
1718
return { value: event, done };
1819
}
1920

services/web-server/src/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ const load = loader(
5656
console.log(
5757
`\n\nNo Pulse namespace defined; no Pulse messages will be received.`
5858
);
59+
5960
return new FakeClient();
6061
}
6162

services/web-server/src/utils/fetch.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ const defaults = {
1414
};
1515
const handleResponse = response =>
1616
Promise.resolve(response)
17-
.then(
18-
() =>
19-
JSON_CONTENT.test(response.headers.get('Content-Type'))
20-
? response.json()
21-
: null
17+
.then(() =>
18+
JSON_CONTENT.test(response.headers.get('Content-Type'))
19+
? response.json()
20+
: null
2221
)
2322
.then(json => {
2423
if (response.ok) {
@@ -47,7 +46,6 @@ export default (url, opts = {}) => {
4746
...opts.headers,
4847
},
4948
};
50-
5149
const { delayFactor, randomizationFactor, maxDelay, retries } = options;
5250

5351
return new Promise((resolve, reject) => {

services/web-server/test/fetch_test.js

+2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ describe('fetch', () => {
1414

1515
it('should retry a 500', () => {
1616
let attemptCount = 0;
17+
1718
server = createServer((req, res) => {
1819
attemptCount += 1;
20+
1921
if (attemptCount < 2) {
2022
res.writeHead(500);
2123
res.end();

0 commit comments

Comments
 (0)