Skip to content

Commit 431f95d

Browse files
committed
chore(build): update yarn to npm
1 parent 067b99b commit 431f95d

File tree

8 files changed

+602
-91
lines changed

8 files changed

+602
-91
lines changed

.npmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
package-lock = false
1+
package-lock = true

backend/package-lock.json

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/config/transform.file.js

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
const path = require('path');
2+
3+
module.exports = {
4+
process(src, filename) {
5+
const assetFilename = JSON.stringify(path.basename(filename));
6+
return `module.exports = ${assetFilename};`;
7+
}
8+
};

frontend/config/transform.style.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = {};

frontend/jest.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ module.exports = {
2727

2828
// A map from regular expressions to module names that allow to stub out resources with a single module
2929
moduleNameMapper: {
30-
'\\.(css|less|sass|scss)$': '<rootDir>/__mocks__/styleMock.js',
30+
'\\.(css|less|sass|scss)$': '<rootDir>/config/transform.style.js',
3131
'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
32-
'<rootDir>/__mocks__/fileMock.js',
32+
'<rootDir>/config/transform.file.js',
3333
'@app/(.*)': '<rootDir>/src/app/$1'
3434
},
3535

frontend/package-lock.json

+93-77
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
"build:prod": "webpack --config ./config/webpack.prod.js",
2727
"format": "prettier --write \"./**/*.ts\" \"./**/*.tsx\" \"./**/*.scss\"",
2828
"start:dev": "webpack serve --hot --color --config ./config/webpack.dev.js",
29-
"test": "run-s test:type-check test:lint test:ci",
29+
"test": "run-s test:lint test:ci",
3030
"test:ci": "export CI=true; jest --collectCoverage",
3131
"test:clearCache": "jest --clearCache",
32-
"test:dev": "run-s test:type-check test:lint test:local",
32+
"test:dev": "run-s test:lint test:local",
3333
"test:fix": "eslint --ext .json,.js,.ts,.jsx,.tsx ./src --fix",
3434
"test:lint": "eslint --ext .json,.js,.ts,.jsx,.tsx ./src",
3535
"test:local": "jest --watchAll",
@@ -87,6 +87,7 @@
8787
"raw-loader": "^4.0.2",
8888
"react-docgen-typescript-loader": "^3.7.2",
8989
"react-router-dom": "^5.2.0",
90+
"redux-mock-store": "^1.5.4",
9091
"regenerator-runtime": "^0.13.7",
9192
"rimraf": "^3.0.2",
9293
"sass-loader": "^7.3.1",

0 commit comments

Comments
 (0)