Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ before_install:
# because this is a weird monorepo and we cd into and out of directories, this is what worked for travis to publish
- echo "//code.lds.org/artifactory/api/npm/npm-fhd/:_authToken=${NPM_PUBLISH_TOKEN}" >> packages/react-scripts/.npmrc
- echo "@fs:registry=https://code.lds.org/artifactory/api/npm/npm-fhd/" >> packages/react-scripts/.npmrc
- npm i -g npm@6.8.0
install:
- "npm i"
- "cd packages/react-scripts"
Expand Down
11 changes: 7 additions & 4 deletions packages/react-scripts/scripts/utils/frontierInit.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const depsToInstall = []
const devDepsToInstall = []

function installFrontierDependencies(appPath, appName, ownPath) {

configureEF(appPath, ownPath, appName)
configureHF(appPath, ownPath)

Expand Down Expand Up @@ -56,6 +55,9 @@ function installFrontierDependencies(appPath, appName, ownPath) {
'dotenv@7',
'jest-dom@3',
'http-proxy-middleware@0.19',
'husky@2',
'lint-staged@8',
'suppress-exit-code@0.1',
]
)

Expand All @@ -67,13 +69,14 @@ function installFrontierDependencies(appPath, appName, ownPath) {
'storybook:build': 'NODE_ENV=development build-storybook -c .storybook -o build',
lint: 'eslint src/',
'lint:fix': 'eslint src/ --fix',
test: `eslint src/ && ${packageJson.scripts.test}`,
}
packageJson.scripts = { ...packageJson.scripts, ...additionalScripts }
delete packageJson.scripts.eject
packageJson.eslintConfig = {
extends: ['@fs/eslint-config-frontier-react'],
packageJson.eslintConfig = { extends: ['@fs/eslint-config-frontier-react'] }
packageJson.husky = {
hooks: { 'pre-commit': 'lint-staged', 'pre-push': 'npm run lint && CI=true npm test' },
}
packageJson['lint-staged'] = { '*.js': ['suppress-exit-code eslint --fix', 'git add'] }
return packageJson
})
installModulesSync(depsToInstall)
Expand Down