From c88f5d76634e01e856602080a04a37203ce05810 Mon Sep 17 00:00:00 2001 From: Remco Lakens Date: Wed, 7 Jun 2023 13:53:25 +0200 Subject: [PATCH] fix: changeset release (#22) ## Context Attempt to fix the automatic release ## Changes Renamed `cbt-hydrogen` to `code-base-theme` ## Checklist - [x] My code follows the style guidelines of this project - [x] I've performed a self-review of my own code - [x] I've added a changeset if this PR contains user-facing or noteworthy changes - [x] I've commented my code, particularly in hard-to-understand areas - [x] I've made corresponding changes to the documentation - [x] I've tested my code for breaking changes and added the corresponding footer in this PR if needed --- .changeset/config.json | 5 ++++- .github/workflows/release.yml | 2 +- .../.eslintignore | 0 apps/{cbt-hydrogen => code-base-theme}/.eslintrc | 0 apps/{cbt-hydrogen => code-base-theme}/.gitignore | 0 .../.graphqlrc.yml | 0 apps/{cbt-hydrogen => code-base-theme}/.npmrc | 0 apps/{cbt-hydrogen => code-base-theme}/README.md | 0 .../app/entry.client.tsx | 0 .../app/entry.server.tsx | 0 .../app/lib/session.server.ts | 0 .../app/root.tsx | 0 .../app/routes/_index.tsx | 0 .../app/styles/tailwind.css | 0 .../package.json | 5 +++-- .../public/favicon.svg | 0 .../remix.config.js | 0 .../remix.env.d.ts | 0 .../server-dev.ts | 0 apps/{cbt-hydrogen => code-base-theme}/server.ts | 0 .../tailwind.config.ts | 0 .../tsconfig.json | 0 package.json | 2 +- pnpm-lock.yaml | 15 +++++++++------ 24 files changed, 18 insertions(+), 11 deletions(-) rename apps/{cbt-hydrogen => code-base-theme}/.eslintignore (100%) rename apps/{cbt-hydrogen => code-base-theme}/.eslintrc (100%) rename apps/{cbt-hydrogen => code-base-theme}/.gitignore (100%) rename apps/{cbt-hydrogen => code-base-theme}/.graphqlrc.yml (100%) rename apps/{cbt-hydrogen => code-base-theme}/.npmrc (100%) rename apps/{cbt-hydrogen => code-base-theme}/README.md (100%) rename apps/{cbt-hydrogen => code-base-theme}/app/entry.client.tsx (100%) rename apps/{cbt-hydrogen => code-base-theme}/app/entry.server.tsx (100%) rename apps/{cbt-hydrogen => code-base-theme}/app/lib/session.server.ts (100%) rename apps/{cbt-hydrogen => code-base-theme}/app/root.tsx (100%) rename apps/{cbt-hydrogen => code-base-theme}/app/routes/_index.tsx (100%) rename apps/{cbt-hydrogen => code-base-theme}/app/styles/tailwind.css (100%) rename apps/{cbt-hydrogen => code-base-theme}/package.json (89%) rename apps/{cbt-hydrogen => code-base-theme}/public/favicon.svg (100%) rename apps/{cbt-hydrogen => code-base-theme}/remix.config.js (100%) rename apps/{cbt-hydrogen => code-base-theme}/remix.env.d.ts (100%) rename apps/{cbt-hydrogen => code-base-theme}/server-dev.ts (100%) rename apps/{cbt-hydrogen => code-base-theme}/server.ts (100%) rename apps/{cbt-hydrogen => code-base-theme}/tailwind.config.ts (100%) rename apps/{cbt-hydrogen => code-base-theme}/tsconfig.json (100%) diff --git a/.changeset/config.json b/.changeset/config.json index 94e4a1e244..cacadf3a99 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -10,5 +10,8 @@ "access": "public", "baseBranch": "main", "updateInternalDependencies": "patch", - "ignore": ["@code-internet-applications/storybook"] + "ignore": [ + "@code-internet-applications/storybook", + "@code-internet-applications/code-base-theme" + ] } diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47411def6c..522d5db81a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,7 @@ jobs: commit: 'ci(changesets): version packages' title: 'ci(changesets): version packages' env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PAT }} - name: Send a Slack notification if a publish happens if: steps.changesets.outputs.published == 'true' diff --git a/apps/cbt-hydrogen/.eslintignore b/apps/code-base-theme/.eslintignore similarity index 100% rename from apps/cbt-hydrogen/.eslintignore rename to apps/code-base-theme/.eslintignore diff --git a/apps/cbt-hydrogen/.eslintrc b/apps/code-base-theme/.eslintrc similarity index 100% rename from apps/cbt-hydrogen/.eslintrc rename to apps/code-base-theme/.eslintrc diff --git a/apps/cbt-hydrogen/.gitignore b/apps/code-base-theme/.gitignore similarity index 100% rename from apps/cbt-hydrogen/.gitignore rename to apps/code-base-theme/.gitignore diff --git a/apps/cbt-hydrogen/.graphqlrc.yml b/apps/code-base-theme/.graphqlrc.yml similarity index 100% rename from apps/cbt-hydrogen/.graphqlrc.yml rename to apps/code-base-theme/.graphqlrc.yml diff --git a/apps/cbt-hydrogen/.npmrc b/apps/code-base-theme/.npmrc similarity index 100% rename from apps/cbt-hydrogen/.npmrc rename to apps/code-base-theme/.npmrc diff --git a/apps/cbt-hydrogen/README.md b/apps/code-base-theme/README.md similarity index 100% rename from apps/cbt-hydrogen/README.md rename to apps/code-base-theme/README.md diff --git a/apps/cbt-hydrogen/app/entry.client.tsx b/apps/code-base-theme/app/entry.client.tsx similarity index 100% rename from apps/cbt-hydrogen/app/entry.client.tsx rename to apps/code-base-theme/app/entry.client.tsx diff --git a/apps/cbt-hydrogen/app/entry.server.tsx b/apps/code-base-theme/app/entry.server.tsx similarity index 100% rename from apps/cbt-hydrogen/app/entry.server.tsx rename to apps/code-base-theme/app/entry.server.tsx diff --git a/apps/cbt-hydrogen/app/lib/session.server.ts b/apps/code-base-theme/app/lib/session.server.ts similarity index 100% rename from apps/cbt-hydrogen/app/lib/session.server.ts rename to apps/code-base-theme/app/lib/session.server.ts diff --git a/apps/cbt-hydrogen/app/root.tsx b/apps/code-base-theme/app/root.tsx similarity index 100% rename from apps/cbt-hydrogen/app/root.tsx rename to apps/code-base-theme/app/root.tsx diff --git a/apps/cbt-hydrogen/app/routes/_index.tsx b/apps/code-base-theme/app/routes/_index.tsx similarity index 100% rename from apps/cbt-hydrogen/app/routes/_index.tsx rename to apps/code-base-theme/app/routes/_index.tsx diff --git a/apps/cbt-hydrogen/app/styles/tailwind.css b/apps/code-base-theme/app/styles/tailwind.css similarity index 100% rename from apps/cbt-hydrogen/app/styles/tailwind.css rename to apps/code-base-theme/app/styles/tailwind.css diff --git a/apps/cbt-hydrogen/package.json b/apps/code-base-theme/package.json similarity index 89% rename from apps/cbt-hydrogen/package.json rename to apps/code-base-theme/package.json index 1c7b2a0c89..36117a4b38 100644 --- a/apps/cbt-hydrogen/package.json +++ b/apps/code-base-theme/package.json @@ -1,13 +1,14 @@ { - "name": "@code-internet-applications/code-base-theme-hydrogen", + "name": "@code-internet-applications/code-base-theme", "author": "Code Internet Applications ", "private": true, + "description": "The repository for the Code Base Theme Hydrogen", "sideEffects": false, "scripts": { "dev": "shopify hydrogen dev", "build": "shopify hydrogen build", - "preview": "npm run build && shopify hydrogen preview", "clean": "rimraf dist .turbo node_modules .cache", + "preview": "npm run build && shopify hydrogen preview", "typecheck": "tsc --noEmit", "lint": "eslint ." }, diff --git a/apps/cbt-hydrogen/public/favicon.svg b/apps/code-base-theme/public/favicon.svg similarity index 100% rename from apps/cbt-hydrogen/public/favicon.svg rename to apps/code-base-theme/public/favicon.svg diff --git a/apps/cbt-hydrogen/remix.config.js b/apps/code-base-theme/remix.config.js similarity index 100% rename from apps/cbt-hydrogen/remix.config.js rename to apps/code-base-theme/remix.config.js diff --git a/apps/cbt-hydrogen/remix.env.d.ts b/apps/code-base-theme/remix.env.d.ts similarity index 100% rename from apps/cbt-hydrogen/remix.env.d.ts rename to apps/code-base-theme/remix.env.d.ts diff --git a/apps/cbt-hydrogen/server-dev.ts b/apps/code-base-theme/server-dev.ts similarity index 100% rename from apps/cbt-hydrogen/server-dev.ts rename to apps/code-base-theme/server-dev.ts diff --git a/apps/cbt-hydrogen/server.ts b/apps/code-base-theme/server.ts similarity index 100% rename from apps/cbt-hydrogen/server.ts rename to apps/code-base-theme/server.ts diff --git a/apps/cbt-hydrogen/tailwind.config.ts b/apps/code-base-theme/tailwind.config.ts similarity index 100% rename from apps/cbt-hydrogen/tailwind.config.ts rename to apps/code-base-theme/tailwind.config.ts diff --git a/apps/cbt-hydrogen/tsconfig.json b/apps/code-base-theme/tsconfig.json similarity index 100% rename from apps/cbt-hydrogen/tsconfig.json rename to apps/code-base-theme/tsconfig.json diff --git a/package.json b/package.json index 066f0eb099..d3936ccd69 100755 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "changeset": "changeset", "create:pkg": "plop component", "version-packages": "changeset version", - "release": "turbo run build --filter=storybook^... && changeset publish" + "release": "turbo run build:core && changeset publish" }, "devDependencies": { "@changesets/changelog-github": "^0.4.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 88b083f4f6..abc3544181 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -90,7 +90,7 @@ importers: specifier: ^5.1.3 version: 5.1.3 - apps/cbt-hydrogen: + apps/code-base-theme: dependencies: '@code-internet-applications/react': specifier: workspace:* @@ -4601,12 +4601,12 @@ packages: - typescript dev: false - /@oclif/plugin-plugins@2.3.2: + /@oclif/plugin-plugins@2.3.2(@types/node@20.2.5)(typescript@5.1.3): resolution: {integrity: sha512-jq/ik7A7bCO/oQp0/Znnpu8/JBXifAQ2OF2KmswbNYt7EpsLqz2DaI/CvkrXRSb+Edzx4Xx3usEgSyocVN/u2A==} engines: {node: '>=12.0.0'} dependencies: '@oclif/color': 1.0.6 - '@oclif/core': 2.1.4 + '@oclif/core': 2.8.5(@types/node@20.2.5)(typescript@5.1.3) chalk: 4.1.2 debug: 4.3.4(supports-color@8.1.1) fs-extra: 9.1.0 @@ -4617,7 +4617,11 @@ packages: tslib: 2.5.3 yarn: 1.22.19 transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' + - '@types/node' - supports-color + - typescript dev: false /@parcel/watcher@2.1.0: @@ -12864,7 +12868,7 @@ packages: http-proxy-agent: 4.0.1 https-proxy-agent: 5.0.1 pac-resolver: 5.0.1 - raw-body: 2.5.1 + raw-body: 2.5.2 socks-proxy-agent: 5.0.1 transitivePeerDependencies: - supports-color @@ -13544,7 +13548,6 @@ packages: http-errors: 2.0.0 iconv-lite: 0.4.24 unpipe: 1.0.0 - dev: false /rc@1.2.8: resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} @@ -16248,7 +16251,7 @@ packages: '@oclif/core': 2.1.4 '@oclif/plugin-commands': 2.2.10(@types/node@20.2.5)(typescript@5.1.3) '@oclif/plugin-help': 5.2.6(@types/node@20.2.5)(typescript@5.1.3) - '@oclif/plugin-plugins': 2.3.2 + '@oclif/plugin-plugins': 2.3.2(@types/node@20.2.5)(typescript@5.1.3) '@shopify/cli-kit': registry.npmjs.org/@shopify/cli-kit@3.45.0(@types/react@18.2.8) '@shopify/plugin-did-you-mean': registry.npmjs.org/@shopify/plugin-did-you-mean@3.45.0(@types/react@18.2.8) transitivePeerDependencies: