Skip to content

Commit a854b63

Browse files
authored
Merge pull request #147 from uicrooks/dev
v4.4.0
2 parents a8e4a70 + 13cb630 commit a854b63

File tree

4 files changed

+31
-35
lines changed

4 files changed

+31
-35
lines changed

.config/.stylelintrc.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@ module.exports = {
2222
*/
2323
'at-rule-no-unknown': null,
2424
'no-descending-specificity': null
25-
}
26-
}
25+
},
26+
customSyntax: 'postcss-html'
27+
}

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
If yes, please describe the impact and migration path for existing applications:
1616

1717
**The PR fulfills these requirements:**
18-
- [ ] It's submitted to the `dev` branch, _not_ the `master` branch
18+
- [ ] It's submitted to the `dev` branch, _not_ the `main` branch
1919

2020
If adding a **new feature**, the PR's description includes:
2121
- [ ] A convincing reason for adding this feature (to avoid wasting your time, it's best to open a suggestion issue first and wait for approval before working on it)

package.json

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "shopify-theme-lab",
33
"description": "Customizable modular development environment for blazing-fast Shopify theme creation",
44
"author": "Sergej Samsonenko",
5-
"version": "4.3.0",
5+
"version": "4.4.0",
66
"license": "MIT",
77
"scripts": {
88
"start": "run-p -sr shopify:serve webpack:watch",
@@ -22,35 +22,36 @@
2222
"fix:shopify": "cd shopify && shopify theme check -a"
2323
},
2424
"dependencies": {
25-
"tailwindcss": "^2.2.17",
26-
"vue": "^3.2.20",
25+
"tailwindcss": "^3.0.2",
26+
"vue": "^3.2.26",
2727
"vuex": "^4.0.2"
2828
},
2929
"devDependencies": {
30-
"@babel/core": "^7.15.8",
31-
"@babel/plugin-transform-runtime": "^7.15.8",
32-
"@babel/preset-env": "^7.15.8",
33-
"@vue/compiler-sfc": "^3.2.20",
34-
"autoprefixer": "^10.3.7",
30+
"@babel/core": "^7.16.0",
31+
"@babel/plugin-transform-runtime": "^7.16.4",
32+
"@babel/preset-env": "^7.16.4",
33+
"@vue/compiler-sfc": "^3.2.26",
34+
"autoprefixer": "^10.4.0",
3535
"babel-loader": "^8.2.3",
3636
"clean-webpack-plugin": "^4.0.0",
3737
"cross-env": "^7.0.3",
38-
"css-loader": "^6.4.0",
39-
"css-minimizer-webpack-plugin": "^3.1.1",
40-
"eslint": "^7.32.0",
41-
"eslint-plugin-vue": "^7.20.0",
42-
"eslint-webpack-plugin": "^3.0.1",
43-
"mini-css-extract-plugin": "^2.4.3",
38+
"css-loader": "^6.5.1",
39+
"css-minimizer-webpack-plugin": "^3.2.0",
40+
"eslint": "^8.4.1",
41+
"eslint-plugin-vue": "^8.2.0",
42+
"eslint-webpack-plugin": "^3.1.1",
43+
"mini-css-extract-plugin": "^2.4.5",
4444
"npm-run-all": "^4.1.5",
45-
"postcss": "^8.3.11",
45+
"postcss": "^8.4.5",
46+
"postcss-html": "^1.3.0",
4647
"postcss-import": "^14.0.2",
47-
"postcss-loader": "^6.2.0",
48-
"stylelint": "^13.13.1",
49-
"stylelint-config-recommended": "^5.0.0",
50-
"stylelint-webpack-plugin": "^3.0.1",
48+
"postcss-loader": "^6.2.1",
49+
"stylelint": "^14.1.0",
50+
"stylelint-config-recommended": "^6.0.0",
51+
"stylelint-webpack-plugin": "^3.1.0",
5152
"url-loader": "^4.1.1",
52-
"vue-loader": "^16.8.1",
53-
"webpack": "^5.59.1",
53+
"vue-loader": "^16.8.3",
54+
"webpack": "^5.65.0",
5455
"webpack-cli": "^4.9.1",
5556
"webpack-merge": "^5.8.0"
5657
}

src/tailwind.config.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,16 @@
77
const path = require('path')
88

99
module.exports = {
10-
mode: 'jit',
11-
darkMode: false,
1210
theme: {
1311
extend: {},
1412
container: {
1513
center: true,
1614
padding: '1rem'
1715
}
1816
},
19-
variants: {},
2017
plugins: [],
21-
purge: {
22-
enabled: process.env.NODE_ENV === 'production',
23-
content: [
24-
path.resolve(__dirname, '**/*.{js,vue}'),
25-
path.resolve(__dirname, '../shopify/**/*.liquid')
26-
]
27-
}
28-
}
18+
content: [
19+
path.resolve(__dirname, '**/*.{js,vue}'),
20+
path.resolve(__dirname, '../shopify/**/*.liquid')
21+
]
22+
}

0 commit comments

Comments
 (0)