Skip to content

Commit

Permalink
fixed momentjs angular lib issue
Browse files Browse the repository at this point in the history
  • Loading branch information
kashw2 committed Dec 24, 2020
1 parent eae2eac commit 29c0dde
Show file tree
Hide file tree
Showing 53 changed files with 1,030 additions and 107 deletions.
76 changes: 0 additions & 76 deletions .eslintrc.json

This file was deleted.

4 changes: 3 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"packages": [
"./libs/util",
"./libs/external",
"./libs/typescript"
"./libs/typescript",
"./libs/angular",
"./panel"
]
}
53 changes: 53 additions & 0 deletions libs/angular/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"name": "@kashw2/lib-angular",
"version": "1.0.0",
"description": "Fleet of the Faithful Knights Angular Componentry, Services, Data Models",
"typings": "./dist/index.d.ts",
"sideEffects": false,
"nyc": {
"exclude": [
"src/**/*.test.ts"
],
"reporter": [
"text-summary",
"html"
],
"instrument": false,
"sourceMap": false
},
"scripts": {
"build": "webpack --config webpack/webpack.config.ts",
"build-dev": "webpack --config webpack/webpack.dev.config.ts"
},
"repository": {
"type": "git",
"url": "git+https://github.com/kashw2/Fleet-of-the-Faithful-Knights.git"
},
"keywords": [
"Angular",
"Package",
"Services",
"Models",
"Component"
],
"author": "Keanu Ashwell",
"private": true,
"license": "ISC",
"bugs": {
"url": "https://github.com/kashw2/Fleet-of-the-Faithful-Knights/issues"
},
"homepage": "https://github.com/kashw2/Fleet-of-the-Faithful-Knights#readme",
"dependencies": {
"ts-loader": "8.0.12",
"typescript": "4.1.3",
"webpack": "5.10.2"
},
"devDependencies": {
"webpack-cli": "4.2.0"
},
"publishConfig": {
"registry": "https://npm.pkg.github.com/kashw2",
"access": "restricted",
"directory": "dist"
}
}
1 change: 1 addition & 0 deletions libs/angular/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './models/hyperlink-map';
29 changes: 29 additions & 0 deletions libs/angular/src/models/hyperlink-map.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import {None, Option, Some} from "funfix-core";

