Skip to content
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
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

72 changes: 0 additions & 72 deletions .eslintrc.json

This file was deleted.

3 changes: 3 additions & 0 deletions .github/workflows/on-gh-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jobs:
needs: one_run
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- uses: actions/cache@v3
- name: get-npm-version
id: package-version
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/on-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ jobs:
needs: one_run
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- uses: actions/cache@v3
id: cache
with:
Expand All @@ -41,6 +44,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- uses: actions/cache@v3
with:
path: node_modules
Expand All @@ -60,6 +66,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- uses: actions/cache@v3
with:
path: node_modules
Expand All @@ -72,6 +81,9 @@ jobs:
needs: build
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- uses: actions/checkout@v3
with:
ref: 'gh-pages'
Expand Down Expand Up @@ -107,6 +119,9 @@ jobs:
needs: build
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- uses: actions/cache@v3
with:
path: node_modules
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/on-push-or-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ jobs:
needs: one_run
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- uses: actions/cache@v3
id: cache
with:
Expand All @@ -51,6 +54,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_NODE_MODULES_PATH }}
Expand All @@ -67,6 +73,9 @@ jobs:
needs: build
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_NODE_MODULES_PATH }}
Expand All @@ -84,6 +93,9 @@ jobs:
needs: install
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_NODE_MODULES_PATH }}
Expand All @@ -98,6 +110,9 @@ jobs:
output_url: ${{ steps.firebase_hosting_preview.outputs.details_url }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_DIST_PATH }}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ scripts/**/*.map
.nx/
.cursor/rules/nx-rules.mdc
.github/instructions/nx.instructions.md

.claude/worktrees
.claude/settings.local.json
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
24
33 changes: 0 additions & 33 deletions apps/demo/.eslintrc.json

This file was deleted.

23 changes: 23 additions & 0 deletions apps/demo/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@

import baseConfig from "../../eslint.config.mjs";
import nx from "@nx/eslint-plugin";

export default [
...baseConfig,
...nx.configs["flat/angular"],
{
files: [
"**/*.ts"
],
rules: {
"@angular-eslint/prefer-standalone": [
"off"
],
// Angular 22 migration pins existing components to ChangeDetectionStrategy.Eager to keep v21 behavior
"@angular-eslint/prefer-on-push-component-change-detection": [
"off"
]
}
},
...nx.configs["flat/angular-template"]
];
28 changes: 14 additions & 14 deletions apps/demo/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
"dependsOn": [
{
"target": "build",
"dependencies": true
}
],
"defaultConfiguration": "production",
"options": {
"outputPath": "dist/apps/demo",
"index": "apps/demo/src/index.html",
Expand All @@ -28,12 +35,6 @@
"optimization": false,
"namedChunks": true
},
"dependsOn": [
{
"target": "build",
"dependencies": true
}
],
"configurations": {
"production": {
"optimization": true,
Expand All @@ -51,31 +52,30 @@
}
]
}
},
"defaultConfiguration": "production"
}
},
"serve": {
"executor": "@angular-devkit/build-angular:dev-server",
"continuous": true,
"options": {
"buildTarget": "ng2-file-upload-demo:build:production"
},
"configurations": {
"production": {
"buildTarget": "ng2-file-upload-demo:build"
}
},
"continuous": true
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": [
"{options.outputFile}"
],
"options": {
"lintFilePatterns": [
"apps/demo/**/*.ts"
]
},
"outputs": [
"{options.outputFile}"
]
}
}
}
}
3 changes: 2 additions & 1 deletion apps/demo/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component } from '@angular/core';
import { Component, ChangeDetectionStrategy } from '@angular/core';
// eslint-disable-next-line @typescript-eslint/no-var-requires
const gettingStarted = require('html-loader!markdown-loader!../getting-started.md');

Expand Down Expand Up @@ -41,6 +41,7 @@ const gettingStarted = require('html-loader!markdown-loader!../getting-started.m
</div>
</footer>
`,
changeDetection: ChangeDetectionStrategy.Eager,
standalone: false
})
export class AppComponent {
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { FileUploadSectionComponent } from './components/file-upload-section';
import { SimpleDemoComponent } from './components/file-upload/simple-demo';

@NgModule({
imports: [BrowserModule, CommonModule, FileUploadModule, TabsModule.forRoot(), FormsModule],
imports: [BrowserModule, CommonModule, FileUploadModule, TabsModule, FormsModule],
declarations: [AppComponent, FileUploadSectionComponent, SimpleDemoComponent],
bootstrap: [AppComponent],
providers: []
Expand Down
3 changes: 2 additions & 1 deletion apps/demo/src/app/components/file-upload-section.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component } from '@angular/core';
import { Component, ChangeDetectionStrategy } from '@angular/core';
// eslint-disable-next-line @typescript-eslint/no-var-requires
const doc = require('html-loader!markdown-loader!../../doc.md');

Expand All @@ -17,6 +17,7 @@ const tabDesc: Array<any> = [
@Component({
selector: 'file-upload-section',
templateUrl: './file-upload-section.html',
changeDetection: ChangeDetectionStrategy.Eager,
standalone: false
})
export class FileUploadSectionComponent {
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/app/components/file-upload/simple-demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ <h3>Upload queue</h3>
<tr>
<td data-label="Name"><strong>{{ item?.file?.name }}</strong></td>
@if (uploader.options.isHTML5) {
<td data-label="Size" nowrap>{{ item?.file?.size/1024/1024 | number:'.2' }} MB</td>
<td data-label="Size" nowrap>{{ item.file.size/1024/1024 | number:'.2' }} MB</td>
}
@if (uploader.options.isHTML5) {
<td data-label="Progress">
Expand Down
3 changes: 2 additions & 1 deletion apps/demo/src/app/components/file-upload/simple-demo.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component } from '@angular/core';
import { Component, ChangeDetectionStrategy } from '@angular/core';
import { FileUploader } from 'ng2-file-upload';

// const URL = '/api/';
Expand All @@ -7,6 +7,7 @@ const URL = 'https://evening-anchorage-3159.herokuapp.com/api/';
@Component({
selector: 'simple-demo',
templateUrl: './simple-demo.html',
changeDetection: ChangeDetectionStrategy.Eager,
standalone: false
})
export class SimpleDemoComponent {
Expand Down
Loading
Loading