diff --git a/api/package-lock.json b/api/package-lock.json index 6dc4de5..a662dbf 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -50,6 +50,7 @@ "@types/unzipper": "^0.10.5", "adm-zip": "^0.5.9", "axios": "1.12.2", + "cpr": "^3.0.1", "csrf": "^3.1.0", "dotenv": "^16.0.1", "http-headers-validation": "^0.0.1", @@ -58,7 +59,7 @@ "nodejs-file-downloader": "4.10.2", "nodemon": "^3.0.0", "pkg": "5.6.0", - "prettier": "^3.0.0", + "prettier": "^3.0.3", "rimraf": "^3.0.2", "supertest": "^6.1.3", "ts-jest": "^29.1.0", @@ -4489,6 +4490,36 @@ "node": ">= 0.10" } }, + "node_modules/cpr": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cpr/-/cpr-3.0.1.tgz", + "integrity": "sha512-Xch4PXQ/KC8lJ+KfJ9JI6eG/nmppLrPPWg5Q+vh65Qr9EjuJEubxh/H/Le1TmCZ7+Xv7iJuNRqapyOFZB+wsxA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "graceful-fs": "^4.1.5", + "minimist": "^1.2.0", + "mkdirp": "~0.5.1", + "rimraf": "^2.5.4" + }, + "bin": { + "cpr": "bin/cpr" + } + }, + "node_modules/cpr/node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, "node_modules/create-jest": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", diff --git a/api/package.json b/api/package.json index 83e35e2..6fd7130 100644 --- a/api/package.json +++ b/api/package.json @@ -16,10 +16,10 @@ "lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"", "exe": "npm run build && pkg .", "copy:files": "npm run public:copy && npm run sasjsbuild:copy && npm run sas:copy && npm run web:copy", - "public:copy": "cp -r ./public/ ./build/public/", - "sasjsbuild:copy": "cp -r ./sasjsbuild/ ./build/sasjsbuild/", - "sas:copy": "cp -r ./sas/ ./build/sas/", - "web:copy": "rimraf web && mkdir web && cp -r ../web/build/ ./web/build/", + "public:copy": "cpr ./public/ ./build/public/", + "sasjsbuild:copy": "cpr ./sasjsbuild/ ./build/sasjsbuild/", + "sas:copy": "cpr ./sas/ ./build/sas/", + "web:copy": "rimraf web && mkdir web && cpr ../web/build/ ./web/build/", "compileSysInit": "ts-node ./scripts/compileSysInit.ts", "copySASjsCore": "ts-node ./scripts/copySASjsCore.ts", "downloadMacros": "ts-node ./scripts/downloadMacros.ts" @@ -85,6 +85,7 @@ "@types/unzipper": "^0.10.5", "adm-zip": "^0.5.9", "axios": "1.12.2", + "cpr": "^3.0.1", "csrf": "^3.1.0", "dotenv": "^16.0.1", "http-headers-validation": "^0.0.1", @@ -93,7 +94,7 @@ "nodejs-file-downloader": "4.10.2", "nodemon": "^3.0.0", "pkg": "5.6.0", - "prettier": "^3.0.0", + "prettier": "^3.0.3", "rimraf": "^3.0.2", "supertest": "^6.1.3", "ts-jest": "^29.1.0", diff --git a/web/package-lock.json b/web/package-lock.json index 501b486..904e1f7 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -56,7 +56,7 @@ "html-webpack-plugin": "5.5.0", "monaco-editor-webpack-plugin": "^7.0.1", "path": "0.12.7", - "prettier": "^2.4.1", + "prettier": "^3.0.3", "sass": "^1.44.0", "sass-loader": "^12.3.0", "style-loader": "^3.3.1", @@ -9712,15 +9712,18 @@ } }, "node_modules/prettier": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", - "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" } }, "node_modules/pretty-error": { @@ -19126,9 +19129,9 @@ "dev": true }, "prettier": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", - "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true }, "pretty-error": { diff --git a/web/package.json b/web/package.json index e2bda68..cc87231 100644 --- a/web/package.json +++ b/web/package.json @@ -4,7 +4,9 @@ "private": true, "scripts": { "start": "webpack-dev-server --config webpack.dev.ts --hot", - "build": "webpack --config webpack.prod.ts" + "build": "webpack --config webpack.prod.ts", + "lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"", + "lint:fix": "npx prettier --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"" }, "dependencies": { "@emotion/react": "^11.4.1", @@ -55,7 +57,7 @@ "html-webpack-plugin": "5.5.0", "monaco-editor-webpack-plugin": "^7.0.1", "path": "0.12.7", - "prettier": "^2.4.1", + "prettier": "^3.0.3", "sass": "^1.44.0", "sass-loader": "^12.3.0", "style-loader": "^3.3.1",