From 95753e5fed62cf7b8d7da7cb24630afff9b7c381 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 1 Jul 2024 10:44:32 -0400 Subject: [PATCH 1/4] build: move frontend-shared from a dev dependency to a runtime dependency in launchpad package.json --- packages/launchpad/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/launchpad/package.json b/packages/launchpad/package.json index 1eb057237309..90faea5d6254 100644 --- a/packages/launchpad/package.json +++ b/packages/launchpad/package.json @@ -18,13 +18,14 @@ "test": "yarn cypress:run:ct && yarn types", "watch": "echo 'run yarn dev from the root' && exit 1" }, - "dependencies": {}, + "dependencies": { + "@packages/frontend-shared": "0.0.0-development" + }, "devDependencies": { "@cypress-design/vue-button": "^0.11.6", "@graphql-typed-document-node/core": "^3.1.0", "@headlessui/vue": "1.4.0", "@intlify/unplugin-vue-i18n": "4.0.0", - "@packages/frontend-shared": "0.0.0-development", "@packages/scaffold-config": "0.0.0-development", "@percy/cypress": "^3.1.2", "@purge-icons/generated": "0.8.1", From 64bec87930456cbfdf1663a81d678fd1d7fa3dde Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 1 Jul 2024 10:48:07 -0400 Subject: [PATCH 2/4] bmp --- .circleci/cache-version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt index 98d210307bac..c7d74b8a00e2 100644 --- a/.circleci/cache-version.txt +++ b/.circleci/cache-version.txt @@ -1,3 +1,3 @@ # Bump this version to force CI to re-create the cache from scratch. -06-07-24 +07-01-24 From a8d64ac5c06265bd39104586e71106ff8e994545 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 1 Jul 2024 11:00:05 -0400 Subject: [PATCH 3/4] add darwin workflow --- .circleci/workflows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 7e6daf090613..b85f2225dbad 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -30,7 +30,7 @@ mainBuildFilters: &mainBuildFilters - /^release\/\d+\.\d+\.\d+$/ # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - 'update-v8-snapshot-cache-on-develop' - - 'ignore-chrom-prefs' + - 'investigate/darwin-ci-build-order' - 'publish-binary' - 'angular-signals-ct-harness' @@ -44,6 +44,7 @@ macWorkflowFilters: &darwin-workflow-filters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - equal: [ 'angular-signals-ct-harness', << pipeline.git.branch >> ] + - equal: [ 'investigate/darwin-ci-build-order', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> From 4f04d6af5cdcdf257731dedcd554207484556bb9 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 1 Jul 2024 11:18:38 -0400 Subject: [PATCH 4/4] move frontend-shared back to dev dependency in launchpad, declare as nx implicit dep --- packages/launchpad/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/launchpad/package.json b/packages/launchpad/package.json index 90faea5d6254..407126c6be12 100644 --- a/packages/launchpad/package.json +++ b/packages/launchpad/package.json @@ -18,14 +18,13 @@ "test": "yarn cypress:run:ct && yarn types", "watch": "echo 'run yarn dev from the root' && exit 1" }, - "dependencies": { - "@packages/frontend-shared": "0.0.0-development" - }, + "dependencies": {}, "devDependencies": { "@cypress-design/vue-button": "^0.11.6", "@graphql-typed-document-node/core": "^3.1.0", "@headlessui/vue": "1.4.0", "@intlify/unplugin-vue-i18n": "4.0.0", + "@packages/frontend-shared": "0.0.0-development", "@packages/scaffold-config": "0.0.0-development", "@percy/cypress": "^3.1.2", "@purge-icons/generated": "0.8.1", @@ -76,7 +75,8 @@ ], "nx": { "implicitDependencies": [ - "@packages/graphql" + "@packages/graphql", + "@packages/frontend-shared" ] } }