diff --git a/.circleci/config.yml b/.circleci/config.yml index 87fc998dd..69d661573 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -433,7 +433,7 @@ jobs: - ~/.cache/pre-commit - run: name: Install Dependencies - command: yarn install:nobrowsers + command: PUPPETEER_SKIP_DOWNLOAD=true PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn - save_cache: name: Save Yarn Package Cache key: yarn-packages-{{ checksum "yarn.lock" }} @@ -494,7 +494,7 @@ jobs: - yarn-packages-server-{{ checksum "yarn.lock" }} - run: name: Install Dependencies - command: yarn install:nobrowsers + command: PUPPETEER_SKIP_DOWNLOAD=true PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn - save_cache: name: Save Yarn Package Cache @@ -650,7 +650,7 @@ jobs: - yarn-packages-server-{{ checksum "yarn.lock" }} - run: name: Install Dependencies - command: yarn install:nobrowsers + command: PUPPETEER_SKIP_DOWNLOAD=true PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn - save_cache: name: Save Yarn Package Cache @@ -679,7 +679,7 @@ jobs: - yarn-packages-server-{{ checksum "yarn.lock" }} - run: name: Install Dependencies - command: yarn install:nobrowsers + command: PUPPETEER_SKIP_DOWNLOAD=true PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn - save_cache: name: Save Yarn Package Cache @@ -730,7 +730,7 @@ jobs: - yarn-packages-server-{{ checksum "yarn.lock" }} - run: name: Install Dependencies - command: yarn install:nobrowsers + command: PUPPETEER_SKIP_DOWNLOAD=true PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn - save_cache: name: Save Yarn Package Cache @@ -771,7 +771,7 @@ jobs: - yarn-packages-server-{{ checksum "yarn.lock" }} - run: name: Install Dependencies - command: yarn install:nobrowsers + command: PUPPETEER_SKIP_DOWNLOAD=true PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn - save_cache: name: Save Yarn Package Cache @@ -819,7 +819,7 @@ jobs: - yarn-packages-server-{{ checksum "yarn.lock" }} - run: name: Install Dependencies - command: yarn install:nobrowsers + command: PUPPETEER_SKIP_DOWNLOAD=true PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn - save_cache: name: Save Yarn Package Cache @@ -849,7 +849,7 @@ jobs: - yarn-packages-server-{{ checksum "yarn.lock" }} - run: name: Install Dependencies - command: yarn install:nobrowsers + command: PUPPETEER_SKIP_DOWNLOAD=true yarn - save_cache: name: Save Yarn Package Cache @@ -894,7 +894,7 @@ jobs: - yarn-packages-server-{{ checksum "yarn.lock" }} - run: name: Install Dependencies - command: yarn install:nobrowsers + command: PUPPETEER_SKIP_DOWNLOAD=true PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn - save_cache: name: Save Yarn Package Cache @@ -929,7 +929,7 @@ jobs: - yarn-packages-server-{{ checksum "yarn.lock" }} - run: name: Install Dependencies - command: yarn install:nobrowsers + command: PUPPETEER_SKIP_DOWNLOAD=true PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn - save_cache: name: Save Yarn Package Cache key: yarn-packages-server-{{ checksum "yarn.lock" }} @@ -1214,7 +1214,7 @@ jobs: - yarn-packages-{{ checksum "yarn.lock" }} - run: name: Install Dependencies - command: yarn install:nobrowsers + command: PUPPETEER_SKIP_DOWNLOAD=true PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn - save_cache: name: Save Yarn Package Cache key: yarn-packages-{{ checksum "yarn.lock" }} @@ -1285,7 +1285,7 @@ jobs: - yarn-packages-server-{{ checksum "yarn.lock" }} - run: name: Install Dependencies - command: yarn install:nobrowsers + command: PUPPETEER_SKIP_DOWNLOAD=true PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn - save_cache: name: Save Yarn Package Cache key: yarn-packages-server-{{ checksum "yarn.lock" }} diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh index 6441c2ae4..5074ca4d5 100755 --- a/.devcontainer/postCreateCommand.sh +++ b/.devcontainer/postCreateCommand.sh @@ -13,5 +13,5 @@ cp -n "${GIT_ROOT}/packages/server/.env-example" "${GIT_ROOT}/packages/server/.e cp -n "${GIT_ROOT}/packages/frontend-2/.env.example" "${GIT_ROOT}/packages/frontend-2/.env" || true echo "Installing nodejs dependencies and building shared packages" -yarn install:nobrowsers +PUPPETEER_SKIP_DOWNLOAD=true PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn yarn build:public diff --git a/package.json b/package.json index 43837a790..dade41a58 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,12 @@ "build": "yarn workspaces foreach -ptvW run build", "build:public": "yarn workspaces foreach -ptvW --no-private run build", "build:tailwind-deps": "yarn workspaces foreach -ivW -j unlimited --include '{@speckle/shared,@speckle/tailwind-theme,@speckle/ui-components}' run build", + "ensure:tailwind-deps": "node ./utils/ensure-tailwind-deps.mjs", + "helm:readme:generate": "./utils/helm/update-schema-json.sh", + "prettier:check": "prettier --check .", + "prettier:fix": "prettier --write .", + "prettier:fix:file": "prettier --write", "circleci:check": "circleci config validate ./.circleci/config.yml", - "cm": "cz", - "dev": "yarn workspaces foreach -pivW -j unlimited run dev", "dev:docker": "docker compose -f ./docker-compose-deps.yml", "dev:docker:up": "docker compose -f ./docker-compose-deps.yml up -d", "dev:docker:down": "docker compose -f ./docker-compose-deps.yml down", @@ -25,22 +28,18 @@ "dev:kind:helm:up": "yarn dev:kind:up && tilt up --file ./.circleci/deployment/Tiltfile.helm --context kind-speckle-server", "dev:kind:helm:down": "tilt down --file ./.circleci/deployment/Tiltfile.helm --context kind-speckle-server", "dev:kind:helm:ci": "tilt ci --file ./.circleci/deployment/Tiltfile.helm --context kind-speckle-server --timeout 10m", + "dev": "yarn workspaces foreach -pivW -j unlimited run dev", "dev:no-server": "yarn workspaces foreach --exclude @speckle/server -pivW -j unlimited run dev", "dev:minimal": "yarn workspaces foreach -pivW -j unlimited --include '{@speckle/server,@speckle/frontend-2}' run dev", "gqlgen": "yarn workspaces foreach -pivW -j unlimited --include '{@speckle/server,@speckle/frontend,@speckle/frontend-2,@speckle/dui3}' run gqlgen", "dev:server": "yarn workspace @speckle/server dev", "dev:frontend-2": "yarn workspace @speckle/frontend-2 dev", "dev:shared": "yarn workspace @speckle/shared dev", - "ensure:tailwind-deps": "node ./utils/ensure-tailwind-deps.mjs", + "prepare": "husky install", + "postinstall": "husky install", + "cm": "cz", "eslint:inspect": "eslint-config-inspector", "eslint:projectwide": "node ./utils/eslint-projectwide.mjs", - "helm:readme:generate": "./utils/helm/update-schema-json.sh", - "install:nobrowsers": "PUPPETEER_SKIP_DOWNLOAD=true PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn install", - "postinstall": "husky install", - "prettier:check": "prettier --check .", - "prettier:fix": "prettier --write .", - "prettier:fix:file": "prettier --write", - "prepare": "husky install", "npkill": "npkill" }, "devDependencies": {