Skip to content

Add support for Angular v18 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ jobs:
- name: Cypress run
uses: cypress-io/github-action@v6
with:
build: npm run build
start: npm start
component: true

- name: Install dependencies
Expand All @@ -36,4 +34,4 @@ jobs:
npm run build
npm run build:lib
npx semantic-release
npm run deploy -- --no-silent --name="Mr. Dharmen's Bot" [email protected]
npx angular-cli-ghpages --name="mr. Dharmen's Bot" [email protected] --dir=dist/cmdk/browser
8 changes: 3 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "18.x"
node-version: "20.x"

- name: Install dependencies
env:
Expand All @@ -27,8 +27,6 @@ jobs:
- name: Cypress run
uses: cypress-io/github-action@v6
with:
build: npm run build
start: npm start
component: true

- name: Lint, build and release
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[![commitizen](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=flat-square)](./CONTRIBUTING.md)
[![PRs](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://github.com/ngxpert/cmdk/compare)
[![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
[![All Contributors](https://img.shields.io/badge/all_contributors-0-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-3)
[![ngxpert-lib](https://img.shields.io/badge/made%20with-%40ngxpert%2Flib-ad1fe3?logo=angular)](https://github.com/ngxpert/lib)
[![spectator](https://img.shields.io/badge/tested%20with-spectator-2196F3.svg?style=flat-square)]()
[![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)
Expand All @@ -35,7 +35,8 @@ Demo and examples: [ngxpert.github.io/cmdk](https://ngxpert.github.io/cmdk)
| @ngxpert/cmdk | Angular |
| ------------- | -------- |
| 1.x | >=16 <17 |
| 2.x | >=17 |
| 2.x | >=17 <18 |
| 3.x | >=18 |

<details>
<summary>For older versions</summary>
Expand Down
16 changes: 9 additions & 7 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,24 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/cmdk",
"outputPath": {
"base": "dist/cmdk"
},
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"polyfills": [
"src/polyfills.ts"
],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": ["src/favicon.ico", "src/assets"],
"styles": [
"src/styles.scss",
"node_modules/prismjs/themes/prism-okaidia.min.css"
],
"scripts": []
"scripts": [],
"browser": "src/main.ts"
},
"configurations": {
"production": {
Expand All @@ -53,9 +57,7 @@
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
Expand Down
13 changes: 11 additions & 2 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
const { defineConfig } = require('cypress');
import { defineConfig } from 'cypress';

module.exports = defineConfig({
export default defineConfig({
component: {
devServer: {
framework: 'angular',
bundler: 'webpack',
options: {
projectConfig: {
root: './',
sourceRoot: 'src',
buildOptions: {
outputPath: 'dist/browser',
},
},
},
},
specPattern: '**/*.cy.ts',
},
Expand Down
5 changes: 0 additions & 5 deletions cypress/e2e/basic.cy.ts

This file was deleted.

20 changes: 0 additions & 20 deletions cypress/support/e2e.ts

This file was deleted.

Loading