@tarojs/taro-loader 3.5.0-beta.1 → 3.5.0-beta.2

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/lib/app.js CHANGED
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const helper_1 = require("@tarojs/helper");
4
4
  const loader_utils_1 = require("loader-utils");
5
+ const constants_1 = require("./constants");
5
6
  function default_1() {
6
7
  var _a;
7
8
  const stringify = (s) => (0, loader_utils_1.stringifyRequest)(this, s);
@@ -18,8 +19,15 @@ if (typeof PRERENDER !== 'undefined') {
18
19
  ${globalObject}._prerender = inst
19
20
  }`;
20
21
  const runtimePath = Array.isArray(options.runtimePath) ? options.runtimePath : [options.runtimePath];
22
+ let setReconcilerPost = '';
21
23
  const setReconciler = runtimePath.reduce((res, item) => {
22
- return res + `import '${item}'\n`;
24
+ if (constants_1.REG_POST.test(item)) {
25
+ setReconcilerPost += `import '${item.replace(constants_1.REG_POST, '')}'\n`;
26
+ return res;
27
+ }
28
+ else {
29
+ return res + `import '${item}'\n`;
30
+ }
23
31
  }, '');
24
32
  const createApp = `${creator}(component, ${frameworkArgs})`;
25
33
  let instantiateApp = blended
@@ -36,6 +44,7 @@ exports.taroApp = app
36
44
  import { window } from '@tarojs/runtime'
37
45
  import { ${creator} } from '${creatorLocation}'
38
46
  import { initPxTransform } from '@tarojs/taro'
47
+ ${setReconcilerPost}
39
48
  import component from ${stringify(this.request.split('!').slice(thisLoaderIndex + 1).join('!'))}
40
49
  ${importFrameworkStatement}
41
50
  var config = ${config};
package/lib/app.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAC9C,+CAA2D;AAG3D;;IACE,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAA,+BAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAElE,MAAM,OAAO,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAA;IAChC,MAAM,EAAE,wBAAwB,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,UAAU,CAAA;IACnH,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;IAC/B,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAA;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;IAC5B,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAA,sBAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAA;IAC/G,MAAM,EAAE,YAAY,EAAE,GAAG,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,aAAa,KAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;IAEnF,MAAM,SAAS,GAAG;;IAEhB,YAAY;EACd,CAAA;IAEA,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACpG,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACrD,OAAO,GAAG,GAAG,WAAW,IAAI,KAAK,CAAA;IACnC,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,SAAS,GAAG,GAAG,OAAO,eAAe,aAAa,GAAG,CAAA;IAE3D,IAAI,cAAc,GAAG,OAAO;QAC1B,CAAC,CAAC;YACM,SAAS;;;CAGpB;QACG,CAAC,CAAC,kBAAkB,SAAS,GAAG,CAAA;IAElC,IAAI,OAAO,iBAAiB,KAAK,UAAU,EAAE;QAC3C,cAAc,GAAG,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;KAC1D;IAED,OAAO,GAAG,aAAa;;WAEd,OAAO,YAAY,eAAe;;wBAErB,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;EAC7F,wBAAwB;eACX,MAAM;;EAEnB,cAAc;EACd,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;;iBAEnB,iBAAiB,CAAC,WAAW;iBAC7B,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,WAAW,CAAC;;CAE7D,CAAA;AACD,CAAC;AAnDD,4BAmDC"}
1
+ {"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAC9C,+CAA2D;AAG3D,2CAAsC;AAEtC;;IACE,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAA,+BAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAElE,MAAM,OAAO,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAA;IAChC,MAAM,EAAE,wBAAwB,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,UAAU,CAAA;IACnH,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;IAC/B,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAA;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;IAC5B,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAA,sBAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAA;IAC/G,MAAM,EAAE,YAAY,EAAE,GAAG,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,aAAa,KAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;IAEnF,MAAM,SAAS,GAAG;;IAEhB,YAAY;EACd,CAAA;IAEA,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACpG,IAAI,iBAAiB,GAAG,EAAE,CAAA;IAC1B,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACrD,IAAI,oBAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACvB,iBAAiB,IAAI,WAAW,IAAI,CAAC,OAAO,CAAC,oBAAQ,EAAE,EAAE,CAAC,KAAK,CAAA;YAC/D,OAAO,GAAG,CAAA;SACX;aAAM;YACL,OAAO,GAAG,GAAG,WAAW,IAAI,KAAK,CAAA;SAClC;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,SAAS,GAAG,GAAG,OAAO,eAAe,aAAa,GAAG,CAAA;IAE3D,IAAI,cAAc,GAAG,OAAO;QAC1B,CAAC,CAAC;YACM,SAAS;;;CAGpB;QACG,CAAC,CAAC,kBAAkB,SAAS,GAAG,CAAA;IAElC,IAAI,OAAO,iBAAiB,KAAK,UAAU,EAAE;QAC3C,cAAc,GAAG,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;KAC1D;IAED,OAAO,GAAG,aAAa;;WAEd,OAAO,YAAY,eAAe;;EAE3C,iBAAiB;wBACK,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;EAC7F,wBAAwB;eACX,MAAM;;EAEnB,cAAc;EACd,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;;iBAEnB,iBAAiB,CAAC,WAAW;iBAC7B,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,WAAW,CAAC;;CAE7D,CAAA;AACD,CAAC;AA1DD,4BA0DC"}
@@ -0,0 +1,5 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.REG_POST = void 0;
4
+ exports.REG_POST = /^post:/;
5
+ //# sourceMappingURL=constants.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,QAAQ,GAAG,QAAQ,CAAA"}
package/lib/h5.js CHANGED
@@ -15,7 +15,7 @@ function genResource(path, pages, loaderContext, syncFileName = false) {
15
15
  }, ${JSON.stringify((0, helper_1.readConfig)(pages.get(path)))})`;
16
16
  }
