diff --git a/package.dev.json b/package.dev.json index 2cb02da7..cdb529a0 100644 --- a/package.dev.json +++ b/package.dev.json @@ -12,20 +12,20 @@ "build-jsdraw-wrapper": "ng build --prod jsdraw-wrapper && cd dist/jsdraw-wrapper && npm pack", "build-ketcher-wrapper": "ng build --prod ketcher-wrapper && cd dist/ketcher-wrapper && npm pack", "build-libraries": "npm run build-file-select && npm run build-jsdraw-wrapper && npm run build-ketcher-wrapper", - "build-server": "ng run gsrs-client:server && npm run webpack:server", + "build-server": "ng run gsrs-client:server", + "start:gsrs:dev": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=fda.dev --sourceMap=true", + "start:gsrs:local": "npm run build-libraries && npm run process-dojo && ng serve --configuration=fda.local", + "start:gsrs:pre-prod": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=fda.pre-prod --sourceMap=true", + "start:gsrs:prod": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=fda.prod --sourceMap=true", + "build:gsrs:pre-prod": "npm run build-libraries && npm run clear-libs-src && ng build --base-href=/ginas/app/beta/ --aot=true --configuration=fda.pre-prod --sourceMap=true && node process-index.js && cd lib && extract-zip dojo-custom-jsdraw.zip && cd .. && npm run copy-libs-dist && npm run build-server", + "build:gsrs:prod": "npm run build-libraries && npm run clear-libs-src && ng build --base-href=/ginas/app/ui/ --configuration=fda.prod && node process-index.js && cd lib && extract-zip dojo-custom-jsdraw.zip && cd .. && npm run copy-libs-dist && npm run build-server", "start:fda:dev": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=fda.dev --sourceMap=true", "start:fda:local": "npm run build-libraries && npm run process-dojo && ng serve --configuration=fda.local", "start:fda:pre-prod": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=fda.pre-prod --sourceMap=true", "start:fda:prod": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=fda.prod --sourceMap=true", - "start:gsrs:dev": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=gsrs.dev --sourceMap=true", - "start:gsrs:local": "npm run build-libraries && npm run process-dojo && ng serve --configuration=gsrs.local", - "start:gsrs:pre-prod": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=gsrs.pre-prod --sourceMap=true", - "start:gsrs:prod": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=gsrs.prod --sourceMap=true", "build:fda:pre-prod": "npm run build-libraries && npm run clear-libs-src && ng build --base-href=/ginas/app/beta/ --aot=true --configuration=fda.pre-prod --sourceMap=true && node process-index.js && cd lib && extract-zip dojo-custom-jsdraw.zip && cd .. && npm run copy-libs-dist && npm run build-server", "build:fda:prod": "npm run build-libraries && npm run clear-libs-src && ng build --base-href=/ginas/app/ui/ --configuration=fda.prod && node process-index.js && cd lib && extract-zip dojo-custom-jsdraw.zip && cd .. && npm run copy-libs-dist && npm run build-server", - "build:gsrs:pre-prod": "npm run build-libraries && npm run clear-libs-src && ng build --base-href=/ginas/app/beta/ --aot=true --configuration=gsrs.pre-prod --sourceMap=true && node process-index.js && cd lib && extract-zip dojo-custom-jsdraw.zip && cd .. && npm run copy-libs-dist && npm run build-server", - "build:gsrs:prod": "npm run build-libraries && npm run clear-libs-src && ng build --base-href=/ginas/app/beta/ --aot=true --configuration=gsrs.prod --sourceMap=true && node process-index.js && cd lib && extract-zip dojo-custom-jsdraw.zip && cd .. && npm run copy-libs-dist && npm run build-server", - "test": "ng test", + "test": "ng test", "lint": "ng lint", "tslint": "tslint", "e2e": "ng e2e", @@ -57,7 +57,7 @@ "helmet": "3.21.2", "lodash": "4.17.21", "lucene-query-parser": "1.2.0", - "moment": "2.29.2", + "moment": "2.29.4", "ng-multiselect-dropdown": "0.2.10", "ngx-json-viewer": "2.4.0", "ngx-moment": "3.5.0", @@ -68,9 +68,9 @@ "util": "0.12.4", "web-animations-js": "2.3.2", "zone.js": "0.11.4", - "z-schema": "5.0.4", "jexl": "2.3.0", - "xlsx": "0.18.5" + "xlsx": "^0.18.5", + "z-schema": "4.2.2" }, "devDependencies": { "@angular-devkit/build-angular": "13.2.1", @@ -107,7 +107,7 @@ "karma-jasmine-html-reporter": "1.7.0", "mkdirp": "1.0.4", "ng-packagr": "13.2.1", - "node-sass": "7.0.1", + "sass": "1.80.6", "protractor": "7.0.0", "raw-loader": "4.0.2", "rimraf": "3.0.2", diff --git a/package.real.json b/package.real.json index 9ecd7f04..200d6abd 100644 --- a/package.real.json +++ b/package.real.json @@ -12,20 +12,20 @@ "build-jsdraw-wrapper": "ng build --prod jsdraw-wrapper && cd dist/jsdraw-wrapper && npm pack", "build-ketcher-wrapper": "ng build --prod ketcher-wrapper && cd dist/ketcher-wrapper && npm pack", "build-libraries": "npm run build-file-select && npm run build-jsdraw-wrapper && npm run build-ketcher-wrapper", - "build-server": "ng run gsrs-client:server && npm run webpack:server", + "build-server": "ng run gsrs-client:server", + "start:gsrs:dev": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=fda.dev --sourceMap=true", + "start:gsrs:local": "npm run build-libraries && npm run process-dojo && ng serve --configuration=fda.local", + "start:gsrs:pre-prod": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=fda.pre-prod --sourceMap=true", + "start:gsrs:prod": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=fda.prod --sourceMap=true", + "build:gsrs:pre-prod": "npm run build-libraries && npm run clear-libs-src && ng build --base-href=/ginas/app/beta/ --aot=true --configuration=fda.pre-prod --sourceMap=true && node process-index.js && cd lib && extract-zip dojo-custom-jsdraw.zip && cd .. && npm run copy-libs-dist && npm run build-server", + "build:gsrs:prod": "npm run build-libraries && npm run clear-libs-src && ng build --base-href=/ginas/app/ui/ --configuration=fda.prod && node process-index.js && cd lib && extract-zip dojo-custom-jsdraw.zip && cd .. && npm run copy-libs-dist && npm run build-server", "start:fda:dev": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=fda.dev --sourceMap=true", "start:fda:local": "npm run build-libraries && npm run process-dojo && ng serve --configuration=fda.local", "start:fda:pre-prod": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=fda.pre-prod --sourceMap=true", "start:fda:prod": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=fda.prod --sourceMap=true", - "start:gsrs:dev": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=gsrs.dev --sourceMap=true", - "start:gsrs:local": "npm run build-libraries && npm run process-dojo && ng serve --configuration=gsrs.local", - "start:gsrs:pre-prod": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=gsrs.pre-prod --sourceMap=true", - "start:gsrs:prod": "npm run build-libraries && npm run process-dojo && ng serve --aot=true --configuration=gsrs.prod --sourceMap=true", "build:fda:pre-prod": "npm run build-libraries && npm run clear-libs-src && ng build --base-href=/ginas/app/beta/ --aot=true --configuration=fda.pre-prod --sourceMap=true && node process-index.js && cd lib && extract-zip dojo-custom-jsdraw.zip && cd .. && npm run copy-libs-dist && npm run build-server", "build:fda:prod": "npm run build-libraries && npm run clear-libs-src && ng build --base-href=/ginas/app/ui/ --configuration=fda.prod && node process-index.js && cd lib && extract-zip dojo-custom-jsdraw.zip && cd .. && npm run copy-libs-dist && npm run build-server", - "build:gsrs:pre-prod": "npm run build-libraries && npm run clear-libs-src && ng build --base-href=/ginas/app/beta/ --aot=true --configuration=gsrs.pre-prod --sourceMap=true && node process-index.js && cd lib && extract-zip dojo-custom-jsdraw.zip && cd .. && npm run copy-libs-dist && npm run build-server", - "build:gsrs:prod": "npm run build-libraries && npm run clear-libs-src && ng build --base-href=/ginas/app/beta/ --aot=true --configuration=gsrs.prod --sourceMap=true && node process-index.js && cd lib && extract-zip dojo-custom-jsdraw.zip && cd .. && npm run copy-libs-dist && npm run build-server", - "test": "ng test", + "test": "ng test", "lint": "ng lint", "tslint": "tslint", "e2e": "ng e2e", @@ -48,6 +48,7 @@ "@angular/router": "13.2.1", "@nguniversal/express-engine": "13.0.2", "@types/hammerjs": "2.0.36", + "@types/node": "18.15.3", "classlist.js": "1.1.20150312", "compression": "1.7.3", "core-js": "2.5.4", @@ -58,27 +59,27 @@ "hammerjs": "2.0.8", "helmet": "3.21.2", "html-to-image": "^1.11.11", - "jsdraw-wrapper": "file:dist/jsdraw-wrapper/jsdraw-wrapper-0.0.1.tgz", - "ketcher-wrapper": "file:dist/ketcher-wrapper/ketcher-wrapper-0.0.1.tgz", + "jexl": "2.3.0", "jspdf": "^2.5.1", "jspdf-autotable": "^3.8.2", + "jsdraw-wrapper": "file:dist/jsdraw-wrapper/jsdraw-wrapper-0.0.1.tgz", + "ketcher-wrapper": "file:dist/ketcher-wrapper/ketcher-wrapper-0.0.1.tgz", "lodash": "4.17.21", "lucene-query-parser": "1.2.0", - "moment": "2.29.2", + "moment": "2.29.4", "ng-multiselect-dropdown": "0.2.10", "ngx-json-viewer": "2.4.0", "ngx-moment": "3.5.0", + "ngx-schema-form": "2.7.0", "primeng": "^13.2.0", "reflect-metadata": "0.1.13", "rxjs": "7.5.4", "ts-loader": "4.5.0", "util": "0.12.4", "web-animations-js": "2.3.2", - "zone.js": "0.11.4", + "xlsx": "^0.18.5", "z-schema": "4.2.2", - "jexl": "2.3.0", - "ngx-schema-form": "2.7.0", - "xlsx": "0.18.5" + "zone.js": "0.11.4" }, "devDependencies": { "@angular-devkit/build-angular": "13.2.1", @@ -94,7 +95,6 @@ "@types/jasmine": "3.10.3", "@types/jasminewd2": "2.0.10", "@types/lodash": "4.14.178", - "@types/node": "17.0.16", "@typescript-eslint/eslint-plugin": "5.11.0", "@typescript-eslint/parser": "5.11.0", "cheerio": "1.0.0-rc.2", @@ -115,15 +115,14 @@ "karma-jasmine-html-reporter": "1.7.0", "mkdirp": "1.0.4", "ng-packagr": "13.2.1", - "node-sass": "7.0.1", "protractor": "7.0.0", "raw-loader": "4.0.2", "rimraf": "3.0.2", + "sass": "1.80.6", "ts-node": "10.5.0", "tslib": "2.3.1", "tslint": "5.20.1", - "typescript": "4.5.5", - "webpack-cli": "4.9.2" + "typescript": "4.5.5" }, "husky": { "hooks": {