From 9c235e34e0cf453bb9f3aec11190af580573f014 Mon Sep 17 00:00:00 2001 From: Kevin Berry <41717340+51ngul4r1ty@users.noreply.github.com> Date: Sat, 3 Feb 2024 00:20:16 -0500 Subject: [PATCH] fix declaration file dist paths --- .vscode/settings.json | 5 ++- package-lock.json | 57 +++++-------------------- package.json | 10 +++-- packages/api-types/package.json | 7 +-- packages/client-sdk/package.json | 11 ++--- packages/client-sdk/src/atollClient.ts | 1 + packages/rest-fetch/package.json | 9 ++-- packages/rest-fetch/src/restApiFetch.ts | 1 + packages/rich-types/package.json | 7 +-- packages/scripts/package.json | 2 +- packages/shared/package.json | 7 +-- packages/vscode-extension/package.json | 6 +-- packages/web-app/package.json | 4 +- 13 files changed, 52 insertions(+), 75 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 20a8c4a..a90ba46 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,10 +6,11 @@ "**/.git": true, "build": true, "coverage": true, - "dist": true, "node_modules": true }, - "search.exclude": {}, + "search.exclude": { + "dist": true + }, "editor.formatOnSave": true, "editor.defaultFormatter": "esbenp.prettier-vscode", "coverage-gutters.showGutterCoverage": true, diff --git a/package-lock.json b/package-lock.json index 8f77304..4a7d8ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "devDependencies": { "prettier": "2.7.1", "rimraf": "3.0.2", - "typescript": "4.2.4" + "typescript": "4.6.4" }, "engines": { "node": ">=16.14.0", @@ -26901,8 +26901,9 @@ } }, "node_modules/typescript": { - "version": "4.2.4", - "license": "Apache-2.0", + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", + "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -29003,6 +29004,7 @@ } }, "packages/api-types": { + "name": "@atoll/api-types", "version": "1.0.0", "license": "MIT", "devDependencies": { @@ -29617,19 +29619,6 @@ } } }, - "packages/client-sdk/node_modules/typescript": { - "version": "4.6.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", - "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, "packages/desktop-app": { "name": "@atoll/desktop-app", "version": "0.1.0", @@ -29637,13 +29626,14 @@ "devDependencies": {} }, "packages/rest-fetch": { + "name": "@atoll/rest-fetch", "version": "1.1.0", "license": "MIT", "dependencies": { + "@atoll/api-types": "0.6.1", "http-status-codes": "2.2.0" }, "devDependencies": { - "@atoll/api-types": "0.6.1", "@babel/core": "7.17.10", "@babel/preset-env": "7.17.10", "@babel/preset-typescript": "7.16.7", @@ -29660,7 +29650,6 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/@atoll/api-types/-/api-types-0.6.1.tgz", "integrity": "sha512-I6wCAz3th8shPXzrCusxDJWBxbdQa+eiSrrIRz6TWXbbQwhIqoggnZV07O2NbU0hgdKUXSBfk0om1nEKgAyQWQ==", - "dev": true, "engines": { "node": ">=16.14.0", "npm": ">=8.3.1" @@ -30116,19 +30105,6 @@ "typescript": ">=2.4.0" } }, - "packages/rich-types/node_modules/typescript": { - "version": "4.6.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", - "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, "packages/scripts": { "name": "@atoll/scripts", "version": "0.1.0", @@ -35592,12 +35568,6 @@ "v8-compile-cache-lib": "^3.0.0", "yn": "3.1.1" } - }, - "typescript": { - "version": "4.6.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", - "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", - "dev": true } } }, @@ -35621,8 +35591,7 @@ "@atoll/api-types": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/@atoll/api-types/-/api-types-0.6.1.tgz", - "integrity": "sha512-I6wCAz3th8shPXzrCusxDJWBxbdQa+eiSrrIRz6TWXbbQwhIqoggnZV07O2NbU0hgdKUXSBfk0om1nEKgAyQWQ==", - "dev": true + "integrity": "sha512-I6wCAz3th8shPXzrCusxDJWBxbdQa+eiSrrIRz6TWXbbQwhIqoggnZV07O2NbU0hgdKUXSBfk0om1nEKgAyQWQ==" }, "@babel/core": { "version": "7.17.10", @@ -35964,12 +35933,6 @@ "resolve": "^1.20.0", "tslib": "^2.3.1" } - }, - "typescript": { - "version": "4.6.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", - "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", - "dev": true } } }, @@ -57322,7 +57285,9 @@ } }, "typescript": { - "version": "4.2.4" + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", + "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==" }, "uglify-js": { "version": "3.17.2", diff --git a/package.json b/package.json index 705e439..b9f05f3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "atoll-mono", - "version": "0.1.1", + "version": "0.66.0", "description": "Atoll's Monorepo using NPM workspaces", "main": "index.ts", "homepage": "https://github.com/51ngul4r1ty/atoll-mono#readme", @@ -21,10 +21,14 @@ "build-pkg:rest-fetch": "npm run build -w packages/rest-fetch", "build-pkg:api-types": "npm run build -w packages/api-types", "build-pkgs:shared": "npm run build-pkg:api-types && npm run build-pkg:rest-fetch && npm run build-pkg:rich-types && npm run build-pkg:client-sdk && npm run build-pkg:shared", + "build-pkgs:extension": "npm run build-pkgs:client-sdk && npm run build-pkg:extension", + "build-pkgs:client-sdk": "npm run build-pkg:rich-types && npm run build-pkgs:rest-fetch && npm run build-pkg:client-sdk", + "build-pkgs:rest-fetch": "npm run build-pkg:api-types && npm run build-pkg:rest-fetch", "dist-pkg:extension": "npm run build-pkgs:shared && npm run build-pkg:extension && npm run build-vsix -w packages/vscode-extension", "check-prereqs-pkg:web-app": "npm run check:prereqs -w packages/web-app", "docker-pkg:web-app": "npm run build-pkg:web-app && npm run -w packages/web-app build:docker", - "clean-all": "npm run clean-all:node-modules", + "clean-all": "npm run clean-all:node-modules && npm run clean-all:dist", + "clean-all:dist": "npm run clean:dist -ws --if-present", "clean-all:node-modules": "npm run clean:node-modules -ws --if-present", "clean:node-modules": "rimraf node_modules", "package-pkg:extension": "npm run package -w packages/vscode-extension", @@ -60,6 +64,6 @@ "devDependencies": { "prettier": "2.7.1", "rimraf": "3.0.2", - "typescript": "4.2.4" + "typescript": "4.6.4" } } diff --git a/packages/api-types/package.json b/packages/api-types/package.json index ecd1b65..fa91109 100644 --- a/packages/api-types/package.json +++ b/packages/api-types/package.json @@ -1,10 +1,10 @@ { "name": "@atoll/api-types", - "version": "1.0.0", + "version": "1.1.1", "description": "Atoll REST API shared types", "main": "dist/index.cjs.js", "module": "dist/index.es.js", - "types": "dist/index.d.ts", + "types": "dist/src/types/index.d.ts", "files": [ "dist" ], @@ -18,7 +18,8 @@ "build": "rollup -c --bundleConfigAsCjs", "prepublishOnly": "npm run clean && npm run build && npm run test", "watch": "rollup -cw --bundleConfigAsCjs", - "clean": "npx --no-install rimraf dist", + "clean": "npm run clean:dist", + "clean:dist": "rimraf dist", "clean:node-modules": "rimraf node_modules", "test": "tsc --noEmit --project tsconfig.json" }, diff --git a/packages/client-sdk/package.json b/packages/client-sdk/package.json index 2077c33..f3b6583 100644 --- a/packages/client-sdk/package.json +++ b/packages/client-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@atoll/client-sdk", - "version": "1.0.0", + "version": "1.1.1", "description": "Atoll REST API client SDK", "main": "dist/index.cjs.js", "module": "dist/index.es.js", @@ -18,7 +18,8 @@ "build": "rollup -c", "prepublishOnly": "npm run clean && npm run build && npm run test", "watch": "rollup -cw", - "clean": "npx --no-install rimraf dist", + "clean": "npm run clean:dist", + "clean:dist": "rimraf dist", "clean:node-modules": "rimraf node_modules", "test": "npm run test:tsc && npm run test:unit", "test:unit": "jest --coverage", @@ -51,9 +52,9 @@ "typescript": "4.6.4" }, "dependencies": { - "@atoll/api-types": "1.0.0", - "@atoll/rest-fetch": "1.1.0", - "@atoll/rich-types": "0.1.1", + "@atoll/api-types": "1.1.1", + "@atoll/rest-fetch": "1.1.1", + "@atoll/rich-types": "1.1.1", "http-status-codes": "2.2.0" } } diff --git a/packages/client-sdk/src/atollClient.ts b/packages/client-sdk/src/atollClient.ts index 29f9b4b..81dab18 100644 --- a/packages/client-sdk/src/atollClient.ts +++ b/packages/client-sdk/src/atollClient.ts @@ -58,6 +58,7 @@ export class AtollClient { }; private onAuthFailureNotification = async (refreshTokenUri: string): Promise => { if (this.notificationHandler) { + debugger; await this.notificationHandler("Re-connecting to Atoll Server...", "info"); } }; diff --git a/packages/rest-fetch/package.json b/packages/rest-fetch/package.json index 7540132..ebb1650 100644 --- a/packages/rest-fetch/package.json +++ b/packages/rest-fetch/package.json @@ -1,10 +1,10 @@ { "name": "@atoll/rest-fetch", - "version": "1.1.0", + "version": "1.1.1", "description": "TypeScript async/await RESTful HTTP client for the browser and node.js", "main": "dist/index.cjs.js", "module": "dist/index.es.js", - "types": "dist/index.d.ts", + "types": "dist/packages/rest-fetch/src/index.d.ts", "files": [ "dist" ], @@ -18,7 +18,8 @@ "build": "rollup -c --bundleConfigAsCjs", "prepublishOnly": "npm run clean && npm run build && npm run test", "watch": "rollup -cw --bundleConfigAsCjs", - "clean": "npx --no-install rimraf dist", + "clean": "npm run clean:dist", + "clean:dist": "rimraf dist", "clean:node-modules": "rimraf node_modules", "test": "npm run test:tsc", "test:tsc": "tsc --noEmit --project tsconfig.json", @@ -34,7 +35,6 @@ "axios": "0.27.2" }, "devDependencies": { - "@atoll/api-types": "0.6.1", "@babel/core": "7.17.10", "@babel/preset-env": "7.17.10", "@babel/preset-typescript": "7.16.7", @@ -44,6 +44,7 @@ "jest": "28.0.3" }, "dependencies": { + "@atoll/api-types": "1.1.1", "http-status-codes": "2.2.0" } } diff --git a/packages/rest-fetch/src/restApiFetch.ts b/packages/rest-fetch/src/restApiFetch.ts index f8d80ba..0aeaa3c 100644 --- a/packages/rest-fetch/src/restApiFetch.ts +++ b/packages/rest-fetch/src/restApiFetch.ts @@ -172,6 +172,7 @@ export class RestApiFetch { throw this.buildFromCaughtError(errorTyped); } private async handleErrorAndRetry(error: any, options: ResourceRequestOptions, apiCall: () => T): Promise { + debugger; const errorTyped = this.fixAxiosError(error); if (options.skipRetryOnAuthFailure || errorTyped.status !== 401) { this.handleError(error); diff --git a/packages/rich-types/package.json b/packages/rich-types/package.json index e546ce9..b963084 100644 --- a/packages/rich-types/package.json +++ b/packages/rich-types/package.json @@ -1,10 +1,10 @@ { "name": "@atoll/rich-types", - "version": "0.1.1", + "version": "1.1.1", "description": "Atoll consuming code shared types", "main": "dist/index.cjs.js", "module": "dist/index.es.js", - "types": "dist/index.d.ts", + "types": "dist/src/types/index.d.ts", "files": [ "dist" ], @@ -18,7 +18,8 @@ "build": "rollup -c", "prepublishOnly": "npm run clean && npm run build && npm run test", "watch": "rollup -cw", - "clean": "npx --no-install rimraf dist", + "clean": "npm run clean:dist", + "clean:dist": "rimraf dist", "clean:node-modules": "rimraf node_modules", "test": "tsc --noEmit --project tsconfig.json" }, diff --git a/packages/scripts/package.json b/packages/scripts/package.json index 445f733..11388b8 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -1,6 +1,6 @@ { "name": "@atoll/scripts", - "version": "0.1.0", + "version": "1.1.1", "description": "", "main": "index.js", "devDependencies": {}, diff --git a/packages/shared/package.json b/packages/shared/package.json index e0773dc..ddbe5b5 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,17 +1,18 @@ { "name": "@atoll/shared", - "version": "0.65.0", + "version": "0.66.0", "description": "Atoll shared code that is common to electron desktop client and web app", "main": "dist/index.cjs.js", "module": "dist/index.es.js", - "types": "dist/index.d.ts", + "types": "dist/src/index.d.ts", "files": [ "dist" ], "sideEffects": false, "scripts": { "build": "echo Node Version && node --version && rollup -c", - "clean": "npx --no-install rimraf dist", + "clean": "npm run clean:dist", + "clean:dist": "rimraf dist", "clean:node-modules": "rimraf node_modules", "gen:react-svg": "deno run --allow-read --allow-write --unstable ../scripts/build-svg-component/index.ts", "open:coverage-report": "npx --no-install opener ./coverage/lcov-report/index.html", diff --git a/packages/vscode-extension/package.json b/packages/vscode-extension/package.json index 4746f16..5006e8f 100644 --- a/packages/vscode-extension/package.json +++ b/packages/vscode-extension/package.json @@ -1,6 +1,6 @@ { "name": "atoll-extension", - "version": "0.4.2", + "version": "0.66.0", "description": "Use Atoll from within VS Code", "author": "Kevin Berry", "repository": { @@ -72,8 +72,8 @@ "webpack-cli": "4.9.2" }, "dependencies": { - "@atoll/client-sdk": "1.0.0", - "@atoll/rich-types": "0.1.1", + "@atoll/client-sdk": "1.1.1", + "@atoll/rich-types": "1.1.1", "axios": "0.27.2" }, "license": "ISC", diff --git a/packages/web-app/package.json b/packages/web-app/package.json index 93c5ac1..9c7e775 100644 --- a/packages/web-app/package.json +++ b/packages/web-app/package.json @@ -1,6 +1,6 @@ { "name": "@atoll/web-app", - "version": "0.65.0", + "version": "0.66.0", "description": "Atoll web app", "scripts": { "build": "npm run build-only && npm run build-deploy", @@ -32,7 +32,7 @@ }, "license": "MIT", "dependencies": { - "@atoll/shared": "0.64.0", + "@atoll/shared": "0.66.0", "@flopflip/memory-adapter": "1.6.0", "@flopflip/react-broadcast": "10.1.11", "axios": "0.26.1",