Skip to content

Commit

Permalink
fix: PR feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-fenster committed May 8, 2020
1 parent 7f5b7cb commit 1e8ba2f
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 16 deletions.
8 changes: 7 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ jobs:
- run:
name: Run lint
working_directory: /home/circleci/workspace/gapic-generator-typescript
command: npm run lint
command: |
rm -f bazel-* # we don't need these broken symlinks here
# we have some extra stuff here in Circle that we don't want to lint
echo test-application-runners >> .eslintignore
echo test-application-runners >> .prettierignore
# and now finally...
npm run lint
showcaseTestApplications:
docker:
- image: circleci/node:10-browsers
Expand Down
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ build/
docs/
protos/
test-fixtures/
pbjs-genfiles/
bazel-*/
coverage/
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
build/
docs/
protos/
bazel-*/
coverage/
2 changes: 0 additions & 2 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ npm_runtime_dependencies = [

npm_test_dependencies = npm_runtime_dependencies + [
"@npm//assert-rejects",
"@npm//c8",
"@npm//codecov",
"@npm//espower-typescript",
"@npm//sinon",
"@npm//mocha",
Expand Down
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
"protoc-gen-typescript_gapic": "build/src/protoc-plugin.js"
},
"files": [
"build/**/*.js",
"build/**/*.d.ts",
"build/src/**/*.js",
"build/src/**/*.d.ts",
"build/protos.js",
"build/protos.d.ts",
"build/templates"
],
"scripts": {
Expand All @@ -27,9 +29,9 @@
"codecov": "c8 --reporter=lcov mocha bazel-bin/test/unit && c8 report",
"compile": "bazel build //...",
"docker-test": "sh docker/test.sh",
"fix": "gts fix src/**/*.ts test/**/*.ts tools/*.ts",
"fix": "gts fix",
"js-test-application": "mocha bazel-bin/test/test-application/test-js --timeout 600000",
"lint": "gts check src/**/*.ts test/**/*.ts tools/*.ts",
"lint": "gts check",
"prepack": "npm run compile && cd templates/typescript_gapic && rm -f package.json.njk && mv package.json package.json.njk && cd ../.. && mkdir -p build && cp -rf bazel-bin/src bazel-bin/protos.js templates build/",
"postpack": "cd templates/typescript_gapic && mv package.json.njk package.json && ln -s package.json package.json.njk",
"test": "bazel test //:unit-tests",
Expand Down
5 changes: 0 additions & 5 deletions pbjs-genfiles/README.md

This file was deleted.

1 change: 1 addition & 0 deletions src/protoc-plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
// }
// Then we use this module-alias module that alters behavior of
// `require` by adding an alias to gapic_generator_typescript.
// TODO(@alexander-fenster): get rid of module-alias.
import * as moduleAlias from 'module-alias';
import * as path from 'path';
moduleAlias.addAlias('gapic_generator_typescript', path.join(__dirname, '..'));
Expand Down
3 changes: 0 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
"outDir": "build",
"baseUrl": ".",
"allowJs": true,
"lib": [
"es2016"
],
"paths": {
"gapic_generator_typescript/*": ["*"]
}
Expand Down

0 comments on commit 1e8ba2f

Please sign in to comment.