@flatjs/evolve 1.7.2 → 1.8.1-next.18

package/package.json

@@ -1,77 +1,125 @@
 {
   "name": "@flatjs/evolve",
-  "version": "1.7.2",
-  "description": "the webpack based tools `evolve` of @flatjs",
-  "keywords": [
-    "shared",
-    "flatjs",
-    "common",
-    "utils"
-  ],
+  "version": "1.8.1-next.18",
   "license": "MIT",
-  "author": "tianyingchun",
-  "sideEffects": false,
-  "main": "index.js",
-  "typings": "index.d.ts",
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  "types": "./dist/index.d.ts",
   "files": [
-    "cjs/",
+    "bin/",
+    "dist/",
     "templates/",
     "index.js",
-    "index.d.ts",
     "README.md",
+    "CHANGELOG.md",
     "package.json"
   ],
+  "scripts": {
+    "serve": "yarn ts-node-esm ./tests/dev-server/dev-server.ts",
+    "build": "rimraf dist && tsc -p ./tsconfig.build.json && npm run minify",
+    "?build-release": "When https://github.com/atlassian/changesets/issues/432 has a solution we can remove this trick",
+    "build-release": "yarn build && rimraf ./_release && yarn pack && mkdir ./_release && tar zxvf ./package.tgz --directory ./_release && rm ./package.tgz",
+    "minify": "ts-node ../../scripts/minify.ts --dest=dist",
+    "codegen": "graphql-codegen --config ./codegen.cjs",
+    "clean": "rimraf --no-glob ./dist ./coverage ./__data__ ./config/__data__ ./_release ./tsconfig.tsbuildinfo",
+    "lint": "eslint . --ext .ts,.mts,.tsx,.js,.jsx,.cjs,.mjs --cache --cache-location ../../.cache/eslint/evolve.eslintcache",
+    "test": "run-s test-unit",
+    "test-task": "vitest run --passWithNoTests",
+    "test-unit": "vitest run --passWithNoTests",
+    "test-watch": "vitest watch --ui",
+    "fix-all-files": "eslint . --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.mdx,.graphql --fix",
+    "typecheck": "tsc --project ./tsconfig.json --noEmit"
+  },
   "dependencies": {
-    "@babel/core": "^7.21.8",
-    "@flatjs/common": "^1.7.0",
-    "@flatjs/evolve-preset-babel": "^1.7.2",
-    "@flatjs/forge-plugin-postcss-pixel": "^1.6.0",
-    "@flatjs/mock": "^1.7.2",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
-    "babel-loader": "^9.1.2",
-    "babel-merge": "^3.0.0",
-    "babel-plugin-import": "^1.13.6",
-    "better-opn": "^3.0.2",
-    "case-sensitive-paths-webpack-plugin": "^2.4.0",
-    "chalk": "^4.1.2",
-    "css-loader": "^6.7.3",
-    "cssnano": "^6.0.1",
-    "cssnano-preset-default": "^6.0.1",
-    "fork-ts-checker-webpack-plugin": "^8.0.0",
-    "html-webpack-plugin": "^5.5.1",
-    "image-minimizer-webpack-plugin": "^3.8.2",
-    "imagemin": "^8.0.1",
-    "less": "^4.1.3",
-    "less-loader": "^11.1.0",
-    "lodash": "^4.17.21",
-    "mini-css-extract-plugin": "^2.7.5",
-    "postcss": "^8.4.23",
-    "postcss-loader": "^7.3.0",
-    "react-refresh": "^0.14.0",
-    "svgo": "^3.0.2",
-    "terser-webpack-plugin": "^5.3.8",
-    "webpack": "^5.82.0",
-    "webpack-bundle-analyzer": "^4.8.0",
+    "@armit/file-utility": "^0.0.18",
+    "@armit/package": "^0.0.27",
+    "@babel/core": "7.21.8",
+    "@flatjs/common": "1.8.1-next.9",
+    "@flatjs/evolve-preset-babel": "1.8.1-next.5",
+    "@flatjs/forge-postcss-plugin-pixel": "1.8.1-next.9",
+    "@flatjs/mock": "1.8.1-next.18",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
+    "@types/babel__core": "7.20.0",
+    "babel-loader": "9.1.2",
+    "babel-merge": "3.0.0",
+    "babel-plugin-import": "1.13.6",
+    "better-opn": "3.0.2",
+    "case-sensitive-paths-webpack-plugin": "2.4.0",
+    "css-loader": "6.7.4",
+    "cssnano": "6.0.1",
+    "express": "4.18.2",
+    "fork-ts-checker-webpack-plugin": "8.0.0",
+    "happy-dom": "9.19.2",
+    "html-webpack-plugin": "5.5.1",
+    "image-minimizer-webpack-plugin": "3.8.2",
+    "less": "4.1.3",
+    "less-loader": "11.1.0",
+    "lodash": "4.17.21",
+    "mini-css-extract-plugin": "2.7.6",
+    "postcss": "8.4.23",
+    "postcss-loader": "7.3.0",
+    "react-refresh": "0.14.0",
+    "svgo": "3.0.2",
+    "terser-webpack-plugin": "5.3.9",
+    "webpack": "5.83.1",
+    "webpack-bundle-analyzer": "4.8.0",
     "webpack-dev-server": "4.15.0",
-    "webpack-sources": "^3.2.3"
+    "webpack-sources": "3.2.3"
   },
   "devDependencies": {
-    "@types/cssnano": "^5.0.0",
-    "@types/lodash": "^4.14.194",
-    "@types/webpack-sources": "^3.2.0",
-    "express": "^4.18.2",
-    "imagemin-gifsicle": "^7.0.0",
-    "imagemin-jpegtran": "^7.0.0",
-    "imagemin-pngquant": "^9.0.2",
-    "imagemin-svgo": "^10.0.1",
-    "sharp": "^0.32.1",
-    "type-fest": "^3.10.0"
+    "@armit/eslint-config-bases": "^0.0.15",
+    "@flatjs/testing": "1.8.1-next.6",
+    "@swc/core": "1.3.58",
+    "@types/express": "4.17.17",
+    "@types/node": "20.2.1",
+    "@vitest/coverage-istanbul": "0.31.1",
+    "@vitest/ui": "0.31.1",
+    "eslint": "8.40.0",
+    "imagemin-gifsicle": "7.0.0",
+    "imagemin-jpegtran": "7.0.0",
+    "imagemin-pngquant": "9.0.2",
+    "imagemin-svgo": "10.0.1",
+    "npm-run-all": "4.1.5",
+    "prettier": "2.8.8",
+    "react": "18.2.0",
+    "rimraf": "5.0.1",
+    "swc-unplugin-ts": "1.0.2",
+    "ts-node": "10.9.1",
+    "vite-tsconfig-paths": "4.2.0",
+    "vitest": "0.31.1",
+    "vue-loader": "17.1.1"
+  },
+  "peerDependencies": {
+    "imagemin-gifsicle": ">=7.0.0",
+    "imagemin-jpegtran": ">=7.0.0",
+    "imagemin-pngquant": ">=9.0.2",
+    "imagemin-svgo": ">=10.0.1"
+  },
+  "peerDependenciesMeta": {
+    "imagemin-gifsicle": {
+      "optional": true
+    },
+    "imagemin-jpegtran": {
+      "optional": true
+    },
+    "imagemin-pngquant": {
+      "optional": true
+    },
+    "imagemin-svgo": {
+      "optional": true
+    }
   },
   "engines": {
     "node": ">=16.0.0"
   },
   "publishConfig": {
-    "access": "public"
-  },
-  "gitHead": "988561e3a6f6b400c1d29d7d5764aa00f6b404b7"
-}
+    "access": "public",
+    "directory": "_release/package"
+  }
+}

