From 41d95660e7a147d54bac6a9afd6a0f8b335b1abc Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Fri, 29 Nov 2019 10:31:18 +1000 Subject: [PATCH] Revert some breaking packages --- bin/build | 2 +- bin/build-dev | 2 +- bin/migrate_create | 2 +- bin/npm | 2 +- bin/yarn | 2 +- package.json | 6 ++++-- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bin/build b/bin/build index 43d749a6..a6a4f699 100755 --- a/bin/build +++ b/bin/build @@ -1,4 +1,4 @@ #!/bin/bash -sudo /usr/local/bin/docker-compose run --no-deps --rm app npm run-script build +docker-compose run --no-deps --rm app npm run-script build exit $? diff --git a/bin/build-dev b/bin/build-dev index 25203eb9..05cccfb4 100755 --- a/bin/build-dev +++ b/bin/build-dev @@ -1,4 +1,4 @@ #!/bin/bash -sudo /usr/local/bin/docker-compose run --no-deps --rm app npm run-script dev +docker-compose run --no-deps --rm app npm run-script dev exit $? diff --git a/bin/migrate_create b/bin/migrate_create index dc2b5edf..b8874077 100755 --- a/bin/migrate_create +++ b/bin/migrate_create @@ -21,6 +21,6 @@ else cd "$CODEBASE" - sudo /usr/local/bin/docker-compose run --rm --no-deps app node node_modules/knex/bin/cli.js migrate:make "$1" + docker-compose run --rm --no-deps app node node_modules/knex/bin/cli.js migrate:make "$1" exit $? fi diff --git a/bin/npm b/bin/npm index a0863df0..5770b92f 100755 --- a/bin/npm +++ b/bin/npm @@ -1,4 +1,4 @@ #!/bin/bash -sudo /usr/local/bin/docker-compose run --no-deps --rm app npm $@ +docker-compose run --no-deps --rm app npm $@ exit $? diff --git a/bin/yarn b/bin/yarn index e4fd807d..848ce474 100755 --- a/bin/yarn +++ b/bin/yarn @@ -1,4 +1,4 @@ #!/bin/bash -sudo /usr/local/bin/docker-compose run --no-deps --rm app yarn $@ +docker-compose run --no-deps --rm app yarn $@ exit $? diff --git a/package.json b/package.json index 0109ab08..f87c6d02 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "description": "A beautiful interface for creating Nginx endpoints", "main": "src/backend/index.js", "devDependencies": { + "@babel/core": "^7.7.4", "babel-core": "^6.26.3", "babel-loader": "^8.0.6", "babel-minify-webpack-plugin": "^0.3.1", @@ -12,6 +13,7 @@ "backbone.marionette": "^4.1.2", "copy-webpack-plugin": "^5.0.5", "css-loader": "^3.2.0", + "ejs-lint": "^0.3.0", "ejs-loader": "^0.3.5", "file-loader": "^5.0.2", "imports-loader": "^0.8.0", @@ -42,7 +44,7 @@ "compression": "^1.7.4", "config": "^3.2.4", "diskdb": "^0.1.17", - "ejs": "^3.0.1", + "ejs": "^2.6.1", "express": "^4.17.1", "express-fileupload": "^1.1.6", "gravatar": "^1.8.0", @@ -50,7 +52,7 @@ "json-schema-ref-parser": "^7.1.2", "jsonwebtoken": "^8.5.1", "knex": "^0.20.3", - "liquidjs": "^9.4.2", + "liquidjs": "^5.1.1", "lodash": "^4.17.15", "moment": "^2.24.0", "mysql": "^2.17.1",