From 37d36be09555b8628a1a55c339897390f87e8460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 2 May 2022 16:02:28 +0200 Subject: [PATCH 1/9] Replace deleted faker - Add Node Version Manager files as hint of the best Node version and to be used with '$ nvm use'. --- .nvmrc | 1 + backend/.nvmrc | 1 + backend/package.json | 2 +- backend/yarn.lock | 9 +++++---- package.json | 2 +- webapp/.nvmrc | 1 + yarn.lock | 9 +++++---- 7 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 .nvmrc create mode 100644 backend/.nvmrc create mode 100644 webapp/.nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 000000000..ce4572cce --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v17.9.0 \ No newline at end of file diff --git a/backend/.nvmrc b/backend/.nvmrc new file mode 100644 index 000000000..e4ab7d287 --- /dev/null +++ b/backend/.nvmrc @@ -0,0 +1 @@ +v12.19.0 \ No newline at end of file diff --git a/backend/package.json b/backend/package.json index 36b24abe7..22e3f19f6 100644 --- a/backend/package.json +++ b/backend/package.json @@ -66,7 +66,6 @@ "debug": "~4.1.1", "dotenv": "~8.2.0", "express": "^4.17.1", - "faker": "Marak/faker.js#master", "graphql": "^14.6.0", "graphql-custom-directives": "~0.2.14", "graphql-iso-date": "~3.6.1", @@ -120,6 +119,7 @@ "xregexp": "^4.3.0" }, "devDependencies": { + "@faker-js/faker": "^4.1.0", "apollo-server-testing": "~2.11.0", "chai": "~4.2.0", "cucumber": "~6.0.5", diff --git a/backend/yarn.lock b/backend/yarn.lock index 117383e58..80e0920b7 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -963,6 +963,11 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@faker-js/faker@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-4.1.0.tgz#53f965b60ec929c8ae5e3c1977bfc00d0f7b7295" + integrity sha512-PhF1yIVv8wupIFPSlL4gPz0z4RbOD9MLQHEMw5xoMrQ1J4rj76eivi0PwmW0K/puRPpHLE4gnrJ7AlTkgORhQA== + "@graphql-toolkit/common@0.10.4": version "0.10.4" resolved "https://registry.yarnpkg.com/@graphql-toolkit/common/-/common-0.10.4.tgz#7785f2a3f14559d0778859c49f4442078c196695" @@ -4587,10 +4592,6 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -faker@Marak/faker.js#master: - version "4.1.0" - resolved "https://codeload.github.com/Marak/faker.js/tar.gz/3b2fa4aebccee52ae1bafc15d575061fb30c3cf1" - fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" diff --git a/package.json b/package.json index 920877f82..9b0e27d95 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "date-fns": "^2.25.0", "dotenv": "^8.2.0", "expect": "^25.3.0", - "faker": "Marak/faker.js#master", + "@faker-js/faker": "5.1.0", "graphql-request": "^2.0.0", "import": "^0.0.6", "jsonwebtoken": "^8.5.1", diff --git a/webapp/.nvmrc b/webapp/.nvmrc new file mode 100644 index 000000000..e4ab7d287 --- /dev/null +++ b/webapp/.nvmrc @@ -0,0 +1 @@ +v12.19.0 \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 58cb36a7f..4e2303801 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1248,6 +1248,11 @@ debug "^3.1.0" lodash.once "^4.1.1" +"@faker-js/faker@5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.1.0.tgz#cee1d77ada0d0dbbe77201d18b1ebabf432d9c0f" + integrity sha512-0VonSKh7fBCqvY+V2FLN2ZW4pR4ZtWJalWmwSaiaB7yK7y4qp8vDfuaq9QdLjf/cdZGx3M7Wc4Q+x4fZHxI21Q== + "@hapi/address@2.x.x": version "2.0.0" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.0.0.tgz#9f05469c88cb2fd3dcd624776b54ee95c312126a" @@ -3058,10 +3063,6 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -faker@Marak/faker.js#master: - version "5.1.0" - resolved "https://codeload.github.com/Marak/faker.js/tar.gz/91dc8a3372426bc691be56153b33e81a16459f49" - fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" From 47b88ffb46e17ffee452b86dcb99516b7e9cca4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 2 May 2022 16:28:45 +0200 Subject: [PATCH 2/9] Fix faker import --- backend/package.json | 2 +- backend/src/db/factories.js | 2 +- backend/src/db/seed.js | 2 +- backend/yarn.lock | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/package.json b/backend/package.json index 22e3f19f6..a48814ef4 100644 --- a/backend/package.json +++ b/backend/package.json @@ -119,7 +119,7 @@ "xregexp": "^4.3.0" }, "devDependencies": { - "@faker-js/faker": "^4.1.0", + "@faker-js/faker": "4.1.0", "apollo-server-testing": "~2.11.0", "chai": "~4.2.0", "cucumber": "~6.0.5", diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js index 6173238ae..798c76fcd 100644 --- a/backend/src/db/factories.js +++ b/backend/src/db/factories.js @@ -1,5 +1,5 @@ import { v4 as uuid } from 'uuid' -import faker from 'faker' +import { faker } from '@faker-js/faker' import slugify from 'slug' import { hashSync } from 'bcryptjs' import { Factory } from 'rosie' diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js index 7d9b5e954..c310320c1 100644 --- a/backend/src/db/seed.js +++ b/backend/src/db/seed.js @@ -1,4 +1,4 @@ -import faker from 'faker' +import { faker } from '@faker-js/faker' import sample from 'lodash/sample' import { createTestClient } from 'apollo-server-testing' import createServer from '../server' diff --git a/backend/yarn.lock b/backend/yarn.lock index 80e0920b7..a151af30b 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -963,7 +963,7 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@faker-js/faker@^4.1.0": +"@faker-js/faker@4.1.0": version "4.1.0" resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-4.1.0.tgz#53f965b60ec929c8ae5e3c1977bfc00d0f7b7295" integrity sha512-PhF1yIVv8wupIFPSlL4gPz0z4RbOD9MLQHEMw5xoMrQ1J4rj76eivi0PwmW0K/puRPpHLE4gnrJ7AlTkgORhQA== From c0a61600e424fb1235cf9f45e9822f42a968f4ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 2 May 2022 16:51:51 +0200 Subject: [PATCH 3/9] Revert change of faker import --- backend/src/db/factories.js | 3 ++- backend/src/db/seed.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js index 798c76fcd..b0df4694b 100644 --- a/backend/src/db/factories.js +++ b/backend/src/db/factories.js @@ -1,5 +1,5 @@ import { v4 as uuid } from 'uuid' -import { faker } from '@faker-js/faker' +import faker from 'faker' import slugify from 'slug' import { hashSync } from 'bcryptjs' import { Factory } from 'rosie' @@ -47,6 +47,7 @@ Factory.define('badge') return neode.create('Badge', buildObject) }) +console.log(faker) Factory.define('image') .attr('url', faker.image.unsplash.imageUrl) .attr('aspectRatio', 1.3333333333333333) diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js index c310320c1..7d9b5e954 100644 --- a/backend/src/db/seed.js +++ b/backend/src/db/seed.js @@ -1,4 +1,4 @@ -import { faker } from '@faker-js/faker' +import faker from 'faker' import sample from 'lodash/sample' import { createTestClient } from 'apollo-server-testing' import createServer from '../server' From bbb88cb1d9688a062e1a071e06e28d59c5c8b19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 2 May 2022 16:53:07 +0200 Subject: [PATCH 4/9] Remove console.log --- backend/src/db/factories.js | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js index b0df4694b..6173238ae 100644 --- a/backend/src/db/factories.js +++ b/backend/src/db/factories.js @@ -47,7 +47,6 @@ Factory.define('badge') return neode.create('Badge', buildObject) }) -console.log(faker) Factory.define('image') .attr('url', faker.image.unsplash.imageUrl) .attr('aspectRatio', 1.3333333333333333) From 7bb1b0bbad2fda164f99aaa3814e86f0529140b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 3 May 2022 12:08:01 +0200 Subject: [PATCH 5/9] Fix faker import and change version, because of unsplash does not exist --- backend/package.json | 2 +- backend/src/db/factories.js | 3 ++- backend/yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index a48814ef4..920c89e01 100644 --- a/backend/package.json +++ b/backend/package.json @@ -119,7 +119,7 @@ "xregexp": "^4.3.0" }, "devDependencies": { - "@faker-js/faker": "4.1.0", + "@faker-js/faker": "^5.1.0", "apollo-server-testing": "~2.11.0", "chai": "~4.2.0", "cucumber": "~6.0.5", diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js index 6173238ae..153a915b6 100644 --- a/backend/src/db/factories.js +++ b/backend/src/db/factories.js @@ -1,5 +1,6 @@ import { v4 as uuid } from 'uuid' -import faker from 'faker' +// Wolle import faker from 'faker' +const faker = require('@faker-js/faker') import slugify from 'slug' import { hashSync } from 'bcryptjs' import { Factory } from 'rosie' diff --git a/backend/yarn.lock b/backend/yarn.lock index a151af30b..afe3ef50d 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -963,10 +963,10 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@faker-js/faker@4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-4.1.0.tgz#53f965b60ec929c8ae5e3c1977bfc00d0f7b7295" - integrity sha512-PhF1yIVv8wupIFPSlL4gPz0z4RbOD9MLQHEMw5xoMrQ1J4rj76eivi0PwmW0K/puRPpHLE4gnrJ7AlTkgORhQA== +"@faker-js/faker@^5.1.0": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.5.3.tgz#18e3af6b8eae7984072bbeb0c0858474d7c4cefe" + integrity sha512-R11tGE6yIFwqpaIqcfkcg7AICXzFg14+5h5v0TfF/9+RMDL6jhzCy/pxHVOfbALGdtVYdt6JdR21tuxEgl34dw== "@graphql-toolkit/common@0.10.4": version "0.10.4" From 0867d2bfcafef8097ba1511b1dfcf2dcf2eed891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 3 May 2022 13:43:10 +0200 Subject: [PATCH 6/9] Fix backend test of locations --- backend/src/schema/resolvers/users/location.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js index e69b48f50..f150e8594 100644 --- a/backend/src/schema/resolvers/users/location.spec.js +++ b/backend/src/schema/resolvers/users/location.spec.js @@ -38,8 +38,8 @@ const newlyCreatedNodesWithLocales = [ nameRU: 'Вельцхайм', nameNL: 'Welzheim', namePL: 'Welzheim', - lng: 9.63444, - lat: 48.87472, + lng: 9.634741, + lat: 48.874924, }, state: { id: expect.stringContaining('region'), From 634249b407610154537e60433cc7773071575f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 3 May 2022 14:22:10 +0200 Subject: [PATCH 7/9] Fix the rest of the faker imports - Some seems to work even the old way?! --- backend/src/db/factories.js | 4 ++-- backend/src/db/seed.js | 3 ++- webapp/components/CommentList/CommentList.story.js | 3 ++- .../_new/generic/TabNavigation/TabNavigator.story.js | 3 ++- webapp/storybook/helpers.js | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js index 153a915b6..1a21df541 100644 --- a/backend/src/db/factories.js +++ b/backend/src/db/factories.js @@ -1,12 +1,12 @@ import { v4 as uuid } from 'uuid' -// Wolle import faker from 'faker' -const faker = require('@faker-js/faker') import slugify from 'slug' import { hashSync } from 'bcryptjs' import { Factory } from 'rosie' import { getDriver, getNeode } from './neo4j' import CONFIG from '../config/index.js' import generateInviteCode from '../schema/resolvers/helpers/generateInviteCode.js' +// import faker from 'faker' // this import is not working, why? +const faker = require('@faker-js/faker') const neode = getNeode() diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js index 7d9b5e954..6499e7e5a 100644 --- a/backend/src/db/seed.js +++ b/backend/src/db/seed.js @@ -1,10 +1,11 @@ -import faker from 'faker' import sample from 'lodash/sample' import { createTestClient } from 'apollo-server-testing' import createServer from '../server' import Factory from '../db/factories' import { getNeode, getDriver } from '../db/neo4j' import { gql } from '../helpers/jest' +// import faker from 'faker' // this import is not working, why? +const faker = require('@faker-js/faker') const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] diff --git a/webapp/components/CommentList/CommentList.story.js b/webapp/components/CommentList/CommentList.story.js index 3ef474c80..84017710d 100644 --- a/webapp/components/CommentList/CommentList.story.js +++ b/webapp/components/CommentList/CommentList.story.js @@ -2,7 +2,8 @@ import { storiesOf } from '@storybook/vue' import { withA11y } from '@storybook/addon-a11y' import HcCommentList from './CommentList.vue' import helpers from '~/storybook/helpers' -import faker from 'faker' +// import faker from 'faker' // this import is not working, why? +const faker = require('@faker-js/faker') helpers.init() diff --git a/webapp/components/_new/generic/TabNavigation/TabNavigator.story.js b/webapp/components/_new/generic/TabNavigation/TabNavigator.story.js index 457e78209..98213f4df 100644 --- a/webapp/components/_new/generic/TabNavigation/TabNavigator.story.js +++ b/webapp/components/_new/generic/TabNavigation/TabNavigator.story.js @@ -8,9 +8,10 @@ import TabNavigation from '~/components/_new/generic/TabNavigation/TabNavigation import UserTeaser from '~/components/UserTeaser/UserTeaser' import HcHashtag from '~/components/Hashtag/Hashtag' import helpers from '~/storybook/helpers' -import faker from 'faker' import { post } from '~/components/PostTeaser/PostTeaser.story.js' import { user } from '~/components/UserTeaser/UserTeaser.story.js' +// import faker from 'faker' // this import is not working, why? +const faker = require('@faker-js/faker') helpers.init() diff --git a/webapp/storybook/helpers.js b/webapp/storybook/helpers.js index 5fcd8e64b..f36a43061 100644 --- a/webapp/storybook/helpers.js +++ b/webapp/storybook/helpers.js @@ -1,6 +1,5 @@ import Vue from 'vue' import Vuex from 'vuex' -import faker from 'faker' import vuexI18n from 'vuex-i18n/dist/vuex-i18n.umd.js' import Styleguide from '@human-connection/styleguide' import Filters from '~/plugins/vue-filters' @@ -8,8 +7,9 @@ import Directives from '~/plugins/vue-directives' import IziToast from '~/plugins/izi-toast' import layout from './layout.vue' import locales from '~/locales/index.js' - import '~/plugins/v-tooltip' +// import faker from 'faker' // this import is not working, why? +const faker = require('@faker-js/faker') const helpers = { init(options = {}) { From 4b42975cd94f353bd7f72e47da3f58664ef36503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 3 May 2022 14:30:11 +0200 Subject: [PATCH 8/9] Fixate faker version in backend - Do this, because of upgrade to v6 that may happen and need a Node version >= v14 we don't support yet as I have seen. --- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/package.json b/backend/package.json index 920c89e01..e0d53b5b9 100644 --- a/backend/package.json +++ b/backend/package.json @@ -119,7 +119,7 @@ "xregexp": "^4.3.0" }, "devDependencies": { - "@faker-js/faker": "^5.1.0", + "@faker-js/faker": "5.1.0", "apollo-server-testing": "~2.11.0", "chai": "~4.2.0", "cucumber": "~6.0.5", diff --git a/backend/yarn.lock b/backend/yarn.lock index afe3ef50d..24bd00b3a 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -963,10 +963,10 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@faker-js/faker@^5.1.0": - version "5.5.3" - resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.5.3.tgz#18e3af6b8eae7984072bbeb0c0858474d7c4cefe" - integrity sha512-R11tGE6yIFwqpaIqcfkcg7AICXzFg14+5h5v0TfF/9+RMDL6jhzCy/pxHVOfbALGdtVYdt6JdR21tuxEgl34dw== +"@faker-js/faker@5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.1.0.tgz#cee1d77ada0d0dbbe77201d18b1ebabf432d9c0f" + integrity sha512-0VonSKh7fBCqvY+V2FLN2ZW4pR4ZtWJalWmwSaiaB7yK7y4qp8vDfuaq9QdLjf/cdZGx3M7Wc4Q+x4fZHxI21Q== "@graphql-toolkit/common@0.10.4": version "0.10.4" From 980a6bf504b66f7e424f3cd389c9495208900370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 3 May 2022 20:02:44 +0200 Subject: [PATCH 9/9] Fix faker package installation in webapp --- webapp/package.json | 2 +- webapp/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 92d72d176..cf4354dde 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -108,6 +108,7 @@ "@babel/core": "~7.12.3", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/preset-env": "~7.9.0", + "@faker-js/faker": "5.1.0", "@storybook/addon-a11y": "^6.3.6", "@storybook/addon-actions": "^5.3.21", "@storybook/addon-notes": "^5.3.18", @@ -136,7 +137,6 @@ "eslint-plugin-promise": "~4.3.1", "eslint-plugin-standard": "~5.0.0", "eslint-plugin-vue": "~6.2.2", - "faker": "^5.1.0", "flush-promises": "^1.0.2", "identity-obj-proxy": "^3.0.0", "jest": "~26.6.3", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 9ff5a19b7..ef71a2a53 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -2379,6 +2379,11 @@ ts-node "^8" tslib "^1" +"@faker-js/faker@5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.1.0.tgz#cee1d77ada0d0dbbe77201d18b1ebabf432d9c0f" + integrity sha512-0VonSKh7fBCqvY+V2FLN2ZW4pR4ZtWJalWmwSaiaB7yK7y4qp8vDfuaq9QdLjf/cdZGx3M7Wc4Q+x4fZHxI21Q== + "@hapi/address@2.x.x": version "2.0.0" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.0.0.tgz#9f05469c88cb2fd3dcd624776b54ee95c312126a" @@ -10235,11 +10240,6 @@ fake-tag@^1.0.0: resolved "https://registry.yarnpkg.com/fake-tag/-/fake-tag-1.0.1.tgz#1d59da482240a02bd83500ca98976530ed154b0d" integrity sha512-qmewZoBpa71mM+y6oxXYW/d1xOYQmeIvnEXAt1oCmdP0sqcogWYLepR87QL1jQVLSVMVYDq2cjY6ec/Wu8/4pg== -faker@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/faker/-/faker-5.1.0.tgz#e10fa1dec4502551aee0eb771617a7e7b94692e8" - integrity sha512-RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw== - fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"