diff --git a/angular.json b/angular.json index 80bfbfc0..92709d70 100755 --- a/angular.json +++ b/angular.json @@ -106,7 +106,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "devui:build" + "buildTarget": "devui:build" } }, "test": { diff --git a/devui/nav-sprite/demo/basic/basic.component.html b/devui/nav-sprite/demo/basic/basic.component.html index 75c9747f..f55d9e4f 100644 --- a/devui/nav-sprite/demo/basic/basic.component.html +++ b/devui/nav-sprite/demo/basic/basic.component.html @@ -3,7 +3,7 @@

Getting Started

Guides: How to use DevUI in your project

1. Create a project

-

It is recommended to use @angular/cli to create your project.

+

It is recommended to use @angular/cli to create your project.

$ ng new New-Project

2. Installation

Go to your project folder and use npm to install DevUI.

diff --git a/devui/nav-sprite/demo/scroll-container/scroll-container.component.html b/devui/nav-sprite/demo/scroll-container/scroll-container.component.html index ed3a8adf..4739eeeb 100644 --- a/devui/nav-sprite/demo/scroll-container/scroll-container.component.html +++ b/devui/nav-sprite/demo/scroll-container/scroll-container.component.html @@ -5,7 +5,7 @@

This is Header.

Getting Started

Guides: How to use DevUI in your project

1. Create a project

-

It is recommended to use @angular/cli to create your project.

+

It is recommended to use @angular/cli to create your project.

$ ng new New-Project

2. Installation

Go to your project folder and use npm to install DevUI.

diff --git a/devui/package.json b/devui/package.json index e10a2718..a52691fb 100755 --- a/devui/package.json +++ b/devui/package.json @@ -1,6 +1,6 @@ { "name": "ng-devui", - "version": "16.2.0", + "version": "17.0.0-alpha", "license": "MIT", "description": "DevUI components based on Angular", "keywords": [ diff --git a/devui/read-tip/demo/basic/basic.component.html b/devui/read-tip/demo/basic/basic.component.html index 84b903c2..b71bdf04 100644 --- a/devui/read-tip/demo/basic/basic.component.html +++ b/devui/read-tip/demo/basic/basic.component.html @@ -2,5 +2,5 @@

Let's see how to use ReadTip

Set selector to display readtip

The following is the target you want to show readtip

- @Jack + @Jack diff --git a/devui/shared/devui-online-ide/files/tsconfig.json.ts b/devui/shared/devui-online-ide/files/tsconfig.json.ts index 57282de2..d9e39b64 100644 --- a/devui/shared/devui-online-ide/files/tsconfig.json.ts +++ b/devui/shared/devui-online-ide/files/tsconfig.json.ts @@ -11,7 +11,6 @@ export default { moduleResolution: 'node', importHelpers: true, target: 'es2015', - typeRoots: ['node_modules/@types'], lib: ['es2018', 'dom'], }, angularCompilerOptions: { diff --git a/devui/tabs/tabs.component.ts b/devui/tabs/tabs.component.ts index 7d66cc6a..7c56c155 100755 --- a/devui/tabs/tabs.component.ts +++ b/devui/tabs/tabs.component.ts @@ -166,7 +166,7 @@ export class TabsComponent implements OnChanges, AfterViewInit { addOrDeleteTab(event: Event, id?: number | string): void { event.stopPropagation(); - const operation = id || id >= 0 ? 'delete' : 'add'; + const operation = id || id === 0 ? 'delete' : 'add'; this.addOrDeleteTabChange.emit({ id, operation }); } diff --git a/devui/test.ts b/devui/test.ts index cd4a1022..f9583b27 100755 --- a/devui/test.ts +++ b/devui/test.ts @@ -1,12 +1,7 @@ // This file is required by karma.conf.js and loads recursively all the .spec and framework files // 此处顺序不可改变 import 'zone.js'; -import 'zone.js/dist/long-stack-trace-zone'; -import 'zone.js/dist/proxy'; -import 'zone.js/dist/sync-test'; -import 'zone.js/dist/jasmine-patch'; -import 'zone.js/dist/async-test'; -import 'zone.js/dist/fake-async-test'; +import 'zone.js/testing'; import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule, diff --git a/devui/toast/toast.service.ts b/devui/toast/toast.service.ts index 776aeb56..c676ec2d 100644 --- a/devui/toast/toast.service.ts +++ b/devui/toast/toast.service.ts @@ -48,7 +48,7 @@ export class ToastService { }); toastRef.instance.close = (index?: number | Message) => { - if (index !== undefined && index > -1) { + if (index || index === 0) { toastRef.instance.removeIndexThrottle(index as number); } else if (index !== undefined) { toastRef.instance.removeMsgThrottle(index); diff --git a/devui/version.ts b/devui/version.ts index c88c0750..ccea6877 100755 --- a/devui/version.ts +++ b/devui/version.ts @@ -1,3 +1,3 @@ import { Version } from '@angular/core'; -export const VERSION = new Version('16.2.0'); +export const VERSION = new Version('17.0.0-alpha'); diff --git a/package.json b/package.json index ffdd0c25..7651a9e1 100644 --- a/package.json +++ b/package.json @@ -31,15 +31,15 @@ "build:devui:ivy": "node --max_old_space_size=8192 ./node_modules/@angular/cli/bin/ng build devui-lib" }, "dependencies": { - "@angular/animations": "^16.0.0", - "@angular/cdk": "^16.0.0", - "@angular/common": "^16.0.0", - "@angular/compiler": "^16.0.0", - "@angular/core": "^16.0.0", - "@angular/forms": "^16.0.0", - "@angular/platform-browser": "^16.0.0", - "@angular/platform-browser-dynamic": "^16.0.0", - "@angular/router": "^16.0.0", + "@angular/animations": "^17.0.4", + "@angular/cdk": "^17.0.0", + "@angular/common": "^17.0.4", + "@angular/compiler": "^17.0.4", + "@angular/core": "^17.0.4", + "@angular/forms": "^17.0.4", + "@angular/platform-browser": "^17.0.4", + "@angular/platform-browser-dynamic": "^17.0.4", + "@angular/router": "^17.0.4", "@devui-design/icons": "^1.2.0", "@ngx-translate/core": "^15.0.0", "@ngx-translate/http-loader": "^8.0.0", @@ -51,16 +51,16 @@ "gridstack": "^6.0.0", "marked": "^4.0.10", "tslib": "^2.0.0", - "zone.js": "~0.13.1" + "zone.js": "~0.14.2" }, "devDependencies": { - "@angular-builders/custom-webpack": "^16.0.0", - "@angular-devkit/build-angular": "^16.0.0", - "@angular-eslint/builder": "^16.0.0", - "@angular-eslint/eslint-plugin": "^16.0.0", - "@angular/cli": "^16.0.0", - "@angular/compiler-cli": "^16.0.0", - "@angular/language-service": "^16.0.0", + "@angular-builders/custom-webpack": "^17.0.0", + "@angular-devkit/build-angular": "^17.0.3", + "@angular-eslint/builder": "^17.0.0", + "@angular-eslint/eslint-plugin": "^17.0.0", + "@angular/cli": "^17.0.3", + "@angular/compiler-cli": "^17.0.4", + "@angular/language-service": "^17.0.4", "@commitlint/cli": "^11.0.0", "@commitlint/config-conventional": "^11.0.0", "@stackblitz/sdk": "^1.5.2", @@ -90,7 +90,7 @@ "lint-staged": "^9.2.3", "lodash-es": "^4.17.15", "markdown-loader": "^5.1.0", - "ng-packagr": "^16.0.0", + "ng-packagr": "^17.0.2", "patch-package": "^6.2.2", "postcss": "^8.2.4", "prettier": "^2.1.2", @@ -104,7 +104,7 @@ "stylelint-scss": "^3.17.0", "synckit": "^0.6.0", "ts-node": "~7.0.0", - "typescript": "~4.9.4" + "typescript": "~5.2.2" }, "lint-staged": { "{devui,src}/**/*.{ts,js}": [ @@ -127,4 +127,4 @@ "pre-push": "npm run test:lib" } } -} +} \ No newline at end of file diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json index f50e0608..f39dcd39 100755 --- a/src/tsconfig.app.json +++ b/src/tsconfig.app.json @@ -3,7 +3,6 @@ "compilerOptions": { "outDir": "../out-tsc/app", "types": ["node", "jasmine"], - "typeRoots": ["node_modules/@types"] }, "files": ["main.ts", "polyfills.ts"], "include": [] diff --git a/tsconfig.json b/tsconfig.json index 0d6db736..571127a7 100755 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,9 +24,6 @@ "noFallthroughCasesInSwitch": true, "forceConsistentCasingInFileNames": true, "target": "ES2022", - "typeRoots": [ - "node_modules/@types" - ], "lib": [ "ES2022", "dom"