Skip to content

Commit 36b7a21

Browse files
deleoniodeleonio
committed
fix: update pnpm workspace configuration to include benchmark-tests and adjust package paths
Refs: #7656
1 parent f8a9999 commit 36b7a21

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+3171
-2115
lines changed

‎.github/workflows/benchmark.yml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Benchmark
2+
3+
on:
4+
pull_request:
5+
6+
concurrency:
7+
group: 'workflow-${{ github.workflow }}-${{ github.ref }}'
8+
cancel-in-progress: true
9+
10+
jobs:
11+
benchmark:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
persist-credentials: false
19+
- uses: ./.github/actions/pnpm-setup
20+
21+
- name: Install playwright browsers
22+
run: pnpm exec playwright install --with-deps chromium
23+
working-directory: packages/tools/benchmark-tests
24+
25+
- name: Build required packages
26+
run: pnpm build:deps
27+
working-directory: packages/tools/benchmark-tests
28+
29+
- name: Run benchmark tests
30+
run: pnpm test-benchmark
31+
working-directory: packages/tools/benchmark-tests
32+
33+
- name: Outline benchmark result
34+
run: cat benchmark-result.json
35+
working-directory: packages/tools/benchmark-tests
36+
37+
- name: Load benchmark from target branch
38+
run: |
39+
git fetch origin ${{ github.base_ref }}
40+
git show origin/${{ github.base_ref }}:packages/tools/benchmark-tests/benchmark-result.json > packages/tools/benchmark-tests/benchmark-baseline.json || echo "[]" > packages/tools/benchmark-tests/benchmark-baseline.json
41+
42+
- name: Compare benchmark with baseline
43+
run: node scripts/compare-benchmark.mjs
44+
working-directory: packages/tools/benchmark-tests
45+
46+
- name: Post PR Comment
47+
if: github.event_name == 'pull_request'
48+
uses: peter-evans/create-or-update-comment@v4
49+
with:
50+
token: ${{ secrets.GITHUB_TOKEN }}
51+
issue-number: ${{ github.event.pull_request.number }}
52+
body-path: packages/tools/benchmark-tests/benchmark-report.md
53+
comment-id: benchmark-report-comment
54+
edit-mode: replace

‎packages/components/package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@
6666
"lint:tsc": "tsc --noemit",
6767
"dev": "cross-env NODE_ENV=development stencil build --prod --watch",
6868
"test": "pnpm test:unit",
69+
"test:e2e": "playwright test",
6970
"test:unit": "cross-env NODE_ENV=test stencil test --spec --json --outputFile dist/jest-test-results.json",
7071
"test:watch": "cross-env NODE_ENV=test stencil test --spec --watchAll",
71-
"test:e2e": "playwright test",
7272
"postpack": "mv package.bak.json package.json",
7373
"prepack": "npm run build && cp package.json package.bak.json && rimraf dist/collection dist/kolibri/assets/@leanup dist/types/assets/@leanup && node scripts/anonymous.js && node scripts/minify.js",
7474
"xunused": "knip"
7575
},
7676
"dependencies": {
7777
"@floating-ui/dom": "1.6.13",
78-
"adopted-style-sheets": "1.1.8",
78+
"adopted-style-sheets": "1.1.9-rc.16",
7979
"clsx": "2.1.1",
8080
"color-convert": "2.0.1",
8181
"color-rgba": "2.4.0",
@@ -124,6 +124,7 @@
124124
"prettier": "3.5.3",
125125
"pug": "3.0.3",
126126
"rimraf": "6.0.1",
127+
"serve": "14.2.4",
127128
"stencil-awesome-test": "1.0.6",
128129
"stylelint": "16.17.0",
129130
"stylelint-config-recommended-scss": "14.1.0",
@@ -134,7 +135,7 @@
134135
"typescript": "5.8.2"
135136
},
136137
"peerDependencies": {
137-
"adopted-style-sheets": "1.1.8"
138+
"adopted-style-sheets": "1.1.9-rc.16"
138139
},
139140
"files": [
140141
"assets",

‎packages/samples/angular/.gitignore‎

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,2 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
2-
3-
# Compiled output
4-
/dist
5-
/tmp
6-
/out-tsc
7-
/bazel-out
8-
9-
# Node
10-
/node_modules
11-
npm-debug.log
12-
yarn-error.log
13-
14-
# IDEs and editors
15-
.idea/
16-
.project
17-
.classpath
18-
.c9/
19-
*.launch
20-
.settings/
21-
*.sublime-workspace
22-
23-
# Visual Studio Code
24-
.vscode/*
25-
!.vscode/settings.json
26-
!.vscode/tasks.json
27-
!.vscode/launch.json
28-
!.vscode/extensions.json
29-
.history/*
30-
31-
# Miscellaneous
32-
/.angular/cache
33-
.sass-cache/
34-
/connect.lock
35-
/coverage
36-
/libpeerconnection.log
37-
testem.log
38-
/typings
39-
40-
# System files
41-
.DS_Store
42-
Thumbs.db
1+
.angular
2+
/src/assets/

‎packages/samples/angular/.knip.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "https://unpkg.com/knip@5/schema.json",
3+
"entry": ["src/main.ts"],
4+
"ignore": [],
5+
"ignoreDependencies": ["@public-ui/angular-v17", "@public-ui/components", "@public-ui/themes", "@tailwindcss/postcss", "adopted-style-sheets"],
6+
"project": ["src/**/*.{js,ts}"]
7+
}