package/templates/html-plugin/index-dev.html

@@ -16,65 +16,49 @@
       content="width=device-width,initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, viewport-fit=cover"
     />
     <title><%= title %></title>
-    <!-- / -->
-    <% if (inlineScripts) { %>
-    <!-- / -->
-    <script>
-      <% for (let index = 0; index < inlineScripts.length; index++) { %>
-        <%= inlineScripts[index]%>
-      <% } %>
-    </script>
-    <!-- / -->
-    <% } %>
-    <!-- / -->
 
-    <% if (viewport) { %>
-    <!-- / -->
-    <script>
-      <%= viewport %>
-    </script>
-    <!-- / -->
-    <% } %>
+    <% if (headBeforeHtmlTags) { %> 
+      <% for (let index = 0; index < headBeforeHtmlTags.length; index++) { %> 
+        <%= headBeforeHtmlTags[index] %> 
+      <% } %> 
+    <% } %> 
 
-    <!-- / -->
+    <% if (inlineScripts) { %>
+      <script>
+        <% for (let index = 0; index < inlineScripts.length; index++) { %>
+          <%= inlineScripts[index] %>
+        <% } %>
+      </script>
+    <% } %> 
+  
+    <% if (viewport) { %>
+      <script><%= viewport %></script>
+    <% } %> 
+    
     <% if (favicon) { %>
-    <!-- / -->
-    <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-    <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
-    <!-- / -->
+      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+    <% } %> 
+    
+    <% if (headBeforeStyles) { %> 
+      <% for (let index = 0; index < headBeforeStyles.length; index++) { %>
+        <link href="<%= headBeforeStyles[index] %>" rel="stylesheet" />
+      <% } %> 
     <% } %>
