Skip to content

Commit 5452d7d

Browse files
committed
chore: structure monorepo in pnpm workspaces
1 parent 78cc829 commit 5452d7d

File tree

107 files changed

+329
-220
lines changed

Some content is hidden

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

107 files changed

+329
-220
lines changed

.github/workflows/build-and-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
# run: pnpm install --frozen-lockfile
4848
#
4949
# - name: test
50-
# run: pnpm test --watch=false --browsers=ChromeHeadless
50+
# run: pnpm test
5151
#
5252
# - name: Upload coverage reports to Codecov
5353
# uses: codecov/codecov-action@v5

.github/workflows/verify-build.yml

Lines changed: 3 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: lint
4848
run: pnpm lint
4949

50-
test-chrome:
50+
test:
5151
runs-on: ubuntu-latest
5252
steps:
5353
- name: Checkout
@@ -63,62 +63,15 @@ jobs:
6363
- name: install
6464
run: pnpm install --frozen-lockfile
6565

66-
- name: Install Playwright Browsers
67-
run: npx playwright install chromium
68-
6966
- name: test
70-
run: pnpm test --browsers=chromiumHeadless
67+
run: pnpm test
7168

7269
# ToDo: investigate coverage reporting
7370
# - name: Upload coverage reports to Codecov
7471
# uses: codecov/codecov-action@v5
7572
# env:
7673
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
7774

78-
test-firefox:
79-
runs-on: ubuntu-latest
80-
steps:
81-
- name: Checkout
82-
uses: actions/checkout@v5
83-
with:
84-
ref: refs/pull/${{ github.event.pull_request.number }}/merge
85-
86-
- uses: pnpm/action-setup@v4
87-
name: Install pnpm
88-
with:
89-
run_install: false
90-
91-
- name: install
92-
run: pnpm install --frozen-lockfile
93-
94-
- name: Install Playwright Browsers
95-
run: npx playwright install firefox
96-
97-
- name: test
98-
run: pnpm test --browsers=firefoxHeadless
99-
100-
test-safari:
101-
runs-on: ubuntu-latest
102-
steps:
103-
- name: Checkout
104-
uses: actions/checkout@v5
105-
with:
106-
ref: refs/pull/${{ github.event.pull_request.number }}/merge
107-
108-
- uses: pnpm/action-setup@v4
109-
name: Install pnpm
110-
with:
111-
run_install: false
112-
113-
- name: install
114-
run: pnpm install --frozen-lockfile
115-
116-
- name: Install Playwright Browsers
117-
run: npx playwright install webkit --with-deps
118-
119-
- name: test
120-
run: pnpm test --browsers=webkitHeadless
121-
12275
prettier:
12376
runs-on: ubuntu-latest
12477
steps:
@@ -136,4 +89,4 @@ jobs:
13689
run: pnpm install --frozen-lockfile
13790

13891
- name: prettier
139-
run: npx prettier . --check
92+
run: pnpm exec prettier . --check

.gitignore

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# See http://help.github.com/ignore-files/ for more about ignoring files.
22

33
# Compiled output
4-
/dist
4+
**/dist
55
/tmp
6-
/out-tsc
6+
**/out-tsc
77
/bazel-out
88

99
# Node
10-
/node_modules
10+
**/node_modules
1111
npm-debug.log
1212
yarn-error.log
1313

@@ -29,10 +29,10 @@ yarn-error.log
2929
.history/*
3030

3131
# Miscellaneous
32-
/.angular/cache
32+
**/.angular/cache
3333
.sass-cache/
3434
/connect.lock
35-
/coverage
35+
**/coverage
3636
/libpeerconnection.log
3737
testem.log
3838
/typings
@@ -42,4 +42,4 @@ testem.log
4242
.DS_Store
4343
Thumbs.db
4444

45-
projects/angular-ecmascript-intl/README.md
45+
libs/angular-ecmascript-intl/README.md

angular.json renamed to demo/angular.json

