diff --git a/package-lock.json b/package-lock.json index d7c887b..5c8cea4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -125,7 +125,7 @@ "moment": "^2.24.0", "mongoose": "^5.6.11", "morgan": "^1.9.1", - "ngx-bootstrap": "^12.0.0", + "ngx-bootstrap": "^18.0.1", "node-ipc": "^9.1.1", "parallel-webpack": "^2.4.0", "passport": "^0.4.0", @@ -24143,18 +24143,18 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" }, "node_modules/ngx-bootstrap": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-12.0.0.tgz", - "integrity": "sha512-6/Hs+FT6peMc+Y2uiOm3IawG06Jh3gLQwwKRBF0U1OMlRbpx4KIyHS9GpZtMevtZaBsCRNfHKiSxwsnvn9wx0Q==", + "version": "18.0.1", + "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-18.0.1.tgz", + "integrity": "sha512-qAni2dMp/MEFkAcwr6TjRmExlFYo1ea+TGyO99ssQg6AXwWmXGI/4Z/FrT60mI54kmJV9IYTjiJjote3bjQtbg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/animations": "^17.0.0", - "@angular/common": "^17.0.0", - "@angular/core": "^17.0.0", - "@angular/forms": "^17.0.0", + "@angular/animations": "^18.0.1", + "@angular/common": "^18.0.1", + "@angular/core": "^18.0.1", + "@angular/forms": "^18.0.1", "rxjs": "^6.5.3 || ^7.4.0" } }, diff --git a/package.json b/package.json index f9ceffc..38b39ad 100644 --- a/package.json +++ b/package.json @@ -62,12 +62,12 @@ "@angular/platform-browser-dynamic": "^18.2.14", "@angular/platform-server": "^18.2.14", "@angular/router": "^18.2.14", - "@ngtools/webpack": "^18.0.0", "@encharm/cws": "^4.5.3", "@fortawesome/angular-fontawesome": "^0.11.1", "@fortawesome/fontawesome-svg-core": "^6.7.2", "@fortawesome/free-brands-svg-icons": "^6.7.2", "@fortawesome/free-solid-svg-icons": "^6.7.2", + "@ngtools/webpack": "^18.0.0", "@passport-next/passport-facebook": "^3.1.2", "@passport-next/passport-google-oauth2": "^1.0.0", "@types/base64-js": "^1.2.5", @@ -167,7 +167,7 @@ "moment": "^2.24.0", "mongoose": "^5.6.11", "morgan": "^1.9.1", - "ngx-bootstrap": "^12.0.0", + "ngx-bootstrap": "^18.0.1", "node-ipc": "^9.1.1", "parallel-webpack": "^2.4.0", "passport": "^0.4.0", diff --git a/src/ts/components/admin/admin-other/admin-other.pug b/src/ts/components/admin/admin-other/admin-other.pug index 32af955..ddeff7d 100644 --- a/src/ts/components/admin/admin-other/admin-other.pug +++ b/src/ts/components/admin/admin-other/admin-other.pug @@ -16,8 +16,13 @@ h2.text-danger PATREON WARNING: p.lead Code relating to Patreon syncing has been removed from the public pixel.horse codebase. p.lead - | You MUST contact the Pony Town Team before opening a Patreon based off the Pony Town Custom Server source code. Not doing so is a violation of the CC-BY-NC 4.0 license applied to the art and music assets supplied with the game. Please submit a request for approval to ponytownhelp@gmail.com. - + | You + b MUST + | contact the Pony Town Team before opening a Patreon based off the Pony Town Custom Server source code. Not doing so is a violation of the + a(href="https://creativecommons.org/licenses/by-nc/4.0/") CC-BY-NC 4.0 + | license applied to the art and music assets supplied with the game. Please submit a request for approval to + a(href="mailto:ponytownhelp@gmail.com") ponytownhelpgmail.com + | . .row .col-12 .form diff --git a/src/ts/components/app/app.module.ts b/src/ts/components/app/app.module.ts index 4037e86..fe4651d 100644 --- a/src/ts/components/app/app.module.ts +++ b/src/ts/components/app/app.module.ts @@ -7,7 +7,6 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { PopoverModule } from 'ngx-bootstrap/popover'; import { ButtonsModule } from 'ngx-bootstrap/buttons'; import { TooltipModule } from 'ngx-bootstrap/tooltip'; - import { SharedModule } from '../shared/shared.module'; import { App } from './app'; @@ -41,7 +40,6 @@ export const routes: Routes = [ PopoverModule.forRoot(), ButtonsModule.forRoot(), TooltipModule.forRoot(), - // TypeaheadModule.forRoot(), SharedModule, RouterModule.forRoot(routes), FontAwesomeModule, diff --git a/src/ts/components/shared/shared.module.ts b/src/ts/components/shared/shared.module.ts index 9481f2f..75ad2fb 100644 --- a/src/ts/components/shared/shared.module.ts +++ b/src/ts/components/shared/shared.module.ts @@ -71,10 +71,12 @@ import { FocusTrap } from './directives/focusTrap'; import { HasFeature } from './directives/hasFeature'; import { dropdownDirectives } from './directives/dropdown'; import { SaveActiveTab } from './directives/saveActiveTab'; +import { DragDropModule } from '@angular/cdk/drag-drop'; import { SiteNamePipe } from './pipes/siteName'; import { VisitPTButton } from './visit-pt-button/visit-pt-button'; import { VisitPTPony } from './visit-pt-pony/visit-pt-pony'; +import { CommonModule } from '@angular/common'; const declarations = [ ActionBar, @@ -143,7 +145,7 @@ const declarations = [ FocusTrap, HasFeature, SaveActiveTab, - SiteNamePipe, + SiteNamePipe ]; @NgModule({ @@ -156,10 +158,12 @@ const declarations = [ ButtonsModule, ModalModule.forRoot(), FontAwesomeModule, + DragDropModule, + CommonModule, // ScrollingModule, ], declarations: declarations, - exports: declarations, + exports: [declarations] }) export class SharedModule { -} +} \ No newline at end of file diff --git a/tsconfig-aot-admin.json b/tsconfig-aot-admin.json index 598a68f..f6c5aaa 100755 --- a/tsconfig-aot-admin.json +++ b/tsconfig-aot-admin.json @@ -1,8 +1,8 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "target": "es5", - "module": "es2015", + "target": "es2022", + "module": "es2022", "baseUrl": ".", "preserveConstEnums": false, "paths": { diff --git a/tsconfig-aot-es.json b/tsconfig-aot-es.json index e42df63..5b9e71d 100755 --- a/tsconfig-aot-es.json +++ b/tsconfig-aot-es.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig-aot.json", "compilerOptions": { - "target": "es2017", + "target": "es2022", "paths": { "core-js/es6": ["src/fixes/empty.js"], "lodash": ["src/ts/lodash.ts"] diff --git a/tsconfig-aot-tools.json b/tsconfig-aot-tools.json index da60508..ac345af 100755 --- a/tsconfig-aot-tools.json +++ b/tsconfig-aot-tools.json @@ -1,8 +1,8 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "target": "es5", - "module": "es2015", + "target": "es2022", + "module": "es2022", "baseUrl": ".", "preserveConstEnums": false, "paths": { diff --git a/tsconfig-aot.json b/tsconfig-aot.json index 3ec80b5..b8dbc8e 100755 --- a/tsconfig-aot.json +++ b/tsconfig-aot.json @@ -1,8 +1,8 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "target": "es5", - "module": "es2015", + "target": "es2022", + "module": "es2022", "baseUrl": ".", "preserveConstEnums": false, "paths": { diff --git a/tsconfig.json b/tsconfig.json index 63de80d..01f8217 100755 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,9 +1,9 @@ { "compilerOptions": { - "target": "ES2020", + "target": "ES2022", "lib": [ "dom", - "ES2020" + "ES2022" ], "rootDir": "src/ts", "outDir": "src/scripts", diff --git a/webpack.prod.mjs b/webpack.prod.mjs index eb01828..86d3a16 100644 --- a/webpack.prod.mjs +++ b/webpack.prod.mjs @@ -64,7 +64,7 @@ export default (args = {}) => }, output: Object.assign({}, common.output, { filename: '[name]-[chunkhash:10].js', - path: path.resolve(__dirname, 'dist', 'browser' , outDir, 'scripts'), + path: path.resolve(__dirname, 'build', outDir, 'scripts'), }), devtool: script === 'bootstrap' ? 'source-map' : false, module: {