Skip to content

Commit e369275

Browse files
committedNov 20, 2024·
Merge branch 'v8' into fix/rule-types
2 parents 73069f1 + fee2d42 commit e369275

File tree

8 files changed

+3498
-66
lines changed

8 files changed

+3498
-66
lines changed
 

Diff for: ‎.github/workflows/deploy.yml

+14-6
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,15 @@ jobs:
2121
uses: actions/setup-node@v1
2222
with:
2323
node-version: ${{ matrix.node-version }}
24-
- run: npm install
25-
- run: npm run build --if-present
26-
- run: npm run lint
27-
- run: npm test
24+
- uses: pnpm/action-setup@v4
25+
with:
26+
version: 9
27+
- run: pnpm install
28+
- run: pnpm install
29+
working-directory: examples
30+
- run: pnpm run build
31+
- run: pnpm run lint
32+
- run: pnpm run test
2833
deploy:
2934
needs: build
3035
runs-on: ubuntu-latest
@@ -33,8 +38,11 @@ jobs:
3338
- uses: actions/setup-node@v1
3439
with:
3540
node-version: 18.x
36-
- run: npm install
37-
- run: npm run build --if-present
41+
- uses: pnpm/action-setup@v4
42+
with:
43+
version: 9
44+
- run: pnpm install
45+
- run: pnpm run build
3846
# https://github.com/marketplace/actions/npm-publish
3947
- uses: JS-DevTools/npm-publish@v2
4048
with:

Diff for: ‎.github/workflows/node.js.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@ jobs:
2121
uses: actions/setup-node@v1
2222
with:
2323
node-version: ${{ matrix.node-version }}
24-
- run: npm install
25-
- run: npm run build --if-present
26-
- run: npm run lint
27-
- run: npm test
24+
- uses: pnpm/action-setup@v4
25+
with:
26+
version: 9
27+
- run: pnpm install
28+
- run: pnpm install
29+
working-directory: examples
30+
- run: pnpm run build
31+
- run: pnpm run lint
32+
- run: pnpm run test

Diff for: ‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ npm-debug.log
55
.DS_Store
66
dist
77
*.tgz
8-
package-lock.json
8+
package-lock.json

Diff for: ‎examples/package-lock.json

-53
This file was deleted.

Diff for: ‎examples/pnpm-lock.yaml

+309
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"homepage": "https://github.com/cachecontrol/json-rules-engine",
4141
"devDependencies": {
4242
"@eslint/js": "^9.13.0",
43+
"@types/node": "^22.9.0",
4344
"eslint": "^9.13.0",
4445
"globals": "^15.11.0",
4546
"lodash": "4.17.21",

Diff for: ‎pnpm-lock.yaml

+3,162
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
3333
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
3434
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
35-
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
35+
"types": ["node"], /* Specify type package names to be included without being referenced in a source file. */
3636
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
3737
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
3838
// "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
@@ -108,6 +108,6 @@
108108
"skipLibCheck": true /* Skip type checking all .d.ts files. */
109109
},
110110
"exclude": [
111-
"tsup.config.ts"
111+
"tsup.config.ts", "dist"
112112
]
113113
}

0 commit comments

Comments
 (0)
Please sign in to comment.