Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: sort package-json for generator to avoid noise in API conversion #352

Merged
merged 3 commits into from
Mar 23, 2020
Merged

feat: sort package-json for generator to avoid noise in API conversion #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd4597f
sort keys in package-json
xiaozhenliu-gg5 Mar 23, 2020
90b1c90
sort package-json in generated client
xiaozhenliu-gg5 Mar 23, 2020
ca5bfc8
Merge branch 'master' into sort-dependency
xiaozhenliu-gg5 Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions baselines/bigquery-storage/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"repository": "googleapis/nodejs-storage",
"license": "Apache-2.0",
"author": "Google LLC",
"main": "build/src/index.js",
"files": [
"build/src",
"build/protos"
],
"main": "build/src/index.js",
"scripts": {
"clean": "gts clean",
"compile": "tsc -p . && cp -r protos build/",
"compile-protos": "compileProtos src",
"docs": "jsdoc -c .jsdoc.js",
"predocs-test": "npm run docs",
"docs-test": "linkinator docs",
"fix": "gts fix",
"lint": "gts check",
"predocs-test": "npm run docs",
"prepare": "npm run compile-protos && npm run compile",
"system-test": "c8 mocha build/system-test",
"test": "c8 mocha build/test"
Expand All @@ -36,8 +36,8 @@
"jsdoc-region-tag": "^1.0.4",
"linkinator": "^2.0.4",
"mocha": "^6.2.2",
"pack-n-play": "^1.0.0-2",
"null-loader": "^3.0.0",
"pack-n-play": "^1.0.0-2",
"ts-loader": "^6.2.2",
"typescript": "~3.8.3",
"webpack": "^4.42.0",
Expand Down
6 changes: 3 additions & 3 deletions baselines/disable-packing-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"repository": "googleapis/nodejs-showcase",
"license": "Apache-2.0",
"author": "Google LLC",
"main": "build/src/index.js",
"files": [
"build/src",
"build/protos"
],
"main": "build/src/index.js",
"scripts": {
"clean": "gts clean",
"compile": "tsc -p . && cp -r protos build/",
"compile-protos": "compileProtos src",
"docs": "jsdoc -c .jsdoc.js",
"predocs-test": "npm run docs",
"docs-test": "linkinator docs",
"fix": "gts fix",
"lint": "gts check",
"predocs-test": "npm run docs",
"prepare": "npm run compile-protos && npm run compile",
"system-test": "c8 mocha build/system-test",
"test": "c8 mocha build/test"
Expand All @@ -36,8 +36,8 @@
"jsdoc-region-tag": "^1.0.4",
"linkinator": "^2.0.4",
"mocha": "^6.2.2",
"pack-n-play": "^1.0.0-2",
"null-loader": "^3.0.0",
"pack-n-play": "^1.0.0-2",
"ts-loader": "^6.2.2",
"typescript": "~3.8.3",
"webpack": "^4.42.0",
Expand Down
6 changes: 3 additions & 3 deletions baselines/dlp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"repository": "googleapis/nodejs-dlp",
"license": "Apache-2.0",
"author": "Google LLC",
"main": "build/src/index.js",
"files": [
"build/src",
"build/protos"
],
"main": "build/src/index.js",
"scripts": {
"clean": "gts clean",
"compile": "tsc -p . && cp -r protos build/",
"compile-protos": "compileProtos src",
"docs": "jsdoc -c .jsdoc.js",
"predocs-test": "npm run docs",
"docs-test": "linkinator docs",
"fix": "gts fix",
"lint": "gts check",
"predocs-test": "npm run docs",
"prepare": "npm run compile-protos && npm run compile",
"system-test": "c8 mocha build/system-test",
"test": "c8 mocha build/test"
Expand All @@ -36,8 +36,8 @@
"jsdoc-region-tag": "^1.0.4",
"linkinator": "^2.0.4",
"mocha": "^6.2.2",
"pack-n-play": "^1.0.0-2",
"null-loader": "^3.0.0",
"pack-n-play": "^1.0.0-2",
"ts-loader": "^6.2.2",
"typescript": "~3.8.3",
"webpack": "^4.42.0",
Expand Down
6 changes: 3 additions & 3 deletions baselines/kms/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"repository": "googleapis/nodejs-kms",
"license": "Apache-2.0",
"author": "Google LLC",
"main": "build/src/index.js",
"files": [
"build/src",
"build/protos"
],
"main": "build/src/index.js",
"scripts": {
"clean": "gts clean",
"compile": "tsc -p . && cp -r protos build/",
"compile-protos": "compileProtos src",
"docs": "jsdoc -c .jsdoc.js",
"predocs-test": "npm run docs",
"docs-test": "linkinator docs",
"fix": "gts fix",
"lint": "gts check",
"predocs-test": "npm run docs",
"prepare": "npm run compile-protos && npm run compile",
"system-test": "c8 mocha build/system-test",
"test": "c8 mocha build/test"
Expand All @@ -36,8 +36,8 @@
"jsdoc-region-tag": "^1.0.4",
"linkinator": "^2.0.4",
"mocha": "^6.2.2",
"pack-n-play": "^1.0.0-2",
"null-loader": "^3.0.0",
"pack-n-play": "^1.0.0-2",
"ts-loader": "^6.2.2",
"typescript": "~3.8.3",
"webpack": "^4.42.0",
Expand Down
6 changes: 3 additions & 3 deletions baselines/logging/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"repository": "googleapis/nodejs-logging",
"license": "Apache-2.0",
"author": "Google LLC",
"main": "build/src/index.js",
"files": [
"build/src",
"build/protos"
],
"main": "build/src/index.js",
"scripts": {
"clean": "gts clean",
"compile": "tsc -p . && cp -r protos build/",
"compile-protos": "compileProtos src",
"docs": "jsdoc -c .jsdoc.js",
"predocs-test": "npm run docs",
"docs-test": "linkinator docs",
"fix": "gts fix",
"lint": "gts check",
"predocs-test": "npm run docs",
"prepare": "npm run compile-protos && npm run compile",
"system-test": "c8 mocha build/system-test",
"test": "c8 mocha build/test"
Expand All @@ -36,8 +36,8 @@
"jsdoc-region-tag": "^1.0.4",
"linkinator": "^2.0.4",
"mocha": "^6.2.2",
"pack-n-play": "^1.0.0-2",
"null-loader": "^3.0.0",
"pack-n-play": "^1.0.0-2",
"ts-loader": "^6.2.2",
"typescript": "~3.8.3",
"webpack": "^4.42.0",
Expand Down
6 changes: 3 additions & 3 deletions baselines/monitoring/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"repository": "googleapis/nodejs-monitoring",
"license": "Apache-2.0",
"author": "Google LLC",
"main": "build/src/index.js",
"files": [
"build/src",
"build/protos"
],
"main": "build/src/index.js",
"scripts": {
"clean": "gts clean",
"compile": "tsc -p . && cp -r protos build/",
"compile-protos": "compileProtos src",
"docs": "jsdoc -c .jsdoc.js",
"predocs-test": "npm run docs",
"docs-test": "linkinator docs",
"fix": "gts fix",
"lint": "gts check",
"predocs-test": "npm run docs",
"prepare": "npm run compile-protos && npm run compile",
"system-test": "c8 mocha build/system-test",
"test": "c8 mocha build/test"
Expand All @@ -36,8 +36,8 @@
"jsdoc-region-tag": "^1.0.4",
"linkinator": "^2.0.4",
"mocha": "^6.2.2",
"pack-n-play": "^1.0.0-2",
"null-loader": "^3.0.0",
"pack-n-play": "^1.0.0-2",
"ts-loader": "^6.2.2",
"typescript": "~3.8.3",
"webpack": "^4.42.0",
Expand Down
6 changes: 3 additions & 3 deletions baselines/redis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"repository": "googleapis/nodejs-redis",
"license": "Apache-2.0",
"author": "Google LLC",
"main": "build/src/index.js",
"files": [
"build/src",
"build/protos"
],
"main": "build/src/index.js",
"scripts": {
"clean": "gts clean",
"compile": "tsc -p . && cp -r protos build/",
"compile-protos": "compileProtos src",
"docs": "jsdoc -c .jsdoc.js",
"predocs-test": "npm run docs",
"docs-test": "linkinator docs",
"fix": "gts fix",
"lint": "gts check",
"predocs-test": "npm run docs",
"prepare": "npm run compile-protos && npm run compile",
"system-test": "c8 mocha build/system-test",
"test": "c8 mocha build/test"
Expand All @@ -36,8 +36,8 @@
"jsdoc-region-tag": "^1.0.4",
"linkinator": "^2.0.4",
"mocha": "^6.2.2",
"pack-n-play": "^1.0.0-2",
"null-loader": "^3.0.0",
"pack-n-play": "^1.0.0-2",
"ts-loader": "^6.2.2",
"typescript": "~3.8.3",
"webpack": "^4.42.0",
Expand Down
6 changes: 3 additions & 3 deletions baselines/showcase/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"repository": "googleapis/nodejs-showcase",
"license": "Apache-2.0",
"author": "Google LLC",
"main": "build/src/index.js",
"files": [
"build/src",
"build/protos"
],
"main": "build/src/index.js",
"scripts": {
"clean": "gts clean",
"compile": "tsc -p . && cp -r protos build/",
"compile-protos": "compileProtos src",
"docs": "jsdoc -c .jsdoc.js",
"predocs-test": "npm run docs",
"docs-test": "linkinator docs",
"fix": "gts fix",
"lint": "gts check",
"predocs-test": "npm run docs",
"prepare": "npm run compile-protos && npm run compile",
"system-test": "c8 mocha build/system-test",
"test": "c8 mocha build/test"
Expand All @@ -36,8 +36,8 @@
"jsdoc-region-tag": "^1.0.4",
"linkinator": "^2.0.4",
"mocha": "^6.2.2",
"pack-n-play": "^1.0.0-2",
"null-loader": "^3.0.0",
"pack-n-play": "^1.0.0-2",
"ts-loader": "^6.2.2",
"typescript": "~3.8.3",
"webpack": "^4.42.0",
Expand Down
6 changes: 3 additions & 3 deletions baselines/texttospeech/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"repository": "googleapis/nodejs-texttospeech",
"license": "Apache-2.0",
"author": "Google LLC",
"main": "build/src/index.js",
"files": [
"build/src",
"build/protos"
],
"main": "build/src/index.js",
"scripts": {
"clean": "gts clean",
"compile": "tsc -p . && cp -r protos build/",
"compile-protos": "compileProtos src",
"docs": "jsdoc -c .jsdoc.js",
"predocs-test": "npm run docs",
"docs-test": "linkinator docs",
"fix": "gts fix",
"lint": "gts check",
"predocs-test": "npm run docs",
"prepare": "npm run compile-protos && npm run compile",
"system-test": "c8 mocha build/system-test",
"test": "c8 mocha build/test"
Expand All @@ -36,8 +36,8 @@
"jsdoc-region-tag": "^1.0.4",
"linkinator": "^2.0.4",
"mocha": "^6.2.2",
"pack-n-play": "^1.0.0-2",
"null-loader": "^3.0.0",
"pack-n-play": "^1.0.0-2",
"ts-loader": "^6.2.2",
"typescript": "~3.8.3",
"webpack": "^4.42.0",
Expand Down
6 changes: 3 additions & 3 deletions baselines/translate/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"repository": "googleapis/nodejs-translation",
"license": "Apache-2.0",
"author": "Google LLC",
"main": "build/src/index.js",
"files": [
"build/src",
"build/protos"
],
"main": "build/src/index.js",
"scripts": {
"clean": "gts clean",
"compile": "tsc -p . && cp -r protos build/",
"compile-protos": "compileProtos src",
"docs": "jsdoc -c .jsdoc.js",
"predocs-test": "npm run docs",
"docs-test": "linkinator docs",
"fix": "gts fix",
"lint": "gts check",
"predocs-test": "npm run docs",
"prepare": "npm run compile-protos && npm run compile",
"system-test": "c8 mocha build/system-test",
"test": "c8 mocha build/test"
Expand All @@ -36,8 +36,8 @@
"jsdoc-region-tag": "^1.0.4",
"linkinator": "^2.0.4",
"mocha": "^6.2.2",
"pack-n-play": "^1.0.0-2",
"null-loader": "^3.0.0",
"pack-n-play": "^1.0.0-2",
"ts-loader": "^6.2.2",
"typescript": "~3.8.3",
"webpack": "^4.42.0",
Expand Down
18 changes: 9 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,39 @@
},
"license": "Apache-2.0",
"author": "Google LLC",
"bin": {
"gapic-generator-typescript": "build/src/start-script.js",
"protoc-gen-typescript_gapic": "build/src/cli.js"
},
"files": [
"build/src",
"pbjs-genfiles",
"templates"
],
"bin": {
"gapic-generator-typescript": "build/src/start-script.js",
"protoc-gen-typescript_gapic": "build/src/cli.js"
},
"scripts": {
"baseline": "node build/tools/update-baselines.js",
"clean": "gts clean",
"codecov": "c8 --reporter=lcov mocha build/test/unit && c8 report",
"compile": "tsc -p .",
"compile-protos": "pbjs -p protos -p node_modules/google-gax/protos -t static-module -o pbjs-genfiles/plugin.js google/protobuf/compiler/plugin.proto google/api/annotations.proto google/api/field_behavior.proto google/api/resource.proto google/api/client.proto google/longrunning/operations.proto service_config.proto && pbts pbjs-genfiles/plugin.js -o pbjs-genfiles/plugin.d.ts",
"docker-test": "sh docker/test.sh",
"ts-test-application": "mocha build/test/test-application/test-ts --timeout 600000",
"js-test-application": "mocha build/test/test-application/test-js --timeout 600000",
"fix": "gts fix",
"js-test-application": "mocha build/test/test-application/test-js --timeout 600000",
"lint": "gts check",
"prepack": "cd templates/typescript_gapic && rm -f package.json.njk && mv package.json package.json.njk",
"postpack": "cd templates/typescript_gapic && mv package.json.njk package.json && ln -s package.json package.json.njk",
"prepare": "npm run compile-protos && npm run compile",
"pretest": "npm run compile-protos && npm run compile",
"test": "c8 --reporter=lcov mocha build/test/unit",
"prepack": "cd templates/typescript_gapic && rm -f package.json.njk && mv package.json package.json.njk",
"postpack": "cd templates/typescript_gapic && mv package.json.njk package.json && ln -s package.json package.json.njk"
"ts-test-application": "mocha build/test/test-application/test-ts --timeout 600000"
},
"dependencies": {
"@types/js-yaml": "^3.12.2",
"file-system": "^2.2.2",
"fs-extra": "^9.0.0",
"get-stdin": "^7.0.0",
"js-yaml": "^3.13.1",
"google-gax": "^1.15.1",
"js-yaml": "^3.13.1",
"nunjucks": "^3.2.1",
"object-hash": "^2.0.3",
"protobufjs": "^6.8.9",
Expand Down
Loading