Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
63d4534
store
ryanslatten Mar 15, 2025
cb41636
Merge branch 'develop' of https://github.com/ngageoint/mage-server in…
ryanslatten Mar 15, 2025
02467bd
update package jsons
ryanslatten Mar 18, 2025
5ed129c
update lock file
ryanslatten Mar 18, 2025
caca0b3
update msi
ryanslatten Mar 19, 2025
fb56c37
update service json
ryanslatten Mar 19, 2025
f6d5cc2
test update
ryanslatten Mar 19, 2025
b0d28e2
test revert
ryanslatten Mar 19, 2025
d86149a
reset
ryanslatten Mar 19, 2025
b6daebe
fix arcgis error
ryanslatten Mar 19, 2025
9277cd2
test
ryanslatten Mar 19, 2025
8bb86d9
test
ryanslatten Mar 19, 2025
0064998
test revert
ryanslatten Mar 19, 2025
a1f90be
test
ryanslatten Mar 19, 2025
edea986
refresh shrinkwrap
ryanslatten Mar 19, 2025
e851f19
update package files
ryanslatten Mar 20, 2025
c30df6c
update minor versions
ryanslatten Mar 20, 2025
fe8429c
update os support
ryanslatten Mar 20, 2025
86a1908
fix errors with sqlite hope
ryanslatten Mar 20, 2025
0c98b68
revert --force change
ryanslatten Mar 20, 2025
c0219e4
remove sqlite3
ryanslatten Mar 20, 2025
c0d4d6c
revert mage change
ryanslatten Mar 20, 2025
720a0e4
revert package
ryanslatten Mar 20, 2025
867568d
change
ryanslatten Mar 20, 2025
f93c3a9
fix arcgis error
ryanslatten Mar 20, 2025
037b1c9
update package files to remove unneeded packages
ryanslatten Mar 20, 2025
c5e7f1d
update mage beta version
ryanslatten Mar 20, 2025
bbcaf7a
update package version to test
ryanslatten Mar 20, 2025
2751012
update core-lib
ryanslatten Mar 20, 2025
ec90785
test
ryanslatten Mar 25, 2025
9266e01
test again
ryanslatten Mar 25, 2025
4b40a50
revert test
ryanslatten Mar 25, 2025
041206e
remove whoami
ryanslatten Mar 26, 2025
7fe4965
update to beta 7
ryanslatten Mar 26, 2025
175447a
test
ryanslatten Mar 26, 2025
51d5b8d
test
ryanslatten Mar 26, 2025
a51ae9b
revert change
ryanslatten Mar 26, 2025
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
2 changes: 0 additions & 2 deletions .github/workflows/build_test.arcgis.service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ jobs:
run: |
cd plugins/arcgis/service
npm ci --force
npm link ../../../service
npm test

package:
Expand All @@ -65,7 +64,6 @@ jobs:
run: |
cd plugins/arcgis/service
npm ci --force
npm link ../../../service
npm run build
- name: package for plugin
run: npm pack ./plugins/arcgis/service
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build_test.image.service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
cd plugins/image/service
npm ci --force
npm install --os=linux --cpu=x64 sharp
npm link ../../../service
rm -rf node_modules/mongoose
npm test

Expand Down Expand Up @@ -68,7 +67,6 @@ jobs:
cd plugins/image/service
npm ci --force
npm install --os=linux --cpu=x64 sharp
npm link ../../../service
rm -rf node_modules/mongoose
npm run build
- name: pack
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/build_test.nga-msi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ jobs:
- name: test with node ${{ matrix.node }}
run: |
cd plugins/nga-msi
npm ci
npm link ../../service
npm ci --force
npm test

package:
Expand All @@ -64,8 +63,7 @@ jobs:
- name: build
run: |
cd plugins/nga-msi
npm ci
npm link ../../service
npm ci --force
npm run build
- name: pack
run: npm pack ./plugins/nga-msi
Expand Down
5 changes: 2 additions & 3 deletions instance/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"name": "@ngageoint/mage.dev-instance",
"version": "6.3.0-beta.6",
"version": "6.3.0-beta.7",
"description": "Assemble a MAGE Server deployment from the core service, the web-app, and selected plugins. This is primarily a development tool because the dependencies point to relative directories instead of production packages. This can however serve as a starting point to create a production MAGE instance package.json.",
"scripts": {
"start": "npm run start:dev-env",
"start:dev": "NODE_PATH=./node_modules node ./node_modules/.bin/mage.service -C config.js",
"postinstall": "node ./init.js",
"start:dev-env": "NODE_PATH=./node_modules node ./node_modules/.bin/mage.service"

},
"repository": {
"type": "git",
Expand All @@ -34,4 +33,4 @@
"@ngageoint/mage.service": "../service",
"@ngageoint/mage.web-app": "../web-app/dist"
}
}
}
7 changes: 4 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@ngageoint/mage.project",
"description": "This is the root package definition for the mage-server monorepo.",
"private": true,
"version": "6.3.0-beta.6",
"version": "6.3.0-beta.7",
"files": [],
"scripts": {
"postinstall": "npm-run-all service:ci web-app:ci image.service:ci nga-msi:ci",
Expand Down Expand Up @@ -33,7 +33,7 @@
"start-web": "npm run web-app:debug"
},
"devDependencies": {
"npm-run-all": "^4.1.5"
"npm-run-all": "4.1.5"
},
"dependencies": {}
}
}
Loading