diff --git a/.github/workflows/tssdk-ci.yml b/.github/workflows/tssdk-ci.yml index c777a16df..3a0746150 100644 --- a/.github/workflows/tssdk-ci.yml +++ b/.github/workflows/tssdk-ci.yml @@ -169,7 +169,7 @@ jobs: ${{ github.workspace }}/.github/scripts/wait_for_looker.sh - name: Run Integration Tests - run: yarn test:nodej + run: yarn test:nodeci - name: Upload integration test results if: ${{ always() }} diff --git a/bin/looker-resources-index/package.json b/bin/looker-resources-index/package.json index 57f9e5631..bf364578c 100644 --- a/bin/looker-resources-index/package.json +++ b/bin/looker-resources-index/package.json @@ -16,7 +16,7 @@ "author": "Looker", "license": "MIT", "devDependencies": { - "@types/node": "22.5.1", + "@types/node": "22.5.4", "typescript": "5.5.4" } } diff --git a/package.json b/package.json index 7537bc98a..4ad4d83fb 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "dev:playground": "yarn workspace @looker/extension-playground develop", "dev:tile": "yarn workspace @looker/extension-tile-playground develop", "clean": "rm -Rf packages/*/lib", - "prepublishOnly": "jest packages/sdk-rtl packages/sdk-node/test", + "prepublishOnly": "jest packages/sdk-rtl", "fix": "yarn lint:es --fix", "lint": "run-p -c lint:*", "lint:es": "eslint 'packages/**/*.ts{,x}' --cache", @@ -71,7 +71,7 @@ "test:redux": "yarn jest packages/redux", "test:sdk": "yarn jest packages/sdk", "test:node": "find . -name \"*.apitest.ts\" -not -path \"./node_modules/*\" -exec node --import tsx --test-timeout 90000 --test {} ';'", - "test:nodej": "find . -name \"sdk.apitest.ts\" -not -path \"./node_modules/*\" -exec node --import tsx --test-timeout 90000 --test-reporter junit --test {} ';'", + "test:nodeci": "find . -name \"sdk.apitest.ts\" -not -path \"./node_modules/*\" -exec node --import tsx --test-timeout 90000 --test-reporter junit --test {} ';'", "test:jest": "DOT_ENV_FILE=.env.test jest", "test:ext": "yarn jest packages/extension-sdk packages/extension-sdk-react", "test:hack": "yarn jest packages/wholly-artifact/src packages/hackathon", @@ -102,7 +102,7 @@ "@types/jest": "29.2.4", "@types/js-yaml": "^3.12.1", "@types/lodash": "4.14.172", - "@types/node": "22.5.1", + "@types/node": "22.5.4", "@types/uuid": "^8.3.4", "@typescript-eslint/eslint-plugin": "^5.61.0", "@typescript-eslint/parser": "^5.61.0", diff --git a/packages/sdk-node/package.json b/packages/sdk-node/package.json index 01b700b52..21fdcb2f1 100644 --- a/packages/sdk-node/package.json +++ b/packages/sdk-node/package.json @@ -31,9 +31,8 @@ }, "homepage": "https://github.com/looker-open-source/sdk-codegen/tree/main/packages/sdk-node", "devDependencies": { - "@types/ini": "^1.3.30", - "@types/node": "22.5.1", - "@looker/sdk-codegen": "21.9.0", + "@types/ini": "4.1.1", + "@types/node": "22.5.4", "dotenv": "^8.2.0", "expect": "29.7.0", "whatwg-fetch": "3.6.20", @@ -42,7 +41,7 @@ "dependencies": { "@looker/sdk": "24.16.0", "@looker/sdk-rtl": "21.6.2", - "ini": "^1.3.8" + "ini": "5.0.0" }, "keywords": [ "Looker", diff --git a/packages/sdk-node/src/nodeSession.apitest.ts b/packages/sdk-node/src/nodeSession.apitest.ts index 5b7db24ba..15e22f6bb 100644 --- a/packages/sdk-node/src/nodeSession.apitest.ts +++ b/packages/sdk-node/src/nodeSession.apitest.ts @@ -28,14 +28,13 @@ import * as fs from 'fs'; import * as process from 'node:process'; import { describe, it } from 'node:test'; import { expect } from 'expect'; -import { specToModel } from '@looker/sdk-codegen'; import { ApiConfigMap, boolDefault, defaultTimeout } from '@looker/sdk-rtl'; -import { TestConfig } from '@looker/sdk-codegen-utils'; +import { TestConfig } from '@looker/sdk-rtl/src/testUtils'; import { NodeTransport } from './nodeTransport'; import { NodeSession } from './nodeSession'; import { ApiConfig, NodeSettings, NodeSettingsIniFile } from './nodeSettings'; -const config = TestConfig(specToModel); +const config = TestConfig(); const envPrefix = 'LOOKERSDK'; const localIni = config.localIni; diff --git a/yarn.lock b/yarn.lock index 4f1bd96e1..bd9bfa6cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3860,6 +3860,11 @@ dependencies: "@types/node" "*" +"@types/ini@4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@types/ini/-/ini-4.1.1.tgz#6984664a8cc74c3348f4049d0bf2b1ab2d061ca3" + integrity sha512-MIyNUZipBTbyUNnhvuXJTY7B6qNI78meck9Jbv3wk0OgNwRyOOVEKDutAkOs1snB/tx0FafyR6/SN4Ps0hZPeg== + "@types/ini@^1.3.30": version "1.3.31" resolved "https://registry.yarnpkg.com/@types/ini/-/ini-1.3.31.tgz#c78541a187bd88d5c73e990711c9d85214800d1b" @@ -3974,10 +3979,10 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433" integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== -"@types/node@*", "@types/node@22.5.1", "@types/node@>= 8": - version "22.5.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.1.tgz#de01dce265f6b99ed32b295962045d10b5b99560" - integrity sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw== +"@types/node@*", "@types/node@22.5.4", "@types/node@>= 8": + version "22.5.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.4.tgz#83f7d1f65bc2ed223bdbf57c7884f1d5a4fa84e8" + integrity sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg== dependencies: undici-types "~6.19.2" @@ -9867,6 +9872,11 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== +ini@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ini/-/ini-5.0.0.tgz#a7a4615339843d9a8ccc2d85c9d81cf93ffbc638" + integrity sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw== + ini@^1.3.2, ini@^1.3.4, ini@^1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"