Merge pull request #246 from dunglas/upgrade-deps

fix: upgrade deps

Author: dunglas

.eslintrc.js

@@ -18,5 +18,8 @@ module.exports = {
   'rules': {
     'prettier/prettier': 'error',
     'no-console': 0,
+    'no-extra-semi': 'off',
+    'no-mixed-spaces-and-tabs': 'off',
+    'no-unexpected-multiline': 'off',
   }
 };

.travis.yml

@@ -1,8 +1,7 @@
 language: node_js
 node_js:
-- '11'
-- '10'
-- '8'
+- '15'
+- '14'
 
 cache:
   directories:
@@ -13,7 +12,7 @@ script:
 - yarn test
 - yarn lint
 - yarn test-gen
-- yarn test-gen-cs
+#- yarn test-gen-cs
 - yarn test-gen-env
 - yarn check
 
@@ -23,5 +22,5 @@ deploy:
   api_key: $NPM_AUTH_TOKEN
   on:
     tags: true
-    node_js: '8'
+    node_js: '15'
   skip_cleanup: true

package.json

@@ -24,33 +24,33 @@
     "@babel/plugin-transform-runtime": "^7.0.0",
     "@babel/preset-env": "^7.6.0",
     "babel-eslint": "^10.0.0",
-    "babel-jest": "^24.0.0",
-    "eslint": "^5.6.0",
-    "eslint-config-prettier": "^6.3.0",
+    "babel-jest": "^26.0.0",
+    "eslint": "^7.17.0",
+    "eslint-config-prettier": "^7.1.0",
     "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-prettier": "^3.1.0",