17
17
  function default_1() {
18
- var _a, _b;
18
+ var _a, _b, _c;
19
19
  const options = (0, loader_utils_1.getOptions)(this);
20
20
  const stringify = (s) => (0, loader_utils_1.stringifyRequest)(this, s);
21
21
  const { importFrameworkStatement, frameworkArgs, creator, creatorLocation, importFrameworkName, extraImportForWeb, execBeforeCreateWebApp, compatComponentImport, compatComponentExtra } = options.loaderMeta;
@@ -24,7 +24,22 @@ function default_1() {
24
24
  const routerMode = ((_a = config === null || config === void 0 ? void 0 : config.router) === null || _a === void 0 ? void 0 : _a.mode) || 'hash';
25
25
  const isMultiRouterMode = routerMode === 'multi';
26
26
  const pxTransformConfig = options.pxTransformConfig;
27
- const pageName = isMultiRouterMode ? (0, path_1.join)((0, path_1.dirname)(this.resourcePath), options.name).replace(options.sourceDir + '/', '') : '';
27
+ const pathDirname = (0, path_1.dirname)(this.resourcePath);
28
+ const pathBasename = (0, path_1.basename)(this.resourcePath);
29
+ const pageName = isMultiRouterMode ? (0, path_1.join)(pathDirname, options.name).replace(options.sourceDir + '/', '') : '';
30
+ if (options.bootstrap || pathBasename.includes('.boot')) {
31
+ /** NOTE: Webpack Virtual Module plugin doesn't support triggering a rebuild for webpack5,
32
+ * which can cause "module not found" error when webpack5 cache is enabled.
33
+ * Currently the only "non-hacky" workaround is to mark this module as non-cacheable.
34
+ *
35
+ * See also:
36
+ * - https://github.com/sysgears/webpack-virtual-modules/issues/76
37
+ * - https://github.com/sysgears/webpack-virtual-modules/issues/86
38
+ * - https://github.com/windicss/windicss-webpack-plugin/blob/bbb91323a2a0c0f880eecdf49b831be092ccf511/src/loaders/virtual-module.ts
39
+ * - https://github.com/sveltejs/svelte-loader/pull/151
40
+ */
41
+ (_b = this.cacheable) === null || _b === void 0 ? void 0 : _b.call(this, false);
42
+ }
28
43
  if (options.bootstrap)
29
44
  return `import(${stringify((0, path_1.join)(options.sourceDir, `${isMultiRouterMode ? pageName : options.entryFileName}.boot`))})`;
30
45
  let tabBarCode = `var tabbarIconPath = []
@@ -35,11 +50,11 @@ var tabbarSelectedIconPath = []
35
50
  for (let i = 0; i < tabbarList.length; i++) {
36
51
  const t = tabbarList[i];
37
52
  if (t.iconPath) {
38
- const iconPath = stringify((0, path_1.join)((0, path_1.dirname)(this.resourcePath), t.iconPath));
53
+ const iconPath = stringify((0, path_1.join)(pathDirname, t.iconPath));
39
54
  tabBarCode += `tabbarIconPath[${i}] = typeof require(${iconPath}) === 'object' ? require(${iconPath}).default : require(${iconPath})\n`;
40
55
  }
41
56
  if (t.selectedIconPath) {
42
- const iconPath = stringify((0, path_1.join)((0, path_1.dirname)(this.resourcePath), t.selectedIconPath));
57
+ const iconPath = stringify((0, path_1.join)(pathDirname, t.selectedIconPath));
43
58
  tabBarCode += `tabbarSelectedIconPath[${i}] = typeof require(${iconPath}) === 'object' ? require(${iconPath}).default : require(${iconPath})\n`;
44
59
  }
45
60
  }
@@ -56,7 +71,7 @@ applyPolyfills().then(function () {
56
71
  const routesConfig = isMultiRouterMode ? `config.routes = []
57
72
  config.route = ${genResource(pageName, pages, this, options.name)}
58
73
  config.pageName = "${pageName}"` : `config.routes = [
59
- ${(_b = config.pages) === null || _b === void 0 ? void 0 : _b.map(path => genResource(path, pages, this)).join(',')}
74
+ ${(_c = config.pages) === null || _c === void 0 ? void 0 : _c.map(path => genResource(path, pages, this)).join(',')}
60
75
  ]`;
61
76
  const routerCreator = isMultiRouterMode ? 'createMultiRouter' : 'createRouter';
62
77
  const code = `import { initPxTransform } from '@tarojs/taro'
package/lib/h5.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"h5.js","sourceRoot":"","sources":["../src/h5.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"h5.js","sourceRoot":"","sources":["../src/h5.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const loader_utils_1 = require("loader-utils");
4
4
  const path = require("path");
5
+ const constants_1 = require("./constants");
5
6
  function default_1() {
6
7
  var _a;
7
8
  const options = (0, loader_utils_1.getOptions)(this);
@@ -19,8 +20,15 @@ function default_1() {
19
20
  ? `${raw}!${this.resourcePath}`
20
21
  : this.request.split('!').slice(1).join('!');
21
22
  const runtimePath = Array.isArray(options.runtimePath) ? options.runtimePath : [options.runtimePath];
23
+ let setReconcilerPost = '';
22
24
  const setReconciler = runtimePath.reduce((res, item) => {
23
- return res + `import '${item}'\n`;
25
+ if (constants_1.REG_POST.test(item)) {
26
+ setReconcilerPost += `import '${item.replace(constants_1.REG_POST, '')}'\n`;
27
+ return res;
28
+ }
29
+ else {
30
+ return res + `import '${item}'\n`;
31
+ }
24
32
  }, '');
25
33
  const { globalObject } = ((_a = this._compilation) === null || _a === void 0 ? void 0 : _a.outputOptions) || { globalObject: 'wx' };
26
34
  const prerender = `
@@ -30,6 +38,7 @@ if (typeof PRERENDER !== 'undefined') {
30
38
  return `${setReconciler}
31
39
  import { createPageConfig, window } from '@tarojs/runtime'
32
40
  import { ${creator} } from '${creatorLocation}'
41
+ ${setReconcilerPost}
33
42
  ${importFrameworkStatement}
34
43
  var config = ${configString};
35
44
  var appConfig = ${JSON.stringify(appConfig)};
@@ -1 +1 @@
1
- {"version":3,"file":"independentPage.js","sourceRoot":"","sources":["../src/independentPage.ts"],"names":[],"mappings":";;AAAA,+CAA2D;AAC3D,6BAA4B;AAQ5B;;IACE,MAAM,OAAO,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAA;IAChC,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IAC/D,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAC3C,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAA,+BAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAClE,MAAM,EACJ,eAAe,EACf,wBAAwB,EACxB,gBAAgB,EAChB,aAAa,EACb,OAAO,EACP,eAAe,EAChB,GAAG,OAAO,CAAC,UAAU,CAAA;IACtB,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;IACnC,MAAM,kBAAkB,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACnD,kBAAkB,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAA;IACxE,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACtD,8DAA8D;IAC9D,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC1C,MAAM,aAAa,GAAG,eAAe;QACnC,CAAC,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,YAAY,EAAE;QAC/B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC9C,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACpG,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACrD,OAAO,GAAG,GAAG,WAAW,IAAI,KAAK,CAAA;IACnC,CAAC,EAAE,EAAE,CAAC,CAAA;IACN,MAAM,EAAE,YAAY,EAAE,GAAG,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,aAAa,KAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;IAEnF,MAAM,SAAS,GAAG;;IAEhB,YAAY;EACd,CAAA;IACA,OAAO,GAAG,aAAa;;WAEd,OAAO,YAAY,eAAe;EAC3C,wBAAwB;eACX,YAAY;kBACT,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;;EAEzC,gBAAgB;EAChB,OAAO,SAAS,iBAAiB;0BACT,SAAS,CAAC,aAAa,CAAC;EAChD,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,sCAAsC,CAAC,CAAC,CAAC,EAAE;EACxE,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC,wCAAwC,CAAC,CAAC,CAAC,EAAE;+CAC/B,OAAO,CAAC,IAAI;EACzD,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;CACnC,CAAA;AACD,CAAC;AA/CD,4BA+CC;AAED,SAAS,aAAa,CAAE,OAAmC,EAAE,YAAoB;IAC/E,MAAM,UAAU,GAAG,SAAS,CAAC,YAAY,CAAC,GAAG,SAAS,CAAA;IACtD,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE;QAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QAC5B,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,UAAU,EAAE;YAChD,OAAO,MAAM,CAAC,OAAO,CAAA;SACtB;KACF;IACD,OAAO,EAAE,CAAA;AACX,CAAC;AAED,SAAS,SAAS,CAAE,IAAY;IAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAC/E,CAAC"}
1
+ {"version":3,"file":"independentPage.js","sourceRoot":"","sources":["../src/independentPage.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tarojs/taro-loader",
3
- "version": "3.5.0-beta.1",
3
+ "version": "3.5.0-beta.2",
4
4
  "description": "> TODO: description",
5
5
  "author": "yuche <i@yuche.me>",
6
6
  "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-loader#readme",
@@ -26,8 +26,8 @@
26
26
  "url": "https://github.com/NervJS/taro/issues"
27
27
  },
28
28
  "dependencies": {
29
- "@tarojs/helper": "3.5.0-beta.1",
30
- "@tarojs/taro": "3.5.0-beta.1",
29
+ "@tarojs/helper": "3.5.0-beta.2",
30
+ "@tarojs/taro": "3.5.0-beta.2",
31
31
  "loader-utils": "^1.2.3"
32
32
  },
33
33
  "publishConfig": {
@@ -36,5 +36,5 @@
36
36
  "devDependencies": {
37
37
  "webpack": "5.69.0"
38
38
  },
39
- "gitHead": "ba9d945ccebb86f06edb7f845110526d92dc7b00"
39
+ "gitHead": "c85adaa45959e6cafc15e6531f4735a7dfa2aab0"
40
40
  }