Skip to content

Commit 25ac558

Browse files
dunglasdunglas
committed
fix: upgrade deps
1 parent 57f49cc commit 25ac558

23 files changed

+3074
-3172
lines changed

‎.eslintrc.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,8 @@ module.exports = {
1818
'rules': {
1919
'prettier/prettier': 'error',
2020
'no-console': 0,
21+
'no-extra-semi': 'off',
22+
'no-mixed-spaces-and-tabs': 'off',
23+
'no-unexpected-multiline': 'off',
2124
}
2225
};

‎package.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,33 +24,33 @@
2424
"@babel/plugin-transform-runtime": "^7.0.0",
2525
"@babel/preset-env": "^7.6.0",
2626
"babel-eslint": "^10.0.0",
27-
"babel-jest": "^24.0.0",
28-
"eslint": "^5.6.0",
29-
"eslint-config-prettier": "^6.3.0",
27+
"babel-jest": "^26.0.0",
28+
"eslint": "^7.17.0",
29+
"eslint-config-prettier": "^7.1.0",
3030
"eslint-plugin-import": "^2.14.0",
31-
"eslint-plugin-prettier": "^3.1.0",
32-
"husky": "^3.0.9",
33-
"jest": "^24.0.0",
34-
"lint-staged": "^9.4.2",
35-
"prettier": "^1.14.3",
36-
"tmp": "^0.1.0"
31+
"eslint-plugin-prettier": "^3.3.0",
32+
"husky": "^4.3.6",
33+
"jest": "^26.6.3",
34+
"lint-staged": "^10.5.3",
35+
"prettier": "^2.2.1",
36+
"tmp": "^0.2.1"
3737
},
3838
"dependencies": {
39-
"@api-platform/api-doc-parser": "^0.8.3",
39+
"@api-platform/api-doc-parser": "^0.12.0",
4040
"@babel/runtime": "^7.0.0",
41-
"chalk": "^2.4.1",
42-
"commander": "^3.0.1",
41+
"chalk": "^4.1.0",
42+
"commander": "^6.2.1",
4343
"handlebars": "^4.0.12",
4444
"handlebars-helpers": "^0.10.0",
45-
"isomorphic-fetch": "^2.2.1",
46-
"mkdirp": "^0.5.1",
45+
"isomorphic-fetch": "^3.0.0",
46+
"mkdirp": "^1.0.4",
4747
"sprintf-js": "^1.1.1"
4848
},
4949
"scripts": {
5050
"test": "jest",
5151
"lint": "eslint src",
5252
"fix": "eslint --fix src",
53-
"eslint-check": "eslint --print-config .eslintrc.js | eslint-config-prettier-check",
53+
"eslint-check": "eslint-config-prettier src/index.js",
5454
"build": "babel src -d lib --ignore '*.test.js'",
5555
"watch": "babel --watch src -d lib --ignore '*.test.js'",
5656
"test-gen": "rm -rf ./tmp && yarn build && ./lib/index.js https://demo.api-platform.com ./tmp/react && ./lib/index.js https://demo.api-platform.com ./tmp/react-native -g react-native && ./lib/index.js https://demo.api-platform.com ./tmp/vue -g vue",

‎src/generators/BaseGenerator.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export default class {
8181
const configuration = JSON.parse(packageFile.toString());
8282
dependencies = Object.keys({
8383
...configuration.dependencies,
84-
...configuration.devDependencies
84+
...configuration.devDependencies,
8585
});
8686
} catch (e) {
8787
console.log(
@@ -154,10 +154,10 @@ export default class {
154154
}
155155

156156
buildFields(fields) {
157-
return fields.map(field => ({
157+
return fields.map((field) => ({
158158
...field,
159159
...this.getHtmlInputTypeFromField(field),
160-
description: field.description.replace(/"/g, "'") // fix for Form placeholder description
160+
description: field.description.replace(/"/g, "'"), // fix for Form placeholder description
161161
}));
162162
}
163163
}

‎src/generators/NextGenerator.js‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default class NextGenerator extends BaseGenerator {
2525
"pages/foos/index.tsx",
2626

2727
// utils
28-
"utils/dataAccess.ts"
28+
"utils/dataAccess.ts",
2929
]);
3030
}
3131

@@ -50,7 +50,7 @@ export default class NextGenerator extends BaseGenerator {
5050
formFields: this.buildFields(fields),
5151
imports,
5252
hydraPrefix: this.hydraPrefix,
53-
title: resource.title
53+
title: resource.title,
5454
};
5555

5656
// Create directories
@@ -61,8 +61,8 @@ export default class NextGenerator extends BaseGenerator {
6161
`${dir}/error`,
6262
`${dir}/interfaces`,
6363
`${dir}/pages`,
64-
`${dir}/utils`
65-
].forEach(dir => this.createDir(dir, false));
64+
`${dir}/utils`,
65+
].forEach((dir) => this.createDir(dir, false));
6666

6767
// copy with patterned name
6868
this.createDir(`${dir}/components/${context.lc}`);
@@ -75,8 +75,8 @@ export default class NextGenerator extends BaseGenerator {
7575

7676
// pages
7777
"pages/%ss/[id].tsx",
78-
"pages/%ss/index.tsx"
79-
].forEach(pattern =>
78+
"pages/%ss/index.tsx",
79+
].forEach((pattern) =>
8080
this.createFileFromPattern(pattern, dir, context.lc, context)
8181
);
8282

@@ -99,8 +99,10 @@ export default class NextGenerator extends BaseGenerator {
9999
"interfaces/Collection.ts",
100100

101101
// utils
102-
"utils/dataAccess.ts"
103-
].forEach(file => this.createFile(file, `${dir}/${file}`, context, false));
102+
"utils/dataAccess.ts",
103+
].forEach((file) =>
104+
this.createFile(file, `${dir}/${file}`, context, false)
105+
);
104106

105107
// API config
106108
this.createEntrypoint(api.entrypoint, `${dir}/config/entrypoint.ts`);
@@ -113,7 +115,7 @@ export default class NextGenerator extends BaseGenerator {
113115
parseFields(resource) {
114116
const fields = [
115117
...resource.writableFields,
116-
...resource.readableFields
118+
...resource.readableFields,
117119
].reduce((list, field) => {
118120
if (list[field.name]) {
119121
return list;
@@ -127,8 +129,8 @@ export default class NextGenerator extends BaseGenerator {
127129
type: this.getType(field),
128130
description: this.getDescription(field),
129131
readonly: false,
130-
reference: field.reference
131-
}
132+
reference: field.reference,
133+
},
132134
};
133135
}, {});
134136

@@ -144,8 +146,8 @@ export default class NextGenerator extends BaseGenerator {
144146
...list,
145147
[type]: {
146148
type,
147-
file: `./${type}`
148-
}
149+
file: `./${type}`,
150+
},
149151
};
150152
},
151153
{}

‎src/generators/NextGenerator.test.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import NextGenerator from "./NextGenerator";
55

66
const generator = new NextGenerator({
77
hydraPrefix: "hydra:",
8-
templateDirectory: `${__dirname}/../../templates`
8+
templateDirectory: `${__dirname}/../../templates`,
99
});
1010

1111
afterEach(() => {
@@ -22,19 +22,19 @@ describe("generate", () => {
2222
range: "http://www.w3.org/2001/XMLSchema#string",
2323
reference: null,
2424
required: true,
25-
description: "An URL"
26-
})
25+
description: "An URL",
26+
}),
2727
];
2828
const resource = new Resource("abc", "http://example.com/foos", {
2929
id: "abc",
3030
title: "abc",
3131
readableFields: fields,
32-
writableFields: fields
32+
writableFields: fields,
3333
});
3434
const api = new Api("http://example.com", {
3535
entrypoint: "http://example.com:8080",
3636
title: "My API",
37-
resources: [resource]
37+
resources: [resource],
3838
});
3939
generator.generate(api, resource, tmpobj.name);
4040

@@ -49,15 +49,15 @@ describe("generate", () => {
4949
"/interfaces/Collection.ts",
5050
"/pages/abcs/[id].tsx",
5151
"/pages/abcs/index.tsx",
52-
"/utils/dataAccess.ts"
53-
].forEach(file => expect(fs.existsSync(tmpobj.name + file)).toBe(true));
52+
"/utils/dataAccess.ts",
53+
].forEach((file) => expect(fs.existsSync(tmpobj.name + file)).toBe(true));
5454

5555
[
5656
"/components/abc/List.tsx",
5757
"/components/abc/ListItem.tsx",
5858
"/components/abc/Show.tsx",
59-
"/interfaces/Abc.ts"
60-
].forEach(file => {
59+
"/interfaces/Abc.ts",
60+
].forEach((file) => {
6161
expect(fs.existsSync(tmpobj.name + file)).toBe(true);
6262
expect(fs.readFileSync(tmpobj.name + file, "utf8")).toMatch(/bar/);
6363
});

‎src/generators/NuxtGenerator.js‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default class NuxtGenerator extends BaseVueGenerator {
3232
// store
3333
"store/crud.js",
3434
"store/notifications.js",
35-
"store/foo.js"
35+
"store/foo.js",
3636
]);
3737
}
3838

