Skip to content

Commit

Permalink
Merge pull request #147 from uicrooks/dev
Browse files Browse the repository at this point in the history
v4.4.0
  • Loading branch information
sergejcodes authored Dec 13, 2021
2 parents a8e4a70 + 13cb630 commit a854b63
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 35 deletions.
5 changes: 3 additions & 2 deletions .config/.stylelintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ module.exports = {
*/
'at-rule-no-unknown': null,
'no-descending-specificity': null
}
}
},
customSyntax: 'postcss-html'
}
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
If yes, please describe the impact and migration path for existing applications:

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

If adding a **new feature**, the PR's description includes:
- [ ] 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)
Expand Down
43 changes: 22 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "shopify-theme-lab",
"description": "Customizable modular development environment for blazing-fast Shopify theme creation",
"author": "Sergej Samsonenko",
"version": "4.3.0",
"version": "4.4.0",
"license": "MIT",
"scripts": {
"start": "run-p -sr shopify:serve webpack:watch",
Expand All @@ -22,35 +22,36 @@
"fix:shopify": "cd shopify && shopify theme check -a"
},
"dependencies": {
"tailwindcss": "^2.2.17",
"vue": "^3.2.20",
"tailwindcss": "^3.0.2",
"vue": "^3.2.26",
"vuex": "^4.0.2"
},
"devDependencies": {
"@babel/core": "^7.15.8",
"@babel/plugin-transform-runtime": "^7.15.8",
"@babel/preset-env": "^7.15.8",
"@vue/compiler-sfc": "^3.2.20",
"autoprefixer": "^10.3.7",
"@babel/core": "^7.16.0",
"@babel/plugin-transform-runtime": "^7.16.4",
"@babel/preset-env": "^7.16.4",
"@vue/compiler-sfc": "^3.2.26",
"autoprefixer": "^10.4.0",
"babel-loader": "^8.2.3",
"clean-webpack-plugin": "^4.0.0",
"cross-env": "^7.0.3",
"css-loader": "^6.4.0",
"css-minimizer-webpack-plugin": "^3.1.1",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^7.20.0",
"eslint-webpack-plugin": "^3.0.1",
"mini-css-extract-plugin": "^2.4.3",
"css-loader": "^6.5.1",
"css-minimizer-webpack-plugin": "^3.2.0",
"eslint": "^8.4.1",
"eslint-plugin-vue": "^8.2.0",
"eslint-webpack-plugin": "^3.1.1",
"mini-css-extract-plugin": "^2.4.5",
"npm-run-all": "^4.1.5",
"postcss": "^8.3.11",
"postcss": "^8.4.5",
"postcss-html": "^1.3.0",
"postcss-import": "^14.0.2",
"postcss-loader": "^6.2.0",
"stylelint": "^13.13.1",
"stylelint-config-recommended": "^5.0.0",
"stylelint-webpack-plugin": "^3.0.1",
"postcss-loader": "^6.2.1",
"stylelint": "^14.1.0",
"stylelint-config-recommended": "^6.0.0",
"stylelint-webpack-plugin": "^3.1.0",
"url-loader": "^4.1.1",
"vue-loader": "^16.8.1",
"webpack": "^5.59.1",
"vue-loader": "^16.8.3",
"webpack": "^5.65.0",
"webpack-cli": "^4.9.1",
"webpack-merge": "^5.8.0"
}
Expand Down
16 changes: 5 additions & 11 deletions src/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,16 @@
const path = require('path')

module.exports = {
mode: 'jit',
darkMode: false,
theme: {
extend: {},
container: {
center: true,
padding: '1rem'
}
},
variants: {},
plugins: [],
purge: {
enabled: process.env.NODE_ENV === 'production',
content: [
path.resolve(__dirname, '**/*.{js,vue}'),
path.resolve(__dirname, '../shopify/**/*.liquid')
]
}
}
content: [
path.resolve(__dirname, '**/*.{js,vue}'),
path.resolve(__dirname, '../shopify/**/*.liquid')
]
}

0 comments on commit a854b63

Please sign in to comment.