Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
smaye81 committed Sep 27, 2023
1 parent 2a51a11 commit 657209c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
9 changes: 4 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ GOOGLE_PROTOBUF_VERSION = 23.4
BAZEL_VERSION = 5.4.0
TS_VERSIONS = 4.1.2 4.2.4 4.3.5 4.4.4 4.5.2 4.6.4 4.7.4 4.8.4 4.9.5 5.0.4

# test

node_modules: package-lock.json
npm ci

Expand Down Expand Up @@ -195,10 +193,11 @@ test-ts-compat: $(GEN)/protobuf-test node_modules
done

.PHONY: lint
lint: node_modules $(BUILD)/protobuf $(BUILD)/protobuf-test $(BUILD)/protobuf-conformance $(GEN)/protobuf-bench $(GEN)/protobuf-example ## Lint all files
lint: node_modules $(BUILD)/protobuf $(BUILD)/protobuf-test $(BUILD)/protobuf-conformance $(BUILD)/protoplugin $(GEN)/protobuf-bench $(GEN)/protobuf-example ## Lint all files
npx eslint --max-warnings 0 .
npm run -w packages/protobuf lint:types
npm run -w packages/protoplugin lint:types
@# Check type exports on npm packages to verify they're correct
npm run -w packages/protobuf attw
npm run -w packages/protoplugin attw

.PHONY: format
format: node_modules $(BIN)/git-ls-files-unstaged $(BIN)/license-header ## Format all files, adding license headers
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"npm": ">=8"
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.10.2",
"@typescript-eslint/eslint-plugin": "^6.2.1",
"@typescript-eslint/parser": "^6.2.1",
"eslint": "^8.46.0",
Expand All @@ -28,7 +29,6 @@
"typescript": "^5.1.6"
},
"dependencies": {
"@arethetypeswrong/cli": "^0.7.0",
"@typescript/vfs": "1.0.0",
"jest": "^29.6.2"
}
Expand Down
3 changes: 1 addition & 2 deletions packages/protobuf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
"build": "npm run build:cjs && npm run build:esm",
"build:cjs": "../../node_modules/typescript/bin/tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs --declaration --declarationDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
"build:esm": "../../node_modules/typescript/bin/tsc --project tsconfig.json --module ES2015 --verbatimModuleSyntax --outDir ./dist/esm --declaration --declarationDir ./dist/esm",
"lint:types": "attw --pack"
"attw": "attw --pack"
},
"main": "./dist/cjs/index.js",
"type": "module",
"types": "./dist/esm/index.d.ts",
"exports": {
"import": {
"types": "./dist/esm/index.d.ts",
Expand Down
5 changes: 2 additions & 3 deletions packages/protoplugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"build": "npm run build:cjs && npm run build:esm",
"build:cjs": "../../node_modules/typescript/bin/tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs --declaration --declarationDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
"build:esm": "../../node_modules/typescript/bin/tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm --declaration --declarationDir ./dist/esm",
"lint:types": "attw --pack"
"attw": "attw --pack"
},
"type": "module",
"exports": {
Expand All @@ -39,11 +39,10 @@
}
}
},
"types": "./dist/esm/index.d.ts",
"typesVersions": {
"*": {
"ecmascript": [
"./dist/esm/ecmascript/index.d.ts"
"./dist/cjs/ecmascript/index.d.ts"
]
}
},
Expand Down

0 comments on commit 657209c

Please sign in to comment.