diff --git a/.github/labeler.yml b/.github/labeler.yml index 926a23a8c..01785f126 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -2,9 +2,9 @@ - changed-files: - any-glob-to-any-file: 'libs/core/**/*' -"package: react": +"package: core-react": - changed-files: - - any-glob-to-any-file: 'libs/react/**/*' + - any-glob-to-any-file: 'libs/core-react/**/*' documentation: - changed-files: diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-packages.yml index 5c099e25b..6a6f8df0a 100644 --- a/.github/workflows/release-packages.yml +++ b/.github/workflows/release-packages.yml @@ -59,7 +59,7 @@ jobs: output: libs/core/CoreBuild.zip paths: libs/core/dist libs/core/components libs/core/css libs/core/hydrate libs/core/loader libs/core/src/components.d.ts - release-react: + release-core-react: needs: [release-core] runs-on: ubuntu-latest steps: @@ -85,15 +85,15 @@ jobs: uses: ./.github/workflows/actions/publish-npm with: preid: ${{ inputs.preid }} - project: 'react' + project: 'core-react' tag: ${{ inputs.tag }} token: ${{ secrets.NPM_TOKEN }} version: ${{ inputs.version }} - working-directory: 'libs/react' + working-directory: 'libs/core-react' - - name: Cache Built react + - name: Cache Built core-react uses: ./.github/workflows/actions/upload-archive with: - name: pine-react - output: libs/react/ReactBuild.zip - paths: libs/react/dist libs/react/css + name: pine-core-react + output: libs/core-react/ReactBuild.zip + paths: libs/core-react/dist libs/core-react/css diff --git a/catalog-info.yaml b/catalog-info.yaml index 9eb7046f1..3be03f397 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -36,4 +36,4 @@ metadata: spec: targets: - ./libs/core/catalog-info.yaml - - ./libs/react/catalog-info.yaml + - ./libs/core-react/catalog-info.yaml diff --git a/libs/core-react/catalog-info.yaml b/libs/core-react/catalog-info.yaml index 0bb400a1e..ac2698a3c 100644 --- a/libs/core-react/catalog-info.yaml +++ b/libs/core-react/catalog-info.yaml @@ -1,7 +1,7 @@ apiVersion: backstage.io/v1alpha1 kind: Component metadata: - name: pine-react + name: pine-core-react description: The React library for the Pine design system tags: - javascript diff --git a/libs/core/stencil.config.ts b/libs/core/stencil.config.ts index 3608bc76a..22470b202 100644 --- a/libs/core/stencil.config.ts +++ b/libs/core/stencil.config.ts @@ -43,7 +43,7 @@ export const config: Config = { includeImportCustomElements: true, includePolyfills: false, includeDefineCustomElements: false, - proxiesFile: '../react/src/components/proxies.ts', + proxiesFile: '../core-react/src/components/proxies.ts', excludeComponents: [ 'pds-icon' ] diff --git a/package-lock.json b/package-lock.json index 4351e6cac..292814066 100644 --- a/package-lock.json +++ b/package-lock.json @@ -76,8 +76,8 @@ "webpack": "^5.74.0" } }, - "libs/react": { - "name": "@pine-ds/react", + "libs/core-react": { + "name": "@pine-ds/core-react", "version": "0.0.2-alpha.0", "license": "MIT", "dependencies": { @@ -103,7 +103,7 @@ "react-dom": "^17.0.2" } }, - "libs/react/node_modules/@types/node": { + "libs/core-react/node_modules/@types/node": { "version": "18.19.3", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.3.tgz", "integrity": "sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg==", @@ -112,7 +112,7 @@ "undici-types": "~5.26.4" } }, - "libs/react/node_modules/typescript": { + "libs/core-react/node_modules/typescript": { "version": "4.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", @@ -4636,6 +4636,10 @@ "resolved": "libs/core", "link": true }, + "node_modules/@pine-ds/core-react": { + "resolved": "libs/core-react", + "link": true + }, "node_modules/@pine-ds/icons": { "version": "3.3.0-rc.0", "resolved": "https://registry.npmjs.org/@pine-ds/icons/-/icons-3.3.0-rc.0.tgz", @@ -4644,10 +4648,6 @@ "@stencil/core": "^4.8.1" } }, - "node_modules/@pine-ds/react": { - "resolved": "libs/react", - "link": true - }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", diff --git a/tsconfig.json b/tsconfig.json index c7558ded5..bb2a155d9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -25,8 +25,8 @@ "@pine-ds/core": [ "./libs/core" ], - "@pine-ds/react": [ - "./react" + "@pine-ds/core-react": [ + "./libs/core-react" ], }, "target": "es2017",