diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 790d1edbe1..6648a63aee 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -12,7 +12,7 @@ importers: '@autorest/testmodeler': ^2.4.0 '@azure-rest/core-client': ^1.2.0 '@azure-tools/codegen': ^2.9.1 - '@azure-tools/rlc-common': workspace:^0.26.0 + '@azure-tools/rlc-common': workspace:^0.26.1 '@azure-tools/test-recorder': ^3.0.0 '@azure/abort-controller': ^1.0.1 '@azure/core-auth': ^1.6.0 @@ -194,7 +194,7 @@ importers: '@azure-tools/typespec-autorest': '>=0.40.0 <1.0.0' '@azure-tools/typespec-azure-core': '>=0.40.0 <1.0.0' '@azure-tools/typespec-client-generator-core': '>=0.40.0 <1.0.0' - '@azure-tools/typespec-ts': workspace:^0.26.0 + '@azure-tools/typespec-ts': workspace:^0.26.1 '@types/mocha': ^5.2.7 '@types/node': ^18.0.0 '@typespec/compiler': '>=0.54.0 <1.0.0' @@ -230,7 +230,7 @@ importers: '@azure-tools/cadl-ranch': ^0.12.4 '@azure-tools/cadl-ranch-expect': ^0.13.2 '@azure-tools/cadl-ranch-specs': ^0.31.5 - '@azure-tools/rlc-common': workspace:^0.26.0 + '@azure-tools/rlc-common': workspace:^0.26.1 '@azure-tools/typespec-azure-core': '>=0.40.0 <1.0.0' '@azure-tools/typespec-client-generator-core': '>=0.40.0 <1.0.0' '@azure/core-auth': ^1.6.0 diff --git a/packages/autorest.typescript/CHANGELOG.md b/packages/autorest.typescript/CHANGELOG.md index 479aa854c1..d4d99b2a8d 100644 --- a/packages/autorest.typescript/CHANGELOG.md +++ b/packages/autorest.typescript/CHANGELOG.md @@ -1,6 +1,10 @@ +## 6.0.20 (2024-04-04) + +- [Bugfix] Fix missing scripts in package.json file. Please refer to [#2402](https://github.com/Azure/autorest.typescript/pull/2402). + ## 6.0.19 (2024-04-03) -- [Feature] Enable esm for RLC generation from TypeSpec. Please refer to [2338](https://github.com/Azure/autorest.typescript/pull/2338). +- [Feature] Enable esm for RLC generation from TypeSpec. Please refer to [#2338](https://github.com/Azure/autorest.typescript/pull/2338). - [Feature] Support usage and access. Please refer to [#2356](https://github.com/Azure/autorest.typescript/pull/2356). - [Feature] Support server versions in modular. Please refer to [#2261](https://github.com/Azure/autorest.typescript/pull/2261). - [Feature] Deprecate baseurl in favor of endpoint in RLC. Please refer to [#2246](https://github.com/Azure/autorest.typescript/pull/2246). diff --git a/packages/autorest.typescript/package.json b/packages/autorest.typescript/package.json index 5b19aaa2c3..28bca3fe21 100644 --- a/packages/autorest.typescript/package.json +++ b/packages/autorest.typescript/package.json @@ -1,6 +1,6 @@ { "name": "@autorest/typescript", - "version": "6.0.19", + "version": "6.0.20", "scripts": { "build": "tsc -p . && npm run copyFiles", "build:test:browser": "tsc -p tsconfig.browser-test.json && webpack --config webpack.config.test.js", @@ -75,7 +75,7 @@ "source-map-support": "^0.5.16", "ts-morph": "^15.1.0", "@azure/core-auth": "^1.6.0", - "@azure-tools/rlc-common": "workspace:^0.26.0" + "@azure-tools/rlc-common": "workspace:^0.26.1" }, "devDependencies": { "@azure-tools/test-recorder": "^3.0.0", diff --git a/packages/autorest.typescript/test/rlcIntegration/generated/dpgCustomization/package.json b/packages/autorest.typescript/test/rlcIntegration/generated/dpgCustomization/package.json index 50db508a7a..0e984cb5fb 100644 --- a/packages/autorest.typescript/test/rlcIntegration/generated/dpgCustomization/package.json +++ b/packages/autorest.typescript/test/rlcIntegration/generated/dpgCustomization/package.json @@ -68,6 +68,7 @@ "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit", "build:samples": "dev-tool samples publish --force", "check-format": "dev-tool run vendored prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\"", + "clean": "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log", "execute:samples": "dev-tool samples run samples-dev", "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\"", "integration-test:browser": "dev-tool run test:browser", diff --git a/packages/autorest.typescript/test/rlcIntegration/generated/httpInfrastructureRest/package.json b/packages/autorest.typescript/test/rlcIntegration/generated/httpInfrastructureRest/package.json index b481fb3a85..f7405292ab 100644 --- a/packages/autorest.typescript/test/rlcIntegration/generated/httpInfrastructureRest/package.json +++ b/packages/autorest.typescript/test/rlcIntegration/generated/httpInfrastructureRest/package.json @@ -65,6 +65,7 @@ "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit", "build:samples": "dev-tool samples publish --force", "check-format": "dev-tool run vendored prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\"", + "clean": "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log", "execute:samples": "dev-tool samples run samples-dev", "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\"", "integration-test:browser": "dev-tool run test:browser", diff --git a/packages/autorest.typescript/test/rlcIntegration/generated/multipleUrlParameters/package.json b/packages/autorest.typescript/test/rlcIntegration/generated/multipleUrlParameters/package.json index ff5a272414..f75fa135d7 100644 --- a/packages/autorest.typescript/test/rlcIntegration/generated/multipleUrlParameters/package.json +++ b/packages/autorest.typescript/test/rlcIntegration/generated/multipleUrlParameters/package.json @@ -65,6 +65,7 @@ "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit", "build:samples": "dev-tool samples publish --force", "check-format": "dev-tool run vendored prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\"", + "clean": "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log", "execute:samples": "dev-tool samples run samples-dev", "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\"", "integration-test:browser": "dev-tool run test:browser", diff --git a/packages/autorest.typescript/test/rlcIntegration/generated/securityAADRest/package.json b/packages/autorest.typescript/test/rlcIntegration/generated/securityAADRest/package.json index 9c8a14d6cc..c87dbe30b9 100644 --- a/packages/autorest.typescript/test/rlcIntegration/generated/securityAADRest/package.json +++ b/packages/autorest.typescript/test/rlcIntegration/generated/securityAADRest/package.json @@ -65,6 +65,7 @@ "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit", "build:samples": "dev-tool samples publish --force", "check-format": "dev-tool run vendored prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\"", + "clean": "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log", "execute:samples": "dev-tool samples run samples-dev", "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\"", "integration-test:browser": "dev-tool run test:browser", diff --git a/packages/autorest.typescript/test/rlcIntegration/generated/securityKeyRest/package.json b/packages/autorest.typescript/test/rlcIntegration/generated/securityKeyRest/package.json index ee5e61cbfa..f3d697748b 100644 --- a/packages/autorest.typescript/test/rlcIntegration/generated/securityKeyRest/package.json +++ b/packages/autorest.typescript/test/rlcIntegration/generated/securityKeyRest/package.json @@ -65,6 +65,7 @@ "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit", "build:samples": "dev-tool samples publish --force", "check-format": "dev-tool run vendored prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\"", + "clean": "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log", "execute:samples": "dev-tool samples run samples-dev", "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.{ts,cts,mts}\" \"test/**/*.{ts,cts,mts}\" \"*.{js,cjs,mjs,json}\"", "integration-test:browser": "dev-tool run test:browser", diff --git a/packages/rlc-common/CHANGELOG.md b/packages/rlc-common/CHANGELOG.md index 6ee6af8fa9..a62d4a595d 100644 --- a/packages/rlc-common/CHANGELOG.md +++ b/packages/rlc-common/CHANGELOG.md @@ -1,6 +1,10 @@ +## 0.26.1 (2024-04-04) + +- [Bugfix] Fix missing scripts in package.json file. Please refer to [#2402](https://github.com/Azure/autorest.typescript/pull/2402). + ## 0.26.0 (2024-04-03) -- [Feature] Enable esm for RLC generation from TypeSpec. Please refer to [2338](https://github.com/Azure/autorest.typescript/pull/2338). +- [Feature] Enable esm for RLC generation from TypeSpec. Please refer to [#2338](https://github.com/Azure/autorest.typescript/pull/2338). - [Feature] Support usage and access. Please refer to [#2356](https://github.com/Azure/autorest.typescript/pull/2356). - [Feature] Support server versions in modular. Please refer to [#2261](https://github.com/Azure/autorest.typescript/pull/2261). - [Feature] Deprecate baseurl in favor of endpoint in RLC. Please refer to [#2246](https://github.com/Azure/autorest.typescript/pull/2246). diff --git a/packages/rlc-common/package.json b/packages/rlc-common/package.json index 7ca021b9f0..c56f458205 100644 --- a/packages/rlc-common/package.json +++ b/packages/rlc-common/package.json @@ -1,6 +1,6 @@ { "name": "@azure-tools/rlc-common", - "version": "0.26.0", + "version": "0.26.1", "description": "", "type": "module", "main": "dist/index.js", diff --git a/packages/rlc-common/src/metadata/packageJson/buildAzureMonorepoPackage.ts b/packages/rlc-common/src/metadata/packageJson/buildAzureMonorepoPackage.ts index dd11c4fc93..41be8ca946 100644 --- a/packages/rlc-common/src/metadata/packageJson/buildAzureMonorepoPackage.ts +++ b/packages/rlc-common/src/metadata/packageJson/buildAzureMonorepoPackage.ts @@ -193,6 +193,7 @@ function getAzureMonorepoScripts(config: AzureMonorepoInfoConfig) { "build:samples": "dev-tool samples publish --force", "check-format": 'dev-tool run vendored prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.{ts,cts,mts}" "test/**/*.{ts,cts,mts}" "*.{js,cjs,mjs,json}"', + "clean": "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log", "execute:samples": "dev-tool samples run samples-dev", format: 'dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.{ts,cts,mts}" "test/**/*.{ts,cts,mts}" "*.{js,cjs,mjs,json}"', @@ -218,7 +219,7 @@ function getEsmScripts({ moduleKind }: AzureMonorepoInfoConfig) { return { "build:test": "npm run clean && tshy && dev-tool run build-test", - build: "npm run clean && tshy && api-extractor run --local", + build: "npm run clean && tshy && mkdirp ./review && api-extractor run --local", "test:node": "npm run clean && tshy && npm run unit-test:node && npm run integration-test:node", test: "npm run clean && tshy && npm run unit-test:node && dev-tool run bundle && npm run unit-test:browser && npm run integration-test", diff --git a/packages/rlc-common/test/integration/packageJson.spec.ts b/packages/rlc-common/test/integration/packageJson.spec.ts index a2cb77d689..9ef975bf5b 100644 --- a/packages/rlc-common/test/integration/packageJson.spec.ts +++ b/packages/rlc-common/test/integration/packageJson.spec.ts @@ -344,7 +344,7 @@ describe("Package file generation", () => { ); expect(packageFile.scripts).to.have.property( "build", - "npm run clean && tshy && api-extractor run --local" + "npm run clean && tshy && mkdirp ./review && api-extractor run --local" ); expect(packageFile.scripts).to.have.property( "test:node", @@ -362,6 +362,10 @@ describe("Package file generation", () => { "unit-test:node", "dev-tool run test:vitest --no-test-proxy" ); + expect(packageFile.scripts).to.have.property( + "clean", + "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log" + ); }); it("[cjs] should include correct test devCependencies with tests", () => { @@ -448,6 +452,10 @@ describe("Package file generation", () => { "unit-test:browser", "dev-tool run test:browser" ); + expect(packageFile.scripts).to.have.property( + "clean", + "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log" + ); }); }); diff --git a/packages/typespec-test/package.json b/packages/typespec-test/package.json index f319dd79c7..51c9268b7d 100644 --- a/packages/typespec-test/package.json +++ b/packages/typespec-test/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "type": "module", "dependencies": { - "@azure-tools/typespec-ts": "workspace:^0.26.0", + "@azure-tools/typespec-ts": "workspace:^0.26.1", "@typespec/openapi": ">=0.54.0 <1.0.0", "@azure-tools/typespec-autorest": ">=0.40.0 <1.0.0", "@typespec/openapi3": ">=0.54.0 <1.0.0", diff --git a/packages/typespec-ts/CHANGELOG.md b/packages/typespec-ts/CHANGELOG.md index 676aab6e99..5cc9d5d71b 100644 --- a/packages/typespec-ts/CHANGELOG.md +++ b/packages/typespec-ts/CHANGELOG.md @@ -1,6 +1,10 @@ +## 0.26.1 (2024-04-04) + +- [Bugfix] Fix missing scripts in package.json file. Please refer to [#2402](https://github.com/Azure/autorest.typescript/pull/2402). + ## 0.26.0 (2024-04-03) -- [Feature] Enable esm for RLC generation from TypeSpec. Please refer to [2338](https://github.com/Azure/autorest.typescript/pull/2338). +- [Feature] Enable esm for RLC generation from TypeSpec. Please refer to [#2338](https://github.com/Azure/autorest.typescript/pull/2338). - [Feature] Support usage and access. Please refer to [#2356](https://github.com/Azure/autorest.typescript/pull/2356). - [Feature] Support server versions in modular. Please refer to [#2261](https://github.com/Azure/autorest.typescript/pull/2261). - [Feature] Deprecate baseurl in favor of endpoint in RLC. Please refer to [#2246](https://github.com/Azure/autorest.typescript/pull/2246). diff --git a/packages/typespec-ts/package.json b/packages/typespec-ts/package.json index dea501823b..53d2c4e550 100644 --- a/packages/typespec-ts/package.json +++ b/packages/typespec-ts/package.json @@ -1,6 +1,6 @@ { "name": "@azure-tools/typespec-ts", - "version": "0.26.0", + "version": "0.26.1", "description": "An experimental TypeSpec emitter for TypeScript RLC", "main": "dist/src/index.js", "type": "module", @@ -93,7 +93,7 @@ "dependencies": { "prettier": "^3.1.0", "tslib": "^2.3.1", - "@azure-tools/rlc-common": "workspace:^0.26.0", + "@azure-tools/rlc-common": "workspace:^0.26.1", "ts-morph": "^15.1.0", "fs-extra": "^11.1.0" },