Skip to content

Commit

Permalink
Switch 2 yarn and upgrade deps (#2)
Browse files Browse the repository at this point in the history
* fix package.json

* npm update to latest packages

* switch client to yarn

* fixes peer dependencies in client
  • Loading branch information
beatthat authored Feb 20, 2020
1 parent e4dee97 commit cbca366
Show file tree
Hide file tree
Showing 8 changed files with 14,285 additions and 19,496 deletions.
18 changes: 9 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,50 +24,50 @@ jobs:
- checkout
- run:
name: Install client
command: cd client && npm install
command: cd client && yarn install --frozen-lockfile
- run:
name: Client test format
command: cd client && npm run test:format
command: cd client && yarn run test:format
client-audit:
executor: node
steps:
- checkout
- run:
name: Audit js
command: cd client && npm run test:audit
command: cd client && yarn run test:audit
client-lint:
executor: node
steps:
- checkout
- run:
name: Install client
command: cd client && npm install
command: cd client && yarn install --frozen-lockfile
- run:
name: Client test lint
command:
cd client && npm run test:lint
cd client && yarn run test:lint
client-types:
executor: node
steps:
- checkout
- run:
name: Install client
command: cd client && npm install
command: cd client && yarn install --frozen-lockfile
- run:
name: Client test types
command:
cd client && npm run test:types
cd client && yarn run test:types
client-test:
executor: node
steps:
- checkout
- run:
name: Install client
command: cd client && npm install
command: cd client && yarn install --frozen-lockfile
- run:
name: Client test
command:
cd client && npm run test
cd client && yarn run test
build-and-push:
parameters:
is-release-tag:
Expand Down
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
PHONY: audit-fix
audit-fix:
cd client && $(MAKE) audit-fix

PHONY: format
format:
cd client && $(MAKE) format
Expand Down
1 change: 1 addition & 0 deletions client/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ module.exports = {
"no-prototype-builtins": "off",
"react/display-name": "off",
"react/prop-types": "off", // Disable prop-types as we use TypeScript for type checking
"@typescript-eslint/ban-ts-ignore": "off",
"@typescript-eslint/camelcase": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/indent": "off",
Expand Down
37 changes: 22 additions & 15 deletions client/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
@echo "This file should not be committed. "
@echo "Feel free to change to point to a local server if you're running one."

.PHONY: audit-fix
audit-fix:
npm audit fix

.PHONY: clean
clean:
rm -rf node_modules .cache public
Expand All @@ -20,36 +16,47 @@ develop: .env.development node_modules/gatsby-cli

.PHONY: format
format: node_modules/prettier
npm run format
yarn run format

node_modules/eslint:
npm install
yarn install --frozen-lockfile

node_modules/gatsby-cli:
npm install
yarn install --frozen-lockfile

node_modules/jest:
yarn install --frozen-lockfile

node_modules/prettier:
npm install
yarn install --frozen-lockfile

node_modules/typescript:
npm install
yarn install --frozen-lockfile

.PHONY: test
test:
npm install && npm run test:all
test: node_modules/jest
yarn run test

PHONY: test-all
test-all:
$(MAKE) test-audit
$(MAKE) test-format
$(MAKE) test-lint
$(MAKE) test-types
$(MAKE) test

.PHONY: test-audit
test-audit:
npm run test:audit
yarn run test:audit

.PHONY: test-format
test-format: node_modules/prettier
npm run test:format
yarn run test:format

.PHONY: test-format
test-lint: node_modules/eslint
npm run test:lint
yarn run test:lint

.PHONY: test-types
test-types: node_modules/typescript
npm run test:types
yarn run test:types
Loading

0 comments on commit cbca366

Please sign in to comment.