@m2c2kit/build-helpers 0.3.4 → 0.3.6

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/dist/index.d.ts CHANGED
@@ -29,9 +29,10 @@ import { InputOptions } from 'rollup';
29
29
  *
30
30
  * @param rootDir - root directory of build, usually "dist" because you
31
31
  * usually hash only production builds
32
+ * @param cwd - current working directory; used only for testing.
32
33
  * @returns
33
34
  */
34
- declare function hashM2c2kitAssets(rootDir: string): {
35
+ declare function hashM2c2kitAssets(rootDir: string, cwd?: string): {
35
36
  name: string;
36
37
  closeBundle: {
37
38
  sequential: boolean;
package/dist/index.js CHANGED
@@ -1,40 +1,9 @@
1
- import { dirname as dirname_m2c2kit_build_helpers } from 'path';
2
- import { fileURLToPath as fileURLToPath_m2c2kit_build_helpers} from 'url';
3
- const __filename = fileURLToPath_m2c2kit_build_helpers(import.meta.url);
4
- const __dirname = dirname_m2c2kit_build_helpers(__filename);
5
1
  import { existsSync, renameSync, readFileSync } from 'fs';
6
2
  import { readFile, writeFile } from 'fs/promises';
7
3
  import path from 'path';
8
4
  import { createHash } from 'crypto';
9
5
  import { fileURLToPath } from 'url';
10
6
 
11
- /******************************************************************************
12
- Copyright (c) Microsoft Corporation.
13
-
14
- Permission to use, copy, modify, and/or distribute this software for any
15
- purpose with or without fee is hereby granted.
16
-
17
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
18
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
19
- AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
20
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
21
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
22
- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
23
- PERFORMANCE OF THIS SOFTWARE.
24
- ***************************************************************************** */
25
- /* global Reflect, Promise */
26
-
27
-
28
- function __awaiter(thisArg, _arguments, P, generator) {
29
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
30
- return new (P || (P = Promise))(function (resolve, reject) {
31
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
32
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
33
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
34
- step((generator = generator.apply(thisArg, _arguments || [])).next());
35
- });
36
- }
37
-
38
7
  // Generated using scripts/write-decode-map.ts
39
8
  var htmlDecodeTree = new Uint16Array(
40
9
  // prettier-ignore
@@ -10852,7 +10821,6 @@ function parse(input, options) {
10852
10821
 
10853
10822
  // AST walker module for Mozilla Parser API compatible trees
10854
10823
 
10855
-
10856
10824
  // An ancestor walk keeps an array of ancestor nodes (including the
10857
10825
  // current node) and passes them to the callback as third parameter
10858
10826
  // (and also as state parameter when no other state is present).
@@ -11161,10 +11129,10 @@ if (!String.prototype.endsWith) {
11161
11129
  }
11162
11130
 
11163
11131
  const OPERATOR_PRECEDENCE = {
11164
- '||': 3,
11132
+ '||': 2,
11133
+ '??': 3,
11165
11134
  '&&': 4,
11166
11135
  '|': 5,
11167
- '??': 5,
11168
11136
  '^': 6,
11169
11137
  '&': 7,
11170
11138
  '==': 8,
@@ -12308,349 +12276,358 @@ function generate(node, options) {
12308
12276
  return state.output
12309
12277
  }
12310
12278
 
12311
- /** We use MD5 for hashing, but keep only the first 16 characters. */
12312
12279
  const HASH_CHARACTER_LENGTH = 16;
12313
- /**
12314
- * rollup plugin to hash m2c2kit assets and enable cache busting.
12315
- *
12316
- * @remarks On repeated deployments, a file with the same name may be
12317
- * cached by browsers. Thus, the old file will be used, not the updated
12318
- * one. To enable cache busting, this rollup plugin adds hashes to filenames
12319
- * for m2c2kit assets: index.js, canvaskit.wasm, images, and fonts. This is
12320
- * done by: 1) parsing index.html and finding the links to css and index.js,
12321
- * calculating a hash of these assets, adding a hash to the asset filenames,
12322
- * and updating the links in index.html to reflect the hash. 2) parsing
12323
- * index.js into an AST, finding string literals that are the urls of fonts,
12324
- * images, and canvaskit.wam, calculating a hash of these assets, adding a
12325
- * hash to the asset filenames, and updating the urls to reflect the hash.
12326
- *
12327
- * Note: index.js is transpiled from TypeScript and no longer has types, so
12328
- * finding the asset urls in the AST assumes that there will be no
12329
- * user code with the same structure as the asset urls. In other words:
12330
- * Don't use a define a property named "canvasKitWasmUrl" that refers to
12331
- * a string literal, don't define a property named "fonts" that that refers
12332
- * to an array expression of object expressions with properties named
12333
- * "fontName" and "url", and don't define a property called "images" that
12334
- * refers to an array expression of object expressions with properties named
12335
- * "imageName", "height", "width", and "url". Otherwise, this plugin may alter
12336
- * your code in unexpected ways (although most likely it will simply give
12337
- * warnings, because it's unlikely there will be valid file assets that will
12338
- * be found and hashed).
12339
- *
12340
- * @param rootDir - root directory of build, usually "dist" because you
12341
- * usually hash only production builds
12342
- * @returns
12343
- */
12344
- function hashM2c2kitAssets(rootDir) {
12345
- const indexHtmlFile = path.join(rootDir, "index.html");
12346
- const indexJsFile = path.join(rootDir, "index.js");
12347
- return {
12348
- name: "hash-m2c2kit-assets",
12349
- closeBundle: {
12350
- sequential: true,
12351
- handler() {
12352
- return __awaiter(this, void 0, void 0, function* () {
12353
- const fileRenames = new Array();
12354
- // Parse index.js using acorn and acorn-walk
12355
- let indexjs;
12356
- try {
12357
- indexjs = yield readFile(indexJsFile, "utf-8");
12358
- }
12359
- catch (_a) {
12360
- throw new Error("could not hash m2c2 assets because there was an error reading index.js. This is a fatal problem because index.js is required.");
12361
- }
12362
- let ast;
12363
- try {
12364
- ast = parse(indexjs, { ecmaVersion: 2020 });
12365
- }
12366
- catch (_b) {
12367
- throw new Error("could not hash m2c2 assets because there was an error parsing index.js. This is a fatal problem because index.js is not valid JavaScript.");
12368
- }
12369
- // it was helpful to use https://astexplorer.net/ to understand the AST
12370
- ancestor(ast, {
12371
- // this code will be run each time the walker visits a literal
12372
- Literal(node, ancestors) {
12373
- if (ancestors.length >= 2) {
12374
- const maybeProperty = ancestors.slice(-2)[0];
12375
- if (maybeProperty.type === "Property") {
12376
- const property = maybeProperty;
12377
- if (property.key.type === "Identifier" &&
12378
- property.key.name == "canvasKitWasmUrl") {
12379
- // property is canvasKitWasmUrl
12380
- const literal = node;
12381
- const originalUrlValue = literal.value;
12382
- try {
12383
- const hashedUrlValue = addHashToUrl(originalUrlValue,
12384
- /**
12385
- * by our convention, the wasm file will be served from
12386
- * the assets directory, so the location is
12387
- * `assets/${canvasKitWasmUrl}` not `${canvasKitWasmUrl}`
12388
- */
12389
- `${rootDir}/assets`);
12390
- literal.value = literal.value.replace(originalUrlValue, hashedUrlValue);
12391
- literal.raw = literal.raw.replace(originalUrlValue, hashedUrlValue);
12392
- addFileToFilesToBeRenamed(`${rootDir}/assets`, originalUrlValue, hashedUrlValue, fileRenames);
12393
- }
12394
- catch (_a) {
12395
- console.log(`warning: could not hash canvaskit.wasm resource because it was not found at ${originalUrlValue}`);
12396
- }
12397
- }
12398
- }
12399
- }
12400
- // we'll be looking back 5 levels
12401
- if (ancestors.length >= 5) {
12402
- const maybeProperty = ancestors.slice(-2)[0];
12403
- if (maybeProperty.type === "Property") {
12404
- const property = maybeProperty;
12405
- if (property.key.type === "Identifier" &&
12406
- property.key.name == "url") {
12407
- // property is url
12408
- const maybeObjExpression = ancestors.slice(-3)[0];
12409
- if (maybeObjExpression.type === "ObjectExpression") {
12410
- const objExpression = maybeObjExpression;
12411
- const properties = objExpression.properties
12412
- .filter((p) => p.type === "Property")
12413
- .map((p) => p);
12414
- const identifiers = properties
12415
- .filter((p) => p.key.type === "Identifier")
12416
- .map((p) => p.key.name);
12417
- const urlFontAssetProperties = ["fontName", "url"];
12418
- const propCount = identifiers.filter((i) => urlFontAssetProperties.indexOf(i) !== -1).length;
12419
- if (propCount === 2) {
12420
- // the object expression has the 2 properties
12421
- const maybeArrayExpression = ancestors.slice(-4)[0];
12422
- if (maybeArrayExpression.type === "ArrayExpression") {
12423
- const maybeProperty = ancestors.slice(-5)[0];
12424
- if (maybeProperty.type === "Property") {
12425
- const property = maybeProperty;
12426
- if (property.key.type === "Identifier" &&
12427
- property.key.name == "fonts") {
12428
- // property is fonts
12429
- const literal = node;
12430
- const originalUrlValue = literal.value;
12431
- try {
12432
- const hashedUrlValue = addHashToUrl(originalUrlValue, rootDir);
12433
- literal.value = literal.value.replace(originalUrlValue, hashedUrlValue);
12434
- literal.raw = literal.raw.replace(originalUrlValue, hashedUrlValue);
12435
- addFileToFilesToBeRenamed(rootDir, originalUrlValue, hashedUrlValue, fileRenames);
12436
- }
12437
- catch (_b) {
12438
- }
12439
- }
12440
- }
12441
- }
12442
- }
12443
- }
12444
- }
12445
- }
12446
- }
12447
- // we'll be looking back 5 levels
12448
- if (ancestors.length >= 5) {
12449
- const maybeProperty = ancestors.slice(-2)[0];
12450
- if (maybeProperty.type === "Property") {
12451
- const property = maybeProperty;
12452
- if (property.key.type === "Identifier" &&
12453
- property.key.name == "url") {
12454
- // property is url
12455
- const maybeObjExpression = ancestors.slice(-3)[0];
12456
- if (maybeObjExpression.type === "ObjectExpression") {
12457
- const objExpression = maybeObjExpression;
12458
- const properties = objExpression.properties
12459
- .filter((p) => p.type === "Property")
12460
- .map((p) => p);
12461
- const identifiers = properties
12462
- .filter((p) => p.key.type === "Identifier")
12463
- .map((p) => p.key.name);
12464
- const urlBrowserImageProperties = [
12465
- "imageName",
12466
- "height",
12467
- "width",
12468
- "url",
12469
- ];
12470
- const propCount = identifiers.filter((i) => urlBrowserImageProperties.indexOf(i) !== -1).length;
12471
- if (propCount === 4) {
12472
- // the object expression has the 4 properties
12473
- const maybeArrayExpression = ancestors.slice(-4)[0];
12474
- if (maybeArrayExpression.type === "ArrayExpression") {
12475
- const maybeProperty = ancestors.slice(-5)[0];
12476
- if (maybeProperty.type === "Property") {
12477
- const property = maybeProperty;
12478
- if (property.key.type === "Identifier" &&
12479
- property.key.name == "images") {
12480
- // property is images
12481
- const literal = node;
12482
- const originalUrlValue = literal.value;
12483
- try {
12484
- const hashedUrlValue = addHashToUrl(originalUrlValue, rootDir);
12485
- literal.value = literal.value.replace(originalUrlValue, hashedUrlValue);
12486
- literal.raw = literal.raw.replace(originalUrlValue, hashedUrlValue);
12487
- addFileToFilesToBeRenamed(rootDir, originalUrlValue, hashedUrlValue, fileRenames);
12488
- }
12489
- catch (_c) {
12490
- }
12491
- }
12492
- }
12493
- }
12494
- }
12495
- }
12496
- }
12497
- }
12498
- }
12499
- },
12500
- });
12501
- const indexJsCode = generate(ast);
12502
- yield writeFile(indexJsFile, indexJsCode);
12503
- // Parse links in index.html using htmlparser2
12504
- // note: if link has attribute hash="false", then hashing
12505
- // is skipped for that link
12506
- const rawHtml = yield readFile(indexHtmlFile, "utf-8");
12507
- const dom = parseDocument(rawHtml);
12508
- // handle the css links
12509
- const links = selectAll("link", dom);
12510
- links
12511
- .map((link) => link)
12512
- .forEach((link) => {
12513
- var _a;
12514
- if (link.attribs["href"].endsWith(".css") &&
12515
- !(((_a = link.attribs["hash"]) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "false")) {
12516
- const originalUrl = link.attribs["href"];
12280
+ function hashM2c2kitAssets(rootDir, cwd = "") {
12281
+ const indexHtmlFile = path.join(cwd, rootDir, "index.html");
12282
+ const indexJsFile = path.join(cwd, rootDir, "index.js");
12283
+ return {
12284
+ name: "hash-m2c2kit-assets",
12285
+ closeBundle: {
12286
+ sequential: true,
12287
+ async handler() {
12288
+ const fileRenames = new Array();
12289
+ let indexjs;
12290
+ try {
12291
+ indexjs = await readFile(indexJsFile, "utf-8");
12292
+ } catch {
12293
+ throw new Error(
12294
+ "could not hash m2c2 assets because there was an error reading index.js. This is a fatal problem because index.js is required."
12295
+ );
12296
+ }
12297
+ let ast;
12298
+ try {
12299
+ ast = parse(indexjs, { ecmaVersion: 2020 });
12300
+ } catch {
12301
+ throw new Error(
12302
+ "could not hash m2c2 assets because there was an error parsing index.js. This is a fatal problem because index.js is not valid JavaScript."
12303
+ );
12304
+ }
12305
+ ancestor(ast, {
12306
+ // this code will be run each time the walker visits a literal
12307
+ Literal(node, ancestors) {
12308
+ if (ancestors.length >= 2) {
12309
+ const maybeProperty = ancestors.slice(-2)[0];
12310
+ if (maybeProperty.type === "Property") {
12311
+ const property = maybeProperty;
12312
+ if (property.key.type === "Identifier" && property.key.name == "canvasKitWasmUrl") {
12313
+ const literal = node;
12314
+ const originalUrlValue = literal.value;
12315
+ try {
12316
+ const hashedUrlValue = addHashToUrl(
12317
+ originalUrlValue,
12318
+ /**
12319
+ * by our convention, the wasm file will be served from
12320
+ * the assets directory, so the location is
12321
+ * `assets/${canvasKitWasmUrl}` not `${canvasKitWasmUrl}`
12322
+ */
12323
+ `${rootDir}/assets`,
12324
+ cwd
12325
+ );
12326
+ literal.value = literal.value.replace(
12327
+ originalUrlValue,
12328
+ hashedUrlValue
12329
+ );
12330
+ literal.raw = literal.raw.replace(
12331
+ originalUrlValue,
12332
+ hashedUrlValue
12333
+ );
12334
+ addFileToFilesToBeRenamed(
12335
+ `${rootDir}/assets`,
12336
+ originalUrlValue,
12337
+ hashedUrlValue,
12338
+ fileRenames
12339
+ );
12340
+ } catch {
12341
+ console.log(
12342
+ `warning: could not hash canvaskit.wasm resource because it was not found at ${originalUrlValue}`
12343
+ );
12344
+ }
12345
+ }
12346
+ }
12347
+ }
12348
+ if (ancestors.length >= 5) {
12349
+ const maybeProperty = ancestors.slice(-2)[0];
12350
+ if (maybeProperty.type === "Property") {
12351
+ const property = maybeProperty;
12352
+ if (property.key.type === "Identifier" && property.key.name == "url") {
12353
+ const maybeObjExpression = ancestors.slice(-3)[0];
12354
+ if (maybeObjExpression.type === "ObjectExpression") {
12355
+ const objExpression = maybeObjExpression;
12356
+ const properties = objExpression.properties.filter((p) => p.type === "Property").map((p) => p);
12357
+ const identifiers = properties.filter((p) => p.key.type === "Identifier").map((p) => p.key.name);
12358
+ const urlFontAssetProperties = ["fontName", "url"];
12359
+ const propCount = identifiers.filter(
12360
+ (i) => urlFontAssetProperties.indexOf(i) !== -1
12361
+ ).length;
12362
+ if (propCount === 2) {
12363
+ const maybeArrayExpression = ancestors.slice(-4)[0];
12364
+ if (maybeArrayExpression.type === "ArrayExpression") {
12365
+ const maybeProperty2 = ancestors.slice(-5)[0];
12366
+ if (maybeProperty2.type === "Property") {
12367
+ const property2 = maybeProperty2;
12368
+ if (property2.key.type === "Identifier" && property2.key.name == "fonts") {
12369
+ const literal = node;
12370
+ const originalUrlValue = literal.value;
12371
+ const optionsDeclarator = ancestors.slice(
12372
+ -7
12373
+ )[0];
12374
+ const objExpression2 = optionsDeclarator.init;
12375
+ const properties2 = objExpression2.properties;
12376
+ const gameIdProperty = properties2.filter(
12377
+ (p) => p.key.type === "Identifier" && p.key.name == "id"
12378
+ )[0];
12379
+ const gameId = gameIdProperty.value.value;
12517
12380
  try {
12518
- link.attribs["href"] = addHashToUrl(link.attribs["href"], rootDir);
12519
- addFileToFilesToBeRenamed(rootDir, originalUrl, link.attribs["href"], fileRenames);
12520
- }
12521
- catch (_b) {
12522
- console.log(`warning: could not hash css resource because it was not found at ${link.attribs["href"]}`);
12381
+ const hashedUrlValue = addHashToUrl(
12382
+ originalUrlValue,
12383
+ path.join(rootDir, "assets", gameId),
12384
+ cwd
12385
+ );
12386
+ literal.value = literal.value.replace(
12387
+ originalUrlValue,
12388
+ hashedUrlValue
12389
+ );
12390
+ literal.raw = literal.raw.replace(
12391
+ originalUrlValue,
12392
+ hashedUrlValue
12393
+ );
12394
+ addFileToFilesToBeRenamed(
12395
+ path.join(rootDir, "assets", gameId),
12396
+ originalUrlValue,
12397
+ hashedUrlValue,
12398
+ fileRenames
12399
+ );
12400
+ } catch {
12523
12401
  }
12402
+ }
12524
12403
  }
12525
- });
12526
- // handle the script link to index.js
12527
- const scripts = selectAll("script", dom);
12528
- scripts
12529
- .map((script) => script)
12530
- .forEach((script) => {
12531
- var _a;
12532
- if (script.attribs["src"] === "./index.js" &&
12533
- !(((_a = script.attribs["hash"]) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "false")) {
12404
+ }
12405
+ }
12406
+ }
12407
+ }
12408
+ }
12409
+ }
12410
+ if (ancestors.length >= 5) {
12411
+ const maybeProperty = ancestors.slice(-2)[0];
12412
+ if (maybeProperty.type === "Property") {
12413
+ const property = maybeProperty;
12414
+ if (property.key.type === "Identifier" && property.key.name == "url") {
12415
+ const maybeObjExpression = ancestors.slice(-3)[0];
12416
+ if (maybeObjExpression.type === "ObjectExpression") {
12417
+ const objExpression = maybeObjExpression;
12418
+ const properties = objExpression.properties.filter((p) => p.type === "Property").map((p) => p);
12419
+ const identifiers = properties.filter((p) => p.key.type === "Identifier").map((p) => p.key.name);
12420
+ const urlBrowserImageProperties = [
12421
+ "imageName",
12422
+ "height",
12423
+ "width",
12424
+ "url"
12425
+ ];
12426
+ const propCount = identifiers.filter(
12427
+ (i) => urlBrowserImageProperties.indexOf(i) !== -1
12428
+ ).length;
12429
+ if (propCount === 4) {
12430
+ const maybeArrayExpression = ancestors.slice(-4)[0];
12431
+ if (maybeArrayExpression.type === "ArrayExpression") {
12432
+ const maybeProperty2 = ancestors.slice(-5)[0];
12433
+ if (maybeProperty2.type === "Property") {
12434
+ const property2 = maybeProperty2;
12435
+ if (property2.key.type === "Identifier" && property2.key.name == "images") {
12436
+ const literal = node;
12437
+ const originalUrlValue = literal.value;
12438
+ const optionsDeclarator = ancestors.slice(
12439
+ -7
12440
+ )[0];
12441
+ const objExpression2 = optionsDeclarator.init;
12442
+ const properties2 = objExpression2.properties;
12443
+ const gameIdProperty = properties2.filter(
12444
+ (p) => p.key.type === "Identifier" && p.key.name == "id"
12445
+ )[0];
12446
+ const gameId = gameIdProperty.value.value;
12534
12447
  try {
12535
- const hashedFilename = addHashToUrl("index.js", rootDir);
12536
- script.attribs["src"] = "./" + path.basename(hashedFilename);
12537
- addFileToFilesToBeRenamed(rootDir, "index.js", hashedFilename, fileRenames);
12448
+ const hashedUrlValue = addHashToUrl(
12449
+ originalUrlValue,
12450
+ path.join(rootDir, "assets", gameId),
12451
+ cwd
12452
+ );
12453
+ literal.value = literal.value.replace(
12454
+ originalUrlValue,
12455
+ hashedUrlValue
12456
+ );
12457
+ literal.raw = literal.raw.replace(
12458
+ originalUrlValue,
12459
+ hashedUrlValue
12460
+ );
12461
+ addFileToFilesToBeRenamed(
12462
+ path.join(rootDir, "assets", gameId),
12463
+ originalUrlValue,
12464
+ hashedUrlValue,
12465
+ fileRenames
12466
+ );
12467
+ } catch {
12538
12468
  }
12539
- catch (_b) {
12540
- console.log(`warning: could not hash index.js because it was not found at ${indexJsFile}`);
12541
- }
12542
- }
12543
- });
12544
- yield writeFile(indexHtmlFile, render(dom));
12545
- fileRenames.forEach((fr) => {
12546
- // we must check existsSync because a file may be included twice
12547
- if (existsSync(fr.original)) {
12548
- renameSync(fr.original, fr.new);
12469
+ }
12549
12470
  }
12550
- });
12551
- yield writeHashManifest(rootDir, fileRenames);
12552
- });
12553
- },
12554
- },
12555
- };
12471
+ }
12472
+ }
12473
+ }
12474
+ }
12475
+ }
12476
+ }
12477
+ }
12478
+ });
12479
+ const indexJsCode = generate(ast);
12480
+ await writeFile(indexJsFile, indexJsCode);
12481
+ const rawHtml = await readFile(indexHtmlFile, "utf-8");
12482
+ const dom = parseDocument(rawHtml);
12483
+ const links = selectAll("link", dom);
12484
+ links.map((link) => link).forEach((link) => {
12485
+ if (link.attribs["href"].endsWith(".css") && !(link.attribs["hash"]?.toLowerCase() === "false")) {
12486
+ const originalUrl = link.attribs["href"];
12487
+ try {
12488
+ link.attribs["href"] = addHashToUrl(
12489
+ link.attribs["href"],
12490
+ rootDir,
12491
+ cwd
12492
+ );
12493
+ addFileToFilesToBeRenamed(
12494
+ rootDir,
12495
+ originalUrl,
12496
+ link.attribs["href"],
12497
+ fileRenames
12498
+ );
12499
+ } catch {
12500
+ console.log(
12501
+ `warning: could not hash css resource because it was not found at ${link.attribs["href"]}`
12502
+ );
12503
+ }
12504
+ }
12505
+ });
12506
+ const scripts = selectAll("script", dom);
12507
+ scripts.map((script) => script).forEach((script) => {
12508
+ if (script.attribs["src"] === "./index.js" && !(script.attribs["hash"]?.toLowerCase() === "false")) {
12509
+ try {
12510
+ const hashedFilename = addHashToUrl("index.js", rootDir, cwd);
12511
+ script.attribs["src"] = "./" + path.basename(hashedFilename);
12512
+ addFileToFilesToBeRenamed(
12513
+ rootDir,
12514
+ "index.js",
12515
+ hashedFilename,
12516
+ fileRenames
12517
+ );
12518
+ } catch {
12519
+ console.log(
12520
+ `warning: could not hash index.js because it was not found at ${indexJsFile}`
12521
+ );
12522
+ }
12523
+ }
12524
+ });
12525
+ await writeFile(indexHtmlFile, render(dom));
12526
+ fileRenames.forEach((fr) => {
12527
+ if (existsSync(path.join(cwd, fr.original))) {
12528
+ renameSync(path.join(cwd, fr.original), path.join(cwd, fr.new));
12529
+ }
12530
+ });
12531
+ await writeHashManifest(rootDir, fileRenames, cwd);
12532
+ }
12533
+ }
12534
+ };
12556
12535
  }
12557
12536
  const getFileHash = (filePath) => {
12558
- const buffer = readFileSync(filePath);
12559
- const hash = createHash("md5").update(buffer).digest("hex");
12560
- return hash.slice(0, HASH_CHARACTER_LENGTH);
12537
+ const buffer = readFileSync(filePath);
12538
+ const hash = createHash("md5").update(buffer).digest("hex");
12539
+ return hash.slice(0, HASH_CHARACTER_LENGTH);
12540
+ };
12541
+ const addHashToUrl = (url, rootDir, cwd = "") => {
12542
+ const ext = path.extname(url);
12543
+ const hash = getFileHash(path.join(cwd, rootDir, url));
12544
+ if (ext) {
12545
+ url = url.replace(ext, `.${hash}${ext}`);
12546
+ } else {
12547
+ url = url + `.${hash}`;
12548
+ }
12549
+ return url;
12561
12550
  };
12562
- const addHashToUrl = (url, rootDir) => {
12563
- const ext = path.extname(url);
12564
- const hash = getFileHash(path.join(rootDir, url));
12565
- if (ext) {
12566
- url = url.replace(ext, `.${hash}${ext}`);
12567
- }
12568
- else {
12569
- url = url + `.${hash}`;
12551
+ async function writeHashManifest(rootDir, fileRenames, cwd = "") {
12552
+ const manifestFilename = path.join(cwd, rootDir, "hash-manifest.json");
12553
+ const manifest = {};
12554
+ fileRenames.forEach((fr) => {
12555
+ let originalName = fr.original.replace(rootDir + path.sep, "");
12556
+ let hashedName = fr.new.replace(rootDir + path.sep, "");
12557
+ if (process.platform === "win32") {
12558
+ originalName = originalName.replace(/\\/g, "/");
12559
+ hashedName = hashedName.replace(/\\/g, "/");
12570
12560
  }
12571
- return url;
12572
- };
12573
- function writeHashManifest(rootDir, fileRenames) {
12574
- return __awaiter(this, void 0, void 0, function* () {
12575
- const manifestFilename = path.join(rootDir, "hash-manifest.json");
12576
- const manifest = {};
12577
- fileRenames.forEach((fr) => {
12578
- let originalName = fr.original.replace(rootDir + path.sep, "");
12579
- let hashedName = fr.new.replace(rootDir + path.sep, "");
12580
- if (process.platform === "win32") {
12581
- originalName = originalName.replace(/\\/g, "/");
12582
- hashedName = hashedName.replace(/\\/g, "/");
12583
- }
12584
- manifest[originalName] = hashedName;
12585
- });
12586
- const manifestString = JSON.stringify(manifest, null, 2);
12587
- yield writeFile(manifestFilename, manifestString);
12588
- });
12561
+ manifest[originalName] = hashedName;
12562
+ });
12563
+ const manifestString = JSON.stringify(manifest, null, 2);
12564
+ await writeFile(manifestFilename, manifestString);
12589
12565
  }
12590
12566
  function addFileToFilesToBeRenamed(rootDir, originalUrlValue, hashedUrlValue, fileRenames) {
12591
- const filename = path.join(rootDir, originalUrlValue);
12592
- const hashedFilename = path.join(rootDir, hashedUrlValue);
12593
- fileRenames.push({
12594
- original: filename,
12595
- new: hashedFilename,
12596
- });
12567
+ const filename = path.join(rootDir, originalUrlValue);
12568
+ const hashedFilename = path.join(rootDir, hashedUrlValue);
12569
+ fileRenames.push({
12570
+ original: filename,
12571
+ new: hashedFilename
12572
+ });
12597
12573
  }
12598
12574
 
12599
12575
  function makeM2c2kitServiceWorker(rootDir, additionalFiles) {
12600
- let inputFile = "";
12601
- return {
12602
- name: "make-m2c2kit-serviceworker",
12603
- buildStart: {
12604
- handler(options) {
12605
- if (options.input) {
12606
- if (typeof options.input === "string") {
12607
- inputFile = path.resolve(options.input);
12608
- }
12609
- else if (Array.isArray(options.input)) {
12610
- inputFile = path.resolve(options.input[0]);
12611
- }
12612
- else {
12613
- throw new Error("Could not determine input file when trying to add service worker code.");
12614
- }
12615
- }
12616
- },
12617
- },
12618
- transform: {
12619
- handler(code, id) {
12620
- if (id === inputFile) {
12621
- if (code.includes("//# sourceMappingURL")) {
12622
- code = code.replace("//# sourceMappingURL", serviceWorkerRegistrationCode + "\n//# sourceMappingURL");
12623
- }
12624
- }
12625
- return code;
12626
- },
12627
- },
12628
- closeBundle: {
12629
- sequential: true,
12630
- handler() {
12631
- return __awaiter(this, void 0, void 0, function* () {
12632
- // this is the path of our @m2c2kit/build-helpers package
12633
- // our sw.js template is stored under the "assets" folder here
12634
- const packageHomeFolderPath = path.dirname(fileURLToPath(import.meta.url));
12635
- let swContents = (yield readFile(path.join(packageHomeFolderPath, "assets", "sw.js"))).toString();
12636
- const manifestFilename = path.join(rootDir, "hash-manifest.json");
12637
- const manifestContents = (yield readFile(manifestFilename)).toString();
12638
- const manifest = JSON.parse(manifestContents);
12639
- const hashedFilenames = Object.values(manifest);
12640
- let replacementString = hashedFilenames.map((f) => `"${f}"`).join(",");
12641
- if (additionalFiles) {
12642
- replacementString =
12643
- replacementString +
12644
- "," +
12645
- additionalFiles.map((f) => `"${f}"`).join(",");
12646
- }
12647
- swContents = swContents.replace('"_-_ADDITIONAL_RESOURCES_TO_CACHE_-_"', replacementString);
12648
- const swDestinationFilename = path.join(rootDir, "sw.js");
12649
- yield writeFile(swDestinationFilename, swContents);
12650
- });
12651
- },
12652
- },
12653
- };
12576
+ let inputFile = "";
12577
+ return {
12578
+ name: "make-m2c2kit-serviceworker",
12579
+ buildStart: {
12580
+ handler(options) {
12581
+ if (options.input) {
12582
+ if (typeof options.input === "string") {
12583
+ inputFile = path.resolve(options.input);
12584
+ } else if (Array.isArray(options.input)) {
12585
+ inputFile = path.resolve(options.input[0]);
12586
+ } else {
12587
+ throw new Error(
12588
+ "Could not determine input file when trying to add service worker code."
12589
+ );
12590
+ }
12591
+ }
12592
+ }
12593
+ },
12594
+ transform: {
12595
+ handler(code, id) {
12596
+ if (id === inputFile) {
12597
+ if (code.includes("//# sourceMappingURL")) {
12598
+ code = code.replace(
12599
+ "//# sourceMappingURL",
12600
+ serviceWorkerRegistrationCode + "\n//# sourceMappingURL"
12601
+ );
12602
+ }
12603
+ }
12604
+ return code;
12605
+ }
12606
+ },
12607
+ closeBundle: {
12608
+ sequential: true,
12609
+ async handler() {
12610
+ const packageHomeFolderPath = path.dirname(
12611
+ fileURLToPath(import.meta.url)
12612
+ );
12613
+ let swContents = (await readFile(path.join(packageHomeFolderPath, "assets", "sw.js"))).toString();
12614
+ const manifestFilename = path.join(rootDir, "hash-manifest.json");
12615
+ const manifestContents = (await readFile(manifestFilename)).toString();
12616
+ const manifest = JSON.parse(manifestContents);
12617
+ const hashedFilenames = Object.values(manifest);
12618
+ let replacementString = hashedFilenames.map((f) => `"${f}"`).join(",");
12619
+ if (additionalFiles) {
12620
+ replacementString = replacementString + "," + additionalFiles.map((f) => `"${f}"`).join(",");
12621
+ }
12622
+ swContents = swContents.replace(
12623
+ '"_-_ADDITIONAL_RESOURCES_TO_CACHE_-_"',
12624
+ replacementString
12625
+ );
12626
+ const swDestinationFilename = path.join(rootDir, "sw.js");
12627
+ await writeFile(swDestinationFilename, swContents);
12628
+ }
12629
+ }
12630
+ };
12654
12631
  }
12655
12632
  const serviceWorkerRegistrationCode = `const registerServiceWorker = async () => {
12656
12633
  if ("serviceWorker" in navigator) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@m2c2kit/build-helpers",
3
- "version": "0.3.4",
3
+ "version": "0.3.6",
4
4
  "description": "",
5
5
  "module": "dist/index.js",
6
6
  "type": "module",
@@ -12,27 +12,28 @@
12
12
  "devDependencies": {
13
13
  "@rollup/plugin-commonjs": "25.0.0",
14
14
  "@rollup/plugin-node-resolve": "15.0.2",
15
- "@rollup/plugin-typescript": "11.1.1",
16
15
  "@types/estree": "1.0.1",
17
16
  "@types/findup-sync": "4.0.2",
17
+ "cpy": "10.1.0",
18
18
  "cpy-cli": "4.2.0",
19
19
  "findup-sync": "5.0.0",
20
- "rimraf": "5.0.0",
21
- "rollup": "3.22.0",
20
+ "rimraf": "5.0.1",
21
+ "rollup": "3.21.0",
22
22
  "rollup-plugin-copy": "^3.4.0",
23
23
  "rollup-plugin-dts": "5.3.0",
24
+ "rollup-plugin-esbuild": "5.0.0",
24
25
  "typescript": "5.0.4"
25
26
  },
26
27
  "scripts": {
27
- "build": "npm run clean && rollup -c && cpy assets dist",
28
+ "build": "npm run clean && tsc && rollup -c",
28
29
  "clean": "rimraf build dist .rollup.cache tsconfig.tsbuildinfo",
29
- "test": "echo \"Error: no test specified\" && exit 1"
30
+ "test": "cd ../.. && npx env-cmd -f .env.jest jest --selectProjects @m2c2kit/build-helpers"
30
31
  },
31
32
  "license": "MIT",
32
33
  "dependencies": {
33
34
  "acorn": "8.8.2",
34
35
  "acorn-walk": "8.2.0",
35
- "astring": "1.8.4",
36
+ "astring": "1.8.5",
36
37
  "css-select": "5.1.0",
37
38
  "dom-serializer": "2.0.0",
38
39
  "domhandler": "5.0.3",