Skip to content

Commit

Permalink
feat: ng17 alpha update (#340)
Browse files Browse the repository at this point in the history
  • Loading branch information
Simplelegant authored Dec 1, 2023
1 parent e7a38ea commit 53591cf
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 39 deletions.
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "devui:build"
"buildTarget": "devui:build"
}
},
"test": {
Expand Down
2 changes: 1 addition & 1 deletion devui/nav-sprite/demo/basic/basic.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h1>Getting Started</h1>
<p>Guides: How to use DevUI in your project</p>
<h2>1. Create a project</h2>
<p>It is recommended to use @angular/cli to create your project.</p>
<p>It is recommended to use &#64;angular/cli to create your project.</p>
<p>$ ng new New-Project</p>
<h2>2. Installation</h2>
<p>Go to your project folder and use npm to install DevUI.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ <h1 class="page-header" #header>This is Header.</h1>
<h1>Getting Started</h1>
<p>Guides: How to use DevUI in your project</p>
<h2>1. Create a project</h2>
<p>It is recommended to use @angular/cli to create your project.</p>
<p>It is recommended to use &#64;angular/cli to create your project.</p>
<p>$ ng new New-Project</p>
<h2>2. Installation</h2>
<p>Go to your project folder and use npm to install DevUI.</p>
Expand Down
2 changes: 1 addition & 1 deletion devui/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion devui/read-tip/demo/basic/basic.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<h1>Let's see how to use ReadTip</h1>
<p class="readtip-content">Set selector to display readtip</p>
<p>The following is the target you want to show readtip</p>
<span class="readtip-target">@Jack</span>
<span class="readtip-target">&#64;Jack</span>
</div>
1 change: 0 additions & 1 deletion devui/shared/devui-online-ide/files/tsconfig.json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export default {
moduleResolution: 'node',
importHelpers: true,
target: 'es2015',
typeRoots: ['node_modules/@types'],
lib: ['es2018', 'dom'],
},
angularCompilerOptions: {
Expand Down
2 changes: 1 addition & 1 deletion devui/tabs/tabs.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
}

Expand Down
7 changes: 1 addition & 6 deletions devui/test.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion devui/toast/toast.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion devui/version.ts
Original file line number Diff line number Diff line change
@@ -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');
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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}": [
Expand All @@ -127,4 +127,4 @@
"pre-push": "npm run test:lib"
}
}
}
}
1 change: 0 additions & 1 deletion src/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"compilerOptions": {
"outDir": "../out-tsc/app",
"types": ["node", "jasmine"],
"typeRoots": ["node_modules/@types"]
},
"files": ["main.ts", "polyfills.ts"],
"include": []
Expand Down
3 changes: 0 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
"noFallthroughCasesInSwitch": true,
"forceConsistentCasingInFileNames": true,
"target": "ES2022",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"ES2022",
"dom"
Expand Down

0 comments on commit 53591cf

Please sign in to comment.