Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cache/.stylelintcache
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"/Users/miklos/Documents/GitHub/grid-bootstrap/scss/_utilities.scss":"1","/Users/miklos/Documents/GitHub/grid-bootstrap/scss/_variables.scss":"2","/Users/miklos/Documents/GitHub/grid-bootstrap/scss/grid-bootstrap-import.scss":"3","/Users/miklos/Documents/GitHub/grid-bootstrap/scss/grid-bootstrap.scss":"4","/Users/miklos/Documents/GitHub/grid-bootstrap/scss/grid/_grid.scss":"5"},{"size":957,"mtime":1623703707460,"hashOfConfig":"6"},{"size":73,"mtime":1623703707460,"hashOfConfig":"6"},{"size":63,"mtime":1623703707460,"hashOfConfig":"6"},{"size":216,"mtime":1623703707460,"hashOfConfig":"6"},{"size":2146,"mtime":1623703707477,"hashOfConfig":"6"},"16giffr"]
[["1","2","3","4","5"],{"key":"6","value":"7"},{"key":"8","value":"9"},{"key":"10","value":"11"},{"key":"12","value":"13"},{"key":"14","value":"15"},"/workspace/scss/grid-bootstrap-import.scss",{"size":63,"mtime":1759301049813,"data":"16"},"/workspace/scss/_utilities.scss",{"size":957,"mtime":1759301049813,"data":"17"},"/workspace/scss/grid/_grid.scss",{"size":2146,"mtime":1759301049813,"data":"18"},"/workspace/scss/grid-bootstrap.scss",{"size":216,"mtime":1759301049813,"data":"19"},"/workspace/scss/_variables.scss",{"size":73,"mtime":1759301049813,"data":"20"},{"hashOfConfig":"21"},{"hashOfConfig":"21"},{"hashOfConfig":"21"},{"hashOfConfig":"21"},{"hashOfConfig":"21"},"3khat9"]
16 changes: 14 additions & 2 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,20 @@ updates:
directory: "/"
schedule:
interval: "weekly"
labels:
- "dependencies"
- "github-actions"
commit-message:
prefix: "chore"
include: "scope"

- package-ecosystem: "yarn"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
interval: "weekly"
labels:
- "dependencies"
- "npm"
commit-message:
prefix: "chore"
include: "scope"
33 changes: 11 additions & 22 deletions .github/workflows/CI-CD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,16 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 14
- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- run: npm install
- run: npm run lint-css
- run: npm run css
node-version: 20
cache: 'yarn'
- run: yarn install --frozen-lockfile
- run: yarn run lint-css
- run: yarn run css
- name: Upload artifact
uses: actions/upload-artifact@master
uses: actions/upload-artifact@v4
with:
name: ci-build
path: dist/
Expand All @@ -35,14 +24,14 @@ jobs:
needs: ['build']
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Download build artifact
uses: actions/download-artifact@v4.1.7
uses: actions/download-artifact@v4
with:
name: ci-build
path: dist/

- uses: JS-DevTools/npm-publish@v1
- uses: JS-DevTools/npm-publish@v4
with:
token: ${{ secrets.NPM_TOKEN }}
16 changes: 10 additions & 6 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
{
"extends": "stylelint-config-standard",
"plugins": [
"stylelint-scss"
],
"extends": "stylelint-config-standard-scss",
"rules": {
"at-rule-no-unknown": null,
"scss/at-rule-no-unknown": true
"scss/at-rule-no-unknown": true,
"import-notation": null,
"scss/dollar-variable-pattern": null,
"selector-class-pattern": null,
"scss/double-slash-comment-empty-line-before": null,
"scss/operator-no-unspaced": null,
"scss/no-global-function-names": null,
"property-no-vendor-prefix": null
}
}
}
23 changes: 11 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"scripts": {
"start": "npm run watch",
"css": "npm-run-all css-compile-main css-compress",
"lint-css": "stylelint \"scss/**/*.scss\" --syntax scss --cache --cache-location .cache/.stylelintcache",
"lint-css:fix": "stylelint \"scss/**/*.scss\" --syntax scss --cache --cache-location .cache/.stylelintcache --fix",
"lint-css": "stylelint \"scss/**/*.scss\" --cache --cache-location .cache/.stylelintcache",
"lint-css:fix": "stylelint \"scss/**/*.scss\" --cache --cache-location .cache/.stylelintcache --fix",
"css-compile-main": "sass --style=expanded ./scss/grid-bootstrap.scss ./dist/css/grid-bootstrap.css",
"css-compress": "uglifycss dist/css/grid-bootstrap.css --output dist/css/grid-bootstrap.min.css",
"watch": "nodemon --watch scss/ --ext scss --exec \"npm run css\"",
Expand All @@ -34,23 +34,22 @@
},
"homepage": "https://github.com/swingerman/grid-bootstrap#readme",
"devDependencies": {
"css-lint": "^1.0.1",
"husky": "^6.0.0",
"nodemon": "^1.19.0",
"husky": "^9.1.7",
"nodemon": "^3.1.7",
"npm-run-all": "^4.1.5",
"postcss-cli": "^6.1.2",
"sass": "^1.43.2",
"stylelint": "^10.0.1",
"stylelint-config-standard": "^18.3.0",
"stylelint-scss": "^3.19.0",
"postcss": "^8.5.1",
"postcss-cli": "^11.0.0",
"sass": "^1.81.0",
"stylelint": "^16.12.0",
"stylelint-config-standard-scss": "^13.1.0",
"uglifycss": "^0.0.29"
},
"dependencies": {
"bootstrap": "^4.3.1"
"bootstrap": "^4.6.2"
},
"lint-staged": {
"src/**/*.scss": [
"stylelint --syntax scss --fix",
"stylelint --fix",
"git add"
]
},
Expand Down
Loading