Merge branch '6.5.1-beta' of https://github.com/ngageoint/mage-server into 6.5.1-beta

Author: ryanslatten

docker/server/Dockerfile

@@ -6,6 +6,7 @@ LABEL author="NGA"
 ARG SERVER_VERSION=6.5.1-beta.2
 ARG ARC_VERSION=NONE
 ARG SFTP_VERSION=NONE
+ARG MSI_VERSION=NONE
 
 USER root
 
@@ -24,6 +25,7 @@ RUN ls -l \
     && npm i --omit dev @ngageoint/mage.web-app@${SERVER_VERSION} \
     && if [ "$ARC_VERSION" != "NONE" ]; then npm i --omit dev @ngageoint/mage.arcgis.service@${ARC_VERSION} @ngageoint/mage.arcgis.web-app@${ARC_VERSION}; fi\
     && if [ "$SFTP_VERSION" != "NONE" ]; then npm i --omit dev @ngageoint/mage.sftp.service@${SFTP_VERSION} @ngageoint/mage.sftp.web@${SFTP_VERSION}; fi \
+    && if [ "$MSI_VERSION" != "NONE" ]; then npm i --omit dev @ngageoint/mage.nga-msi@${MSI_VERSION}; fi \
     && ln -s ./node_modules/.bin/mage.service
 
 VOLUME /var/lib/mage
@@ -32,5 +34,6 @@ EXPOSE 4242
 ENTRYPOINT [ "./mage.service", \
     "--plugin", "@ngageoint/mage.arcgis.service", \
     "--plugin", "@ngageoint/mage.sftp.service", \
+    "--plugin", "@ngageoint/mage.nga-msi", \
     "--web-plugin", "@ngageoint/mage.arcgis.web-app", \
     "--web-plugin", "@ngageoint/mage.sftp.web"]

instance/config.js

@@ -36,7 +36,8 @@ module.exports = {
     plugins: {
       servicePlugins: [
         '@ngageoint/mage.arcgis.service',
-        '@ngageoint/mage.sftp.service'
+        '@ngageoint/mage.sftp.service',
+        '@ngageoint/mage.nga-msi'
       ],
       webUIPlugins: [
         '@ngageoint/mage.arcgis.web-app',

instance/package.json

@@ -28,6 +28,7 @@
     "@ngageoint/mage.arcgis.web-app": "../plugins/arcgis/web-app/dist/main",
     "@ngageoint/mage.sftp.web": "../plugins/sftp/web/dist/main",
     "@ngageoint/mage.sftp.service": "../plugins/sftp/service",
+    "@ngageoint/mage.nga-msi": "../plugins/nga-msi",
     "@ngageoint/mage.service": "../service",
     "@ngageoint/mage.web-app": "../web-app/dist"
   }

package.json

@@ -5,10 +5,10 @@
   "version": "6.5.1-beta.2",
   "files": [],
   "scripts": {
-    "postinstall": "npm-run-all service:ci web-app:ci arcgis:ci sftp:ci",
+    "postinstall": "npm-run-all service:ci web-app:ci arcgis:ci sftp:ci nga-msi:ci",
     "install:resolve": "npm-run-all service:install web-app:install",
     "build": "npm-run-all service:build web-app:build instance:build",
-    "build-all": "npm-run-all build arcgis:build sftp:build",
+    "build-all": "npm-run-all build arcgis:build sftp:build nga-msi:build",
     "pack-all": "npm-run-all service:pack web-app:pack image.service:pack nga-msi:pack",
     "service:install": "npm install --prefix service",
     "service:ci": "npm ci --prefix service",
@@ -39,8 +39,7 @@
     "image.service:ci": "npm ci --prefix plugins/image/service",
     "image.service:build": "npm run build --prefix plugins/image/service",
     "image.service:pack": "npm pack ./plugins/image/service",
-    "nga-msi:install": "npm install --prefix plugins/nga-msi",
-    "nga-msi:ci": "npm ci --prefix plugins/nga-msi",
+    "nga-msi:ci": "cd plugins/nga-msi && npm ci && npm link ../../service",
     "nga-msi:build": "npm run build --prefix plugins/nga-msi",
     "nga-msi:pack": "npm pack ./plugins/nga-msi",
     "start": "npm run instance:start",

plugins/nga-msi/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngageoint/mage.nga-msi",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "The NGA-MSI package is a Mage server plugin that provides feeds from National Geospatial-Intelligence Agency's Maritime Safety Information API.",
   "main": "lib/index.js",
   "files": [
@@ -49,6 +49,6 @@
     "typescript": "5.8.2"
   },
   "peerDependencies": {
-    "@ngageoint/mage.service": "6.3.0-beta.7"
+    "@ngageoint/mage.service": ">=6.3.0 || 6.5.0-beta.1"
   }
 }

plugins/nga-msi/package.json

@@ -1,21 +1,21 @@
 {
-  "include": [
-  ],
-  "exclude": [
-  ],
-  "references": [
-  ],
+  "include": [],
+  "exclude": [],
+  "references": [],
   "compilerOptions": {
     /* Basic Options */
-    "target": "ES2016",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
-    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-    "lib": [ "ES2016" ],                             /* Specify library files to be included in the compilation. */
-    "allowJs": true,                       /* Allow javascript files to be compiled. */
+    "target": "ES2016", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
+    "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    "lib": [
+      "ES2016",
+      "DOM"
+    ], /* 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. */
+    "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": "./lib",                        /* Redirect output structure to the directory. */
     // "rootDir": ".",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
@@ -26,40 +26,36 @@
     // "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. */
+    "strict": true, /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* 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. */
-
     /* Module Resolution Options */
-    "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    "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'. */
+    "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. */
-
     /* 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. */
   }
-}
+}