diff --git a/.circleci/config.yml b/.circleci/config.yml index 7e5ed97e2e9..27ba7e83802 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -165,7 +165,7 @@ jobs: name: Build and push production Docker image command: | VERSION=$(git describe --tags `git rev-list --tags --max-count=1` | cut -c2-100) - docker build -t ${DOCKER_REPOSITORY}:${VERSION} -t ${DOCKER_REPOSITORY}:latest . + docker build -t ${DOCKER_REPOSITORY}:${VERSION} -t ${DOCKER_REPOSITORY}:latest ./apps/reaction docker login -u ${DOCKER_USER} -p ${DOCKER_PASS} docker push ${DOCKER_REPOSITORY}:${VERSION} docker push ${DOCKER_REPOSITORY}:latest diff --git a/.husky/.gitignore b/.husky/.gitignore index c9cdc63b070..31354ec1389 100644 --- a/.husky/.gitignore +++ b/.husky/.gitignore @@ -1 +1 @@ -_ \ No newline at end of file +_ diff --git a/package-lock.json b/package-lock.json index 0b27ff4c003..89422d46f1a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,14 @@ { - "name": "reaction-monorepos", + "name": "reaction", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "reaction-monorepos", + "name": "reaction", "version": "1.0.0", "hasInstallScript": true, - "license": "ISC", + "license": "GPL-3.0", "workspaces": [ "apps/*", "packages/*" @@ -123001,7 +123001,7 @@ "eslint-plugin-react-hooks": "^2.0.1", "jest": "^28.1.3", "nock": "^13.1.0", - "stripe": "^8.167.0" + "stripe": "^8.222.0" }, "dependencies": { "@jest/console": { diff --git a/package.json b/package.json index c3b2469030a..de9cb1e5d4e 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,13 @@ { - "name": "reaction-monorepos", + "name": "reaction", "version": "1.0.0", - "description": "", + "description": "Reaction is a modern reactive, real-time event driven ecommerce platform.", "main": "index.js", "scripts": { - "start:dev": "npm run start:dev --workspace=apps/reaction", + "start:dev": "npm run start:dev -w=apps/reaction", + "start:meteor-blaze-app": "npm run start -w=apps/meteor-blaze-app", "build:packages": "npm run build -w=packages/file-collections -w=packages/file-collections-sa-base -w=packages/file-collections-sa-gridfs -w=packages/logger -w=packages/random", - "test": "npm run test -w=packages/api-core", + "test": "npm run test --if-present --ws", "test:integration:query": "npm run test:integration:query --workspace=apps/reaction", "test:integration:mutation": "npm run test:integration:mutation --workspace=apps/reaction", "changeset": "changeset", @@ -14,18 +15,20 @@ "lint": "eslint . --resolve-plugins-relative-to .", "lint:docker": "npx --quiet --package @reactioncommerce/ci-scripts@1.6.2 lint-dockerfiles --workspace=apps/reaction", "lint:gql": "npm run lint:gql -w=apps/reaction -w=packages/api-core -w=packages/api-plugin-surcharges", - "postinstall": "npm run build:packages" + "postinstall": "npm run build:packages && is-ci || is-docker || husky install .husky" }, + "homepage": "https://github.com/reactioncommerce/reaction", + "url": "https://github.com/reactioncommerce/reaction", + "email": "reaction@reactioncommerce.com", "repository": { "type": "git", - "url": "git+https://github.com/vanpho93/reaction-monorepos.git" + "url": "https://github.com/reactioncommerce/reaction.git" }, - "author": "", - "license": "ISC", + "author": "Reaction Commerce ", + "license": "GPL-3.0", "bugs": { - "url": "https://github.com/vanpho93/reaction-monorepos/issues" + "url": "https://github.com/reactioncommerce/reaction/issues" }, - "homepage": "https://github.com/vanpho93/reaction-monorepos#readme", "workspaces": [ "apps/*", "packages/*" @@ -70,5 +73,13 @@ "types-are-capitalized", "types-have-descriptions" ] + }, + "prettier": { + "arrowParens": "always" + }, + "commitlint": { + "extends": [ + "@commitlint/config-conventional" + ] } }