Skip to content

Commit

Permalink
Merge pull request #72 from vtex/fix/version-2x
Browse files Browse the repository at this point in the history
Run vtex setup
  • Loading branch information
kevinch authored Jul 8, 2020
2 parents 6171dec + 5af8705 commit b146bf4
Show file tree
Hide file tree
Showing 10 changed files with 1,524 additions and 194 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules/
coverage/
*.snap.ts
27 changes: 4 additions & 23 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,28 +1,9 @@
{
"parser": "babel-eslint",
"extends": [
"vtex",
"vtex-react",
"plugin:import/recommended"
],
"plugins": ["import"],
"rules": {
"import/no-unresolved": [
"error",
{
"commonjs": true,
"amd": true,
"ignore": ["^([a-zA-Z@]+[-\\.]?)+"]
}
]
},
"extends": "vtex",
"root": true,
"env": {
"browser": true,
"node": true,
"mocha": true,
"es6": true,
"jest": true
},
"globals": {
"__DEV__": true
}
}
}
7 changes: 1 addition & 6 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
{
"singleQuote": true,
"trailingComma": "all",
"semi": false,
"printWidth": 80
}
"@vtex/prettier-config"
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Changed

- App setup with `vtex setup`

### Fixed

- Italian i18n.
Expand Down
76 changes: 48 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
{
"name": "@vtex/profile-form",
"version": "2.7.1",
"description": "React component for managing user profiles",
"main": "lib/index.js",
"files": [
"lib"
],
"private": true,
"license": "AGPL-3.0-only",
"scripts": {
"lint": "eslint --ext js,jsx,ts,tsx .",
"format": "prettier --write \"**/*.{ts,tsx,js,jsx,json}\"",
"build": "npm run symlinks && nwb build-react-component --no-demo && npm run removeMocks && npm run addLocales",
"build:link": "npm link && watch 'npm run build' src",
"removeMocks": "rm -rf lib/**/__mocks__ && rm -rf lib/__mocks__",
Expand All @@ -22,20 +20,58 @@
"locales:lint": "intl-equalizer",
"locales:fix": "intl-equalizer --fix"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged",
"pre-push": "yarn locales:lint && yarn test"
}
},
"lint-staged": {
"*.{ts,js,tsx,jsx}": [
"eslint --fix",
"prettier --write"
],
"*.{json,graphql,gql}": [
"prettier --write"
]
},
"devDependencies": {
"@vtex/intl-equalizer": "^2.4.2",
"@vtex/prettier-config": "^0.1.3",
"babel-jest": "^23.6.0",
"babel-plugin-add-react-displayname": "0.0.5",
"babel-preset-react-app": "^3.1.2",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"enzyme-react-intl": "^2.0.0",
"eslint": "^6.8.0",
"eslint-config-vtex": "^12.2.1",
"eslint-config-vtex-react": "^6.2.1",
"husky": "^4.2.0",
"jest": "^22.4.4",
"jest-enzyme": "^6.0.2",
"lint-staged": "^10.0.2",
"nwb": "^0.21.5",
"prettier": "^1.19.1",
"react-dom": "^16.4.1",
"react-hot-loader": "^4.3.4",
"react-test-renderer": "^16.4.1",
"typescript": "^3.7.5"
},
"version": "2.7.1",
"description": "React component for managing user profiles",
"main": "lib/index.js",
"files": [
"lib"
],
"repository": "https://github.com/vtex/profile-form",
"author": "Gustavo Silva (@akafts)",
"license": "AGPL-3.0-only",
"homepage": "https://github.com/vtex/profile-form",
"keywords": [
"react-component",
"vtex",
"profile"
],
"husky": {
"hooks": {
"pre-push": "yarn locales:lint && yarn test"
}
},
"jest": {
"setupTestFrameworkScriptFile": "<rootDir>/react/__tests__/setupTests.js",
"testURL": "http://localhost",
Expand Down Expand Up @@ -76,22 +112,6 @@
"react": "^16.4.1",
"react-intl": "^2.4.0"
},
"devDependencies": {
"@vtex/intl-equalizer": "^2.4.2",
"babel-jest": "^23.6.0",
"babel-plugin-add-react-displayname": "0.0.5",
"babel-preset-react-app": "^3.1.2",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"enzyme-react-intl": "^2.0.0",
"husky": "^2.3.0",
"jest": "^22.4.4",
"jest-enzyme": "^6.0.2",
"nwb": "^0.21.5",
"react-dom": "^16.4.1",
"react-hot-loader": "^4.3.4",
"react-test-renderer": "^16.4.1"
},
"peerDependencies": {
"vtex-tachyons": "^2.5.0"
}
Expand Down
8 changes: 8 additions & 0 deletions react/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "vtex-react/io",
"env": {
"browser": true,
"es6": true,
"jest": true
}
}
5 changes: 3 additions & 2 deletions react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,10 @@
"nwb": "^0.21.5",
"react-dom": "^16.4.1",
"react-hot-loader": "^4.3.4",
"react-test-renderer": "^16.4.1"
"react-test-renderer": "^16.4.1",
"vtex.render-runtime": "http://vtex.vtexassets.com/_v/public/typings/v1/[email protected]/public/@types/vtex.render-runtime"
},
"peerDependencies": {
"vtex-tachyons": "^2.5.0"
}
}
}
7 changes: 7 additions & 0 deletions react/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"compilerOptions": {
"module": "es6",
"moduleResolution": "node",
"target": "es2017"
}
}
4 changes: 4 additions & 0 deletions react/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10820,6 +10820,10 @@ vtex-tachyons@^2.6.0:
resolved "https://registry.yarnpkg.com/vtex-tachyons/-/vtex-tachyons-2.10.0.tgz#d72363dcd77d0960cb23efc82e0e8d168714f153"
integrity sha512-WWEOR4iyrMQ2fzp+EActa5ZLaYSMdPk2yxP8XQRhg+q+QnbFH2EKGayjkea4okXRDE7KTKQZdLF3GlB/HaXOow==

"vtex.render-runtime@http://vtex.vtexassets.com/_v/public/typings/v1/[email protected]/public/@types/vtex.render-runtime":
version "7.42.0"
resolved "http://vtex.vtexassets.com/_v/public/typings/v1/[email protected]/public/@types/vtex.render-runtime#b76f76d8f763385cfc57452386bbd20ab6fe9e9b"

w3c-hr-time@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
Expand Down
Loading

0 comments on commit b146bf4

Please sign in to comment.