Skip to content

Commit f5b935a

Browse files
committed
fixes
1 parent cda1280 commit f5b935a

File tree

2 files changed

+4
-26
lines changed

2 files changed

+4
-26
lines changed

generators/vue/templates/package.json.ejs

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"bootswatch": "<%= nodeDependencies['bootswatch'] %>",
3737
<%_ } _%>
3838
"dayjs": "<%= nodeDependencies['dayjs'] %>",
39+
"numeral": "<%= nodeDependencies['numeral'] %>",
3940
<%_ if (communicationSpringWebsocket) { _%>
4041
"sockjs-client": "1.5.2",
4142
"@stomp/rx-stomp": "1.1.4",
@@ -66,21 +67,19 @@
6667
"@vue/cli-service": "<%= nodeDependencies['@vue/cli-service'] %>",
6768
"@vue/eslint-config-prettier": "<%= nodeDependencies['@vue/eslint-config-prettier'] %>",
6869
"@vue/eslint-config-typescript": "<%= nodeDependencies['@vue/eslint-config-typescript'] %>",
70+
"@vue/vue2-jest": "<%= nodeDependencies['@vue/vue2-jest'] %>",
6971
"@vue/test-utils": "<%= nodeDependencies['@vue/test-utils'] %>",
7072
"axios-mock-adapter": "<%= nodeDependencies['axios-mock-adapter'] %>",
7173
"autoprefixer": "<%= nodeDependencies['autoprefixer'] %>",
7274
"browser-sync-webpack-plugin": "<%= nodeDependencies['browser-sync-webpack-plugin'] %>",
7375
"copy-webpack-plugin": "<%= nodeDependencies['copy-webpack-plugin'] %>",
7476
"css-loader": "<%= nodeDependencies['css-loader'] %>",
75-
"css-minimizer-webpack-plugin": "<%= nodeDependencies['css-minimizer-webpack-plugin'] %>",
76-
"fork-ts-checker-webpack-plugin": "<%= nodeDependencies['fork-ts-checker-webpack-plugin'] %>",
7777
<%_ if (!skipJhipsterDependencies) { _%>
7878
"generator-jhipster": "<%= jhipsterVersion %>",
7979
<%_ blueprints.forEach(blueprint => { _%>
8080
"<%= blueprint.name %>": "<%= blueprint.version %>",
8181
<%_ }); _%>
8282
<%_ } _%>
83-
"html-webpack-plugin": "<%= nodeDependencies['html-webpack-plugin'] %>",
8483
"jest": "<%= nodeDependencies['jest'] %>",
8584
"jest-environment-jsdom": "<%= nodeDependencies['jest-environment-jsdom'] %>",
8685
"jest-junit": "<%= nodeDependencies['jest-junit'] %>",
@@ -90,11 +89,6 @@
9089
"folder-hash": "<%= nodeDependencies['folder-hash'] %>",
9190
"merge-jsons-webpack-plugin": "<%= nodeDependencies['merge-jsons-webpack-plugin'] %>",
9291
<%_ } _%>
93-
"mini-css-extract-plugin": "<%= nodeDependencies['mini-css-extract-plugin'] %>",
94-
"numeral": "<%= nodeDependencies['numeral'] %>",
95-
"postcss-import": "<%= nodeDependencies['postcss-import'] %>",
96-
"postcss-loader": "<%= nodeDependencies['postcss-loader'] %>",
97-
"postcss-url": "<%= nodeDependencies['postcss-url'] %>",
9892
"prettier": "<%= nodeDependencies['prettier'] %>",
9993
<%_ if (!skipServer) { _%>
10094
"prettier-plugin-java": "<%= nodeDependencies['prettier-plugin-java'] %>",
@@ -104,31 +98,17 @@
10498
"cypress": "<%= nodeDependencies['cypress'] %>",
10599
<%_ } _%>
106100
"rimraf": "<%= nodeDependencies['rimraf'] %>",
107-
"sass": "<%= nodeDependencies['sass'] %>",
108101
"sass-loader": "<%= nodeDependencies['sass-loader'] %>",
109102
"sinon": "<%= nodeDependencies['sinon'] %>",
110103
"swagger-ui-dist": "<%= nodeDependencies['swagger-ui-dist'] %>",
111-
"terser-webpack-plugin": "<%= nodeDependencies['terser-webpack-plugin'] %>",
112104
"ts-jest": "<%= nodeDependencies['ts-jest'] %>",
113-
"ts-loader": "<%= nodeDependencies['ts-loader'] %>",
114105
"eslint": "<%= nodeDependencies['eslint'] %>",
115106
"eslint-plugin-prettier": "<%= nodeDependencies['eslint-plugin-prettier'] %>",
116107
"eslint-plugin-vue": "<%= nodeDependencies['eslint-plugin-vue'] %>",
117108
"typescript": "<%= nodeDependencies['typescript'] %>",
118-
<%_ if (microfrontend) { _%>
119-
"@vue/vue2-jest": "<%= nodeDependencies['@vue/vue2-jest'] %>",
120-
<%_ } else { _%>
121-
"vue-jest": "<%= nodeDependencies['vue-jest'] %>",
122-
<%_ } _%>
123109
"vue-loader": "<%= nodeDependencies['vue-loader'] %>",
124-
"vue-template-compiler": "<%= nodeDependencies['vue'] %>",
125-
"webpack": "<%= nodeDependencies['webpack'] %>",
126-
"webpack-bundle-analyzer": "<%= nodeDependencies['webpack-bundle-analyzer'] %>",
127-
"webpack-cli": "<%= nodeDependencies['webpack-cli'] %>",
128-
"webpack-dev-server": "<%= nodeDependencies['webpack-dev-server'] %>",
129110
"webpack-merge": "<%= nodeDependencies['webpack-merge'] %>",
130111
"webpack-notifier": "<%= nodeDependencies['webpack-notifier'] %>"
131-
"workbox-webpack-plugin": "<%= nodeDependencies['workbox-webpack-plugin'] %>"
132112
},
133113
"engines": {
134114
"node": ">=<%= nodeVersion %>",
@@ -172,9 +152,7 @@
172152
"webapp:build:prod": "<%= clientPackageManager %> run vue-build -- --mode production",
173153
"webapp:dev": "<%= clientPackageManager %> run vue-serve",
174154
"webapp:prod": "<%= clientPackageManager %> run clean-www && <%= clientPackageManager %> run webapp:build:prod --",
175-
"webapp:test": "<%= clientPackageManager %> run test --",
176-
"webpack-dev-server": "webpack serve --config webpack/webpack.common.js",
177-
"webpack": "webpack --config webpack/webpack.common.js"
155+
"webapp:test": "<%= clientPackageManager %> run test --"
178156
},
179157
"vuePlugins": {
180158
"service": [

generators/vue/templates/src/test/javascript/jest.conf.js.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717
],
1818
moduleFileExtensions: ['js', 'json', 'ts', 'vue'],
1919
transform: {
20-
'.*\\.(vue)$': '<%= microfrontend ? '@vue/vue2-jest' : 'vue-jest' %>',
20+
'.*\\.(vue)$': '@vue/vue2-jest',
2121
'^.+\\.tsx?$': [
2222
'ts-jest',
2323
{

0 commit comments

Comments
 (0)