mirror of
https://github.com/balena-os/balena-supervisor.git
synced 2025-06-17 06:48:14 +00:00
Move build files into build-conf and rename to build-utils
Change-type: patch Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
@ -35,7 +35,7 @@ RUN apk add --no-cache \
|
|||||||
sqlite-dev \
|
sqlite-dev \
|
||||||
dbus-dev
|
dbus-dev
|
||||||
|
|
||||||
COPY build-conf/node-sums.txt .
|
COPY build-utils/node-sums.txt .
|
||||||
|
|
||||||
# Install node from balena's prebuilt cache
|
# Install node from balena's prebuilt cache
|
||||||
RUN curl -SLO "${NODE_LOCATION}" \
|
RUN curl -SLO "${NODE_LOCATION}" \
|
||||||
@ -54,7 +54,8 @@ RUN npm ci --build-from-source --sqlite=/usr/lib
|
|||||||
#dev-copy=entry.sh .
|
#dev-copy=entry.sh .
|
||||||
#dev-cmd-live=LIVEPUSH=1 ./entry.sh
|
#dev-cmd-live=LIVEPUSH=1 ./entry.sh
|
||||||
|
|
||||||
COPY webpack.config.js fix-jsonstream.js hardcode-migrations.js tsconfig.json tsconfig.release.json ./
|
COPY build-utils ./build-utils
|
||||||
|
COPY webpack.config.js tsconfig.json tsconfig.release.json ./
|
||||||
COPY src ./src
|
COPY src ./src
|
||||||
COPY test ./test
|
COPY test ./test
|
||||||
COPY typings ./typings
|
COPY typings ./typings
|
||||||
|
@ -4,6 +4,6 @@
|
|||||||
// Also, JSONStream starts a pipe between stdin and stdout if module.parent is undefined.
|
// Also, JSONStream starts a pipe between stdin and stdout if module.parent is undefined.
|
||||||
// This pipe can fail throwing an uncaught exception, so we fake a module.parent to prevent this.
|
// This pipe can fail throwing an uncaught exception, so we fake a module.parent to prevent this.
|
||||||
// See https://github.com/dominictarr/JSONStream/issues/129
|
// See https://github.com/dominictarr/JSONStream/issues/129
|
||||||
module.exports = function (source) {
|
module.exports = function(source) {
|
||||||
return "module.parent = {};\n" + source.toString().replace(/^#! .*\n/, '')
|
return 'module.parent = {};\n' + source.toString().replace(/^#! .*\n/, '');
|
||||||
}
|
};
|
@ -24,7 +24,7 @@
|
|||||||
"packagejson:copy": "cp package.json build/",
|
"packagejson:copy": "cp package.json build/",
|
||||||
"testitems:copy": "cp -r test/data build/test/",
|
"testitems:copy": "cp -r test/data build/test/",
|
||||||
"lint:coffee": "balena-lint test/",
|
"lint:coffee": "balena-lint test/",
|
||||||
"lint:typescript": "balena-lint -e ts -e js --typescript src/ test/ typings/ && tsc --noEmit && tsc --noEmit --project tsconfig.js.json",
|
"lint:typescript": "balena-lint -e ts -e js --typescript src/ test/ typings/ build-utils/ && tsc --noEmit && tsc --noEmit --project tsconfig.js.json",
|
||||||
"sync": "ts-node sync/sync.ts"
|
"sync": "ts-node sync/sync.ts"
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
|
@ -4,5 +4,5 @@
|
|||||||
"noImplicitAny": false,
|
"noImplicitAny": false,
|
||||||
"checkJs": true
|
"checkJs": true
|
||||||
},
|
},
|
||||||
"include": ["src/**/*", "test/**/*", "typings/**/*.d.ts"]
|
"include": ["src/**/*", "test/**/*", "typings/**/*.d.ts", "build-utils/**/*"]
|
||||||
}
|
}
|
||||||
|
@ -102,13 +102,13 @@ module.exports = function(env) {
|
|||||||
_.escapeRegExp(path.join('knex', 'lib', 'migrate', 'sources')),
|
_.escapeRegExp(path.join('knex', 'lib', 'migrate', 'sources')),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
use: require.resolve('./hardcode-migrations'),
|
use: require.resolve('./build-utils/hardcode-migrations'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
test: new RegExp(
|
test: new RegExp(
|
||||||
_.escapeRegExp(path.join('JSONStream', 'index.js')) + '$',
|
_.escapeRegExp(path.join('JSONStream', 'index.js')) + '$',
|
||||||
),
|
),
|
||||||
use: require.resolve('./fix-jsonstream'),
|
use: require.resolve('./build-utils/fix-jsonstream'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
test: /\.coffee$/,
|
test: /\.coffee$/,
|
||||||
|
Reference in New Issue
Block a user