-
-    <!-- / -->
-    <% if (headBeforeStyles) { %>
-    <!-- / -->
-    <% for (let index = 0; index < headBeforeStyles.length; index++) { %>
-    <link href="<%= headBeforeStyles[index] %>" rel="stylesheet" />
-    <% } %>
-    <!-- / -->
-    <% } %>
-    <!-- / -->
-
-    <!-- / -->
-    <% if (headBeforeScripts) { %>
-    <!-- / -->
-    <% for (let index = 0; index < headBeforeScripts.length; index++) { %>
-    <script crossorigin="anonymous" src="<%= headBeforeScripts[index]%>"></script>
-    <% } %>
-    <!-- / -->
+    
+    <% if (headBeforeScripts) { %> 
+      <% for (let index = 0; index < headBeforeScripts.length; index++) { %>
+        <script  crossorigin="anonymous" src="<%= headBeforeScripts[index]%>"></script>
+      <% } %>
     <% } %>
-    <!-- / -->
   </head>
 
   <body>
     <div id="app"></div>
-    <!-- / -->
-    <% if (bodyAfterScripts) { %>
-    <!-- / -->
-    <% for (let index = 0; index < bodyAfterScripts.length; index++) { %>
-    <script crossorigin="anonymous" src="<%= bodyAfterScripts[index]%>"></script>
-    <% } %>
-    <!-- / -->
+    <% if (bodyAfterScripts) { %> 
+      <% for (let index = 0; index < bodyAfterScripts.length; index++) { %>
+        <script crossorigin="anonymous" src="<%= bodyAfterScripts[index]%>"></script>
+      <% } %> 
     <% } %>
-    <!-- / -->
   </body>
 </html>

package/templates/html-plugin/index-inte.html

@@ -16,65 +16,49 @@
       content="width=device-width,initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, viewport-fit=cover"
     />
     <title><%= title %></title>
-    <!-- / -->
-    <% if (inlineScripts) { %>
-    <!-- / -->
-    <script>
-      <% for (let index = 0; index < inlineScripts.length; index++) { %>
-        <%= inlineScripts[index]%>
-      <% } %>
-    </script>
-    <!-- / -->
-    <% } %>
-    <!-- / -->
 
-    <% if (viewport) { %>
-    <!-- / -->
-    <script>
-      <%= viewport %>
-    </script>
-    <!-- / -->
-    <% } %>
+    <% if (headBeforeHtmlTags) { %> 
+      <% for (let index = 0; index < headBeforeHtmlTags.length; index++) { %> 
+        <%= headBeforeHtmlTags[index] %> 
+      <% } %> 
+    <% } %> 
 
-    <!-- / -->
+    <% if (inlineScripts) { %>
+      <script>
+        <% for (let index = 0; index < inlineScripts.length; index++) { %>
+          <%= inlineScripts[index] %>
+        <% } %>
+      </script>
+    <% } %> 
+  
+    <% if (viewport) { %>
+      <script><%= viewport %></script>
+    <% } %> 
+    
     <% if (favicon) { %>
-    <!-- / -->
-    <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-    <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
-    <!-- / -->
+      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+    <% } %> 
+    
+    <% if (headBeforeStyles) { %> 
+      <% for (let index = 0; index < headBeforeStyles.length; index++) { %>
+        <link href="<%= headBeforeStyles[index] %>" rel="stylesheet" />
+      <% } %> 
     <% } %>
-
-    <!-- / -->
-    <% if (headBeforeStyles) { %>
-    <!-- / -->
-    <% for (let index = 0; index < headBeforeStyles.length; index++) { %>
-    <link href="<%= headBeforeStyles[index] %>" rel="stylesheet" />
-    <% } %>
-    <!-- / -->
-    <% } %>
-    <!-- / -->
-
-    <!-- / -->
-    <% if (headBeforeScripts) { %>
-    <!-- / -->
-    <% for (let index = 0; index < headBeforeScripts.length; index++) { %>
-    <script crossorigin="anonymous" src="<%= headBeforeScripts[index]%>"></script>
-    <% } %>
-    <!-- / -->
+    
+    <% if (headBeforeScripts) { %> 
+      <% for (let index = 0; index < headBeforeScripts.length; index++) { %>
+        <script  crossorigin="anonymous" src="<%= headBeforeScripts[index]%>"></script>
+      <% } %>
     <% } %>
-    <!-- / -->
   </head>
 
   <body>
     <div id="app"></div>
-    <!-- / -->
-    <% if (bodyAfterScripts) { %>
-    <!-- / -->
-    <% for (let index = 0; index < bodyAfterScripts.length; index++) { %>
-    <script crossorigin="anonymous" src="<%= bodyAfterScripts[index]%>"></script>
-    <% } %>
-    <!-- / -->
+    <% if (bodyAfterScripts) { %> 
+      <% for (let index = 0; index < bodyAfterScripts.length; index++) { %>
+        <script crossorigin="anonymous" src="<%= bodyAfterScripts[index]%>"></script>
+      <% } %> 
     <% } %>
-    <!-- / -->
   </body>
 </html>

package/templates/html-plugin/index-inte2.html

@@ -16,65 +16,49 @@
       content="width=device-width,initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, viewport-fit=cover"
     />
     <title><%= title %></title>
-    <!-- / -->
-    <% if (inlineScripts) { %>
-    <!-- / -->
-    <script>
-      <% for (let index = 0; index < inlineScripts.length; index++) { %>
-        <%= inlineScripts[index]%>
-      <% } %>
-    </script>
-    <!-- / -->
-    <% } %>
-    <!-- / -->
 
-    <% if (viewport) { %>
-    <!-- / -->
-    <script>
-      <%= viewport %>
-    </script>
-    <!-- / -->
-    <% } %>
+    <% if (headBeforeHtmlTags) { %> 
+      <% for (let index = 0; index < headBeforeHtmlTags.length; index++) { %> 
+        <%= headBeforeHtmlTags[index] %> 
+      <% } %> 
+    <% } %> 
 
-    <!-- / -->
+    <% if (inlineScripts) { %>
+      <script>
+        <% for (let index = 0; index < inlineScripts.length; index++) { %>
+          <%= inlineScripts[index] %>
+        <% } %>
+      </script>
+    <% } %> 
+  
+    <% if (viewport) { %>
+      <script><%= viewport %></script>
+    <% } %> 
+    
     <% if (favicon) { %>
-    <!-- / -->
-    <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-    <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
-    <!-- / -->
+      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+    <% } %> 
+    
+    <% if (headBeforeStyles) { %> 
+      <% for (let index = 0; index < headBeforeStyles.length; index++) { %>
+        <link href="<%= headBeforeStyles[index] %>" rel="stylesheet" />
+      <% } %> 
     <% } %>
-
-    <!-- / -->
-    <% if (headBeforeStyles) { %>
-    <!-- / -->
-    <% for (let index = 0; index < headBeforeStyles.length; index++) { %>
-    <link href="<%= headBeforeStyles[index] %>" rel="stylesheet" />
-    <% } %>
-    <!-- / -->
-    <% } %>
-    <!-- / -->
-
-    <!-- / -->
-    <% if (headBeforeScripts) { %>
-    <!-- / -->
-    <% for (let index = 0; index < headBeforeScripts.length; index++) { %>
-    <script crossorigin="anonymous" src="<%= headBeforeScripts[index]%>"></script>
-    <% } %>
-    <!-- / -->
+    
+    <% if (headBeforeScripts) { %> 
+      <% for (let index = 0; index < headBeforeScripts.length; index++) { %>
+        <script  crossorigin="anonymous" src="<%= headBeforeScripts[index]%>"></script>
+      <% } %>
     <% } %>
-    <!-- / -->
   </head>
 
   <body>
     <div id="app"></div>
-    <!-- / -->
-    <% if (bodyAfterScripts) { %>
-    <!-- / -->
-    <% for (let index = 0; index < bodyAfterScripts.length; index++) { %>
-    <script crossorigin="anonymous" src="<%= bodyAfterScripts[index]%>"></script>
-    <% } %>
-    <!-- / -->
+    <% if (bodyAfterScripts) { %> 
+      <% for (let index = 0; index < bodyAfterScripts.length; index++) { %>
+        <script crossorigin="anonymous" src="<%= bodyAfterScripts[index]%>"></script>
+      <% } %> 
     <% } %>
-    <!-- / -->
   </body>
 </html>

package/templates/html-plugin/index-inte3.html

@@ -16,65 +16,49 @@
       content="width=device-width,initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, viewport-fit=cover"
     />
     <title><%= title %></title>
-    <!-- / -->
-    <% if (inlineScripts) { %>
-    <!-- / -->
-    <script>
-      <% for (let index = 0; index < inlineScripts.length; index++) { %>
-        <%= inlineScripts[index]%>
-      <% } %>
-    </script>
-    <!-- / -->
-    <% } %>
-    <!-- / -->
 
-    <% if (viewport) { %>
-    <!-- / -->
-    <script>
-      <%= viewport %>
-    </script>
-    <!-- / -->
-    <% } %>
+    <% if (headBeforeHtmlTags) { %> 
+      <% for (let index = 0; index < headBeforeHtmlTags.length; index++) { %> 
+        <%= headBeforeHtmlTags[index] %> 
+      <% } %> 
+    <% } %> 
 
-    <!-- / -->
+    <% if (inlineScripts) { %>
+      <script>
+        <% for (let index = 0; index < inlineScripts.length; index++) { %>
+          <%= inlineScripts[index] %>
+        <% } %>
+      </script>
+    <% } %> 
+  
+    <% if (viewport) { %>
+      <script><%= viewport %></script>
+    <% } %> 
+    
     <% if (favicon) { %>
-    <!-- / -->
-    <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-    <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
-    <!-- / -->
+      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+    <% } %> 
+    
+    <% if (headBeforeStyles) { %> 
+      <% for (let index = 0; index < headBeforeStyles.length; index++) { %>
+        <link href="<%= headBeforeStyles[index] %>" rel="stylesheet" />
+      <% } %> 
     <% } %>
-
-    <!-- / -->
-    <% if (headBeforeStyles) { %>
-    <!-- / -->
-    <% for (let index = 0; index < headBeforeStyles.length; index++) { %>
-    <link href="<%= headBeforeStyles[index] %>" rel="stylesheet" />
-    <% } %>
-    <!-- / -->
-    <% } %>
-    <!-- / -->
-
-    <!-- / -->
-    <% if (headBeforeScripts) { %>
-    <!-- / -->
-    <% for (let index = 0; index < headBeforeScripts.length; index++) { %>
-    <script crossorigin="anonymous" src="<%= headBeforeScripts[index]%>"></script>
-    <% } %>
-    <!-- / -->
+    
+    <% if (headBeforeScripts) { %> 
+      <% for (let index = 0; index < headBeforeScripts.length; index++) { %>
+        <script  crossorigin="anonymous" src="<%= headBeforeScripts[index]%>"></script>
+      <% } %>
     <% } %>
-    <!-- / -->
   </head>
 
   <body>
     <div id="app"></div>
-    <!-- / -->
-    <% if (bodyAfterScripts) { %>
-    <!-- / -->
-    <% for (let index = 0; index < bodyAfterScripts.length; index++) { %>
-    <script crossorigin="anonymous" src="<%= bodyAfterScripts[index]%>"></script>
-    <% } %>
-    <!-- / -->
+    <% if (bodyAfterScripts) { %> 
+      <% for (let index = 0; index < bodyAfterScripts.length; index++) { %>
+        <script crossorigin="anonymous" src="<%= bodyAfterScripts[index]%>"></script>
+      <% } %> 
     <% } %>
-    <!-- / -->
   </body>
 </html>