Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

tooling: update to Node 10 and pin packages (#370)

Guilherme Oenning4773afad35fe
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5f8bd7362..ca683f7b3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,8 @@ version: 2
jobs:
build:
docker:
- - image: getfider/circleci:0.0.7
+ - image: getfider/circleci:0.0.8
+ - image: postgres:9.6.8
working_directory: /go/src/github.com/getfider/fider
steps:
- checkout
@@ -11,13 +12,27 @@ jobs:
- fider-v1-npm-{{ checksum "package-lock.json" }}
- run:
name: npm install
- command: if [ ! -d "./node_modules" ]; then npm install; fi
- - run: make lint
- - run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make build
+ command: if [ ! -d "./node_modules" ]; then npm ci; fi
- save_cache:
key: fider-v1-npm-{{ checksum "package-lock.json" }}
paths:
- node_modules/
+ - run:
+ name: setup postgres
+ command: |
+ for i in 1 2 3 4 5; do psql -h localhost -p 5432 -U postgres -c "CREATE DATABASE fider_ci" && break || sleep 2; done
+ for i in 1 2 3 4 5; do psql -h localhost -p 5432 -U postgres -c "CREATE EXTENSION pg_trgm" -d fider_ci && break || sleep 2; done
+ for i in 1 2 3 4 5; do psql -h localhost -p 5432 -U postgres -c "CREATE USER fider_ci WITH PASSWORD 'fider_ci_pw'" && break || sleep 2; done
+ - run: make lint
+ - run:
+ name: test
+ command: |
+ mkdir ./dist
+ make test-ui
+ DATABASE_URL=postgres://fider_ci:fider_ci_pw@localhost:5432/fider_ci?sslmode=disable make coverage
+ bash <(curl -s https://codecov.io/bash)
+
+ - run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make build
- setup_remote_docker
- run: docker build -t getfider/fider .
- run: docker save -o ./docker-image.tar getfider/fider
@@ -25,25 +40,9 @@ jobs:
root: ./
paths:
- docker-image.tar
- test:
- docker:
- - image: getfider/circleci:0.0.7
- - image: postgres:9.6.8
- working_directory: /go/src/github.com/getfider/fider
- steps:
- - checkout
- - run:
- name: setup postgres
- command: |
- mkdir dist
- for i in 1 2 3 4 5; do psql -h localhost -p 5432 -U postgres -c "CREATE DATABASE fider_ci" && break || sleep 2; done
- for i in 1 2 3 4 5; do psql -h localhost -p 5432 -U postgres -c "CREATE EXTENSION pg_trgm" -d fider_ci && break || sleep 2; done
- for i in 1 2 3 4 5; do psql -h localhost -p 5432 -U postgres -c "CREATE USER fider_ci WITH PASSWORD 'fider_ci_pw'" && break || sleep 2; done
- - run: DATABASE_URL=postgres://fider_ci:fider_ci_pw@localhost:5432/fider_ci?sslmode=disable make coverage
- - run: bash <(curl -s https://codecov.io/bash)
push:
docker:
- - image: getfider/circleci:0.0.7
+ - image: getfider/circleci:0.0.8
working_directory: /go/src/github.com/getfider/fider
steps:
- attach_workspace:
@@ -74,8 +73,6 @@ workflows:
all:
jobs:
- build
- - test
- push:
requires:
- - build
- - test
\ No newline at end of file
+ - build
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1c946bcc5..3c4a4d6a0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ If you know these technologies or would like to learn them, lucky you! This is t
Install the following tools:
- Go 1.10+ (https://golang.org/)
-- Node.js 8+ (https://nodejs.org/)
+- Node.js 10+ (https://nodejs.org/)
- Docker (https://www.docker.com/)
- github.com/codegangsta/gin (https://github.com/codegangsta/gin/)
diff --git a/Makefile b/Makefile
index fae699186..fa89024bf 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ lint-fix:
test-ui:
rm -rf ./output/public
npx tsc -p ./tsconfig.json
- npx jest ./output/public
+ TZ='GMT' npx jest ./output/public
test-server:
godotenv -f .test.env go test ./... -p=1
diff --git a/package-lock.json b/package-lock.json
index 4f05d7561..d80654e6d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,9 +86,9 @@
"dev": true
},
"@types/react": {
- "version": "16.3.12",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.3.12.tgz",
- "integrity": "sha512-FfBhLC3QeXXEtjoGGLixS7cB305vzBOM1dZKtbUuXeTfjY0quzRRMxpqylC4QyUaLqdhNLdER0ZdHUGAVlGSCA==",
+ "version": "16.3.13",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.3.13.tgz",
+ "integrity": "sha512-YMFH/E9ryjUm2AoOy8KdTuG1SufaMuYmO/5xACROl0pm9dRmE2RN3d2zjv/eHALF6LGRZPVb7G9kqP0n5dWttQ==",
"dev": true,
"requires": {
"csstype": "^2.2.0"
@@ -1903,16 +1903,16 @@
"dev": true
},
"chromedriver": {
- "version": "2.35.0",
- "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.35.0.tgz",
- "integrity": "sha512-zqvC/HKybRxiM68GzByvUaXxTmNCmpETvLQIM92IEdrQxPnONKt3ZdTsiwxmGrL2ZIDbr9OEHJljmhZZMEsFPw==",
+ "version": "2.38.2",
+ "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.38.2.tgz",
+ "integrity": "sha512-gh77kozqCPTtr74RZpnSgBCoClpNznsg2NEKwi8t54UyzrcpMRkG9nH1qhwI+ojLQpsdpsSjGiASSdMsFZT/mw==",
"dev": true,
"requires": {
"del": "^3.0.0",
- "extract-zip": "^1.6.5",
+ "extract-zip": "^1.6.6",
"kew": "^0.7.0",
"mkdirp": "^0.5.1",
- "request": "^2.83.0"
+ "request": "^2.85.0"
}
},
"ci-info": {
@@ -2611,9 +2611,9 @@
}
},
"csstype": {
- "version": "2.4.1",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.4.1.tgz",
- "integrity": "sha512-JuXYT9dt8xtpc4mwHSOYnZtQS3TmYVhmZDyXbppTid29krM8Eyn5CmsZjIDTSvzunvutYOBwQmnziR5vgFkJGw==",
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.4.2.tgz",
+ "integrity": "sha512-1TnkyZwDy0oUl//6685j2bTMNe61SzntWntijNdmmEzvpYbGmVMZkj204gv4glcQp6z/ypg+YRziT91XVFmOyg==",
"dev": true
},
"currently-unhandled": {
@@ -10616,9 +10616,9 @@
}
},
"sass-loader": {
- "version": "6.0.7",
- "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.7.tgz",
- "integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.0.1.tgz",
+ "integrity": "sha512-MeVVJFejJELlAbA7jrRchi88PGP6U9yIfqyiG+bBC4a9s2PX+ulJB9h8bbEohtPBfZmlLhNZ0opQM9hovRXvlw==",
"dev": true,
"requires": {
"clone-deep": "^2.0.1",
diff --git a/package.json b/package.json
index 563b5b387..85ec60df6 100644
--- a/package.json
+++ b/package.json
@@ -4,43 +4,43 @@
"repository": "https://github.com/getfider/fider",
"private": true,
"dependencies": {
- "markdown-it": "^8.4.1",
- "react": "^16.3.1",
- "react-dom": "^16.3.1",
- "react-textarea-autosize": "^6.1.0",
- "react-toastify": "^4.0.0-rc.2",
+ "markdown-it": "8.4.1",
+ "react": "16.3.2",
+ "react-dom": "16.3.2",
+ "react-textarea-autosize": "6.1.0",
+ "react-toastify": "4.0.0-rc.5",
"semantic-ui-css": "2.2.14",
- "semantic-ui-react": "^0.79.0"
+ "semantic-ui-react": "0.79.1"
},
"devDependencies": {
- "@types/jest": "^22.2.3",
+ "@types/jest": "22.2.3",
"@types/markdown-it": "0.0.4",
"@types/node": "9.6.7",
- "@types/react": "^16.3.5",
- "@types/react-dom": "^16.0.4",
- "@types/react-textarea-autosize": "^4.3.2",
- "@types/selenium-webdriver": "^3.0.8",
- "chromedriver": "2.35.0",
- "css-loader": "^0.28.11",
- "dotenv": "^5.0.1",
- "file-loader": "^1.1.11",
- "jest": "^22.4.3",
- "mini-css-extract-plugin": "^0.4.0",
- "node-sass": "^4.8.3",
- "prettier": "^1.11.1",
- "reflect-metadata": "^0.1.12",
- "sass-loader": "^6.0.7",
- "selenium-webdriver": "^3.6.0",
- "ts-jest": "^22.4.4",
- "ts-loader": "^4.1.0",
- "tslint": "^5.9.1",
- "tslint-config-prettier": "^1.10.0",
- "tslint-plugin-prettier": "^1.3.0",
- "tslint-react": "^3.5.1",
- "typescript": "^2.8.1",
- "webpack": "^4.5.0",
- "webpack-clean-obsolete-chunks": "^0.4.0",
- "webpack-cli": "^2.0.14"
+ "@types/react": "16.3.13",
+ "@types/react-dom": "16.0.5",
+ "@types/react-textarea-autosize": "4.3.2",
+ "@types/selenium-webdriver": "3.0.8",
+ "chromedriver": "2.38.2",
+ "css-loader": "0.28.11",
+ "dotenv": "5.0.1",
+ "file-loader": "1.1.11",
+ "jest": "22.4.3",
+ "mini-css-extract-plugin": "0.4.0",
+ "node-sass": "4.9.0",
+ "prettier": "1.12.1",
+ "reflect-metadata": "0.1.12",
+ "sass-loader": "7.0.1",
+ "selenium-webdriver": "3.6.0",
+ "ts-jest": "22.4.4",
+ "ts-loader": "4.2.0",
+ "tslint": "5.9.1",
+ "tslint-config-prettier": "1.12.0",
+ "tslint-plugin-prettier": "1.3.0",
+ "tslint-react": "3.5.1",
+ "typescript": "2.8.3",
+ "webpack": "4.6.0",
+ "webpack-clean-obsolete-chunks": "0.4.0",
+ "webpack-cli": "2.0.15"
},
"jest": {
"transform": {
diff --git a/public/services/utils.spec.tsx b/public/services/utils.spec.tsx
index 9ac2bb9c1..b2a40e95f 100644
--- a/public/services/utils.spec.tsx
+++ b/public/services/utils.spec.tsx
@@ -17,7 +17,7 @@ import { classSet, formatDate, timeSince } from "./utils";
[
{ input: new Date(2018, 4, 27, 10, 12, 59), expected: "May 27, 2018 · 10:12" },
{ input: new Date(2058, 12, 12, 23, 21, 53), expected: "January 12, 2059 · 23:21" },
- { input: "2018-04-11T18:13:33.128082Z", expected: "April 11, 2018 · 19:13" },
+ { input: "2018-04-11T18:13:33.128082Z", expected: "April 11, 2018 · 18:13" },
{ input: "2017-11-20T07:47:42.158142Z", expected: "November 20, 2017 · 07:47" }
].forEach(x => {
test(`formatDate of ${x.input} should be ${x.expected}`, () => {