Skip to content

Commit

Permalink
Merge branch 'main' into fix-sec-jsonpath
Browse files Browse the repository at this point in the history
  • Loading branch information
kvz committed Oct 31, 2023
2 parents 5aa7138 + ced0a58 commit dd2cad5
Show file tree
Hide file tree
Showing 33 changed files with 10,611 additions and 9,668 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/ci-monolib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ on: [push, pull_request]
jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
node: ['18']
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- run: yarn
- run: yarn test
node-version: 18
cache: 'yarn'
- run: corepack yarn --immutable
- run: corepack yarn test
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ pids
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
typings/
yarn-debug.log*
yarn-error.log*
yarn-error.log*
.yarn/install-state.gz
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodeLinker: node-modules
enableGlobalCache: true
3 changes: 2 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"packages": ["packages/*"],
"version": "independent",
"npmClient": "yarn"
"npmClient": "yarn",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
14 changes: 10 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
{
"name": "monolib",
"private": true,
"workspaces": [
"packages/*"
],
"packageManager": "[email protected]+sha224.ca5d6f5a8aecd0801adc32f775675b01961bdc2383867d36f4732a0a",
"engines": {
"node": ">= 18",
"yarn": "4.0.1"
},
"scripts": {
"pub": "npm-run-all test lernaPublish",
"lernaPublish": "lerna publish",
"new": "sucrase-node new.ts",
"lernaBootstrap": "lerna bootstrap --npm-client=yarn",
"install": "npm run lernaBootstrap",
"fix": "DEBUG=eslint:cli-engine eslint . --ext .js,.jsx,.ts,.tsx --fix && yarn fix:formatting",
"lint": "DEBUG=eslint:cli-engine eslint . --ext .js,.jsx,.ts,.tsx && yarn lint:formatting",
"build": "lerna run tsc",
"test:watch": "jest packages/*/src/*.test.ts --watch",
"test": "npm-run-all build lernaBootstrap lint jest",
"test": "npm-run-all build lint jest",
"jest": "jest --verbose packages/*/src/*.test.ts",
"jest:update": "jest --verbose --updateSnapshot packages/*/src/*.test.ts",
"fix:formatting": "prettier --write .",
Expand Down Expand Up @@ -46,7 +52,7 @@
"eslint-plugin-react-hooks": "^4.2.0",
"fakefile": "1.0.0",
"jest": "^29.0.1",
"lerna": "4.0.0",
"lerna": "^7.0.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.6",
"replace-require-with-import": "^2.1.0",
Expand Down
1 change: 0 additions & 1 deletion packages/abbr/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@transloadit/abbr",
"license": "AGPL-3.0-only",
"private": false,
"publishConfig": {
"access": "public"
},
Expand Down
1 change: 0 additions & 1 deletion packages/analyze-step/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@transloadit/analyze-step",
"license": "AGPL-3.0-only",
"private": false,
"publishConfig": {
"access": "public"
},
Expand Down
164 changes: 0 additions & 164 deletions packages/analyze-step/yarn.lock

This file was deleted.

1 change: 0 additions & 1 deletion packages/enrich-tweet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "@transloadit/enrich-tweet",
"license": "AGPL-3.0-only",
"version": "0.1.2",
"private": false,
"publishConfig": {
"access": "public"
},
Expand Down
Loading

0 comments on commit dd2cad5

Please sign in to comment.