zephyr-modernjs-plugin 0.0.0-canary.28 → 0.0.0-canary.29

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.
@@ -41,24 +41,21 @@ const withZephyr = (zephyrOptions) => ({
41
41
  name: pluginName,
42
42
  pre: ['@modern-js/plugin-module-federation-config'],
43
43
  async setup(api) {
44
- api.modifyWebpackConfig(async (config, utils) => {
44
+ api.modifyWebpackConfig(async (config) => {
45
45
  const currentBundler = api.getAppContext().bundlerType;
46
46
  if (currentBundler !== 'webpack') {
47
47
  return;
48
48
  }
49
49
  const { withZephyr } = await Promise.resolve().then(() => __importStar(require('zephyr-webpack-plugin')));
50
- const z_config = await withZephyr(zephyrOptions)(config);
51
- /* eslint-disable-next-line */
52
- utils.mergeConfig(config, z_config);
50
+ return await withZephyr(zephyrOptions)(config);
53
51
  });
54
- api.modifyRspackConfig(async (config, utils) => {
52
+ api.modifyRspackConfig(async (config) => {
55
53
  const currentBundler = api.getAppContext().bundlerType;
56
54
  if (currentBundler !== 'rspack') {
57
55
  return;
58
56
  }
59
57
  const { withZephyr } = await Promise.resolve().then(() => __importStar(require('zephyr-rspack-plugin')));
60
- const z_config = await withZephyr(zephyrOptions)(config);
61
- utils.mergeConfig(config, z_config);
58
+ return await withZephyr(zephyrOptions)(config);
62
59
  });
63
60
  },
64
61
  usePlugins: isDev ? [zephyrFixPublicPath()] : [],
@@ -1 +1 @@
1
- {"version":3,"file":"with-zephyr.js","sourceRoot":"","sources":["../../src/modernjs-plugin/with-zephyr.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAsC;AAGtC,MAAM,UAAU,GAAG,wBAAwB,CAAC;AAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,aAAa,CAAC;AAEjD,MAAM,UAAU,GAAG,CACxB,aAAmC,EACc,EAAE,CAAC,CAAC;IACrD,IAAI,EAAE,UAAU;IAChB,GAAG,EAAE,CAAC,4CAA4C,CAAC;IAEnD,KAAK,CAAC,KAAK,CAAC,GAAG;QACb,GAAG,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;YAC9C,MAAM,cAAc,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC,WAAW,CAAC;YACvD,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;gBACjC,OAAO;YACT,CAAC;YAED,MAAM,EAAE,UAAU,EAAE,GAAG,wDAAa,uBAAuB,GAAC,CAAC;YAC7D,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;YACzD,8BAA8B;YAC9B,KAAK,CAAC,WAAW,CAAC,MAAa,EAAE,QAAe,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;YAC7C,MAAM,cAAc,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC,WAAW,CAAC;YACvD,IAAI,cAAc,KAAK,QAAQ,EAAE,CAAC;gBAChC,OAAO;YACT,CAAC;YAED,MAAM,EAAE,UAAU,EAAE,GAAG,wDAAa,sBAAsB,GAAC,CAAC;YAC5D,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;YACzD,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;CACjD,CAAC,CAAC;AAhCU,QAAA,UAAU,cAgCpB;AAEH,SAAS,mBAAmB;IAC1B,OAAO;QACL,IAAI,EAAE,uBAAuB;QAC7B,GAAG,EAAE,CAAC,UAAU,CAAC;QACjB,KAAK,CAAC,GAAG;YACP,GAAG,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;gBACrD,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,qBAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;oBACnD,MAAM,CAAC,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;gBAC3D,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;gBACpD,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,qBAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;oBACnD,MAAM,CAAC,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;gBAC3D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"with-zephyr.js","sourceRoot":"","sources":["../../src/modernjs-plugin/with-zephyr.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAsC;AAGtC,MAAM,UAAU,GAAG,wBAAwB,CAAC;AAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,aAAa,CAAC;AAEjD,MAAM,UAAU,GAAG,CACxB,aAAmC,EACc,EAAE,CAAC,CAAC;IACrD,IAAI,EAAE,UAAU;IAChB,GAAG,EAAE,CAAC,4CAA4C,CAAC;IAEnD,KAAK,CAAC,KAAK,CAAC,GAAG;QACb,GAAG,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACvC,MAAM,cAAc,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC,WAAW,CAAC;YACvD,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;gBACjC,OAAO;YACT,CAAC;YAED,MAAM,EAAE,UAAU,EAAE,GAAG,wDAAa,uBAAuB,GAAC,CAAC;YAC7D,OAAO,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACtC,MAAM,cAAc,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC,WAAW,CAAC;YACvD,IAAI,cAAc,KAAK,QAAQ,EAAE,CAAC;gBAChC,OAAO;YACT,CAAC;YAED,MAAM,EAAE,UAAU,EAAE,GAAG,wDAAa,sBAAsB,GAAC,CAAC;YAC5D,OAAO,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;CACjD,CAAC,CAAC;AA7BU,QAAA,UAAU,cA6BpB;AAEH,SAAS,mBAAmB;IAC1B,OAAO;QACL,IAAI,EAAE,uBAAuB;QAC7B,GAAG,EAAE,CAAC,UAAU,CAAC;QACjB,KAAK,CAAC,GAAG;YACP,GAAG,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;gBACrD,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,qBAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;oBACnD,MAAM,CAAC,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;gBAC3D,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;gBACpD,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,qBAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;oBACnD,MAAM,CAAC,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;gBAC3D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
@@ -0,0 +1,16 @@
1
+ import baseConfig from '../../eslint.config.mjs';
2
+
3
+ export default [
4
+ ...baseConfig,
5
+ {
6
+ files: ['**/*.ts', '**/*.tsx'],
7
+ rules: {
8
+ '@typescript-eslint/explicit-function-return-type': [
9
+ 'error',
10
+ {
11
+ allowExpressions: true,
12
+ },
13
+ ],
14
+ },
15
+ },
16
+ ];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zephyr-modernjs-plugin",
3
- "version": "0.0.0-canary.28",
3
+ "version": "0.0.0-canary.29",
4
4
  "description": "Modernjs plugin for Zephyr",
5
5
  "repository": {
6
6
  "type": "git",
@@ -17,8 +17,8 @@
17
17
  "types": "dist/index.d.ts",
18
18
  "dependencies": {
19
19
  "tslib": "^2.8.1",
20
- "zephyr-agent": "0.0.0-canary.28",
21
- "zephyr-edge-contract": "0.0.0-canary.28"
20
+ "zephyr-edge-contract": "0.0.0-canary.29",
21
+ "zephyr-agent": "0.0.0-canary.29"
22
22
  },
23
23
  "devDependencies": {
24
24
  "@modern-js/app-tools": "^2.68.14",