@signageos/webpack-plugin 0.1.1 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/dist/ConnectControl/apiHelper.js +2 -1
- package/dist/ConnectControl/apiHelper.js.map +1 -1
- package/dist/ConnectControl/helper.js +14 -11
- package/dist/ConnectControl/helper.js.map +1 -1
- package/dist/index.js +64 -43
- package/dist/index.js.map +1 -1
- package/package-lock.json +2476 -4808
- package/package.json +15 -12
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
|
|
|
4
4
|
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
|
|
5
5
|
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
|
|
6
6
|
|
|
7
|
+
## [0.3.0] - 2022-06-14
|
|
8
|
+
### Added
|
|
9
|
+
- Support for Webpack 5
|
|
10
|
+
|
|
11
|
+
## [0.2.0] - 2022-04-06
|
|
12
|
+
### Added
|
|
13
|
+
- Ask for organization when default is not set yet and offer to save the default organization
|
|
14
|
+
|
|
15
|
+
## [0.1.2] - 2022-01-18
|
|
16
|
+
### Fixed
|
|
17
|
+
- Compatibility with peer dependency for front-display version 9.13.0+ (because of changed API)
|
|
18
|
+
|
|
7
19
|
## [0.1.1] - 2021-02-22
|
|
8
20
|
### Fixed
|
|
9
21
|
- `localhost:8090` based development of applet works now
|
|
@@ -47,6 +47,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
47
47
|
}
|
|
48
48
|
};
|
|
49
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
|
+
exports.createOrganizationRestApi = exports.API_URL = void 0;
|
|
50
51
|
var RestApi_1 = require("@signageos/sdk/dist/RestApi/RestApi");
|
|
51
52
|
var sosControlHelper_1 = require("@signageos/sdk/dist/SosHelper/sosControlHelper");
|
|
52
53
|
var parameters = require("../../config/parameters");
|
|
@@ -56,7 +57,7 @@ function createOrganizationRestApi() {
|
|
|
56
57
|
var config, accountAuth, accountOptions, organization, organizationAuth, organizationOptions;
|
|
57
58
|
return __generator(this, function (_a) {
|
|
58
59
|
switch (_a.label) {
|
|
59
|
-
case 0: return [4 /*yield*/, sosControlHelper_1.loadConfig()];
|
|
60
|
+
case 0: return [4 /*yield*/, (0, sosControlHelper_1.loadConfig)()];
|
|
60
61
|
case 1:
|
|
61
62
|
config = _a.sent();
|
|
62
63
|
accountAuth = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiHelper.js","sourceRoot":"","sources":["../../src/ConnectControl/apiHelper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"apiHelper.js","sourceRoot":"","sources":["../../src/ConnectControl/apiHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,+DAA0D;AAC1D,mFAA4E;AAC5E,oDAAsD;AAEzC,QAAA,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC;AAEzC,SAAsB,yBAAyB;;;;;wBAE/B,qBAAM,IAAA,6BAAU,GAAE,EAAA;;oBAA3B,MAAM,GAAG,SAAkB;oBAC3B,WAAW,GAAoB;wBACpC,GAAG,EAAE,eAAO;wBACZ,IAAI,EAAE;4BACL,QAAQ,EAAE,MAAM,CAAC,cAAe;4BAChC,MAAM,EAAE,MAAM,CAAC,gBAAiB;yBAChC;wBACD,OAAO,EAAE,IAAY;qBACrB,CAAC;oBACI,cAAc,gBAChB,WAAW,CACd,CAAC;oBACmB,qBAAM,IAAI,iBAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,sBAAuB,CAAC,EAAA;;oBAA9G,YAAY,GAAG,SAA+F;oBAC9G,gBAAgB,GAAoB;wBACzC,GAAG,EAAE,eAAO;wBACZ,IAAI,EAAE;4BACL,QAAQ,EAAE,YAAY,CAAC,aAAc;4BACrC,MAAM,EAAE,YAAY,CAAC,iBAAkB;yBACvC;wBACD,OAAO,EAAE,IAAY;qBACrB,CAAC;oBACI,mBAAmB,gBACrB,gBAAgB,CACnB,CAAC;oBACF,sBAAO,IAAI,iBAAO,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,EAAC;;;;CAC1D;AA3BD,8DA2BC"}
|
|
@@ -35,14 +35,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
-
var
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
38
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
39
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
40
|
+
if (ar || !(i in from)) {
|
|
41
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
42
|
+
ar[i] = from[i];
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
44
46
|
};
|
|
45
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
|
+
exports.getAppletFileRelativePath = exports.getAllFiles = exports.createAppletZip = exports.createAllAppletZips = exports.loadConnectedDeviceUids = exports.reloadConnectedDevices = exports.ignoredFiles = void 0;
|
|
46
49
|
var os = require("os");
|
|
47
50
|
var _ = require("lodash");
|
|
48
51
|
var fsExtra = require("fs-extra");
|
|
@@ -64,7 +67,7 @@ function reloadConnectedDevices() {
|
|
|
64
67
|
case 1:
|
|
65
68
|
connectedDeviceUids = _a.sent();
|
|
66
69
|
if (!(connectedDeviceUids.length >= 1)) return [3 /*break*/, 4];
|
|
67
|
-
return [4 /*yield*/, apiHelper_1.createOrganizationRestApi()];
|
|
70
|
+
return [4 /*yield*/, (0, apiHelper_1.createOrganizationRestApi)()];
|
|
68
71
|
case 2:
|
|
69
72
|
resApi_1 = _a.sent();
|
|
70
73
|
return [4 /*yield*/, Promise.all(connectedDeviceUids.map(function (deviceUid) { return __awaiter(_this, void 0, void 0, function () {
|
|
@@ -78,7 +81,7 @@ function reloadConnectedDevices() {
|
|
|
78
81
|
})];
|
|
79
82
|
case 1:
|
|
80
83
|
_a.sent();
|
|
81
|
-
console.log("Successfully reloaded device "
|
|
84
|
+
console.log("Successfully reloaded device ".concat(deviceUid, " "));
|
|
82
85
|
return [3 /*break*/, 3];
|
|
83
86
|
case 2:
|
|
84
87
|
error_1 = _a.sent();
|
|
@@ -165,7 +168,7 @@ function createAppletZip(deviceUid, outputFileSystem) {
|
|
|
165
168
|
case 0:
|
|
166
169
|
archive = archiver('zip');
|
|
167
170
|
deviceConnectDir = path.join(connectRuntimeDirPath, deviceUid);
|
|
168
|
-
packageZipPath = path.join(deviceConnectDir, "package.zip" +
|
|
171
|
+
packageZipPath = path.join(deviceConnectDir, "package.zip" + "".concat(deviceUid));
|
|
169
172
|
output = fsExtra.createWriteStream(packageZipPath);
|
|
170
173
|
archive.pipe(output);
|
|
171
174
|
actualDirectory = process.cwd();
|
|
@@ -218,10 +221,10 @@ function getAllFiles(directory, outputFileSystem) {
|
|
|
218
221
|
if (!!exports.ignoredFiles.includes(file)) return [3 /*break*/, 4];
|
|
219
222
|
p = path.join(directory, file);
|
|
220
223
|
if (!outputFileSystem.statSync(p).isDirectory()) return [3 /*break*/, 3];
|
|
221
|
-
_a = [fileList];
|
|
224
|
+
_a = [__spreadArray([], fileList, true)];
|
|
222
225
|
return [4 /*yield*/, getAllFiles(p, outputFileSystem)];
|
|
223
226
|
case 2:
|
|
224
|
-
fileList =
|
|
227
|
+
fileList = __spreadArray.apply(void 0, _a.concat([(_b.sent()), true]));
|
|
225
228
|
return [3 /*break*/, 4];
|
|
226
229
|
case 3:
|
|
227
230
|
fileList.push(p);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/ConnectControl/helper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/ConnectControl/helper.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -57,11 +57,12 @@ var fsExtra = require("fs-extra");
|
|
|
57
57
|
var nativeFs = require("fs");
|
|
58
58
|
var serveStatic = require("serve-static");
|
|
59
59
|
var chalk = require("chalk");
|
|
60
|
+
var cliArgs = require("command-line-args");
|
|
60
61
|
var debug_1 = require("debug");
|
|
61
|
-
var
|
|
62
|
+
var organizationFacade_1 = require("@signageos/cli/dist/Organization/organizationFacade");
|
|
62
63
|
var helper_1 = require("./ConnectControl/helper");
|
|
63
|
-
var
|
|
64
|
-
var debug = debug_1.default('@signageos/webpack-plugin:index');
|
|
64
|
+
var createDomain_1 = require("@signageos/cli/dist/Emulator/createDomain");
|
|
65
|
+
var debug = (0, debug_1.default)('@signageos/webpack-plugin:index');
|
|
65
66
|
function getCompilationFileSystem(possibleFs) {
|
|
66
67
|
var fileSystem = possibleFs;
|
|
67
68
|
if (!('createReadStream' in fileSystem)) {
|
|
@@ -85,7 +86,7 @@ var Plugin = /** @class */ (function () {
|
|
|
85
86
|
var _this = this;
|
|
86
87
|
console.log('SOS Plugin started');
|
|
87
88
|
var emulator;
|
|
88
|
-
compiler.
|
|
89
|
+
compiler.hooks.watchRun.tapPromise('SignageOSPlugin', function (_compiler) { return __awaiter(_this, void 0, void 0, function () {
|
|
89
90
|
return __generator(this, function (_a) {
|
|
90
91
|
switch (_a.label) {
|
|
91
92
|
case 0:
|
|
@@ -94,13 +95,11 @@ var Plugin = /** @class */ (function () {
|
|
|
94
95
|
case 1:
|
|
95
96
|
emulator = _a.sent();
|
|
96
97
|
_a.label = 2;
|
|
97
|
-
case 2:
|
|
98
|
-
callback();
|
|
99
|
-
return [2 /*return*/];
|
|
98
|
+
case 2: return [2 /*return*/];
|
|
100
99
|
}
|
|
101
100
|
});
|
|
102
101
|
}); });
|
|
103
|
-
compiler.
|
|
102
|
+
compiler.hooks.watchClose.tap('SignageOSPlugin', function () { return __awaiter(_this, void 0, void 0, function () {
|
|
104
103
|
return __generator(this, function (_a) {
|
|
105
104
|
if (emulator) {
|
|
106
105
|
emulator.stop();
|
|
@@ -109,16 +108,24 @@ var Plugin = /** @class */ (function () {
|
|
|
109
108
|
return [2 /*return*/];
|
|
110
109
|
});
|
|
111
110
|
}); });
|
|
112
|
-
compiler.
|
|
111
|
+
compiler.hooks.assetEmitted.tap('SignageOSPlugin', function (filename, assetEmittedInfo) { return __awaiter(_this, void 0, void 0, function () {
|
|
112
|
+
return __generator(this, function (_a) {
|
|
113
|
+
if (emulator) {
|
|
114
|
+
emulator.notifyEmittedFile(filename, assetEmittedInfo);
|
|
115
|
+
}
|
|
116
|
+
return [2 /*return*/];
|
|
117
|
+
});
|
|
118
|
+
}); });
|
|
119
|
+
compiler.hooks.done.tap('SignageOSPlugin', function (stats) { return __awaiter(_this, void 0, void 0, function () {
|
|
113
120
|
return __generator(this, function (_a) {
|
|
114
121
|
switch (_a.label) {
|
|
115
122
|
case 0:
|
|
116
123
|
if (!emulator) return [3 /*break*/, 2];
|
|
117
124
|
emulator.notifyDone(stats);
|
|
118
|
-
return [4 /*yield*/, helper_1.createAllAppletZips(getCompilationFileSystem(stats.compilation.compiler.outputFileSystem))];
|
|
125
|
+
return [4 /*yield*/, (0, helper_1.createAllAppletZips)(getCompilationFileSystem(stats.compilation.compiler.outputFileSystem))];
|
|
119
126
|
case 1:
|
|
120
127
|
_a.sent();
|
|
121
|
-
helper_1.reloadConnectedDevices();
|
|
128
|
+
(0, helper_1.reloadConnectedDevices)();
|
|
122
129
|
_a.label = 2;
|
|
123
130
|
case 2: return [2 /*return*/];
|
|
124
131
|
}
|
|
@@ -138,32 +145,40 @@ module.exports = Plugin;
|
|
|
138
145
|
module.exports.default = Plugin;
|
|
139
146
|
var APPLET_DIRECTORY_PATH = '/applet';
|
|
140
147
|
function createEmulator(options) {
|
|
148
|
+
var _a;
|
|
141
149
|
return __awaiter(this, void 0, void 0, function () {
|
|
142
|
-
var projectPath, defaultPort, frontDisplayPath, frontDisplayDistPath_1, packageConfig,
|
|
143
|
-
return __generator(this, function (
|
|
144
|
-
switch (
|
|
150
|
+
var projectPath, defaultPort, frontDisplayPath, frontDisplayDistPath_1, packagePath, packageConfig, currentOptions, organizationUid, lastCompilationAssets_1, envVars_1, app, server_1, error_1;
|
|
151
|
+
return __generator(this, function (_b) {
|
|
152
|
+
switch (_b.label) {
|
|
145
153
|
case 0:
|
|
146
|
-
|
|
154
|
+
_b.trys.push([0, 2, , 3]);
|
|
147
155
|
projectPath = process.cwd();
|
|
148
156
|
defaultPort = options.port;
|
|
149
157
|
frontDisplayPath = path.dirname(require.resolve('@signageos/front-display/package.json', { paths: [projectPath] }));
|
|
150
158
|
frontDisplayDistPath_1 = path.join(frontDisplayPath, 'dist');
|
|
151
|
-
|
|
152
|
-
|
|
159
|
+
packagePath = path.join(projectPath, 'package.json');
|
|
160
|
+
packageConfig = fsExtra.pathExistsSync(packagePath)
|
|
161
|
+
? JSON.parse(fsExtra.readFileSync(packagePath).toString())
|
|
162
|
+
: { version: '0.0.0' };
|
|
163
|
+
currentOptions = cliArgs([
|
|
164
|
+
organizationFacade_1.NO_DEFAULT_ORGANIZATION_OPTION,
|
|
165
|
+
organizationFacade_1.ORGANIZATION_UID_OPTION,
|
|
166
|
+
], { partial: true });
|
|
167
|
+
return [4 /*yield*/, (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(currentOptions)];
|
|
153
168
|
case 1:
|
|
154
|
-
|
|
155
|
-
organizationUid = sosGlobalConfig.defaultOrganizationUid;
|
|
169
|
+
organizationUid = _b.sent();
|
|
156
170
|
if (!organizationUid) {
|
|
157
|
-
throw new Error("No default organization selected. Use "
|
|
171
|
+
throw new Error("No default organization selected. Use ".concat(chalk.green('sos organization set-default'), " first."));
|
|
158
172
|
}
|
|
159
173
|
lastCompilationAssets_1 = {};
|
|
160
174
|
envVars_1 = {
|
|
175
|
+
uid: ((_a = packageConfig.sos) === null || _a === void 0 ? void 0 : _a.appletUid) || '__default_timing__',
|
|
161
176
|
version: packageConfig.version,
|
|
162
177
|
organizationUid: organizationUid,
|
|
163
|
-
binaryFilePath: APPLET_DIRECTORY_PATH
|
|
178
|
+
binaryFilePath: "".concat(APPLET_DIRECTORY_PATH, "/index.html"),
|
|
164
179
|
checksum: '',
|
|
165
180
|
frontAppletVersion: '',
|
|
166
|
-
frontAppletBinaryFile: '',
|
|
181
|
+
frontAppletBinaryFile: '', // has bundled front applet
|
|
167
182
|
};
|
|
168
183
|
app = express();
|
|
169
184
|
app.use(cors());
|
|
@@ -171,25 +186,20 @@ function createEmulator(options) {
|
|
|
171
186
|
var currentDate = new Date();
|
|
172
187
|
res.header('Last-Modified', currentDate.toString());
|
|
173
188
|
res.header('Content-type', 'text/cache-manifest; charset=UTF-8');
|
|
174
|
-
res.send("CACHE MANIFEST\n# v1 - "
|
|
189
|
+
res.send("CACHE MANIFEST\n# v1 - ".concat(currentDate.toISOString(), "\n/tmp\nNETWORK:\n*\n"));
|
|
175
190
|
});
|
|
176
191
|
app.get('/', function (_req, res) {
|
|
177
|
-
res.send("<script>\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET = {};\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.binaryFile = location.origin + "
|
|
192
|
+
res.send("<script>\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET = {};\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.binaryFile = location.origin + ".concat(JSON.stringify(envVars_1.binaryFilePath), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.uid = ").concat(JSON.stringify(envVars_1.uid), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.version = ").concat(JSON.stringify(envVars_1.version), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.checksum = ").concat(JSON.stringify(envVars_1.checksum), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.frontAppletVersion = ").concat(JSON.stringify(envVars_1.frontAppletVersion), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.frontAppletBinaryFile = ").concat(JSON.stringify(envVars_1.frontAppletBinaryFile), ";\n\t\t\t\t\twindow.__SOS_AUTO_VERIFICATION = {};\n\t\t\t\t\twindow.__SOS_AUTO_VERIFICATION.organizationUid = ").concat(JSON.stringify(envVars_1.organizationUid), ";\n\t\t\t\t</script>")
|
|
178
193
|
+ fsExtra.readFileSync(path.join(frontDisplayDistPath_1, 'index.html')).toString());
|
|
179
194
|
});
|
|
180
195
|
app.use(serveStatic(frontDisplayDistPath_1));
|
|
181
196
|
server_1 = http.createServer(app);
|
|
182
197
|
server_1.listen(defaultPort, function () {
|
|
183
|
-
console.log("Emulator is running at "
|
|
198
|
+
console.log("Emulator is running at ".concat(chalk.blue(chalk.bold((0, createDomain_1.createDomain)(options, server_1)))));
|
|
184
199
|
});
|
|
185
200
|
app.use(APPLET_DIRECTORY_PATH, function (req, res, next) {
|
|
186
201
|
var fileUrl = url.parse(req.url);
|
|
187
202
|
var relativeFilePath = fileUrl.pathname ? fileUrl.pathname.substr(1) : '';
|
|
188
|
-
if (!currentCompilation_1) {
|
|
189
|
-
res.status(502).send('<span style="background-color: darkred;">Webpack is starting up. Please wait a second & try it again.</span>');
|
|
190
|
-
return;
|
|
191
|
-
}
|
|
192
|
-
var fileSystem = getCompilationFileSystem(currentCompilation_1.compiler.outputFileSystem);
|
|
193
203
|
if (relativeFilePath === 'index.html') {
|
|
194
204
|
if (typeof lastCompilationAssets_1[relativeFilePath] === 'undefined') {
|
|
195
205
|
res.status(404).send();
|
|
@@ -198,44 +208,55 @@ function createEmulator(options) {
|
|
|
198
208
|
// Propagate Hot reload of whole emulator
|
|
199
209
|
var prependFileContent = '<script>window.onunload = function () { window.parent.location.reload(); }</script>';
|
|
200
210
|
res.setHeader('Content-Type', 'text/html');
|
|
201
|
-
res.send(prependFileContent + lastCompilationAssets_1[relativeFilePath].source());
|
|
211
|
+
res.send(prependFileContent + lastCompilationAssets_1[relativeFilePath].source.source());
|
|
202
212
|
}
|
|
203
213
|
}
|
|
204
214
|
else if (typeof lastCompilationAssets_1[relativeFilePath] !== 'undefined') {
|
|
205
|
-
var compiledFilePath = lastCompilationAssets_1[relativeFilePath].existsAt;
|
|
206
215
|
var contentType = mime.getType(relativeFilePath) || 'application/octet-stream';
|
|
207
216
|
res.setHeader('Content-Type', contentType);
|
|
208
|
-
|
|
209
|
-
readStream.pipe(res);
|
|
217
|
+
res.send(lastCompilationAssets_1[relativeFilePath].source.buffer());
|
|
210
218
|
}
|
|
211
219
|
else {
|
|
212
220
|
next();
|
|
213
221
|
}
|
|
214
222
|
});
|
|
215
223
|
return [2 /*return*/, {
|
|
216
|
-
|
|
224
|
+
notifyEmittedFile: function (filename, assetEmittedInfo) {
|
|
217
225
|
try {
|
|
218
226
|
console.log('SOS Applet compilation done');
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
227
|
+
if (assetEmittedInfo instanceof Buffer) {
|
|
228
|
+
// Back compatibility for Webpack 4 and less.
|
|
229
|
+
// It's returning Buffer of the emitted asset directly
|
|
230
|
+
lastCompilationAssets_1[filename] = {
|
|
231
|
+
source: {
|
|
232
|
+
source: function () { return assetEmittedInfo; },
|
|
233
|
+
buffer: function () { return assetEmittedInfo; },
|
|
234
|
+
},
|
|
235
|
+
};
|
|
236
|
+
}
|
|
237
|
+
else {
|
|
238
|
+
lastCompilationAssets_1[filename] = assetEmittedInfo;
|
|
224
239
|
}
|
|
225
|
-
currentCompilation_1 = stats.compilation;
|
|
226
|
-
lastCompilationAssets_1 = __assign(__assign({}, lastCompilationAssets_1), stats.compilation.assets);
|
|
227
240
|
}
|
|
228
241
|
catch (error) {
|
|
229
242
|
console.error(error);
|
|
230
243
|
process.exit(1);
|
|
231
244
|
}
|
|
232
245
|
},
|
|
246
|
+
notifyDone: function (stats) {
|
|
247
|
+
envVars_1.checksum = stats.compilation.hash;
|
|
248
|
+
debug('process.env', envVars_1);
|
|
249
|
+
if (typeof stats.compilation.assets['index.html'] === 'undefined') {
|
|
250
|
+
console.warn("Applet has to have ".concat(chalk.green('index.html'), " in output files."));
|
|
251
|
+
return;
|
|
252
|
+
}
|
|
253
|
+
},
|
|
233
254
|
stop: function () {
|
|
234
255
|
server_1.close();
|
|
235
256
|
},
|
|
236
257
|
}];
|
|
237
258
|
case 2:
|
|
238
|
-
error_1 =
|
|
259
|
+
error_1 = _b.sent();
|
|
239
260
|
console.error(error_1);
|
|
240
261
|
process.exit(1);
|
|
241
262
|
return [3 /*break*/, 3];
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,iCAAmC;AACnC,2BAA6B;AAC7B,2BAA6B;AAC7B,yBAA2B;AAC3B,2BAA6B;AAC7B,2BAA6B;AAC7B,kCAAoC;AACpC,6BAA+B;AAC/B,0CAA4C;AAC5C,6BAA+B;AAC/B,+BAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|