@nocobase/build 0.10.1-alpha.1 → 0.11.0-alpha.1

package/lib/build.js

@@ -39,9 +39,10 @@ function getBundleOpts(opts) {
     buildArgs = _opts$buildArgs === void 0 ? {} : _opts$buildArgs,
     _opts$rootConfig = opts.rootConfig,
     rootConfig = _opts$rootConfig === void 0 ? {} : _opts$rootConfig;
-  const entry = (0, _utils.getExistFile)({
+  const entry = (0, _utils.getExistFiles)({
     cwd,
-    files: ['src/index.tsx', 'src/index.ts', 'src/index.jsx', 'src/index.js'],
+    files: ['src/index.tsx', 'src/index.ts', 'src/index.jsx', 'src/index.js', 'src/server/index.ts', 'src/server/index.js', 'src/client/index.js', 'src/client/index.ts', 'src/client/index.tsx'],
+    onlyOne: false,
     returnRelative: true
   });
   const userConfig = (0, _getUserConfig.default)({

package/lib/getUserConfig.js

@@ -43,7 +43,7 @@ function _default({
       throw new Error(`can\'t found config file: ${customPath}`);
     }
   }
-  const configFile = finalPath || (0, _utils.getExistFile)({
+  const configFile = finalPath || (0, _utils.getExistFiles)({
     cwd,
     files: CONFIG_FILES,
     returnRelative: false

package/lib/utils/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getExistFile = getExistFile;
+exports.getExistFiles = getExistFiles;
 Object.defineProperty(exports, "getLernaPackages", {
   enumerable: true,
   get: function get() {
@@ -16,11 +16,13 @@ var _getLernaPackages = require("./getLernaPackages");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function getExistFile({
+function getExistFiles({
   cwd,
   files,
-  returnRelative
+  returnRelative,
+  onlyOne = true
 }) {
+  const res = [];
   var _iterator = _createForOfIteratorHelper(files),
     _step;
   try {
@@ -28,7 +30,8 @@ function getExistFile({
       const file = _step.value;
       const absFilePath = (0, _path.join)(cwd, file);
       if ((0, _fs.existsSync)(absFilePath)) {
-        return returnRelative ? file : absFilePath;
+        const filePath = returnRelative ? file : absFilePath;
+        res.push(filePath);
       }
     }
   } catch (err) {
@@ -36,4 +39,5 @@ function getExistFile({
   } finally {
     _iterator.f();
   }
+  return onlyOne ? res[0] : res; // undefined or string[]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "0.10.1-alpha.1",
+  "version": "0.11.0-alpha.1",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "bin": {
@@ -8,31 +8,31 @@
   },
   "typings": "./index.d.ts",
   "dependencies": {
-    "@babel/core": "7.12.3",
-    "@babel/plugin-proposal-class-properties": "7.12.1",
-    "@babel/plugin-proposal-decorators": "7.12.1",
-    "@babel/plugin-proposal-do-expressions": "7.12.1",
-    "@babel/plugin-proposal-export-default-from": "7.12.1",
-    "@babel/plugin-proposal-export-namespace-from": "7.12.1",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "7.12.1",
-    "@babel/plugin-proposal-optional-chaining": "7.12.1",
+    "@babel/core": "7.22.5",
+    "@babel/plugin-proposal-class-properties": "7.18.6",
+    "@babel/plugin-proposal-decorators": "7.22.5",
+    "@babel/plugin-proposal-do-expressions": "7.22.5",
+    "@babel/plugin-proposal-export-default-from": "7.22.5",
+    "@babel/plugin-proposal-export-namespace-from": "7.18.9",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
+    "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/plugin-transform-modules-commonjs": "7.12.1",
-    "@babel/plugin-transform-runtime": "7.12.1",
+    "@babel/plugin-transform-modules-commonjs": "7.22.5",
+    "@babel/plugin-transform-runtime": "7.22.5",
     "@babel/preset-env": "7.12.1",
-    "@babel/preset-react": "7.12.1",
-    "@babel/preset-typescript": "7.12.1",
-    "@babel/register": "7.12.1",
+    "@babel/preset-react": "7.22.5",
+    "@babel/preset-typescript": "7.22.5",
+    "@babel/register": "7.22.5",
     "@lerna/filter-packages": "4.0.0",
     "@lerna/project": "4.0.0",
     "@lerna/query-graph": "4.0.0",
-    "@rollup/plugin-babel": "5.3.1",
-    "@rollup/plugin-commonjs": "16.0.0",
-    "@rollup/plugin-inject": "4.0.2",
-    "@rollup/plugin-json": "4.1.0",
-    "@rollup/plugin-node-resolve": "10.0.0",
-    "@rollup/plugin-replace": "2.3.4",
-    "@rollup/plugin-url": "5.0.1",
+    "@rollup/plugin-babel": "6.0.3",
+    "@rollup/plugin-commonjs": "25.0.1",
+    "@rollup/plugin-inject": "5.0.3",
+    "@rollup/plugin-json": "6.0.0",
+    "@rollup/plugin-node-resolve": "15.1.0",
+    "@rollup/plugin-replace": "5.0.2",
+    "@rollup/plugin-url": "8.0.1",
     "@svgr/rollup": "5.5.0",
     "ajv": "6.12.6",
     "autoprefixer": "9.6.0",
@@ -45,23 +45,23 @@
     "gulp-if": "2.0.2",
     "gulp-less": "^5.0.0",
     "gulp-plumber": "^1.2.1",
-    "gulp-typescript": "5.0.1",
+    "gulp-typescript": "6.0.0-alpha.1",
     "less": "4.1.3",
     "less-plugin-npm-import": "2.1.0",
     "lodash": "4.17.21",
     "pkg-up": "3.1.0",
     "rimraf": "2.6.3",
-    "rollup": "2.33.3",
-    "rollup-plugin-postcss": "3.1.8",
+    "rollup": "3.25.1",
+    "rollup-plugin-postcss": "4.0.2",
     "rollup-plugin-terser": "7.0.2",
-    "rollup-plugin-typescript2": "0.29.0",
+    "rollup-plugin-typescript2": "0.34.1",
     "semver": "6.1.1",
     "signale": "1.4.0",
     "slash2": "2.0.0",
     "temp-dir": "2.0.0",
     "through2": "3.0.1",
-    "ts-loader": "^8.0.7",
-    "typescript": "4.5.5",
+    "ts-loader": "^9.4.3",
+    "typescript": "5.1.3",
     "update-notifier": "3.0.0",
     "vinyl-fs": "3.0.3",
     "yargs-parser": "13.1.2"
@@ -74,5 +74,5 @@
     "@types/gulp-plumber": "^0.0.32",
     "umi-tools": "^0.4.0"
   },
-  "gitHead": "8f415f5e0ee2e72d681f9ab16af5911b52c374a9"
+  "gitHead": "7581b6d3a3a54f09f06a9effb7e3e65328281b2b"
 }

package/src/build.ts

@@ -11,13 +11,24 @@ import randomColor from './randomColor';
 import registerBabel from './registerBabel';
 import rollup from './rollup';
 import { Dispose, IBundleOptions, IBundleTypeOutput, ICjs, IEsm, IOpts } from './types';
-import { getExistFile, getLernaPackages } from './utils';
+import { getExistFiles, getLernaPackages } from './utils';
 
 export function getBundleOpts(opts: IOpts): IBundleOptions[] {
   const { cwd, buildArgs = {}, rootConfig = {} } = opts;
-  const entry = getExistFile({
+  const entry = getExistFiles({
     cwd,
-    files: ['src/index.tsx', 'src/index.ts', 'src/index.jsx', 'src/index.js'],
+    files: [
+      'src/index.tsx',
+      'src/index.ts',
+      'src/index.jsx',
+      'src/index.js',
+      'src/server/index.ts',
+      'src/server/index.js',
+      'src/client/index.js',
+      'src/client/index.ts',
+      'src/client/index.tsx'
+    ],
+    onlyOne: false,
     returnRelative: true,
   });
   const userConfig = getUserConfig({ cwd, customPath: buildArgs.config });

package/src/getUserConfig.ts

@@ -5,7 +5,7 @@ import signale from 'signale';
 import slash from 'slash2';
 import schema from './schema';
 import { IBundleOptions } from './types';
-import { getExistFile } from './utils';
+import { getExistFiles } from './utils';
 
 function testDefault(obj) {
   return obj.default || obj;
@@ -51,7 +51,7 @@ export default function({ cwd, customPath }: { cwd: string; customPath?: string
 
   const configFile =
     finalPath ||
-    getExistFile({
+    getExistFiles({
       cwd,
       files: CONFIG_FILES,
       returnRelative: false,

package/src/utils/index.ts

@@ -1,13 +1,17 @@
 import { existsSync } from 'fs';
 import { join } from 'path';
 
-export function getExistFile({ cwd, files, returnRelative }) {
+export function getExistFiles({ cwd, files, returnRelative, onlyOne = true }) {
+  const res = [];
   for (const file of files) {
     const absFilePath = join(cwd, file);
     if (existsSync(absFilePath)) {
-      return returnRelative ? file : absFilePath;
+      const filePath = returnRelative ? file : absFilePath;
+      res.push(filePath);
     }
   }
+
+  return onlyOne ? res[0] : res; // undefined or string[]
 }
 
 export { getLernaPackages } from './getLernaPackages';