Lines changed: 11 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,38 @@
11
{
2-
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
2+
"$schema": "../node_modules/@angular/cli/lib/config/schema.json",
33
"version": 1,
4-
"newProjectRoot": "projects",
54
"projects": {
6-
"angular-ecmascript-intl": {
7-
"projectType": "library",
8-
"root": "projects/angular-ecmascript-intl",
9-
"sourceRoot": "projects/angular-ecmascript-intl/src",
10-
"prefix": "intl",
11-
"architect": {
12-
"build": {
13-
"builder": "@angular/build:ng-packagr",
14-
"options": {
15-
"project": "projects/angular-ecmascript-intl/ng-package.json"
16-
},
17-
"configurations": {
18-
"production": {
19-
"tsConfig": "projects/angular-ecmascript-intl/tsconfig.lib.prod.json"
20-
},
21-
"development": {
22-
"tsConfig": "projects/angular-ecmascript-intl/tsconfig.lib.json"
23-
}
24-
},
25-
"defaultConfiguration": "production"
26-
},
27-
"test": {
28-
"builder": "@angular/build:unit-test",
29-
"options": {
30-
"buildTarget": "::development",
31-
"browsers": ["chromium"],
32-
"runner": "vitest",
33-
"providersFile": "projects/angular-ecmascript-intl/src/providers.ts",
34-
"tsConfig": "projects/angular-ecmascript-intl/tsconfig.spec.json"
35-
}
36-
}
37-
}
38-
},
395
"angular-intl-demo": {
406
"projectType": "application",
417
"schematics": {
428
"@schematics/angular:component": {
439
"style": "scss"
4410
}
4511
},
46-
"root": "projects/angular-intl-demo",
47-
"sourceRoot": "projects/angular-intl-demo/src",
12+
"root": "",
13+
"sourceRoot": "src",
4814
"prefix": "app",
4915
"architect": {
5016
"build": {
5117
"builder": "@angular/build:application",
5218
"options": {
53-
"outputPath": "dist/angular-intl-demo",
54-
"index": "projects/angular-intl-demo/src/index.html",
55-
"browser": "projects/angular-intl-demo/src/main.ts",
56-
"tsConfig": "projects/angular-intl-demo/tsconfig.app.json",
19+
"outputPath": "../dist/angular-intl-demo",
20+
"index": "src/index.html",
21+
"browser": "src/main.ts",
22+
"tsConfig": "tsconfig.app.json",
5723
"inlineStyleLanguage": "scss",
5824
"assets": [
5925
{
6026
"glob": "README.md",
61-
"input": "./",
27+
"input": "../",
6228
"output": "/"
6329
},
64-
"projects/angular-intl-demo/src/favicon.ico",
65-
"projects/angular-intl-demo/src/assets"
30+
"src/favicon.ico",
31+
"src/assets"
6632
],
6733
"styles": [
6834
"node_modules/prismjs/themes/prism-okaidia.css",
69-
"projects/angular-intl-demo/src/styles.scss"
35+
"src/styles.scss"
7036
],
7137
"scripts": [
7238
"node_modules/marked/lib/marked.umd.js",

demo/package.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"name": "demo",
3+
"private": true,
4+
"scripts": {
5+
"build": "ng build",
6+
"start": "ng serve"
7+
},
8+
"dependencies": {
9+
"@angular/cdk": "20.2.4",
10+
"@angular/common": "20.3.1",
11+
"@angular/compiler": "20.3.1",
12+
"@angular/core": "20.3.1",
13+
"@angular/forms": "20.3.1",
14+
"@angular/material": "20.2.4",
15+
"@angular/platform-browser": "20.3.1",
16+
"@angular/router": "20.3.1",
17+
"angular-ecmascript-intl": "../dist/angular-ecmascript-intl",
18+
"marked": "^16.0.0",
19+
"ngx-markdown": "^20.0.0",
20+
"prismjs": "^1.30.0",
21+
"tslib": "^2.8.1"
22+
},
23+
"devDependencies": {
24+
"@angular/build": "20.3.2",
25+
"@angular/cli": "20.3.2",
26+
"@angular/compiler-cli": "20.3.1",
27+
"typescript": "~5.9.0"
28+
}
29+
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)