zephyr-modernjs-plugin 0.0.0-canary.12 → 0.0.0-canary.13

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zephyr-modernjs-plugin",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Modernjs plugin for Zephyr",
   "repository": {
     "type": "git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zephyr-modernjs-plugin",
-  "version": "0.0.0-canary.12",
+  "version": "0.0.0-canary.13",
   "description": "Modernjs plugin for Zephyr",
   "repository": {
     "type": "git",
@@ -19,9 +19,9 @@
     "@modern-js/app-tools": "^2.68.14",
     "is-ci": "^4.1.0",
     "tslib": "^2.8.1",
-    "zephyr-agent": "0.0.0-canary.12",
-    "zephyr-edge-contract": "0.0.0-canary.12",
-    "zephyr-xpack-internal": "0.0.0-canary.12"
+    "zephyr-xpack-internal": "0.0.0-canary.13",
+    "zephyr-edge-contract": "0.0.0-canary.13",
+    "zephyr-agent": "0.0.0-canary.13"
   },
   "devDependencies": {
     "@types/is-ci": "3.0.4",
@@ -31,8 +31,8 @@
     "ts-jest": "^29.2.6"
   },
   "peerDependencies": {
-    "zephyr-rspack-plugin": "0.0.0-canary.12",
-    "zephyr-webpack-plugin": "0.0.0-canary.12"
+    "zephyr-rspack-plugin": "0.0.0-canary.13",
+    "zephyr-webpack-plugin": "0.0.0-canary.13"
   },
   "peerDependenciesMeta": {
     "zephyr-rspack-plugin": {

package/.eslintrc.json

@@ -1,28 +0,0 @@
-{
-  "extends": ["../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx"],
-      "parserOptions": {
-        "project": ["libs/zephyr-modernjs-plugin/tsconfig.*?.json"]
-      },
-      "rules": {}
-    },
-    {
-      "files": ["*.ts", "*.tsx"],
-      "rules": {
-        "@typescript-eslint/explicit-function-return-type": [
-          "error",
-          {
-            "allowExpressions": true
-          }
-        ]
-      }
-    },
-    {
-      "files": ["*.js", "*.jsx"],
-      "rules": {}
-    }
-  ]
-}

package/dist/tsconfig.tsbuildinfo

@@ -1 +0,0 @@
-{"version":"5.8.3"}

package/jest.config.ts

@@ -1,11 +0,0 @@
-/* eslint-disable */
-export default {
-  displayName: 'zephyr-modernjs-plugin',
-  preset: '../../jest.preset.js',
-  testEnvironment: 'node',
-  transform: {
-    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
-  },
-  moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '../../coverage/libs/zephyr-modernjs-plugin',
-};

package/project.json

@@ -1,37 +0,0 @@
-{
-  "name": "zephyr-modernjs-plugin",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "libs/zephyr-modernjs-plugin/src",
-  "projectType": "library",
-  "tags": [],
-  "targets": {
-    "build": {
-      "executor": "@nx/js:tsc",
-      "outputs": ["{options.outputPath}"],
-      "options": {
-        "rootDir": "libs/zephyr-modernjs-plugin/src",
-        "outputPath": "libs/zephyr-modernjs-plugin/dist",
-        "tsConfig": "libs/zephyr-modernjs-plugin/tsconfig.lib.json",
-        "main": "libs/zephyr-modernjs-plugin/src/index.ts"
-      }
-    },
-    "publish": {
-      "command": "node tools/scripts/publish.mjs zephyr-modernjs-plugin {args.ver} {args.tag}",
-      "dependsOn": ["build"]
-    },
-    "release": {
-      "command": "pnpm dist-tag add zephyr-modernjs-plugin@$(npm view zephyr-modernjs-plugin@next version) latest"
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-      "options": {
-        "jestConfig": "libs/zephyr-modernjs-plugin/jest.config.ts"
-      }
-    }
-  }
-}

package/src/index.ts

@@ -1 +0,0 @@
-export { withZephyr } from './modernjs-plugin/with-zephyr';

package/src/modernjs-plugin/with-zephyr.ts

@@ -1,62 +0,0 @@
-import type { AppTools, CliPluginFuture } from '@modern-js/app-tools';
-import { ze_log } from 'zephyr-agent';
-import type { ZephyrPluginOptions } from 'zephyr-edge-contract';
-
-const pluginName = 'zephyr-modernjs-plugin';
-const isDev = process.env['NODE_ENV'] === 'development';
-
-export const withZephyr = (
-  zephyrOptions?: ZephyrPluginOptions
-): CliPluginFuture<AppTools<'rspack' | 'webpack'>> => ({
-  name: pluginName,
-  pre: ['@modern-js/plugin-module-federation-config'],
-
-  async setup(api) {
-    api.modifyWebpackConfig(async (config, utils) => {
-      const currentBundler = api.getAppContext().bundlerType;
-      if (currentBundler !== 'webpack') {
-        return;
-      }
-
-      const { withZephyr } = await import('zephyr-webpack-plugin');
-      const z_config = await withZephyr(zephyrOptions)(config);
-      /* eslint-disable-next-line */
-      utils.mergeConfig(config as any, z_config as any);
-    });
-
-    api.modifyRspackConfig(async (config, utils) => {
-      const currentBundler = api.getAppContext().bundlerType;
-      if (currentBundler !== 'rspack') {
-        return;
-      }
-
-      const { withZephyr } = await import('zephyr-rspack-plugin');
-      const z_config = await withZephyr(zephyrOptions)(config);
-      utils.mergeConfig(config, z_config);
-    });
-  },
-
-  usePlugins: isDev ? [zephyrFixPublicPath()] : [],
-});
-
-function zephyrFixPublicPath(): CliPluginFuture<AppTools> {
-  return {
-    name: 'zephyr-publicpath-fix',
-    pre: [pluginName],
-    setup(api) {
-      api.modifyWebpackConfig(async (config, { isServer }) => {
-        if (!isServer) {
-          ze_log.misc('Modifying publicPath for Dev Server');
-          config.output = { ...config.output, publicPath: 'auto' };
-        }
-      });
-
-      api.modifyRspackConfig(async (config, { isServer }) => {
-        if (!isServer) {
-          ze_log.misc('Modifying publicPath for Dev Server');
-          config.output = { ...config.output, publicPath: 'auto' };
-        }
-      });
-    },
-  };
-}

package/tsconfig.json

@@ -1,24 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "module": "commonjs",
-    "target": "ES2020",
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "allowSyntheticDefaultImports": true
-  },
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}

package/tsconfig.lib.json

@@ -1,10 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "declaration": true,
-    "types": ["node"]
-  },
-  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"],
-  "include": ["src/**/*.ts"]
-}

package/tsconfig.spec.json

@@ -1,13 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "types": ["jest", "node"]
-  },
-  "include": [
-    "jest.config.ts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ]
-}