@@ -54,8 +54,8 @@ export default class NuxtGenerator extends BaseVueGenerator {
5454
`${dir}/services`,
5555
`${dir}/store`,
5656
`${dir}/utils`,
57-
`${dir}/validators`
58-
].forEach(dir => this.createDir(dir, false));
57+
`${dir}/validators`,
58+
].forEach((dir) => this.createDir(dir, false));
5959

6060
// error
6161
this.createFile(
@@ -71,8 +71,10 @@ export default class NuxtGenerator extends BaseVueGenerator {
7171
"mixins/list.js",
7272
"mixins/notification.js",
7373
"mixins/show.js",
74-
"mixins/update.js"
75-
].forEach(file => this.createFile(file, `${dir}/${file}`, context, false));
74+
"mixins/update.js",
75+
].forEach((file) =>
76+
this.createFile(file, `${dir}/${file}`, context, false)
77+
);
7678

7779
// stores
7880
this.createFile(
@@ -98,7 +100,7 @@ export default class NuxtGenerator extends BaseVueGenerator {
98100
);
99101

100102
// utils
101-
["dates.js", "fetch.js", "hydra.js"].forEach(file =>
103+
["dates.js", "fetch.js", "hydra.js"].forEach((file) =>
102104
this.createFile(`utils/${file}`, `${dir}/utils/${file}`, {}, false)
103105
);
104106

@@ -124,8 +126,10 @@ export default class NuxtGenerator extends BaseVueGenerator {
124126
"services/%s.js",
125127

126128
// store
127-
"store/%s.js"
128-
].forEach(pattern => this.createFileFromPattern(pattern, dir, lc, context));
129+
"store/%s.js",
130+
].forEach((pattern) =>
131+
this.createFileFromPattern(pattern, dir, lc, context)
132+
);
129133

130134
// components
131135
[
@@ -135,8 +139,8 @@ export default class NuxtGenerator extends BaseVueGenerator {
135139
"DataFilter.vue",
136140
"InputDate.vue",
137141
"Loading.vue",
138-
"Toolbar.vue"
139-
].forEach(file =>
142+
"Toolbar.vue",
143+
].forEach((file) =>
140144
this.createFile(
141145
`components/${file}`,
142146
`${dir}/components/${file}`,

‎src/generators/NuxtGenerator.test.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import NuxtGenerator from "./NuxtGenerator";
55

66
const generator = new NuxtGenerator({
77
hydraPrefix: "hydra:",
8-
templateDirectory: `${__dirname}/../../templates`
8+
templateDirectory: `${__dirname}/../../templates`,
99
});
1010

1111
afterEach(() => {
@@ -22,8 +22,8 @@ describe("generate", () => {
2222
range: "http://www.w3.org/2001/XMLSchema#string",
2323
reference: null,
2424
required: true,
25-
description: "An URL"
26-
})
25+
description: "An URL",
26+
}),
2727
];
2828
const resource = new Resource("abc", "http://example.com/foos", {
2929
id: "foo",
@@ -32,12 +32,12 @@ describe("generate", () => {
3232
writableFields: fields,
3333
getParameters: function getParameters() {
3434
return Promise.resolve([]);
35-
}
35+
},
3636
});
3737
const api = new Api("http://example.com", {
3838
entrypoint: "http://example.com:8080",
3939
title: "My API",
40-
resources: [resource]
40+
resources: [resource],
4141
});
4242

4343
generator.generate(api, resource, tmpobj.name).then(() => {
@@ -58,8 +58,8 @@ describe("generate", () => {
5858
"/utils/hydra.js",
5959
"/pages/foos/_id.vue",
6060
"/pages/foos/index.vue",
61-
"/pages/foos/new.vue"
62-
].forEach(file => {
61+
"/pages/foos/new.vue",
62+
].forEach((file) => {
6363
expect(fs.existsSync(tmpobj.name + file)).toBe(true);
6464
});
6565

0 commit comments

Comments
 (0)