@modern-js/core 1.10.1 → 1.10.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @modern-js/core
 
+## 1.10.2
+
+### Patch Changes
+
+- d32f35134: chore: add modern/jest/eslint/ts config files to .npmignore
+- d9d398e16: add filter logic for merge config
+- Updated dependencies [d5913bd96]
+- Updated dependencies [d32f35134]
+- Updated dependencies [6ae4a34ae]
+- Updated dependencies [b80229c79]
+- Updated dependencies [948cc4436]
+  - @modern-js/plugin@1.3.4
+  - @modern-js/load-config@1.3.3
+  - @modern-js/utils@1.7.3
+
 ## 1.10.1
 
 ### Patch Changes

package/compiled/ajv/package.json

@@ -1 +1 @@
-{"name":"ajv","author":"Evgeny Poberezkin","version":"8.11.0","funding":{"type":"github","url":"https://github.com/sponsors/epoberezkin"},"license":"MIT","types":"dist/ajv.d.ts"}
+{"name":"ajv","author":"Evgeny Poberezkin","version":"8.11.0","funding":{"type":"github","url":"https://github.com/sponsors/epoberezkin"},"license":"MIT","types":"types/ajv.d.ts"}

package/dist/config/mergeConfig.js

@@ -9,7 +9,11 @@ const utils_1 = require("@modern-js/utils");
  * @param configs - Configuration from modern.config.ts or plugin's config hook.
  * @returns - normalized user config.
  */
-const mergeConfig = (configs) => (0, lodash_1.mergeWith)({}, ...configs, (target, source) => {
+const mergeConfig = (configs) => (0, lodash_1.mergeWith)({}, ...configs, (target, source, key) => {
+    // Do not use the following merge logic for source.designSystem and tools.tailwind(css)
+    if (key === 'designSystem' || key === 'tailwind' || key === 'tailwindcss') {
+        return (0, lodash_1.mergeWith)({}, target !== null && target !== void 0 ? target : {}, source !== null && source !== void 0 ? source : {});
+    }
     if (Array.isArray(target)) {
         if (Array.isArray(source)) {
             return [...target, ...source];

package/dist/config/types/index.d.ts

@@ -5,7 +5,7 @@ import type { MetaOptions } from '@modern-js/utils';
 import type { TransformOptions } from '@babel/core';
 import type webpack from 'webpack';
 import type { Configuration as WebpackConfiguration } from 'webpack';
-import autoprefixer from 'autoprefixer';
+import type autoprefixer from 'autoprefixer';
 import type { BasePluginOptions, TerserOptions as RawTerserOptions } from 'terser-webpack-plugin';
 import type { PluginConfig } from '../../loadPlugins';
 import type { TestConfig, JestConfig } from './test';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.10.1",
+  "version": "1.10.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -40,18 +40,18 @@
   },
   "bin": "./bin/modern-js.js",
   "dependencies": {
-    "@modern-js/load-config": "^1.3.2",
-    "@modern-js/plugin": "^1.3.3",
-    "@modern-js/utils": "^1.7.2"
+    "@modern-js/load-config": "^1.3.3",
+    "@modern-js/plugin": "^1.3.4",
+    "@modern-js/utils": "^1.7.3"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
-    "@modern-js/types": "1.5.2",
+    "@modern-js/types": "1.5.3",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/babel__code-frame": "^7.0.3",
     "@types/babel__core": "^7.1.16",
-    "@types/jest": "^26",
+    "@types/jest": "^27",
     "@types/less": "^3.0.3",
     "@types/node": "^14",
     "@types/react": "^17",
@@ -70,11 +70,33 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
+  "wireit": {
+    "build": {
+      "command": "tsc",
+      "files": [
+        "src/**/*",
+        "tsconfig.json",
+        "package.json"
+      ],
+      "output": [
+        "dist/**/*"
+      ]
+    },
+    "test": {
+      "command": "jest",
+      "files": [
+        "src/**/*",
+        "tsconfig.json",
+        "package.json"
+      ],
+      "output": []
+    }
+  },
   "scripts": {
     "new": "modern new",
-    "build": "tsc",
+    "build": "wireit",
     "dev": "tsc --watch",
-    "test": "jest"
+    "test": "wireit"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/.eslintrc.js

@@ -1,9 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ['@modern-js'],
-  ignorePatterns: ['compiled/'],
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-    project: ['./tsconfig.json'],
-  },
-};

package/jest.config.js

@@ -1,7 +0,0 @@
-const sharedConfig = require('@scripts/jest-config');
-
-/** @type {import('@jest/types').Config.InitialOptions} */
-module.exports = {
-  ...sharedConfig,
-  rootDir: __dirname,
-};

package/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "target": "ES2019",
-    "declaration": true,
-    "outDir": "./dist",
-    "baseUrl": "./",
-    "isolatedModules": true,
-    "esModuleInterop": true
-  },
-  "include": ["src"]
-}