Skip to content

Commit a087ed5

Browse files
author
SZCZUPAK Valentin
authored
Merge pull request #67 from Oksydan/new-webpackconfig
New webpack config
2 parents e537edc + d12b6f8 commit a087ed5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+17358
-12317
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules
22
assets
3+
.env

package-lock.json

Lines changed: 17021 additions & 12194 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
"description": "Tools to help while developing the Classic theme",
55
"main": "index.js",
66
"scripts": {
7-
"build": "NODE_ENV=production webpack --progress --colors --debug --display-chunks",
8-
"watch": "webpack --progress --colors --debug --display-chunks --watch",
7+
"build-analyze": "webpack --progress --mode=production --analyze",
8+
"build": "webpack --progress --mode=production",
9+
"watch": "npm run dev",
10+
"dev": "webpack serve --progress --mode=development",
911
"scss-lint": "stylelint \"**/*.scss\" --formatter verbose",
1012
"scss-fix": "stylelint \"**/*.scss\" --fix",
1113
"lint": "eslint -c .eslintrc.js --ext .js,.vue ./js",
@@ -14,48 +16,47 @@
1416
"author": "PrestaShop",
1517
"license": "AFL-3.0",
1618
"devDependencies": {
17-
"@babel/core": "^7.14.5",
18-
"@types/jquery": "^3.5.6",
19-
"@types/swiper": "^5.4.2",
2019
"autoprefixer": "^6.7.7",
21-
"babel-eslint": "^10.0.3",
22-
"babel-loader": "^8.2.2",
2320
"bootstrap": "5.0.1",
2421
"bootstrap-touchspin": "^4.3.0",
2522
"bourbon": "^7.0.0",
26-
"css-loader": "^5.2.5",
23+
"css-loader": "^5.2.7",
24+
"css-minimizer-webpack-plugin": "^3.1.1",
25+
"dotenv": "^10.0.0",
26+
"esbuild-loader": "^2.16.0",
2727
"eslint": "^6.8.0",
2828
"eslint-config-airbnb-base": "^14.0.0",
2929
"eslint-config-prestashop": "0.1.0",
3030
"eslint-import-resolver-webpack": "^0.12.1",
3131
"eslint-plugin-html": "^6.0.0",
3232
"eslint-plugin-import": "^2.20.0",
33-
"expose-loader": "^0.7.5",
33+
"expose-loader": "^3.0.0",
3434
"file-loader": "^6.2.0",
35-
"flexibility": "^1.0.5",
36-
"jquery": "^3.5.1",
37-
"jquery-touchswipe": "^1.6",
38-
"jquery.browser": "^0.1.0",
39-
"manrope": "^2.0.0",
40-
"material-design-icons-iconfont": "^5.0.1",
41-
"mini-css-extract-plugin": "^1.6.0",
42-
"node-sass": "^5.0.0",
43-
"postcss-flexibility": "^1.0.2",
44-
"postcss-loader": "^3.0.0",
35+
"fork-ts-checker-webpack-plugin": "^6.3.4",
36+
"hot-accept-webpack-plugin": "^2.0.0-beta.7",
37+
"mini-css-extract-plugin": "^1.6.2",
38+
"node-sass": "^6.0.1",
39+
"postcss": "^8.3.9",
40+
"postcss-loader": "^6.1.1",
41+
"postcss-preset-env": "^6.7.0",
4542
"sass-loader": "^12.1.0",
46-
"style-loader": "^0.14.0",
4743
"stylelint": "^12.0.0",
4844
"stylelint-config-prestashop": "^1.0.5",
49-
"tether": "^1.1.1",
50-
"ts-loader": "^9.2.3",
5145
"typescript": "^4.3.3",
52-
"uglifyjs-webpack-plugin": "^2.2.0",
53-
"velocity-animate": "^1.2.3",
54-
"webpack": "^5.36.2",
55-
"webpack-cli": "^3.3.10",
46+
"webpack": "^5.58.1",
47+
"webpack-bundle-analyzer": "^4.4.2",
48+
"webpack-cli": "^4.9.0",
49+
"webpack-dev-server": "^4.3.1",
50+
"webpack-merge": "^5.8.0",
5651
"webpack-sources": "^0.1.0"
5752
},
5853
"dependencies": {
59-
"@popperjs/core": "^2.9.2"
54+
"@popperjs/core": "^2.9.2",
55+
"@types/jquery": "^3.5.6",
56+
"jquery": "^3.5.1",
57+
"jquery-touchswipe": "^1.6",
58+
"jquery.browser": "^0.1.0",
59+
"manrope": "^2.0.0",
60+
"material-design-icons-iconfont": "^5.0.1"
6061
}
6162
}

src/js/theme.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
2424
*/
2525
/* eslint-disable */
26-
import 'expose-loader?Tether!tether';
2726
import 'bootstrap/dist/js/bootstrap.min';
2827
import prestashop from 'prestashop';
2928
import EventEmitter from 'events';
File renamed without changes.

src/css/core/components/product/_product-miniature.scss renamed to src/scss/core/components/product/_product-miniature.scss

File renamed without changes.

0 commit comments

Comments
 (0)