Skip to content

Commit 29aaf5d

Browse files
authored
Merge pull request #5 from ngxpert/ng-update-18
Add support for Angular v18
2 parents 51b5ee2 + be27ff3 commit 29aaf5d

File tree

11 files changed

+6121
-4908
lines changed

11 files changed

+6121
-4908
lines changed

.github/workflows/release.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ jobs:
1919
- name: Cypress run
2020
uses: cypress-io/github-action@v6
2121
with:
22-
build: npm run build
23-
start: npm start
2422
component: true
2523

2624
- name: Install dependencies
@@ -36,4 +34,4 @@ jobs:
3634
npm run build
3735
npm run build:lib
3836
npx semantic-release
39-
npm run deploy -- --no-silent --name="Mr. Dharmen's Bot" [email protected]
37+
npx angular-cli-ghpages --name="mr. Dharmen's Bot" [email protected] --dir=dist/cmdk/browser

.github/workflows/test.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
- name: Use Node.js
18-
uses: actions/setup-node@v3
18+
uses: actions/setup-node@v4
1919
with:
20-
node-version: "18.x"
20+
node-version: "20.x"
2121

2222
- name: Install dependencies
2323
env:
@@ -27,8 +27,6 @@ jobs:
2727
- name: Cypress run
2828
uses: cypress-io/github-action@v6
2929
with:
30-
build: npm run build
31-
start: npm start
3230
component: true
3331

3432
- name: Lint, build and release

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[![commitizen](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=flat-square)](./CONTRIBUTING.md)
99
[![PRs](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://github.com/ngxpert/cmdk/compare)
1010
[![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
11-
[![All Contributors](https://img.shields.io/badge/all_contributors-0-orange.svg?style=flat-square)](#contributors-)
11+
[![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-3)
1212
[![ngxpert-lib](https://img.shields.io/badge/made%20with-%40ngxpert%2Flib-ad1fe3?logo=angular)](https://github.com/ngxpert/lib)
1313
[![spectator](https://img.shields.io/badge/tested%20with-spectator-2196F3.svg?style=flat-square)]()
1414
[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
@@ -35,7 +35,8 @@ Demo and examples: [ngxpert.github.io/cmdk](https://ngxpert.github.io/cmdk)
3535
| @ngxpert/cmdk | Angular |
3636
| ------------- | -------- |
3737
| 1.x | >=16 <17 |
38-
| 2.x | >=17 |
38+
| 2.x | >=17 <18 |
39+
| 3.x | >=18 |
3940

4041
<details>
4142
<summary>For older versions</summary>

angular.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,24 @@
1515
"prefix": "app",
1616
"architect": {
1717
"build": {
18-
"builder": "@angular-devkit/build-angular:browser",
18+
"builder": "@angular-devkit/build-angular:application",
1919
"options": {
20-
"outputPath": "dist/cmdk",
20+
"outputPath": {
21+
"base": "dist/cmdk"
22+
},
2123
"index": "src/index.html",
22-
"main": "src/main.ts",
23-
"polyfills": "src/polyfills.ts",
24+
"polyfills": [
25+
"src/polyfills.ts"
26+
],
2427
"tsConfig": "tsconfig.app.json",
2528
"inlineStyleLanguage": "scss",
2629
"assets": ["src/favicon.ico", "src/assets"],
2730
"styles": [
2831
"src/styles.scss",
2932
"node_modules/prismjs/themes/prism-okaidia.min.css"
3033
],
31-
"scripts": []
34+
"scripts": [],
35+
"browser": "src/main.ts"
3236
},
3337
"configurations": {
3438
"production": {
@@ -53,9 +57,7 @@
5357
"outputHashing": "all"
5458
},
5559
"development": {
56-
"buildOptimizer": false,
5760
"optimization": false,
58-
"vendorChunk": true,
5961
"extractLicenses": false,
6062
"sourceMap": true,
6163
"namedChunks": true

cypress.config.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
1-
const { defineConfig } = require('cypress');
1+
import { defineConfig } from 'cypress';
22

3-
module.exports = defineConfig({
3+
export default defineConfig({
44
component: {
55
devServer: {
66
framework: 'angular',
77
bundler: 'webpack',
8+
options: {
9+
projectConfig: {
10+
root: './',
11+
sourceRoot: 'src',
12+
buildOptions: {
13+
outputPath: 'dist/browser',
14+
},
15+
},
16+
},
817
},
918
specPattern: '**/*.cy.ts',
1019
},

cypress/e2e/basic.cy.ts

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

cypress/support/e2e.ts

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

0 commit comments

Comments
 (0)