Skip to content

Commit

Permalink
Merge branch 'master' into fix-paginator-dropdown-item-template
Browse files Browse the repository at this point in the history
  • Loading branch information
cetincakiroglu authored Mar 22, 2024
2 parents 3a176df + 7f9de49 commit e420363
Show file tree
Hide file tree
Showing 654 changed files with 195,059 additions and 14,101 deletions.
12 changes: 10 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@angular-eslint/template/eqeqeq": [
"error",
{
"allowNullOrUndefined": true
"allowNullOrUndefined": true
}
],
"@angular-eslint/no-host-metadata-property": "off",
Expand All @@ -59,6 +59,14 @@
"files": ["*.html"],
"extends": ["plugin:@angular-eslint/template/recommended"],
"rules": {}
},
{
"files": ["*.js"],
"rules": {
"parserOptions": {
"allowImportExportEverywhere": true
}
}
}
]
}
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ testem.log
Thumbs.db

# type doc
api-generator/typedoc.json
api-generator/typedoc.json
.vercel
487 changes: 482 additions & 5 deletions CHANGELOG.md

Large diffs are not rendered by default.

102 changes: 51 additions & 51 deletions angular.json
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -28,41 +28,53 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/primeng/browser",
"outputPath": "dist/primeng",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": ["zone.js"],
"browser": "src/main.ts",
"polyfills": [
"zone.js"
],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": ["src/assets"],
"styles": ["src/styles.scss"],
"scripts": ["./node_modules/prismjs/prism.js", "./node_modules/prismjs/components/prism-typescript.js", "./node_modules/prismjs/components/prism-scss.js", "./node_modules/prismjs/components/prism-bash.js"],
"allowedCommonJsDependencies": ["chart.js", "xlsx", "jspdf-autotable", "file-saver", "jspdf", "quill", "core-js", "raf", "rgbcolor"]
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.scss"
],
"scripts": [
"./node_modules/prismjs/prism.js",
"./node_modules/prismjs/components/prism-typescript.js",
"./node_modules/prismjs/components/prism-scss.js",
"./node_modules/prismjs/components/prism-bash.js"
],
"allowedCommonJsDependencies": [
"chart.js",
"xlsx",
"jspdf-autotable",
"file-saver",
"jspdf",
"quill",
"core-js",
"raf",
"rgbcolor"
],
"server": "src/main.server.ts",
"ssr": {
"entry": "server.ts"
}
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": {
"styles": {
"inlineCritical": false
}
},
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
"sourceMap": true
}
},
"defaultConfiguration": "production"
Expand All @@ -88,38 +100,26 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"polyfills": [
"zone.js",
"zone.js/testing"
],
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"assets": ["src/assets"],
"styles": ["src/styles.scss", "src/assets/components/themes/lara-light-blue/theme.css"],
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.scss"
],
"scripts": []
}
},
"server": {
"builder": "@angular-devkit/build-angular:server",
"options": {
"outputPath": "dist/primeng/server",
"main": "server.ts",
"tsConfig": "tsconfig.server.json",
"inlineStyleLanguage": "scss",
"optimization": false
},
"configurations": {
"production": {
"outputHashing": "media"
},
"development": {
"optimization": false,
"sourceMap": true,
"extractLicenses": false,
"vendorChunk": true
}
},
"defaultConfiguration": "production"
}
}
}
},
"cli": {
"analytics": false
}
}
}
7 changes: 4 additions & 3 deletions api/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* eslint-env es6 */
const server = require('../dist/primeng/server/main');
import { app } from '../dist/primeng/server/server.mjs';

module.exports = server.app();
const server = app();

export default server;
Loading

0 comments on commit e420363

Please sign in to comment.