Skip to content

Commit

Permalink
Update dependencies and practies
Browse files Browse the repository at this point in the history
  • Loading branch information
ai committed Oct 7, 2023
1 parent b863ed9 commit 6630823
Show file tree
Hide file tree
Showing 5 changed files with 676 additions and 381 deletions.
31 changes: 25 additions & 6 deletions .github/workflows/test.yml
Expand Up @@ -12,15 +12,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: latest
version: 8
- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: pnpm
- name: Install dependencies
run: pnpm install --frozen-lockfile --ignore-scripts
Expand All @@ -31,16 +31,16 @@ jobs:
strategy:
matrix:
node-version:
- 18
- 16
- 14
name: Node.js ${{ matrix.node-version }} Quick
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: latest
version: 8
- name: Install Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand All @@ -50,3 +50,22 @@ jobs:
run: pnpm install --frozen-lockfile --ignore-scripts
- name: Run unit tests
run: pnpm unit
old:
runs-on: ubuntu-latest
name: Node.js 14 Quick
steps:
- name: Checkout the repository
uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 7
- name: Install Node.js 14
uses: actions/setup-node@v3
with:
node-version: 14
cache: pnpm
- name: Install dependencies
run: pnpm install --no-frozen-lockfile --ignore-scripts
- name: Run unit tests
run: pnpm unit
44 changes: 22 additions & 22 deletions index.js
@@ -1,6 +1,6 @@
let { join, basename, extname, relative } = require('path')
let { readFileSync } = require('fs')
let { platform } = require('os')
let { basename, extname, join, relative } = require('node:path')
let { readFileSync } = require('node:fs')
let { platform } = require('node:os')
let { parse } = require('postcss-js')
let sugarss = require('sugarss')
let vars = require('postcss-simple-vars')
Expand Down Expand Up @@ -28,7 +28,7 @@ function addMixin(helpers, mixins, rule, file) {
return false
})

mixins[name] = { mixin: rule, args, content }
mixins[name] = { args, content, mixin: rule }
if (file) mixins[name].file = file
rule.remove()
}
Expand All @@ -37,9 +37,9 @@ function processModulesForHotReloadRecursively(module, helpers) {
let moduleId = module.id
module.children.forEach(childModule => {
helpers.result.messages.push({
type: 'dependency',
file: childModule.id,
parent: moduleId
parent: moduleId,
type: 'dependency'
})
processModulesForHotReloadRecursively(childModule, helpers)
})
Expand Down Expand Up @@ -67,7 +67,7 @@ function loadGlobalMixin(helpers, globs) {
})
} else {
try {
mixins[name] = { mixin: require(path), file: path }
mixins[name] = { file: path, mixin: require(path) }
let module = require.cache[require.resolve(path)]
if (module) {
processModulesForHotReloadRecursively(module, helpers)
Expand All @@ -81,9 +81,9 @@ function loadGlobalMixin(helpers, globs) {
function addGlobalMixins(helpers, local, global, parent) {
for (let name in global) {
helpers.result.messages.push({
type: 'dependency',
file: global[name].file,
parent: parent || ''
parent: parent || '',
type: 'dependency'
})
local[name] = global[name]
}
Expand All @@ -93,10 +93,10 @@ function watchNewMixins(helpers, mixinsDirs) {
let uniqueDirsPath = Array.from(new Set(mixinsDirs))
for (let dir of uniqueDirsPath) {
helpers.result.messages.push({
type: 'dir-dependency',
dir,
glob: MIXINS_GLOB,
parent: ''
parent: '',
type: 'dir-dependency'
})
}
}
Expand Down Expand Up @@ -209,24 +209,24 @@ module.exports = (opts = {}) => {
}

return {
Once(root, helpers) {
if (loadFrom.length > 0) {
try {
let global = loadGlobalMixin(helpers, loadFrom)
addGlobalMixins(helpers, mixins, global, opts.parent)
} catch {}
}
},
AtRule: {
'add-mixin': (node, helpers) => {
insertMixin(helpers, mixins, node, opts)
},
'define-mixin': (node, helpers) => {
addMixin(helpers, mixins, node)
node.remove()
},
'mixin': (node, helpers) => {
insertMixin(helpers, mixins, node, opts)
},
'add-mixin': (node, helpers) => {
insertMixin(helpers, mixins, node, opts)
}
},
Once(root, helpers) {
if (loadFrom.length > 0) {
try {
let global = loadGlobalMixin(helpers, loadFrom)
addGlobalMixins(helpers, mixins, global, opts.parent)
} catch {}
}
},
OnceExit(_, helpers) {
Expand Down
26 changes: 15 additions & 11 deletions package.json
Expand Up @@ -10,8 +10,10 @@
"sass"
],
"scripts": {
"unit": "uvu . '\\.test\\.(ts|js)$'",
"test": "c8 pnpm unit && eslint ."
"unit": "uvu . '\\.test\\.js$'",
"test:coverage": "c8 pnpm unit",
"test:lint": "eslint .",
"test": "pnpm run /^test:/"
},
"author": "Andrey Sitnik <andrey@sitnik.ru>",
"license": "MIT",
Expand All @@ -33,22 +35,24 @@
"postcss": "^8.2.14"
},
"dependencies": {
"fast-glob": "^3.2.12",
"fast-glob": "^3.3.1",
"postcss-js": "^4.0.1",
"postcss-simple-vars": "^7.0.1",
"sugarss": "^4.0.1"
},
"devDependencies": {
"@logux/eslint-config": "^49.0.0",
"c8": "^7.13.0",
"clean-publish": "^4.1.1",
"eslint": "^8.36.0",
"eslint-config-standard": "^17.0.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-n": "^15.6.1",
"@logux/eslint-config": "^52.0.1",
"c8": "^8.0.1",
"clean-publish": "^4.2.0",
"eslint": "^8.51.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-n": "^16.1.0",
"eslint-plugin-node-import": "^1.0.4",
"eslint-plugin-perfectionist": "^2.1.0",
"eslint-plugin-prefer-let": "^3.0.1",
"eslint-plugin-promise": "^6.1.1",
"postcss": "^8.4.21",
"postcss": "^8.4.31",
"uvu": "^0.5.6"
},
"prettier": {
Expand Down

0 comments on commit 6630823

Please sign in to comment.