From 5e15feec5148d62d5250edaf28bf31e24f4ed867 Mon Sep 17 00:00:00 2001 From: Ketan Reddy Date: Fri, 20 Feb 2026 13:56:23 -0800 Subject: [PATCH 1/3] disable StrictHostKeyChecking for releases --- .circleci/config.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d22e45c..bc90bac 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,18 +15,28 @@ executors: base: docker: - image: docker.io/playerui/bazel-docker-slim:18 - working_directory: ~/tools + working_directory: ~/cli resource_class: medium environment: TZ: "/usr/share/zoneinfo/America/Los_Angeles" commands: + setup_auth: + description: Configure authentication for deployments + steps: + - add_ssh_keys: + fingerprints: + - "SHA256:hUAWVYdfSW5ml6ufbfyEHUcuPwUJ88xVhsZc21b2lA8" + - run: mkdir -p ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config + - run: git config --global user.name "Intuit Service" + - run: git config --global user.email "opensource-svc@intuit.com" + auto_shipit: description: Perform Auto shipit steps: - attach_workspace: - at: ~/tools - + at: ~/cli + - setup_auth - run: echo "//registry.npmjs.com/:_authToken=$NPM_TOKEN" >> ~/.npmrc - run: echo -e $GPG_KEY | gpg --import --batch - run: | @@ -62,7 +72,7 @@ jobs: executor: base steps: - attach_workspace: - at: ~/player + at: ~/cli - run: | echo "build --remote_header=x-buildbuddy-api-key=${BUILDBUDDY_API_KEY}" >> .bazelrc.local echo "test --remote_header=x-buildbuddy-api-key=${BUILDBUDDY_API_KEY}" >> .bazelrc.local @@ -76,7 +86,7 @@ jobs: executor: base steps: - attach_workspace: - at: ~/tools + at: ~/cli - run: bazel build -- $(bazel query "kind(npm_package, //...)" --output label 2>/dev/null | tr '\n' ' ') - persist_to_workspace: @@ -89,7 +99,7 @@ jobs: executor: base steps: - attach_workspace: - at: ~/tools + at: ~/cli - run: | bazel coverage --config=ci -- $(bazel query "kind(js_test, //...)" --output label 2>/dev/null | tr '\n' ' ') From cec8f52cbf5e952fedae56bb85bd5fa2352d7940 Mon Sep 17 00:00:00 2001 From: Ketan Reddy Date: Fri, 20 Feb 2026 13:56:34 -0800 Subject: [PATCH 2/3] Fix resource limits for CI --- .bazelrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.bazelrc b/.bazelrc index e13f194..3996ea4 100644 --- a/.bazelrc +++ b/.bazelrc @@ -16,8 +16,8 @@ common --remote_cache_compression --remote_cache_async # CI Config common:ci --build_metadata=ROLE=CI -common:ci --local_resources=cpu=4 -common:ci --local_resources=memory=8000 +common:ci --local_resources=cpu=2 +common:ci --local_resources=memory=4000 # Release Config common:release --config=ci --stamp --workspace_status_command=./scripts/workspace-status.sh From ee93ff4561ea612e6008af696b6b1d902e01728c Mon Sep 17 00:00:00 2001 From: Ketan Reddy Date: Fri, 20 Feb 2026 14:31:07 -0800 Subject: [PATCH 3/3] Use new dependencies --- BUILD.bazel | 1 - MODULE.bazel | 1 + cli/BUILD | 12 +- cli/src/__tests__/commands/check.test.ts | 114 ++++----- cli/src/commands/dependency-versions/check.ts | 40 +-- cli/src/commands/dsl/compile.ts | 4 +- cli/src/commands/xlr/compile.ts | 4 +- cli/src/commands/xlr/convert.ts | 4 +- cli/src/plugins/LSPAssetsPlugin.ts | 4 +- cli/src/plugins/LSPPluginPlugin.ts | 2 +- cli/src/plugins/LSPTransformsPlugin.ts | 4 +- .../plugins/__tests__/LSPAssetsPlugin.test.ts | 2 +- cli/src/plugins/index.ts | 8 +- cli/src/utils/base-command.ts | 8 +- cli/src/utils/compilation-context.ts | 4 +- cli/src/utils/compile-renderer.ts | 2 +- cli/src/utils/xlr/visitors/file.ts | 2 +- cli/src/utils/xlr/visitors/plugin.ts | 8 +- cli/src/utils/xlr/visitors/types.ts | 2 +- package.json | 14 +- pnpm-lock.yaml | 236 +++++++++--------- 21 files changed, 235 insertions(+), 241 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index b03ccc0..f5400b9 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -14,7 +14,6 @@ exports_files([ "tsconfig.json", "package.json", "vitest.config.mts", - ".editorconfig", ".all-contributorsrc", "README.md", "requirements.txt", diff --git a/MODULE.bazel b/MODULE.bazel index f91cabc..ac4fe0e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -8,6 +8,7 @@ archive_override( urls = ["https://github.com/player-ui/rules_player/archive/refs/tags/v2.3.0.tar.gz"], integrity = "sha256-ic72uLj5+fdjFXxwmtRrHGPlWA3ewTXB6Gx6TRMKgh4=" ) + bazel_dep(name = "aspect_bazel_lib", version = "2.17.1") bazel_dep(name = "aspect_rules_js", version = "2.3.7") bazel_dep(name = "bazel_skylib", version = "1.8.1") diff --git a/cli/BUILD b/cli/BUILD index 11e21a4..5f5e1db 100644 --- a/cli/BUILD +++ b/cli/BUILD @@ -20,12 +20,12 @@ build_deps = [ ] deps = [ - "//:node_modules/@player-tools/dsl", - "//:node_modules/@player-tools/json-language-service", - "//:node_modules/@player-tools/xlr", - "//:node_modules/@player-tools/xlr-converters", - "//:node_modules/@player-tools/xlr-sdk", - "//:node_modules/@player-tools/xlr-utils", + "//:node_modules/@player-lang/react-dsl", + "//:node_modules/@player-lang/json-language-service", + "//:node_modules/@xlr-lib/xlr", + "//:node_modules/@xlr-lib/xlr-converters", + "//:node_modules/@xlr-lib/xlr-sdk", + "//:node_modules/@xlr-lib/xlr-utils", "//:node_modules/@babel/plugin-transform-react-jsx-source", "//:node_modules/@babel/preset-env", "//:node_modules/@babel/preset-react", diff --git a/cli/src/__tests__/commands/check.test.ts b/cli/src/__tests__/commands/check.test.ts index 926a722..130ec50 100644 --- a/cli/src/__tests__/commands/check.test.ts +++ b/cli/src/__tests__/commands/check.test.ts @@ -76,7 +76,7 @@ beforeEach(() => { ); }); -describe("checks @player-ui/@player-tools versions and outputs warnings/recommendations", () => { +describe("checks @player-ui/@player-lang versions and outputs warnings/recommendations", () => { test("should issue error message due to not being run in the root directory", async () => { cwdSpy.mockReturnValue( "/Users/username/player/utilities/cli/src/__tests__", @@ -121,11 +121,11 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "To add string pattern(s) for files to exclude, consider adding them after the -i flag.", ], [ - "Inspecting the @player-ui/@player-tools dependencies in the current repository...", + "Inspecting the @player-ui/@player-lang dependencies in the current repository...", ], [ " - TOP-LEVEL @player-ui/@player-tools DEPENDENCIES:", + TOP-LEVEL @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -135,7 +135,7 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen ], [ " - NESTED @player-ui/@player-tools DEPENDENCIES:", + NESTED @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -144,10 +144,10 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen ", ], [ - "Unique top-level and nested @player-ui/@player-tools versions match. ", + "Unique top-level and nested @player-ui/@player-lang versions match. ", ], [ - "There are no issues related to @player-ui/@player-tools dependency versioning. You are good to go! ", + "There are no issues related to @player-ui/@player-lang dependency versioning. You are good to go! ", ], ] `); @@ -178,11 +178,11 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "To add string pattern(s) for files to exclude, consider adding them after the -i flag.", ], [ - "Inspecting the @player-ui/@player-tools dependencies in the current repository...", + "Inspecting the @player-ui/@player-lang dependencies in the current repository...", ], [ " - TOP-LEVEL @player-ui/@player-tools DEPENDENCIES:", + TOP-LEVEL @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -191,10 +191,10 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen ", ], [ - "No nested @player-ui/@player-tools dependencies exist. Only a single top-level @player-ui/@player-tools version exists, 3.11.0", + "No nested @player-ui/@player-lang dependencies exist. Only a single top-level @player-ui/@player-lang version exists, 3.11.0", ], [ - "There are no issues related to @player-ui/@player-tools dependency versioning. You are good to go! ", + "There are no issues related to @player-ui/@player-lang dependency versioning. You are good to go! ", ], ] `); @@ -224,11 +224,11 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "To add string pattern(s) for files to exclude, consider adding them after the -i flag.", ], [ - "Inspecting the @player-ui/@player-tools dependencies in the current repository...", + "Inspecting the @player-ui/@player-lang dependencies in the current repository...", ], [ " - NESTED @player-ui/@player-tools DEPENDENCIES:", + NESTED @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -237,10 +237,10 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen ", ], [ - "No top-level @player-ui/@player-tools dependencies exist. Only a single nested @player-ui/@player-tools version exists, 3.11.0", + "No top-level @player-ui/@player-lang dependencies exist. Only a single nested @player-ui/@player-lang version exists, 3.11.0", ], [ - "There are no issues related to @player-ui/@player-tools dependency versioning. You are good to go! ", + "There are no issues related to @player-ui/@player-lang dependency versioning. You are good to go! ", ], ] `); @@ -264,13 +264,13 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "To add string pattern(s) for files to exclude, consider adding them after the -i flag.", ], [ - "Inspecting the @player-ui/@player-tools dependencies in the current repository...", + "Inspecting the @player-ui/@player-lang dependencies in the current repository...", ], [ - "No @player-ui/@player-tools dependencies exist.", + "No @player-ui/@player-lang dependencies exist.", ], [ - "There are no issues related to @player-ui/@player-tools dependency versioning. You are good to go! ", + "There are no issues related to @player-ui/@player-lang dependency versioning. You are good to go! ", ], ] `); @@ -320,11 +320,11 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "To add string pattern(s) for files to exclude, consider adding them after the -i flag.", ], [ - "Inspecting the @player-ui/@player-tools dependencies in the current repository...", + "Inspecting the @player-ui/@player-lang dependencies in the current repository...", ], [ " - TOP-LEVEL @player-ui/@player-tools DEPENDENCIES:", + TOP-LEVEL @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -334,7 +334,7 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen ], [ " - NESTED @player-ui/@player-tools DEPENDENCIES:", + NESTED @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -346,13 +346,13 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "WARNINGS:", ], [ - "- Mismatch between the top-level and the nested @player-ui/@player-tools dependency.", + "- Mismatch between the top-level and the nested @player-ui/@player-lang dependency.", ], [ "RECOMMENDATIONS:", ], [ - "- The highest @player-ui/@player-tools version is 3.30.1 at the nested level. Please bump the top-level version, 3.11.0, to 3.30.1.", + "- The highest @player-ui/@player-lang version is 3.30.1 at the nested level. Please bump the top-level version, 3.11.0, to 3.30.1.", ], ] `); @@ -395,11 +395,11 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "To add string pattern(s) for files to exclude, consider adding them after the -i flag.", ], [ - "Inspecting the @player-ui/@player-tools dependencies in the current repository...", + "Inspecting the @player-ui/@player-lang dependencies in the current repository...", ], [ " - TOP-LEVEL @player-ui/@player-tools DEPENDENCIES:", + TOP-LEVEL @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -415,7 +415,7 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen ], [ " - NESTED @player-ui/@player-tools DEPENDENCIES:", + NESTED @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -433,16 +433,16 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "WARNINGS:", ], [ - "- There are multiple top-level @player-ui/@player-tools dependency versions.", + "- There are multiple top-level @player-ui/@player-lang dependency versions.", ], [ - "- There are multiple nested @player-ui/@player-tools dependency versions.", + "- There are multiple nested @player-ui/@player-lang dependency versions.", ], [ "RECOMMENDATIONS:", ], [ - "- Resolve all top-level @player-ui/@player-tools dependencies to the same version. Consider updating them to the latest player version you have, 4.37.3. When all top-level @player-ui/@player-tools dependencies are resolved, run the current CLI again to obtain recommendations about nested @player-ui/@player-tools dependencies.", + "- Resolve all top-level @player-ui/@player-lang dependencies to the same version. Consider updating them to the latest player version you have, 4.37.3. When all top-level @player-ui/@player-lang dependencies are resolved, run the current CLI again to obtain recommendations about nested @player-ui/@player-lang dependencies.", ], ] `); @@ -478,11 +478,11 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "To add string pattern(s) for files to exclude, consider adding them after the -i flag.", ], [ - "Inspecting the @player-ui/@player-tools dependencies in the current repository...", + "Inspecting the @player-ui/@player-lang dependencies in the current repository...", ], [ " - NESTED @player-ui/@player-tools DEPENDENCIES:", + NESTED @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -500,13 +500,13 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "WARNINGS:", ], [ - "- There are multiple nested @player-ui/@player-tools dependency versions.", + "- There are multiple nested @player-ui/@player-lang dependency versions.", ], [ "RECOMMENDATIONS:", ], [ - "- The highest @player-ui/@player-tools version is 4.37.3 at the nested level. Please add resolutions for all nested @player-ui/@player-tools versions to this version or bump the nested versions to it.", + "- The highest @player-ui/@player-lang version is 4.37.3 at the nested level. Please add resolutions for all nested @player-ui/@player-lang versions to this version or bump the nested versions to it.", ], ] `); @@ -542,11 +542,11 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "To add string pattern(s) for files to exclude, consider adding them after the -i flag.", ], [ - "Inspecting the @player-ui/@player-tools dependencies in the current repository...", + "Inspecting the @player-ui/@player-lang dependencies in the current repository...", ], [ " - TOP-LEVEL @player-ui/@player-tools DEPENDENCIES:", + TOP-LEVEL @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -556,7 +556,7 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen ], [ " - NESTED @player-ui/@player-tools DEPENDENCIES:", + NESTED @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -574,13 +574,13 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "WARNINGS:", ], [ - "- There are multiple nested @player-ui/@player-tools dependency versions.", + "- There are multiple nested @player-ui/@player-lang dependency versions.", ], [ "RECOMMENDATIONS:", ], [ - "- The highest @player-ui/@player-tools version is 4.37.3 at the top level. Please add resolutions for all nested @player-ui/@player-tools versions to this version or bump the nested versions to it.", + "- The highest @player-ui/@player-lang version is 4.37.3 at the top level. Please add resolutions for all nested @player-ui/@player-lang versions to this version or bump the nested versions to it.", ], ] `); @@ -617,11 +617,11 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "To add string pattern(s) for files to exclude, consider adding them after the -i flag.", ], [ - "Inspecting the @player-ui/@player-tools dependencies in the current repository...", + "Inspecting the @player-ui/@player-lang dependencies in the current repository...", ], [ " - TOP-LEVEL @player-ui/@player-tools DEPENDENCIES:", + TOP-LEVEL @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -631,7 +631,7 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen ], [ " - NESTED @player-ui/@player-tools DEPENDENCIES:", + NESTED @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -649,16 +649,16 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "WARNINGS:", ], [ - "- There are multiple nested @player-ui/@player-tools dependency versions.", + "- There are multiple nested @player-ui/@player-lang dependency versions.", ], [ "RECOMMENDATIONS:", ], [ - "- The highest @player-ui/@player-tools version is 4.37.3 at the nested level. Please bump the top-level version, 3.11.0, to 4.37.3.", + "- The highest @player-ui/@player-lang version is 4.37.3 at the nested level. Please bump the top-level version, 3.11.0, to 4.37.3.", ], [ - "- Also, please add resolutions or bump the versions for nested @player-ui/@player-tools dependencies whose version is not 4.37.3.", + "- Also, please add resolutions or bump the versions for nested @player-ui/@player-lang dependencies whose version is not 4.37.3.", ], ] `); @@ -694,11 +694,11 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "To add string pattern(s) for files to exclude, consider adding them after the -i flag.", ], [ - "Inspecting the @player-ui/@player-tools dependencies in the current repository...", + "Inspecting the @player-ui/@player-lang dependencies in the current repository...", ], [ " - TOP-LEVEL @player-ui/@player-tools DEPENDENCIES:", + TOP-LEVEL @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -716,13 +716,13 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "WARNINGS:", ], [ - "- There are multiple top-level @player-ui/@player-tools dependency versions.", + "- There are multiple top-level @player-ui/@player-lang dependency versions.", ], [ "RECOMMENDATIONS:", ], [ - "- Resolve all top-level @player-ui/@player-tools dependencies to the same version. Consider updating them to the latest player version you have, 4.37.3. When all top-level @player-ui/@player-tools dependencies are resolved, run the current CLI again to obtain recommendations about nested @player-ui/@player-tools dependencies.", + "- Resolve all top-level @player-ui/@player-lang dependencies to the same version. Consider updating them to the latest player version you have, 4.37.3. When all top-level @player-ui/@player-lang dependencies are resolved, run the current CLI again to obtain recommendations about nested @player-ui/@player-lang dependencies.", ], ] `); @@ -759,11 +759,11 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "To add string pattern(s) for files to exclude, consider adding them after the -i flag.", ], [ - "Inspecting the @player-ui/@player-tools dependencies in the current repository...", + "Inspecting the @player-ui/@player-lang dependencies in the current repository...", ], [ " - TOP-LEVEL @player-ui/@player-tools DEPENDENCIES:", + TOP-LEVEL @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -779,7 +779,7 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen ], [ " - NESTED @player-ui/@player-tools DEPENDENCIES:", + NESTED @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -791,13 +791,13 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "WARNINGS:", ], [ - "- There are multiple top-level @player-ui/@player-tools dependency versions.", + "- There are multiple top-level @player-ui/@player-lang dependency versions.", ], [ "RECOMMENDATIONS:", ], [ - "- Resolve all top-level @player-ui/@player-tools dependencies to the same version. Consider updating them to the latest player version you have, 4.37.3. When all top-level @player-ui/@player-tools dependencies are resolved, run the current CLI again to obtain recommendations about nested @player-ui/@player-tools dependencies.", + "- Resolve all top-level @player-ui/@player-lang dependencies to the same version. Consider updating them to the latest player version you have, 4.37.3. When all top-level @player-ui/@player-lang dependencies are resolved, run the current CLI again to obtain recommendations about nested @player-ui/@player-lang dependencies.", ], ] `); @@ -834,11 +834,11 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "To add string pattern(s) for files to exclude, consider adding them after the -i flag.", ], [ - "Inspecting the @player-ui/@player-tools dependencies in the current repository...", + "Inspecting the @player-ui/@player-lang dependencies in the current repository...", ], [ " - TOP-LEVEL @player-ui/@player-tools DEPENDENCIES:", + TOP-LEVEL @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -854,7 +854,7 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen ], [ " - NESTED @player-ui/@player-tools DEPENDENCIES:", + NESTED @player-ui/@player-lang DEPENDENCIES:", ], [ "Version How to find dependency @@ -866,13 +866,13 @@ describe("checks @player-ui/@player-tools versions and outputs warnings/recommen "WARNINGS:", ], [ - "- There are multiple top-level @player-ui/@player-tools dependency versions.", + "- There are multiple top-level @player-ui/@player-lang dependency versions.", ], [ "RECOMMENDATIONS:", ], [ - "- Resolve all top-level @player-ui/@player-tools dependencies to the same version. Consider updating them to the latest player version you have, 4.20.5. When all top-level @player-ui/@player-tools dependencies are resolved, run the current CLI again to obtain recommendations about nested @player-ui/@player-tools dependencies.", + "- Resolve all top-level @player-ui/@player-lang dependencies to the same version. Consider updating them to the latest player version you have, 4.20.5. When all top-level @player-ui/@player-lang dependencies are resolved, run the current CLI again to obtain recommendations about nested @player-ui/@player-lang dependencies.", ], ] `); diff --git a/cli/src/commands/dependency-versions/check.ts b/cli/src/commands/dependency-versions/check.ts index 3c919a4..59b9c60 100644 --- a/cli/src/commands/dependency-versions/check.ts +++ b/cli/src/commands/dependency-versions/check.ts @@ -10,17 +10,17 @@ interface DependencyMap { [dependencyVersion: string]: string[]; } -/** A command to get @player-ui/@player-tools dependency versions and issue warnings/recommendations based on them */ +/** A command to get @player-ui/@player-lang dependency versions and issue warnings/recommendations based on them */ export default class DependencyVersionsCheck extends BaseCommand { static summary = - "Checks for @player-ui/@player-tools dependency version mismatches and issues warnings/solutions accordingly"; + "Checks for @player-ui/@player-lang dependency version mismatches and issues warnings/solutions accordingly"; static description = `Consider the following: - The interpretation of TOP-LEVEL and NESTED dependencies is as follows: a. TOP-LEVEL dependencies only have one 'node_modules' in their path b. NESTED dependencies have more than one 'node_modules' in their path - - @player-ui/@player-tools dependencies are fetched not only from inside the 'node_modules' at the top of the repository in which it is run but also from 'node_modules' in sub-directories. - For example, if you have some 'node_modules' inside of a 'packages' folder that contains @player-ui/@player-tools dependencies, then these will also be fetched. + - @player-ui/@player-lang dependencies are fetched not only from inside the 'node_modules' at the top of the repository in which it is run but also from 'node_modules' in sub-directories. + For example, if you have some 'node_modules' inside of a 'packages' folder that contains @player-ui/@player-lang dependencies, then these will also be fetched. The display of such dependencies also depends on the first bullet point. `; @@ -112,7 +112,7 @@ export default class DependencyVersionsCheck extends BaseCommand { } console.log( - "Inspecting the @player-ui/@player-tools dependencies in the current repository...", + "Inspecting the @player-ui/@player-lang dependencies in the current repository...", ); let packageJsons = glob.sync( @@ -265,7 +265,7 @@ export default class DependencyVersionsCheck extends BaseCommand { } if (topLevelVersionsExist) { - console.log("\nTOP-LEVEL @player-ui/@player-tools DEPENDENCIES:"); + console.log("\nTOP-LEVEL @player-ui/@player-lang DEPENDENCIES:"); printTable( versionToTopLevelDependencyMap, sortedTopLevelVersions, @@ -274,7 +274,7 @@ export default class DependencyVersionsCheck extends BaseCommand { } if (nestedVersionsExist) { - console.log("\nNESTED @player-ui/@player-tools DEPENDENCIES:"); + console.log("\nNESTED @player-ui/@player-lang DEPENDENCIES:"); printTable( versionToNestedDependencyMap, sortedNestedVersions, @@ -290,28 +290,28 @@ export default class DependencyVersionsCheck extends BaseCommand { ) { if (singleVersionsMatch) { console.log( - "Unique top-level and nested @player-ui/@player-tools versions match. ", + "Unique top-level and nested @player-ui/@player-lang versions match. ", ); } if (!topLevelVersionsExist && nestedVersions.length === 1) { console.log( - `No top-level @player-ui/@player-tools dependencies exist. Only a single nested @player-ui/@player-tools version exists, ${nestedVersions[0]}`, + `No top-level @player-ui/@player-lang dependencies exist. Only a single nested @player-ui/@player-lang version exists, ${nestedVersions[0]}`, ); } if (!nestedVersionsExist && topLevelVersions.length === 1) { console.log( - `No nested @player-ui/@player-tools dependencies exist. Only a single top-level @player-ui/@player-tools version exists, ${topLevelVersions[0]}`, + `No nested @player-ui/@player-lang dependencies exist. Only a single top-level @player-ui/@player-lang version exists, ${topLevelVersions[0]}`, ); } if (!nestedVersionsExist && !topLevelVersionsExist) { - console.log("No @player-ui/@player-tools dependencies exist."); + console.log("No @player-ui/@player-lang dependencies exist."); } console.log( - "There are no issues related to @player-ui/@player-tools dependency versioning. You are good to go! ", + "There are no issues related to @player-ui/@player-lang dependency versioning. You are good to go! ", ); this.exit(results.exitCode); return results; @@ -320,48 +320,48 @@ export default class DependencyVersionsCheck extends BaseCommand { console.log(chalkNegative("WARNINGS:")); if (multipleTopLevelVersionsDetected) { console.log( - "- There are multiple top-level @player-ui/@player-tools dependency versions.", + "- There are multiple top-level @player-ui/@player-lang dependency versions.", ); } if (multipleNestedVersionsDetected) { console.log( - "- There are multiple nested @player-ui/@player-tools dependency versions.", + "- There are multiple nested @player-ui/@player-lang dependency versions.", ); } if (singleVersionsMismatch) { console.log( - "- Mismatch between the top-level and the nested @player-ui/@player-tools dependency.", + "- Mismatch between the top-level and the nested @player-ui/@player-lang dependency.", ); } console.log(chalkPositive("RECOMMENDATIONS:")); if (multipleTopLevelVersionsDetected) { console.log( - `- Resolve all top-level @player-ui/@player-tools dependencies to the same version. Consider updating them to the latest player version you have, ${highestTopLevelVersion}. When all top-level @player-ui/@player-tools dependencies are resolved, run the current CLI again to obtain recommendations about nested @player-ui/@player-tools dependencies.`, + `- Resolve all top-level @player-ui/@player-lang dependencies to the same version. Consider updating them to the latest player version you have, ${highestTopLevelVersion}. When all top-level @player-ui/@player-lang dependencies are resolved, run the current CLI again to obtain recommendations about nested @player-ui/@player-lang dependencies.`, ); } else if (highestTopLevelVersion && highestNestedVersion) { // highestTopLevelVersion && highestNestedVersion defined means: single top-level version, one or more nested versions if (cmp(highestTopLevelVersion, highestNestedVersion) >= 1) { // when only a single top-level version is detected, it is simply the highest console.log( - `- The highest @player-ui/@player-tools version is ${highestTopLevelVersion} at the top level. Please add resolutions for all nested @player-ui/@player-tools versions to this version or bump the nested versions to it.`, + `- The highest @player-ui/@player-lang version is ${highestTopLevelVersion} at the top level. Please add resolutions for all nested @player-ui/@player-lang versions to this version or bump the nested versions to it.`, ); } else { console.log( - `- The highest @player-ui/@player-tools version is ${highestNestedVersion} at the nested level. Please bump the top-level version, ${highestTopLevelVersion}, to ${highestNestedVersion}.`, + `- The highest @player-ui/@player-lang version is ${highestNestedVersion} at the nested level. Please bump the top-level version, ${highestTopLevelVersion}, to ${highestNestedVersion}.`, ); if (multipleNestedVersionsDetected) { console.log( - `- Also, please add resolutions or bump the versions for nested @player-ui/@player-tools dependencies whose version is not ${highestNestedVersion}.`, + `- Also, please add resolutions or bump the versions for nested @player-ui/@player-lang dependencies whose version is not ${highestNestedVersion}.`, ); } } } else if (highestNestedVersion && multipleNestedVersionsDetected) { // no top-level version defined, multiple nested versions console.log( - `- The highest @player-ui/@player-tools version is ${highestNestedVersion} at the nested level. Please add resolutions for all nested @player-ui/@player-tools versions to this version or bump the nested versions to it.`, + `- The highest @player-ui/@player-lang version is ${highestNestedVersion} at the nested level. Please add resolutions for all nested @player-ui/@player-lang versions to this version or bump the nested versions to it.`, ); } diff --git a/cli/src/commands/dsl/compile.ts b/cli/src/commands/dsl/compile.ts index 521042a..e1638a5 100644 --- a/cli/src/commands/dsl/compile.ts +++ b/cli/src/commands/dsl/compile.ts @@ -6,8 +6,8 @@ import mkdirp from "mkdirp"; import logSymbols from "log-symbols"; import figures from "figures"; import chalk from "chalk"; -import type { CompilationResult } from "@player-tools/dsl"; -import { fingerprintContent as fallbackFingerprint } from "@player-tools/dsl"; +import type { CompilationResult } from "@player-lang/react-dsl"; +import { fingerprintContent as fallbackFingerprint } from "@player-lang/react-dsl"; import { BaseCommand } from "../../utils/base-command"; import { convertToFileGlob, normalizePath } from "../../utils/fs"; import type { CompletedTask } from "../../utils/task-runner"; diff --git a/cli/src/commands/xlr/compile.ts b/cli/src/commands/xlr/compile.ts index d884dc4..f7423b4 100644 --- a/cli/src/commands/xlr/compile.ts +++ b/cli/src/commands/xlr/compile.ts @@ -4,8 +4,8 @@ import fs from "fs"; import path from "path"; import globby from "globby"; import logSymbols from "log-symbols"; -import { TsConverter } from "@player-tools/xlr-converters"; -import type { Manifest } from "@player-tools/xlr"; +import { TsConverter } from "@xlr-lib/xlr-converters"; +import type { Manifest } from "@xlr-lib/xlr"; import chalk from "chalk"; import { BaseCommand } from "../../utils/base-command"; import { pluginVisitor, fileVisitor } from "../../utils/xlr/visitors"; diff --git a/cli/src/commands/xlr/convert.ts b/cli/src/commands/xlr/convert.ts index 7eb04bc..a9753a1 100644 --- a/cli/src/commands/xlr/convert.ts +++ b/cli/src/commands/xlr/convert.ts @@ -2,8 +2,8 @@ import { Flags } from "@oclif/core"; import path from "path"; import fs from "fs"; import chalk from "chalk"; -import type { ExportTypes } from "@player-tools/xlr-sdk"; -import { XLRSDK } from "@player-tools/xlr-sdk"; +import type { ExportTypes } from "@xlr-lib/xlr-sdk"; +import { XLRSDK } from "@xlr-lib/xlr-sdk"; import logSymbols from "log-symbols"; import { BaseCommand } from "../../utils/base-command"; diff --git a/cli/src/plugins/LSPAssetsPlugin.ts b/cli/src/plugins/LSPAssetsPlugin.ts index 98ab57c..a1bf5d4 100644 --- a/cli/src/plugins/LSPAssetsPlugin.ts +++ b/cli/src/plugins/LSPAssetsPlugin.ts @@ -1,6 +1,6 @@ -import type { PlayerLanguageService } from "@player-tools/json-language-service"; +import type { PlayerLanguageService } from "@player-lang/json-language-service"; import type { PlayerCLIPlugin } from "./index"; -import { TSManifest } from "@player-tools/xlr"; +import { TSManifest } from "@xlr-lib/xlr"; /** Loads XLRs into the LSP via the manifest.js file */ export interface LSPAssetsPluginModuleConfig { diff --git a/cli/src/plugins/LSPPluginPlugin.ts b/cli/src/plugins/LSPPluginPlugin.ts index a3d62a2..b89e43e 100644 --- a/cli/src/plugins/LSPPluginPlugin.ts +++ b/cli/src/plugins/LSPPluginPlugin.ts @@ -1,7 +1,7 @@ import type { PlayerLanguageService, PlayerLanguageServicePlugin, -} from "@player-tools/json-language-service"; +} from "@player-lang/json-language-service"; import type { PlayerCLIPlugin } from "./index"; /** diff --git a/cli/src/plugins/LSPTransformsPlugin.ts b/cli/src/plugins/LSPTransformsPlugin.ts index 5c93e0b..754bf3e 100644 --- a/cli/src/plugins/LSPTransformsPlugin.ts +++ b/cli/src/plugins/LSPTransformsPlugin.ts @@ -1,5 +1,5 @@ -import type { PlayerLanguageService } from "@player-tools/json-language-service"; -import type { TransformFunction } from "@player-tools/xlr"; +import type { PlayerLanguageService } from "@player-lang/json-language-service"; +import type { TransformFunction } from "@xlr-lib/xlr"; import type { PlayerCLIPlugin } from "./index"; /** diff --git a/cli/src/plugins/__tests__/LSPAssetsPlugin.test.ts b/cli/src/plugins/__tests__/LSPAssetsPlugin.test.ts index e48ee9a..d8564dc 100644 --- a/cli/src/plugins/__tests__/LSPAssetsPlugin.test.ts +++ b/cli/src/plugins/__tests__/LSPAssetsPlugin.test.ts @@ -1,4 +1,4 @@ -import { PlayerLanguageService } from "@player-tools/json-language-service"; +import { PlayerLanguageService } from "@player-lang/json-language-service"; import { vi, test, expect, describe, beforeEach } from "vitest"; import { LSPAssetsPlugin } from "../LSPAssetsPlugin"; diff --git a/cli/src/plugins/index.ts b/cli/src/plugins/index.ts index c2d051e..83786c9 100644 --- a/cli/src/plugins/index.ts +++ b/cli/src/plugins/index.ts @@ -1,7 +1,7 @@ -import type { PlayerLanguageService } from "@player-tools/json-language-service"; -import type { DSLCompiler } from "@player-tools/dsl"; -import type { ExportTypes } from "@player-tools/xlr-sdk"; -import type { TransformFunction } from "@player-tools/xlr"; +import type { PlayerLanguageService } from "@player-lang/json-language-service"; +import type { DSLCompiler } from "@player-lang/react-dsl"; +import type { ExportTypes } from "@xlr-lib/xlr-sdk"; +import type { TransformFunction } from "@xlr-lib/xlr"; import type { CompilationContext } from "../utils/compilation-context"; export * from "./LSPAssetsPlugin"; diff --git a/cli/src/utils/base-command.ts b/cli/src/utils/base-command.ts index 49ec59d..b1ac4ee 100644 --- a/cli/src/utils/base-command.ts +++ b/cli/src/utils/base-command.ts @@ -1,10 +1,10 @@ import { Command, Flags } from "@oclif/core"; import path from "path"; import { cosmiconfig } from "cosmiconfig"; -import { PlayerLanguageService } from "@player-tools/json-language-service"; -import { DSLCompiler } from "@player-tools/dsl"; -import type { ExportTypes } from "@player-tools/xlr-sdk"; -import type { TransformFunction } from "@player-tools/xlr"; +import { PlayerLanguageService } from "@player-lang/json-language-service"; +import { DSLCompiler } from "@player-lang/react-dsl"; +import type { ExportTypes } from "@xlr-lib/xlr-sdk"; +import type { TransformFunction } from "@xlr-lib/xlr"; import type { PlayerConfigFileShape, PlayerConfigResolvedShape, diff --git a/cli/src/utils/compilation-context.ts b/cli/src/utils/compilation-context.ts index 0a7a4c5..aa6bfcb 100644 --- a/cli/src/utils/compilation-context.ts +++ b/cli/src/utils/compilation-context.ts @@ -1,5 +1,5 @@ -import type { DSLCompiler, SerializeContext } from "@player-tools/dsl"; -import { isDefaultCompilerContentType } from "@player-tools/dsl"; +import type { DSLCompiler, SerializeContext } from "@player-lang/react-dsl"; +import { isDefaultCompilerContentType } from "@player-lang/react-dsl"; import { AsyncSeriesBailHook } from "tapable-ts"; export interface identifyContentReturn { diff --git a/cli/src/utils/compile-renderer.ts b/cli/src/utils/compile-renderer.ts index 6171755..1104156 100644 --- a/cli/src/utils/compile-renderer.ts +++ b/cli/src/utils/compile-renderer.ts @@ -1,6 +1,6 @@ import chalk from "chalk"; import figureSet from "figures"; -import type { SerializeType } from "@player-tools/dsl"; +import type { SerializeType } from "@player-lang/react-dsl"; import type { TaskProgressRenderer } from "./task-runner"; import { getTaskSymbol } from "./diag-renderer"; diff --git a/cli/src/utils/xlr/visitors/file.ts b/cli/src/utils/xlr/visitors/file.ts index f11b543..f502a93 100644 --- a/cli/src/utils/xlr/visitors/file.ts +++ b/cli/src/utils/xlr/visitors/file.ts @@ -1,4 +1,4 @@ -import type { Manifest } from "@player-tools/xlr"; +import type { Manifest } from "@xlr-lib/xlr"; import path from "path"; import fs from "fs"; import type { VisitorProps } from "./types"; diff --git a/cli/src/utils/xlr/visitors/plugin.ts b/cli/src/utils/xlr/visitors/plugin.ts index 00acac4..5b54b6b 100644 --- a/cli/src/utils/xlr/visitors/plugin.ts +++ b/cli/src/utils/xlr/visitors/plugin.ts @@ -1,10 +1,10 @@ -import type { TopLevelNode } from "@player-tools/xlr-utils"; -import { isNodeExported, isTopLevelNode } from "@player-tools/xlr-utils"; +import type { TopLevelNode } from "@xlr-lib/xlr-utils"; +import { isNodeExported, isTopLevelNode } from "@xlr-lib/xlr-utils"; import path from "path"; import ts from "typescript"; import fs from "fs"; -import type { Manifest, NamedType, RefNode } from "@player-tools/xlr"; -import type { TsConverter } from "@player-tools/xlr-converters"; +import type { Manifest, NamedType, RefNode } from "@xlr-lib/xlr"; +import type { TsConverter } from "@xlr-lib/xlr-converters"; import type { VisitorProps } from "./types"; import { PLAYER_PLUGIN_INTERFACE_NAME } from "../consts"; diff --git a/cli/src/utils/xlr/visitors/types.ts b/cli/src/utils/xlr/visitors/types.ts index 4138e3e..d5462ac 100644 --- a/cli/src/utils/xlr/visitors/types.ts +++ b/cli/src/utils/xlr/visitors/types.ts @@ -1,4 +1,4 @@ -import type { TsConverter } from "@player-tools/xlr-converters"; +import type { TsConverter } from "@xlr-lib/xlr-converters"; import type ts from "typescript"; export interface VisitorProps { diff --git a/package.json b/package.json index 300af23..108966a 100644 --- a/package.json +++ b/package.json @@ -21,12 +21,12 @@ "@babel/register": "^7.23.3", "@oclif/core": "1.9.0", "@oclif/plugin-plugins": "^1.9.0", - "@player-tools/dsl": "^0.12.0", - "@player-tools/json-language-service": "^0.12.0", - "@player-tools/xlr": "^0.12.0", - "@player-tools/xlr-converters": "^0.12.0", - "@player-tools/xlr-sdk": "^0.12.0", - "@player-tools/xlr-utils": "^0.12.0", + "@player-lang/react-dsl": "0.0.2-next.0", + "@player-lang/json-language-service": "0.0.2-next.0", + "@xlr-lib/xlr": "0.1.1-next.1", + "@xlr-lib/xlr-converters": "^0.1.1-next.1", + "@xlr-lib/xlr-sdk": "0.1.1-next.1", + "@xlr-lib/xlr-utils": "0.1.1-next.1", "@types/babel__register": "^7.17.0", "@types/fs-extra": "^9.0.13", "@types/mkdirp": "^1.0.2", @@ -45,7 +45,7 @@ "happy-dom": "^13.3.8", "husky": "^7.0.2", "is-ci-cli": "^2.2.0", - "jiti": "^2.4.2", + "jiti": "^2.6.1", "log-symbols": "^4.0.0", "log-update": "^4.0.0", "mkdirp": "^1.0.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 96017c7..6defa93 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,24 +35,12 @@ importers: '@oclif/plugin-plugins': specifier: ^1.9.0 version: 1.10.11(@oclif/config@1.18.17) - '@player-tools/dsl': - specifier: ^0.12.0 - version: 0.12.0(@types/node@18.19.130)(@types/react@18.3.27)(react@18.3.1) - '@player-tools/json-language-service': - specifier: ^0.12.0 - version: 0.12.0 - '@player-tools/xlr': - specifier: ^0.12.0 - version: 0.12.0 - '@player-tools/xlr-converters': - specifier: ^0.12.0 - version: 0.12.0(jsonc-parser@2.3.1)(typescript@5.5.4) - '@player-tools/xlr-sdk': - specifier: ^0.12.0 - version: 0.12.0(typescript@5.5.4) - '@player-tools/xlr-utils': - specifier: ^0.12.0 - version: 0.12.0(jsonc-parser@2.3.1)(typescript@5.5.4) + '@player-lang/json-language-service': + specifier: 0.0.2-next.0 + version: 0.0.2-next.0 + '@player-lang/react-dsl': + specifier: 0.0.2-next.0 + version: 0.0.2-next.0(@types/react@18.3.27)(react@18.3.1) '@types/babel__register': specifier: ^7.17.0 version: 7.17.3 @@ -68,6 +56,18 @@ importers: '@types/std-mocks': specifier: ^1.0.1 version: 1.0.4 + '@xlr-lib/xlr': + specifier: 0.1.1-next.1 + version: 0.1.1-next.1 + '@xlr-lib/xlr-converters': + specifier: ^0.1.1-next.1 + version: 0.1.1-next.1(jsonc-parser@2.3.1)(typescript@5.5.4) + '@xlr-lib/xlr-sdk': + specifier: 0.1.1-next.1 + version: 0.1.1-next.1(typescript@5.5.4) + '@xlr-lib/xlr-utils': + specifier: 0.1.1-next.1 + version: 0.1.1-next.1(jsonc-parser@2.3.1)(typescript@5.5.4) chalk: specifier: ^4.0.1 version: 4.1.2 @@ -108,7 +108,7 @@ importers: specifier: ^2.2.0 version: 2.2.0 jiti: - specifier: ^2.4.2 + specifier: ^2.6.1 version: 2.6.1 log-symbols: specifier: ^4.0.0 @@ -1667,45 +1667,26 @@ packages: resolution: {integrity: sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==, tarball: https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz} engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} - '@player-tools/dsl@0.12.0': - resolution: {integrity: sha512-HA5Qei+yZEdCCxa6zjr7klOb1DhCxAHVER+CxiVGB2IlTKFX34jMY+UECLZViVF1vlhmmCQI50BcksWev3Qb3Q==, tarball: https://registry.npmjs.org/@player-tools/dsl/-/dsl-0.12.0.tgz} - peerDependencies: - '@types/react': ^18.2.51 - react: ^18.2.0 - - '@player-tools/json-language-service@0.12.0': - resolution: {integrity: sha512-ASwRnmV/mNuPvIUbvmXj3On67w8qq3i0tEtfZk5+6030qyI0KEK0HcghCcGPbzdslWGOlAGyidt7LjKtA6BJrA==, tarball: https://registry.npmjs.org/@player-tools/json-language-service/-/json-language-service-0.12.0.tgz} - - '@player-tools/xlr-converters@0.12.0': - resolution: {integrity: sha512-FMhxpDnlHnty05QtfL6BLuC5K1+gikwm/OBXy0AM8iTQ5w4W4t/XX8aWvd/DNizE/i9Erp9/pD4jIV9av1ToyQ==, tarball: https://registry.npmjs.org/@player-tools/xlr-converters/-/xlr-converters-0.12.0.tgz} - peerDependencies: - typescript: 5.5.4 + '@player-lang/json-language-service@0.0.2-next.0': + resolution: {integrity: sha512-OBwJZLEr+FJs8+/zNjlhBW7Ptqv6RcrEkd9EtsLXLhgT8wGdBXRrdW/Zs/e6MujczUzU3SodYMY6pqFrzqe/pA==, tarball: https://registry.npmjs.org/@player-lang/json-language-service/-/json-language-service-0.0.2-next.0.tgz} - '@player-tools/xlr-sdk@0.12.0': - resolution: {integrity: sha512-KMzv/hJLJ0zQVhamFv4HMNl7I7EpuJJuOs7kj5zK3ywHCs1z08jheqzyfA1ka14vo2lvha3aS1CS5H7Ayw1ErA==, tarball: https://registry.npmjs.org/@player-tools/xlr-sdk/-/xlr-sdk-0.12.0.tgz} + '@player-lang/react-dsl@0.0.2-next.0': + resolution: {integrity: sha512-pf9AJIovEcsS99okM5CXCxlmklk2MSOiHD4i9prK4sbhlMiZetrM9S+Phl5gY5fzf38Y3QhPZoN5jWLKwYxE9g==, tarball: https://registry.npmjs.org/@player-lang/react-dsl/-/react-dsl-0.0.2-next.0.tgz} peerDependencies: - typescript: 5.5.4 - - '@player-tools/xlr-utils@0.12.0': - resolution: {integrity: sha512-PzdNkiJy/RvHuorW2ece/Swq1GQ2XUWiNnsxFdLEud5TFVrynePuFCEJZm+7Bssf4Ju3nCLFr0ARUB8M4zHq4w==, tarball: https://registry.npmjs.org/@player-tools/xlr-utils/-/xlr-utils-0.12.0.tgz} - peerDependencies: - jsonc-parser: ^2.3.1 - typescript: 5.5.4 - - '@player-tools/xlr@0.12.0': - resolution: {integrity: sha512-iB3PmIJd8dygTgjak8GKdQqkAkc23JpxMyd+OCnAU8Uctrsl46YPTBZIhtKn2Vbn4vzAQmJkl4cz2C8xDgnvDg==, tarball: https://registry.npmjs.org/@player-tools/xlr/-/xlr-0.12.0.tgz} + '@types/react': ^18.3.3 + react: ^18.2.0 - '@player-ui/make-flow@0.12.0-next.1': - resolution: {integrity: sha512-jXFK25y5u9yCFLn+O6Yg+YZNPpwG4ZNtixO3n9m7uPe3g4WwkccyBFd44QxcopJylL2nblH2THDr3dJistqYuw==, tarball: https://registry.npmjs.org/@player-ui/make-flow/-/make-flow-0.12.0-next.1.tgz} + '@player-ui/make-flow@0.15.0': + resolution: {integrity: sha512-Nha+1TgOV0v9AuHORAhYEwIjoU75kujHhhV/BJgs9UqLsTnBzM8jFloOuDbDKPwR1UQwc2Qa8mGvEcyn3TGK1g==, tarball: https://registry.npmjs.org/@player-ui/make-flow/-/make-flow-0.15.0.tgz} - '@player-ui/partial-match-registry@0.12.0-next.1': - resolution: {integrity: sha512-qxFT+yrijZQ4Bbgu9LFE7W0RjU8A7gTGy9TRqokLWLaZ9lx6xl6XK/oekF7wRtnJ0zdm4WVGJZM0M+Z2mIpAbg==, tarball: https://registry.npmjs.org/@player-ui/partial-match-registry/-/partial-match-registry-0.12.0-next.1.tgz} + '@player-ui/partial-match-registry@0.15.0': + resolution: {integrity: sha512-1MJ0vpBcokL6O0cqunrUB/aWOaleL/1qxoWaEzcW8fxHiERpmpA+A8KT276KD7AjX+ketEXm9jFsovnKLXuMvQ==, tarball: https://registry.npmjs.org/@player-ui/partial-match-registry/-/partial-match-registry-0.15.0.tgz} - '@player-ui/player@0.12.0-next.1': - resolution: {integrity: sha512-jjH2fEwv+qWPGZ5o+6jWf6S+hY+3wbJkgS6poD7yADapQT6ufsefvUkAM+F9ZMJTYzpHNJnF+8JancYeM0a3dw==, tarball: https://registry.npmjs.org/@player-ui/player/-/player-0.12.0-next.1.tgz} + '@player-ui/player@0.15.0': + resolution: {integrity: sha512-v4zZXRj2troYyHRYYrpmDqwlUhOOKZsA5wrDF4uvo1bsZtWrjGYdaAgeThMrcZSkRrK8ueGehKMRMJLKcbWJtw==, tarball: https://registry.npmjs.org/@player-ui/player/-/player-0.15.0.tgz} - '@player-ui/types@0.12.0-next.1': - resolution: {integrity: sha512-9rILZKIvu6lSGQZ7oVIqzwk7ap6clo7E4iutS0PUJoGkjlwsDEpGIDu1O7wiKRJNmYmY0GCL4JOJdglCFEJnRA==, tarball: https://registry.npmjs.org/@player-ui/types/-/types-0.12.0-next.1.tgz} + '@player-ui/types@0.15.0': + resolution: {integrity: sha512-Z6WECxiIND9iGEaE/9/czwBjDM7Htkjthu+fMgcv8gTpVRqZB9HvKq5ImT20gYEFPAAf0IEeiqaANjId6NAMCg==, tarball: https://registry.npmjs.org/@player-ui/types/-/types-0.15.0.tgz} '@pnpm/config.env-replace@1.1.0': resolution: {integrity: sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==, tarball: https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz} @@ -2243,6 +2224,25 @@ packages: '@vitest/utils@2.1.9': resolution: {integrity: sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==, tarball: https://registry.npmjs.org/@vitest/utils/-/utils-2.1.9.tgz} + '@xlr-lib/xlr-converters@0.1.1-next.1': + resolution: {integrity: sha512-uFxVj5J9atsz/vNW+Tw1IFoPKO7DFgj4PqqUz5734e5THFCBJ8ZPo4gw6cYNqhwOkVQ6HfKsVPeWF9zmoSt9PA==, tarball: https://registry.npmjs.org/@xlr-lib/xlr-converters/-/xlr-converters-0.1.1-next.1.tgz} + peerDependencies: + typescript: 5.5.4 + + '@xlr-lib/xlr-sdk@0.1.1-next.1': + resolution: {integrity: sha512-8RbAwyR9iVwcUpjmjfekCm1OCwQ/aYs+XxuwEE/d7M1o07Eb/bYUovEMRiAr9DhiRwR6VshbW2yMv/blyz94Ag==, tarball: https://registry.npmjs.org/@xlr-lib/xlr-sdk/-/xlr-sdk-0.1.1-next.1.tgz} + peerDependencies: + typescript: 5.5.4 + + '@xlr-lib/xlr-utils@0.1.1-next.1': + resolution: {integrity: sha512-NqmvM/hpROJzYKPiXaSDO8D6W+Zcgp8CIL/7xE9WiRliGKzCZau9Zou80KIepkxgq6o1s5X4PDPxR1pGWNK5Pw==, tarball: https://registry.npmjs.org/@xlr-lib/xlr-utils/-/xlr-utils-0.1.1-next.1.tgz} + peerDependencies: + jsonc-parser: 2.3.1 + typescript: 5.5.4 + + '@xlr-lib/xlr@0.1.1-next.1': + resolution: {integrity: sha512-AybUJPSW1Vdpq8FsXzAUnPvbTavzD2NYqiR+EDBqOEVchnDXrtiNG2vsjMmzooxaaa+/JYps8vlTbgG9n2Dflw==, tarball: https://registry.npmjs.org/@xlr-lib/xlr/-/xlr-0.1.1-next.1.tgz} + '@yarnpkg/lockfile@1.1.0': resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==, tarball: https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz} @@ -3241,11 +3241,12 @@ packages: glob@10.5.0: resolution: {integrity: sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==, tarball: https://registry.npmjs.org/glob/-/glob-10.5.0.tgz} + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me hasBin: true glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==, tarball: https://registry.npmjs.org/glob/-/glob-7.2.3.tgz} - deprecated: Glob versions prior to v9 are no longer supported + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me globals@14.0.0: resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==, tarball: https://registry.npmjs.org/globals/-/globals-14.0.0.tgz} @@ -4445,6 +4446,10 @@ packages: resolution: {integrity: sha512-58INzrX0rL6ttCfsGoFmOuQY5AjR6A5E/MmGKJ5JvWHOey6gOEOC6vO8K6C0Y2bQR6KJ8o8aFwHjp/mJ/HcYsQ==, tarball: https://registry.npmjs.org/sorted-array/-/sorted-array-2.0.4.tgz} deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. + source-map-js@1.2.0: + resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==, tarball: https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz} + engines: {node: '>=0.10.0'} + source-map-js@1.2.1: resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==, tarball: https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz} engines: {node: '>=0.10.0'} @@ -7165,39 +7170,12 @@ snapshots: '@pkgr/core@0.2.9': {} - '@player-tools/dsl@0.12.0(@types/node@18.19.130)(@types/react@18.3.27)(react@18.3.1)': + '@player-lang/json-language-service@0.0.2-next.0': dependencies: - '@player-ui/player': 0.12.0-next.1 - '@player-ui/types': 0.12.0-next.1 - '@types/mkdirp': 1.0.2 - '@types/react': 18.3.27 - chalk: 4.1.2 - command-line-application: 0.10.1 - dequal: 2.0.3 - fs-extra: 10.1.0 - globby: 11.1.0 - jsonc-parser: 2.3.1 - mkdirp: 1.0.4 - react: 18.3.1 - react-json-reconciler: 2.0.0(react@18.3.1) - source-map-js: 1.2.1 - tapable-ts: 0.2.4 - ts-node: 10.9.2(@types/node@18.19.130)(typescript@5.5.4) - tslib: 2.8.1 - typescript: 5.5.4 - transitivePeerDependencies: - - '@swc/core' - - '@swc/wasm' - - '@types/node' - - '@player-tools/json-language-service@0.12.0': - dependencies: - '@player-tools/xlr': 0.12.0 - '@player-tools/xlr-sdk': 0.12.0(typescript@5.5.4) - '@player-tools/xlr-utils': 0.12.0(jsonc-parser@2.3.1)(typescript@5.5.4) - '@player-ui/player': 0.12.0-next.1 - change-case: 4.1.2 - cross-fetch: 3.2.0 + '@player-ui/player': 0.15.0 + '@xlr-lib/xlr': 0.1.1-next.1 + '@xlr-lib/xlr-sdk': 0.1.1-next.1(typescript@5.5.4) + '@xlr-lib/xlr-utils': 0.1.1-next.1(jsonc-parser@2.3.1)(typescript@5.5.4) detect-indent: 6.1.0 jsonc-parser: 2.3.1 tapable-ts: 0.2.4 @@ -7206,58 +7184,40 @@ snapshots: typescript: 5.5.4 vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.17.5 - transitivePeerDependencies: - - encoding - - '@player-tools/xlr-converters@0.12.0(jsonc-parser@2.3.1)(typescript@5.5.4)': - dependencies: - '@player-tools/xlr': 0.12.0 - '@player-tools/xlr-utils': 0.12.0(jsonc-parser@2.3.1)(typescript@5.5.4) - tslib: 2.8.1 - typescript: 5.5.4 - transitivePeerDependencies: - - jsonc-parser - '@player-tools/xlr-sdk@0.12.0(typescript@5.5.4)': + '@player-lang/react-dsl@0.0.2-next.0(@types/react@18.3.27)(react@18.3.1)': dependencies: - '@player-tools/xlr': 0.12.0 - '@player-tools/xlr-converters': 0.12.0(jsonc-parser@2.3.1)(typescript@5.5.4) - '@player-tools/xlr-utils': 0.12.0(jsonc-parser@2.3.1)(typescript@5.5.4) - '@types/fs-extra': 9.0.13 - '@types/node': 18.19.130 + '@player-ui/player': 0.15.0 + '@player-ui/types': 0.15.0 + '@types/react': 18.3.27 + dequal: 2.0.3 fs-extra: 10.1.0 + globby: 11.1.0 jsonc-parser: 2.3.1 + react: 18.3.1 + react-json-reconciler: 2.0.0(react@18.3.1) + source-map-js: 1.2.0 + tapable-ts: 0.2.4 tslib: 2.8.1 typescript: 5.5.4 - '@player-tools/xlr-utils@0.12.0(jsonc-parser@2.3.1)(typescript@5.5.4)': - dependencies: - '@player-tools/xlr': 0.12.0 - jsonc-parser: 2.3.1 - tslib: 2.8.1 - typescript: 5.5.4 - - '@player-tools/xlr@0.12.0': - dependencies: - tslib: 2.8.1 - - '@player-ui/make-flow@0.12.0-next.1': + '@player-ui/make-flow@0.15.0': dependencies: - '@player-ui/types': 0.12.0-next.1 + '@player-ui/types': 0.15.0 tslib: 2.8.1 - '@player-ui/partial-match-registry@0.12.0-next.1': + '@player-ui/partial-match-registry@0.15.0': dependencies: '@types/dlv': 1.1.5 dlv: 1.1.3 sorted-array: 2.0.4 tslib: 2.8.1 - '@player-ui/player@0.12.0-next.1': + '@player-ui/player@0.15.0': dependencies: - '@player-ui/make-flow': 0.12.0-next.1 - '@player-ui/partial-match-registry': 0.12.0-next.1 - '@player-ui/types': 0.12.0-next.1 + '@player-ui/make-flow': 0.15.0 + '@player-ui/partial-match-registry': 0.15.0 + '@player-ui/types': 0.15.0 '@types/dlv': 1.1.5 dequal: 2.0.3 dlv: 1.1.3 @@ -7269,7 +7229,7 @@ snapshots: ts-nested-error: 1.2.1 tslib: 2.8.1 - '@player-ui/types@0.12.0-next.1': + '@player-ui/types@0.15.0': dependencies: tslib: 2.8.1 @@ -7935,6 +7895,38 @@ snapshots: loupe: 3.2.1 tinyrainbow: 1.2.0 + '@xlr-lib/xlr-converters@0.1.1-next.1(jsonc-parser@2.3.1)(typescript@5.5.4)': + dependencies: + '@xlr-lib/xlr': 0.1.1-next.1 + '@xlr-lib/xlr-utils': 0.1.1-next.1(jsonc-parser@2.3.1)(typescript@5.5.4) + tslib: 2.8.1 + typescript: 5.5.4 + transitivePeerDependencies: + - jsonc-parser + + '@xlr-lib/xlr-sdk@0.1.1-next.1(typescript@5.5.4)': + dependencies: + '@types/fs-extra': 9.0.13 + '@types/node': 18.19.130 + '@xlr-lib/xlr': 0.1.1-next.1 + '@xlr-lib/xlr-converters': 0.1.1-next.1(jsonc-parser@2.3.1)(typescript@5.5.4) + '@xlr-lib/xlr-utils': 0.1.1-next.1(jsonc-parser@2.3.1)(typescript@5.5.4) + fs-extra: 10.1.0 + jsonc-parser: 2.3.1 + tslib: 2.8.1 + typescript: 5.5.4 + + '@xlr-lib/xlr-utils@0.1.1-next.1(jsonc-parser@2.3.1)(typescript@5.5.4)': + dependencies: + '@xlr-lib/xlr': 0.1.1-next.1 + jsonc-parser: 2.3.1 + tslib: 2.8.1 + typescript: 5.5.4 + + '@xlr-lib/xlr@0.1.1-next.1': + dependencies: + tslib: 2.8.1 + '@yarnpkg/lockfile@1.1.0': {} acorn-jsx@5.3.2(acorn@8.15.0): @@ -10404,6 +10396,8 @@ snapshots: sorted-array@2.0.4: {} + source-map-js@1.2.0: {} + source-map-js@1.2.1: {} source-map-support@0.5.21: