From 457b5eb66e3a7fd080676f373cae901357ef93d0 Mon Sep 17 00:00:00 2001
From: Ali Stump <astump@esri.com>
Date: Mon, 2 Oct 2023 12:15:54 -0700
Subject: [PATCH] fix: copy assets

---
 package-lock.json                                         | 2 +-
 package.json                                              | 2 +-
 packages/calcite-components/package.json                  | 4 +++-
 packages/calcite-components/src/assets/styles/global.scss | 8 ++++----
 .../calcite-components/src/assets/styles/includes.scss    | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1c33f849d18..6d9b30c26ca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -95,7 +95,7 @@
         "workbox-build": "7.0.0"
       },
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
diff --git a/package.json b/package.json
index b36717f430e..cedec413df0 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   ],
   "scripts": {
     "build": "turbo run build --log-order=stream",
-    "clean:node": "rimraf node_modules --glob ./packages/**/node_modules",
+    "clean:node": "rimraf node_modules --glob ./packages/*/node_modules",
     "clean": "turbo run clean --log-order=stream",
     "lint": "turbo run lint --log-order=stream",
     "publish:next": "lerna publish from-package --dist-tag next --yes",
diff --git a/packages/calcite-components/package.json b/packages/calcite-components/package.json
index 82eab9a6a56..04680d23c12 100644
--- a/packages/calcite-components/package.json
+++ b/packages/calcite-components/package.json
@@ -46,8 +46,10 @@
     "test": "stencil test --no-docs --no-build --spec --e2e",
     "util:build-docs": "npm run util:prep-build-reqs && stencil build --docs --config stencil.storybook.config.ts",
     "util:clean-tested-build": "npm ci && npm test && npm run build",
-    "util:copy-assets": "npm run util:copy-icons",
+    "util:copy-assets": "concurrently npm:util:copy-icons npm:util:copy-tokens npm:util:copy-base",
     "util:copy-icons": "cpy \"../../node_modules/@esri/calcite-ui-icons/js/*.json\" \"./src/components/icon/assets/icon/\" --flat",
+    "util:copy-tokens": "cpy \"../../node_modules/@esri/calcite-design-tokens/dist/**/*\" \"./node_modules/@esri/calcite-design-tokens/dist\"",
+    "util:copy-base": "cpy \"../../node_modules/@esri/calcite-base/dist/**/*\" \"./node_modules/@esri/calcite-base/dist\"",
     "util:generate-t9n-docs-json": "ts-node --esm support/generateT9nDocsJSON.ts",
     "util:generate-t9n-types": "ts-node --esm support/generateT9nTypes.ts",
     "util:hydration-styles": "ts-node --esm support/hydrationStyles.ts",
diff --git a/packages/calcite-components/src/assets/styles/global.scss b/packages/calcite-components/src/assets/styles/global.scss
index 4fd3de08ae8..72adbd446b0 100644
--- a/packages/calcite-components/src/assets/styles/global.scss
+++ b/packages/calcite-components/src/assets/styles/global.scss
@@ -1,7 +1,7 @@
-@import "../../../../../node_modules/@esri/calcite-base/dist/_index";
-@import "../../../../../node_modules/@esri/calcite-design-tokens/dist/scss/global";
-@import "../../../../../node_modules/@esri/calcite-design-tokens/dist/scss/light";
-@import "../../../../../node_modules/@esri/calcite-design-tokens/dist/scss/dark";
+@import "../../../node_modules/@esri/calcite-base/dist/_index";
+@import "../../../node_modules/@esri/calcite-design-tokens/dist/scss/global";
+@import "../../../node_modules/@esri/calcite-design-tokens/dist/scss/light";
+@import "../../../node_modules/@esri/calcite-design-tokens/dist/scss/dark";
 
 /* CSS vars (@include in global) */
 @import "type";
diff --git a/packages/calcite-components/src/assets/styles/includes.scss b/packages/calcite-components/src/assets/styles/includes.scss
index ba28cc72382..05a10732bed 100644
--- a/packages/calcite-components/src/assets/styles/includes.scss
+++ b/packages/calcite-components/src/assets/styles/includes.scss
@@ -1,5 +1,5 @@
-@import "../../../../../node_modules/@esri/calcite-base/dist/_index";
-@import "../../../../../node_modules/@esri/calcite-design-tokens/dist/scss/global";
+@import "../../../node_modules/@esri/calcite-base/dist/_index";
+@import "../../../node_modules/@esri/calcite-design-tokens/dist/scss/global";
 
 /* mixins & extensions */
 @import "animation";