Merge magicspace changes (update)

mufancom · Oct 27, 2023 · a248219 · a248219
2 parents 2aea972 + b6f1a68
commit a248219
Show file tree

Hide file tree

Showing 11 changed files with 365 additions and 52 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -11,15 +11,15 @@
   "extends": ["plugin:@mufan/javascript"],
   "overrides": [
     {
-      "files": "**/*.{js,cjs}",
+      "files": "**/*.{js,mjs}",
       "parserOptions": {
-        "sourceType": "script"
+        "sourceType": "module"
       }
     },
     {
-      "files": "**/*.mjs",
+      "files": "**/*.cjs",
       "parserOptions": {
-        "sourceType": "module"
+        "sourceType": "script"
       }
     }
   ]

diff --git a/.magicspace/boilerplate.json b/.magicspace/boilerplate.json
@@ -8,6 +8,8 @@
     "license": "MIT",
     "author": "Chengdu Mufan Technology Co., Ltd.",
     "defaultBranch": "master",
+    "packageManager": "yarn",
+    "type": "module",
     "projects": [
       {
         "name": "general-composables",

diff --git a/.magicspace/boilerplate.schema.json b/.magicspace/boilerplate.schema.json
@@ -64,6 +64,9 @@
         },
         "license": {
           "type": "boolean"
+        },
+        "discord": {
+          "type": "string"
         }
       },
       "additionalProperties": false
@@ -451,7 +454,10 @@
     "type-32": {
       "type": "object",
       "required": [
-        "name"
+        "name",
+        "type",
+        "defaultBranch",
+        "packageManager"
       ],
       "properties": {
         "name": {

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,6 +7,9 @@
   },
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.rulers": [80],
+  "files.associations": {
+    "boilerplate.json": "jsonc"
+  },
   "files.eol": "\n",
   "files.insertFinalNewline": true,
   "files.trimTrailingWhitespace": true,

diff --git a/general/src/composables/README.md.ts b/general/src/composables/README.md.ts
@@ -54,11 +54,11 @@ export default composable<ResolvedOptions>(options => {
   ];
 });
 
-interface Badge {
+type Badge = {
   title: string;
   image: string;
   url: string;
-}
+};
 
 function buildBadges(
   {

diff --git a/general/src/composables/eslintrc.ts b/general/src/composables/eslintrc.ts
@@ -1,5 +1,5 @@
 import type {JSONFileOptions} from '@magicspace/core';
-import {json, composable} from '@magicspace/core';
+import {composable, json} from '@magicspace/core';
 
 import type {ResolvedOptions} from '../library/index.js';
 

diff --git a/general/src/library/boilerplate.ts b/general/src/library/boilerplate.ts
@@ -108,20 +108,21 @@ export const Options = x.object({
 
 export type Options = x.TypeOf<typeof Options>;
 
-export interface ResolvedPackageOptions extends PackageOptions {
+export type ResolvedPackageOptions = {
   alias?: string;
   resolvedDir: string;
   packageJSONPath: string;
-}
+} & PackageOptions;
 
-export interface ResolvedOptions extends Options, BoilerplateBuilderContext {
+export type ResolvedOptions = {
   defaultBranch: string;
   packageManager: 'pnpm' | 'yarn';
   packagesDir: string | undefined;
   packages: ResolvedPackageOptions[];
   packagesSortedByName: ResolvedPackageOptions[];
   packagesSortedByAlias: ResolvedPackageOptions[];
-}
+} & Options &
+  BoilerplateBuilderContext;
 
 export function resolveOptions<TOptions extends Options>(
   options: TOptions,

diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
   "repository": "https://github.com/makeflow/mufan-code-boilerplates.git",
   "author": "Chengdu Mufan Technology Co., Ltd.",
   "license": "MIT",
+  "type": "module",
   "exports": {
     "./general": {
       "types": "./general/bld/library/index.d.ts",
@@ -33,10 +34,10 @@
     "typescript": "^5.2.2"
   },
   "devDependencies": {
-    "@mufan/eslint-plugin": "^0.2.5",
+    "@mufan/eslint-plugin": "^0.2.13",
     "@types/lodash": "^4.14.159",
     "@types/node": "^14.0.27",
-    "eslint": "^8.51.0",
+    "eslint": "^8.52.0",
     "rimraf": "^5.0.5",
     "run-in-every": "^0.2.0",
     "yarn-deduplicate": "^6.0.2"

diff --git a/typescript/src/composables/package.json.ts b/typescript/src/composables/package.json.ts
@@ -9,9 +9,9 @@ import {
 import _ from 'lodash';
 
 import type {
-  ResolvedPackageOptions,
   PackageExports,
   ResolvedOptions,
+  ResolvedPackageOptions,
   ResolvedTypeScriptProjectOptions,
 } from '../library/index.js';
 

diff --git a/typescript/src/library/options.ts b/typescript/src/library/options.ts
@@ -143,12 +143,12 @@ export const Options = GeneralOptions.extend({
 
 export type Options = x.TypeOf<typeof Options>;
 
-export interface ResolvedTypeScriptBuild {
+export type ResolvedTypeScriptBuild = {
   outDir: string;
   module: BuildModuleType;
-}
+};
 
-export interface ResolvedTypeScriptProjectOptions {
+export type ResolvedTypeScriptProjectOptions = {
   name: string;
   srcDir: string;
   bldDir: string;
@@ -162,14 +162,14 @@ export interface ResolvedTypeScriptProjectOptions {
   entrances: string[];
   package: ResolvedPackageOptions;
   references: ResolvedTypeScriptProjectReference[] | undefined;
-}
+};
 
 export type ResolvedPackageOptions = ResolvedGeneralPackageOptions &
   PackageOptions;
 
-export interface ResolvedTypeScriptProjectReference {
+export type ResolvedTypeScriptProjectReference = {
   path: string;
-}
+};
 
 export type ResolvedOptions = Options &
   ResolvedGeneralOptions & {
@@ -245,10 +245,9 @@ export function resolveOptions(
   };
 }
 
-interface ResolvedTypeScriptProjectOptionsWithRawReferences
-  extends OmitValueOfKey<ResolvedTypeScriptProjectOptions, 'references'> {
+type ResolvedTypeScriptProjectOptionsWithRawReferences = {
   references?: GeneralTypeScriptProjectReferenceOptions[];
-}
+} & OmitValueOfKey<ResolvedTypeScriptProjectOptions, 'references'>;
 
 export function buildResolvedTypeScriptProjectOptions(
   {