-    "husky": "^3.0.9",
-    "jest": "^24.0.0",
-    "lint-staged": "^9.4.2",
-    "prettier": "^1.14.3",
-    "tmp": "^0.1.0"
+    "eslint-plugin-prettier": "^3.3.0",
+    "husky": "^4.3.6",
+    "jest": "^26.6.3",
+    "lint-staged": "^10.5.3",
+    "prettier": "^2.2.1",
+    "tmp": "^0.2.1"
   },
   "dependencies": {
-    "@api-platform/api-doc-parser": "^0.8.3",
+    "@api-platform/api-doc-parser": "^0.12.0",
     "@babel/runtime": "^7.0.0",
-    "chalk": "^2.4.1",
-    "commander": "^3.0.1",
+    "chalk": "^4.1.0",
+    "commander": "^6.2.1",
     "handlebars": "^4.0.12",
     "handlebars-helpers": "^0.10.0",
-    "isomorphic-fetch": "^2.2.1",
-    "mkdirp": "^0.5.1",
+    "isomorphic-fetch": "^3.0.0",
+    "mkdirp": "^1.0.4",
     "sprintf-js": "^1.1.1"
   },
   "scripts": {
     "test": "jest",
     "lint": "eslint src",
     "fix": "eslint --fix src",
-    "eslint-check": "eslint --print-config .eslintrc.js | eslint-config-prettier-check",
+    "eslint-check": "eslint-config-prettier src/index.js",
     "build": "babel src -d lib --ignore '*.test.js'",
     "watch": "babel --watch src -d lib --ignore '*.test.js'",
     "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

@@ -81,7 +81,7 @@ export default class {
       const configuration = JSON.parse(packageFile.toString());
       dependencies = Object.keys({
         ...configuration.dependencies,
-        ...configuration.devDependencies
+        ...configuration.devDependencies,
       });
     } catch (e) {
       console.log(
@@ -154,10 +154,10 @@ export default class {
   }
 
   buildFields(fields) {
-    return fields.map(field => ({
+    return fields.map((field) => ({
       ...field,
       ...this.getHtmlInputTypeFromField(field),
-      description: field.description.replace(/"/g, "'") // fix for Form placeholder description
+      description: field.description.replace(/"/g, "'"), // fix for Form placeholder description
     }));
   }
 }

src/generators/NextGenerator.js

@@ -25,7 +25,7 @@ export default class NextGenerator extends BaseGenerator {
       "pages/foos/index.tsx",
 
       // utils
-      "utils/dataAccess.ts"
+      "utils/dataAccess.ts",
     ]);
   }
 
@@ -50,7 +50,7 @@ export default class NextGenerator extends BaseGenerator {
       formFields: this.buildFields(fields),
       imports,
       hydraPrefix: this.hydraPrefix,
-      title: resource.title
+      title: resource.title,
     };
 
     // Create directories
@@ -61,8 +61,8 @@ export default class NextGenerator extends BaseGenerator {
       `${dir}/error`,
       `${dir}/interfaces`,
       `${dir}/pages`,
-      `${dir}/utils`
-    ].forEach(dir => this.createDir(dir, false));
+      `${dir}/utils`,
+    ].forEach((dir) => this.createDir(dir, false));
 
     // copy with patterned name
     this.createDir(`${dir}/components/${context.lc}`);
@@ -75,8 +75,8 @@ export default class NextGenerator extends BaseGenerator {
 
       // pages
       "pages/%ss/[id].tsx",
-      "pages/%ss/index.tsx"
-    ].forEach(pattern =>
+      "pages/%ss/index.tsx",
+    ].forEach((pattern) =>
       this.createFileFromPattern(pattern, dir, context.lc, context)
     );
 
@@ -99,8 +99,10 @@ export default class NextGenerator extends BaseGenerator {
       "interfaces/Collection.ts",
 
       // utils
-      "utils/dataAccess.ts"
-    ].forEach(file => this.createFile(file, `${dir}/${file}`, context, false));
+      "utils/dataAccess.ts",
+    ].forEach((file) =>
+      this.createFile(file, `${dir}/${file}`, context, false)
+    );
 
     // API config
     this.createEntrypoint(api.entrypoint, `${dir}/config/entrypoint.ts`);
@@ -113,7 +115,7 @@ export default class NextGenerator extends BaseGenerator {
   parseFields(resource) {
     const fields = [
       ...resource.writableFields,
-      ...resource.readableFields
+      ...resource.readableFields,
     ].reduce((list, field) => {
       if (list[field.name]) {
         return list;
@@ -127,8 +129,8 @@ export default class NextGenerator extends BaseGenerator {
           type: this.getType(field),
           description: this.getDescription(field),
           readonly: false,
-          reference: field.reference
-        }
+          reference: field.reference,
+        },
       };
     }, {});
 
@@ -144,8 +146,8 @@ export default class NextGenerator extends BaseGenerator {
           ...list,
           [type]: {
             type,
-            file: `./${type}`
-          }
+            file: `./${type}`,
+          },
         };
       },
       {}

src/generators/NextGenerator.test.js

@@ -5,7 +5,7 @@ import NextGenerator from "./NextGenerator";
 
 const generator = new NextGenerator({
   hydraPrefix: "hydra:",
-  templateDirectory: `${__dirname}/../../templates`
+  templateDirectory: `${__dirname}/../../templates`,
 });
 
 afterEach(() => {
@@ -22,19 +22,19 @@ describe("generate", () => {
         range: "http://www.w3.org/2001/XMLSchema#string",
         reference: null,
         required: true,
-        description: "An URL"
-      })
+        description: "An URL",
+      }),
     ];
     const resource = new Resource("abc", "http://example.com/foos", {
       id: "abc",
       title: "abc",
       readableFields: fields,
-      writableFields: fields
+      writableFields: fields,
     });
     const api = new Api("http://example.com", {
       entrypoint: "http://example.com:8080",
       title: "My API",
-      resources: [resource]
+      resources: [resource],
     });
     generator.generate(api, resource, tmpobj.name);
 
@@ -49,15 +49,15 @@ describe("generate", () => {
       "/interfaces/Collection.ts",
       "/pages/abcs/[id].tsx",
       "/pages/abcs/index.tsx",
-      "/utils/dataAccess.ts"
-    ].forEach(file => expect(fs.existsSync(tmpobj.name + file)).toBe(true));
+      "/utils/dataAccess.ts",
+    ].forEach((file) => expect(fs.existsSync(tmpobj.name + file)).toBe(true));
 
     [
       "/components/abc/List.tsx",
       "/components/abc/ListItem.tsx",
       "/components/abc/Show.tsx",
-      "/interfaces/Abc.ts"
-    ].forEach(file => {
+      "/interfaces/Abc.ts",
+    ].forEach((file) => {
       expect(fs.existsSync(tmpobj.name + file)).toBe(true);
       expect(fs.readFileSync(tmpobj.name + file, "utf8")).toMatch(/bar/);
     });

src/generators/NuxtGenerator.js

@@ -32,7 +32,7 @@ export default class NuxtGenerator extends BaseVueGenerator {
       // store
       "store/crud.js",
       "store/notifications.js",
-      "store/foo.js"
+      "store/foo.js",
     ]);
   }
 
