From caf5a09e65388756ddab711836c4880f9e874b1a Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Wed, 19 Jun 2019 10:00:44 -0500 Subject: [PATCH 1/3] Support building on Windows Closes: https://github.com/parse-community/parse-dashboard/issues/1097 --- package-lock.json | 68 +++++++++++++++++++---------------------------- package.json | 5 ++-- 2 files changed, 31 insertions(+), 42 deletions(-) diff --git a/package-lock.json b/package-lock.json index bf593c6d67..c6c7251bce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3196,6 +3196,16 @@ "object-assign": "^4.1.1" } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + } + }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", @@ -4689,8 +4699,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -4711,14 +4720,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4733,20 +4740,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -4863,8 +4867,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -4876,7 +4879,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4891,7 +4893,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4899,14 +4900,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -4925,7 +4924,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5006,8 +5004,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5019,7 +5016,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -5105,8 +5101,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -5142,7 +5137,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5162,7 +5156,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5206,14 +5199,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -7820,7 +7811,6 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7830,15 +7820,13 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true, - "optional": true + "dev": true } } }, @@ -8939,17 +8927,17 @@ "body-parser": "1.19.0", "commander": "2.20.0", "deepcopy": "2.0.0", - "express": "4.16.4", + "express": "4.17.1", "follow-redirects": "1.7.0", "intersect": "1.0.1", "lodash": "4.17.11", "lru-cache": "5.1.1", - "mime": "2.4.2", - "mongodb": "3.2.4", + "mime": "2.4.3", + "mongodb": "3.2.6", "parse": "2.4.0", - "pg-promise": "8.7.0", + "pg-promise": "8.7.2", "redis": "2.8.0", - "semver": "6.0.0", + "semver": "6.1.1", "tv4": "1.3.0", "uuid": "3.3.2", "uws": "10.148.1", diff --git a/package.json b/package.json index 2aab05eba7..d6b207d98e 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "babel-loader": "8.0.6", "babel-plugin-transform-object-rest-spread": "6.26.0", "core-js": "2.6.5", + "cross-env": "5.2.0", "css-loader": "2.1.1", "eslint": "5.16.0", "eslint-plugin-jest": "22.5.1", @@ -99,8 +100,8 @@ "dev": "node ./Parse-Dashboard/index.js & webpack --config webpack/build.config.js --devtool eval-source-map --progress --watch", "dashboard": "node ./Parse-Dashboard/index.js & webpack --config webpack/build.config.js --progress --watch", "pig": "http-server ./PIG -p 4041 -s & webpack --config webpack/PIG.config.js --progress --watch", - "build": "NODE_ENV=production webpack --config webpack/production.config.js && webpack --config webpack/PIG.config.js", - "test": "NODE_PATH=./node_modules jest", + "build": "cross-env NODE_ENV=production webpack --config webpack/production.config.js && webpack --config webpack/PIG.config.js", + "test": "cross-env NODE_PATH=./node_modules jest", "lint": "eslint . --ignore-path .gitignore --cache", "pretest": "npm run lint", "generate": "node scripts/generate.js", From c49e5740615a7ab361d11052e2d9bbee82ea832e Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Wed, 14 Aug 2019 19:44:01 -0500 Subject: [PATCH 2/3] Revert "Support building on Windows" This reverts commit caf5a09e65388756ddab711836c4880f9e874b1a. --- package-lock.json | 68 ++++++++++++++++++++++++++++------------------- package.json | 5 ++-- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index c6c7251bce..bf593c6d67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3196,16 +3196,6 @@ "object-assign": "^4.1.1" } }, - "cross-env": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", - "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.5", - "is-windows": "^1.0.0" - } - }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", @@ -4699,7 +4689,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -4720,12 +4711,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4740,17 +4733,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4867,7 +4863,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4879,6 +4876,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4893,6 +4891,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4900,12 +4899,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -4924,6 +4925,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5004,7 +5006,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5016,6 +5019,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5101,7 +5105,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -5137,6 +5142,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5156,6 +5162,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5199,12 +5206,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -7811,6 +7820,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7820,13 +7830,15 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true + "dev": true, + "optional": true } } }, @@ -8927,17 +8939,17 @@ "body-parser": "1.19.0", "commander": "2.20.0", "deepcopy": "2.0.0", - "express": "4.17.1", + "express": "4.16.4", "follow-redirects": "1.7.0", "intersect": "1.0.1", "lodash": "4.17.11", "lru-cache": "5.1.1", - "mime": "2.4.3", - "mongodb": "3.2.6", + "mime": "2.4.2", + "mongodb": "3.2.4", "parse": "2.4.0", - "pg-promise": "8.7.2", + "pg-promise": "8.7.0", "redis": "2.8.0", - "semver": "6.1.1", + "semver": "6.0.0", "tv4": "1.3.0", "uuid": "3.3.2", "uws": "10.148.1", diff --git a/package.json b/package.json index d6b207d98e..2aab05eba7 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,6 @@ "babel-loader": "8.0.6", "babel-plugin-transform-object-rest-spread": "6.26.0", "core-js": "2.6.5", - "cross-env": "5.2.0", "css-loader": "2.1.1", "eslint": "5.16.0", "eslint-plugin-jest": "22.5.1", @@ -100,8 +99,8 @@ "dev": "node ./Parse-Dashboard/index.js & webpack --config webpack/build.config.js --devtool eval-source-map --progress --watch", "dashboard": "node ./Parse-Dashboard/index.js & webpack --config webpack/build.config.js --progress --watch", "pig": "http-server ./PIG -p 4041 -s & webpack --config webpack/PIG.config.js --progress --watch", - "build": "cross-env NODE_ENV=production webpack --config webpack/production.config.js && webpack --config webpack/PIG.config.js", - "test": "cross-env NODE_PATH=./node_modules jest", + "build": "NODE_ENV=production webpack --config webpack/production.config.js && webpack --config webpack/PIG.config.js", + "test": "NODE_PATH=./node_modules jest", "lint": "eslint . --ignore-path .gitignore --cache", "pretest": "npm run lint", "generate": "node scripts/generate.js", From c409634bc97dd90edf44d4524dc397797a9f9b1e Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Wed, 14 Aug 2019 19:47:19 -0500 Subject: [PATCH 3/3] remove conflicts --- package-lock.json | 16 +++++++++++++--- package.json | 5 +++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 09e5bde511..309b87556c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3891,6 +3891,16 @@ "object-assign": "^4.1.1" } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + } + }, "cross-fetch": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.2.2.tgz", @@ -10253,10 +10263,10 @@ "lodash": "4.17.15", "lru-cache": "5.1.1", "mime": "2.4.4", - "mongodb": "3.2.7", + "mongodb": "3.3.0", "node-rsa": "1.0.5", "parse": "2.6.0", - "pg-promise": "9.0.0", + "pg-promise": "9.0.1", "redis": "2.8.0", "semver": "6.3.0", "subscriptions-transport-ws": "0.9.16", @@ -10264,7 +10274,7 @@ "uuid": "3.3.2", "winston": "3.2.1", "winston-daily-rotate-file": "3.10.0", - "ws": "7.1.1" + "ws": "7.1.2" }, "dependencies": { "bcryptjs": { diff --git a/package.json b/package.json index 4661f4a59c..180c21c948 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "babel-loader": "8.0.6", "babel-plugin-transform-object-rest-spread": "6.26.0", "core-js": "3.2.1", + "cross-env": "5.2.0", "css-loader": "3.2.0", "eslint": "6.1.0", "eslint-plugin-jest": "22.15.1", @@ -106,8 +107,8 @@ "dev": "node ./Parse-Dashboard/index.js & webpack --config webpack/build.config.js --devtool eval-source-map --progress --watch", "dashboard": "node ./Parse-Dashboard/index.js & webpack --config webpack/build.config.js --progress --watch", "pig": "http-server ./PIG -p 4041 -s & webpack --config webpack/PIG.config.js --progress --watch", - "build": "NODE_ENV=production webpack --config webpack/production.config.js && webpack --config webpack/PIG.config.js", - "test": "NODE_PATH=./node_modules jest", + "build": "cross-env NODE_ENV=production webpack --config webpack/production.config.js && webpack --config webpack/PIG.config.js", + "test": "cross-env NODE_PATH=./node_modules jest", "lint": "eslint . --ignore-path .gitignore --cache", "pretest": "npm run lint", "generate": "node scripts/generate.js",