export class HyperlinkMap {

constructor(
private label: Option<string> = None,
private hyperlink: Option<string> = None,
private active: Option<boolean> = Some(false),
private callback?: (...x: any) => any,
) {
}

public getCallback(): Option<any> {
return Option.of(this.callback);
}

public getHyperlink(): Option<string> {
return this.label;
}

public getLabel(): Option<string> {
return this.label;
}

public isActive(): boolean {
return this.active.contains(true);
}

}
70 changes: 70 additions & 0 deletions libs/angular/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"compilerOptions": {
/* Visit https://aka.ms/tsconfig.json to read more about this file */

/* Basic Options */
// "incremental": true, /* Enable incremental compilation */
"target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
"declaration": true, /* Generates corresponding '.d.ts' file. */
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
"sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "./dist", /* Redirect output structure to the directory. */
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

/* Strict Type-Checking Options */
"strict": true, /* Enable all strict type-checking options. */
"noImplicitAny": false, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */

/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */

/* Module Resolution Options */
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */

/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */

/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */

/* Advanced Options */
"skipLibCheck": true, /* Skip type checking of declaration files. */
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
}
}
24 changes: 24 additions & 0 deletions libs/angular/webpack/webpack.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module.exports = {
entry: "./src/index.ts",
mode: "production",
devtool: "source-map",
target: "node",
module: {
rules: [
{
test: /\.tsx?$/,
use: "ts-loader",
exclude: /node_modules/,
},
],
},
output: {
globalObject: "typeof self !== 'undefined' ? self : this", // See https://github.com/webpack/webpack/issues/6522
libraryTarget: "umd",
filename: 'lib-angular.js'
},
resolve: {
extensions: [".ts", ".js"],
modules: ['src', 'node_modules']
}
}
24 changes: 24 additions & 0 deletions libs/angular/webpack/webpack.dev.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module.exports = {
entry: "./src/index.ts",
mode: "development",
devtool: "source-map",
target: "node",
module: {
rules: [
{
test: /\.tsx?$/,
use: "ts-loader",
exclude: /node_modules/,
},
],
},
output: {
globalObject: "typeof self !== 'undefined' ? self : this", // See https://github.com/webpack/webpack/issues/6522
libraryTarget: "umd",
filename: 'lib-angular.js'
},
resolve: {
extensions: [".ts", ".js"],
modules: ['src', 'node_modules']
}
}
6 changes: 3 additions & 3 deletions libs/external/src/discord/activity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '@ffk/lib-util';
import {None, Option} from 'funfix-core';
import {List} from 'immutable';
import {Moment} from 'moment';
import * as moment from 'moment';
import {Asset, AssetJsonSerializer} from './asset';
import {Emoji, EmojiJsonSerializer} from './emoji';
import {
Expand Down Expand Up @@ -38,7 +38,7 @@ export class Activity {
readonly name: Option<string> = None,
readonly type: Option<number> = None,
readonly url: Option<string> = None,
readonly createdAt: Option<Moment> = None,
readonly createdAt: Option<moment.Moment> = None,
readonly timestamps: List<Timestamp> = List(),
readonly applicationId: Option<string> = None,
readonly details: Option<string> = None,
Expand Down Expand Up @@ -92,7 +92,7 @@ export class Activity {
return this.timestamps;
}

public getCreatedAt(): Option<Moment> {
public getCreatedAt(): Option<moment.Moment> {
return this.createdAt;
}

Expand Down
6 changes: 3 additions & 3 deletions libs/external/src/discord/channel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {None, Option} from 'funfix-core';
import {Overwrite, OverwriteJsonSerializer} from './overwrite';
import {Set} from 'immutable';
import {User, UserJsonSerializer} from './user';
import {Moment} from 'moment';
import * as moment from 'moment';
import {
JsonBuilder,
JsonSerializer,
Expand Down Expand Up @@ -53,11 +53,11 @@ export class Channel {
readonly ownerId: Option<string> = None,
readonly applicationId: Option<string> = None,
readonly parentId: Option<string> = None,
readonly lastPinTimestamp: Option<Moment> = None,
readonly lastPinTimestamp: Option<moment.Moment> = None,
) {
}

public getLastPinTimestamp(): Option<Moment> {
public getLastPinTimestamp(): Option<moment.Moment> {
return this.lastPinTimestamp;
}

Expand Down
10 changes: 5 additions & 5 deletions libs/external/src/discord/guild-member.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {None, Option} from 'funfix-core';
import {User, UserJsonSerializer} from './user';
import {Set} from 'immutable';
import {Moment} from 'moment';
import * as moment from 'moment';
import {JsonBuilder, JsonSerializer, parseBoolean, parseDate, parseSet, parseString} from '@ffk/lib-util';
import {deafKey, joinedAtKey, muteKey, nickKey, pendingKey, premiumSinceKey, rolesKey, userKey} from './json-keys';

Expand All @@ -11,8 +11,8 @@ export class GuildMember {
readonly user: Option<User> = None,
readonly nick: Option<string> = None,
readonly roles: Set<string> = Set(),
readonly joinedAt: Option<Moment> = None,
readonly premiumSince: Option<Moment> = None,
readonly joinedAt: Option<moment.Moment> = None,
readonly premiumSince: Option<moment.Moment> = None,
readonly deaf: Option<boolean> = None,
readonly mute: Option<boolean> = None,
readonly pending: Option<boolean> = None
Expand All @@ -31,11 +31,11 @@ export class GuildMember {
return this.roles;
}

public getJoinedAt(): Option<Moment> {
public getJoinedAt(): Option<moment.Moment> {
return this.joinedAt;
}

public getPremiumSince(): Option<Moment> {
public getPremiumSince(): Option<moment.Moment> {
return this.premiumSince;
}

Expand Down
Loading

0 comments on commit 29c0dde

Please sign in to comment.