@@ -54,8 +54,8 @@ export default class NuxtGenerator extends BaseVueGenerator {
       `${dir}/services`,
       `${dir}/store`,
       `${dir}/utils`,
-      `${dir}/validators`
-    ].forEach(dir => this.createDir(dir, false));
+      `${dir}/validators`,
+    ].forEach((dir) => this.createDir(dir, false));
 
     // error
     this.createFile(
@@ -71,8 +71,10 @@ export default class NuxtGenerator extends BaseVueGenerator {
       "mixins/list.js",
       "mixins/notification.js",
       "mixins/show.js",
-      "mixins/update.js"
-    ].forEach(file => this.createFile(file, `${dir}/${file}`, context, false));
+      "mixins/update.js",
+    ].forEach((file) =>
+      this.createFile(file, `${dir}/${file}`, context, false)
+    );
 
     // stores
     this.createFile(
@@ -98,7 +100,7 @@ export default class NuxtGenerator extends BaseVueGenerator {
     );
 
     // utils
-    ["dates.js", "fetch.js", "hydra.js"].forEach(file =>
+    ["dates.js", "fetch.js", "hydra.js"].forEach((file) =>
       this.createFile(`utils/${file}`, `${dir}/utils/${file}`, {}, false)
     );
 
@@ -124,8 +126,10 @@ export default class NuxtGenerator extends BaseVueGenerator {
       "services/%s.js",
 
       // store
-      "store/%s.js"
-    ].forEach(pattern => this.createFileFromPattern(pattern, dir, lc, context));
+      "store/%s.js",
+    ].forEach((pattern) =>
+      this.createFileFromPattern(pattern, dir, lc, context)
+    );
 
     // components
     [
@@ -135,8 +139,8 @@ export default class NuxtGenerator extends BaseVueGenerator {
       "DataFilter.vue",
       "InputDate.vue",
       "Loading.vue",
-      "Toolbar.vue"
-    ].forEach(file =>
+      "Toolbar.vue",
+    ].forEach((file) =>
       this.createFile(
         `components/${file}`,
         `${dir}/components/${file}`,

src/generators/NuxtGenerator.test.js

@@ -5,7 +5,7 @@ import NuxtGenerator from "./NuxtGenerator";
 
 const generator = new NuxtGenerator({
   hydraPrefix: "hydra:",
-  templateDirectory: `${__dirname}/../../templates`
+  templateDirectory: `${__dirname}/../../templates`,
 });
 
 afterEach(() => {
@@ -22,8 +22,8 @@ describe("generate", () => {
         range: "http://www.w3.org/2001/XMLSchema#string",
         reference: null,
         required: true,
-        description: "An URL"
-      })
+        description: "An URL",
+      }),
     ];
     const resource = new Resource("abc", "http://example.com/foos", {
       id: "foo",
@@ -32,12 +32,12 @@ describe("generate", () => {
       writableFields: fields,
       getParameters: function getParameters() {
         return Promise.resolve([]);
-      }
+      },
     });
     const api = new Api("http://example.com", {
       entrypoint: "http://example.com:8080",
       title: "My API",
-      resources: [resource]
+      resources: [resource],
     });
 
     generator.generate(api, resource, tmpobj.name).then(() => {
@@ -58,8 +58,8 @@ describe("generate", () => {
         "/utils/hydra.js",
         "/pages/foos/_id.vue",
         "/pages/foos/index.vue",
-        "/pages/foos/new.vue"
-      ].forEach(file => {
+        "/pages/foos/new.vue",
+      ].forEach((file) => {
         expect(fs.existsSync(tmpobj.name + file)).toBe(true);
       });