‎packages/samples/angular/.vscode/extensions.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎packages/samples/angular/.vscode/launch.json‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎packages/samples/angular/.vscode/tasks.json‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎packages/samples/angular/angular.json‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
"projects": {
66
"angular": {
77
"projectType": "application",
8-
"schematics": {
9-
"@schematics/angular:component": {
10-
"style": "scss"
11-
}
12-
},
138
"root": "",
149
"sourceRoot": "src",
1510
"prefix": "app",
@@ -22,9 +17,8 @@
2217
"browser": "src/main.ts",
2318
"polyfills": ["zone.js"],
2419
"tsConfig": "tsconfig.app.json",
25-
"inlineStyleLanguage": "scss",
2620
"assets": ["src/favicon.ico", "src/assets"],
27-
"styles": ["src/styles.scss"],
21+
"styles": ["src/styles.css"],
2822
"scripts": []
2923
},
3024
"configurations": {
@@ -74,16 +68,15 @@
7468
"options": {
7569
"polyfills": ["zone.js", "zone.js/testing"],
7670
"tsConfig": "tsconfig.spec.json",
77-
"inlineStyleLanguage": "scss",
7871
"assets": ["src/favicon.ico", "src/assets"],
79-
"styles": ["src/styles.scss"],
72+
"styles": ["src/styles.css"],
8073
"scripts": []
8174
}
8275
}
8376
}
8477
}
85-
},
86-
"cli": {
87-
"analytics": false
88-
}
78+
},
79+
"cli": {
80+
"analytics": false
81+
}
8982
}

‎packages/samples/angular/package.json‎

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,46 @@
11
{
22
"name": "@public-ui/sample-angular",
3-
"version": "2.1.3",
3+
"version": "3.0.0-rc.13",
44
"private": true,
55
"scripts": {
6-
"build:deps": "pnpm --filter @public-ui/sample-angular^... build",
7-
"ng": "ng",
8-
"start": "ng serve",
96
"build": "ng build",
10-
"watch": "ng build --watch --configuration development"
7+
"format": "prettier --check src",
8+
"prepare": "cpy \"node_modules/@public-ui/components/assets/**/*\" src/assets --dot",
9+
"start": "ng serve",
10+
"unused": "knip"
1111
},
1212
"dependencies": {
13-
"@angular/animations": "18.2.13",
14-
"@angular/common": "18.2.13",
15-
"@angular/compiler": "18.2.13",
16-
"@angular/core": "18.2.13",
17-
"@angular/forms": "18.2.13",
18-
"@angular/platform-browser": "18.2.13",
19-
"@angular/platform-browser-dynamic": "18.2.13",
20-
"@angular/router": "18.2.13",
21-
"@public-ui/angular-v18": "workspace:*",
13+
"@angular/animations": "17.3.12",
14+
"@angular/common": "17.3.12",
15+
"@angular/compiler": "17.3.12",
16+
"@angular/core": "17.3.12",
17+
"@angular/platform-browser": "17.3.12",
18+
"@angular/platform-browser-dynamic": "17.3.12",
19+
"@angular/router": "17.3.12",
20+
"@public-ui/angular-v17": "workspace:*",
2221
"@public-ui/components": "workspace:*",
23-
"@public-ui/theme-default": "workspace:*",
24-
"rxjs": "~7.8.2",
25-
"zone.js": "~0.14.10"
22+
"@public-ui/themes": "workspace:*",
23+
"rxjs": "7.8.2",
24+
"tslib": "2.8.1",
25+
"zone.js": "0.14.10"
2626
},
2727
"devDependencies": {
28-
"@angular-devkit/build-angular": "18.2.15",
29-
"@angular/cli": "18.2.15",
30-
"@angular/compiler-cli": "18.2.13",
31-
"@types/jasmine": "~5.1.7",
32-
"jasmine-core": "~5.6.0",
33-
"karma": "~6.4.4",
34-
"karma-chrome-launcher": "~3.2.0",
35-
"karma-coverage": "~2.2.1",
36-
"karma-jasmine": "~5.1.0",
37-
"karma-jasmine-html-reporter": "~2.1.0",
38-
"typescript": "~5.5.4"
28+
"@angular-devkit/build-angular": "17.3.17",
29+
"@angular/cli": "17.3.17",
30+
"@angular/compiler-cli": "17.3.12",
31+
"@types/jasmine": "5.1.8",
32+
"@tailwindcss/postcss": "4.1.8",
33+
"adopted-style-sheets": "1.1.9-rc.16",
34+
"cpy-cli": "5.0.0",
35+
"karma-jasmine": "5.1.0",
36+
"karma-chrome-launcher": "3.2.0",
37+
"karma-jasmine-html-reporter": "2.1.0",
38+
"karma-coverage": "2.2.1",
39+
"jasmine-core": "5.7.1",
40+
"knip": "5.46.0",
41+
"postcss": "8.5.4",
42+
"prettier": "3.5.3",
43+
"tailwindcss": "3.4.17",
44+
"typescript": "5.4.5"
3945
}
4046
}

‎packages/samples/angular/postcss.config.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module.exports = {
2+
plugins: {
3+
tailwindcss: {},
4+
},
5+
};

0 commit comments

Comments
 (0)
⚡