feat: added styled-system config and converted babel

codebender828 · codebender828 · commit fd480310cf41 · 2020-12-01T11:26:07.000+08:00
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -10,7 +10,7 @@ extends:
 parser: vue-eslint-parser
 parserOptions:
   parser: '@typescript-eslint/parser'
-  ecmaVersion: 12
+  ecmaVersion: 2020
   sourceType: module
 plugins:
   - '@typescript-eslint'
diff --git a/_templates/generator/component/package.json.ejs.t b/_templates/generator/component/package.json.ejs.t
@@ -18,8 +18,8 @@ to: packages/<%=h.changeCase.paramCase(name)%>/package.json
   "license": "MIT",
   "scripts": {
     "build": "concurrently yarn:build:*",
-    "build:esm": "cross-env swc src --out-dir dist/esm/",
-    "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",
+    "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",
+    "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",
     "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"
   }
 }
diff --git a/_templates/generator/module/package.json.ejs.t b/_templates/generator/module/package.json.ejs.t
@@ -18,7 +18,7 @@ to: packages/<%=h.changeCase.paramCase(name)%>/package.json
   "license": "MIT",
   "scripts": {
     "build": "concurrently yarn:build:*",
-    "build:esm": "cross-env swc src --out-dir dist/esm/",
-    "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/"
+    "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",
+    "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps"
   }
 }
diff --git a/babel.config.js b/babel.config.js
@@ -0,0 +1,25 @@
+const BABEL_ENV = process.env.BABEL_ENV
+const isCommonJS = BABEL_ENV !== undefined && BABEL_ENV === 'cjs'
+const isESM = BABEL_ENV !== undefined && BABEL_ENV === 'esm'
+
+module.exports = function (api) {
+  api.cache(true)
+
+  const presets = [
+    [
+      '@babel/env',
+      {
+        loose: true,
+        modules: isCommonJS ? 'commonjs' : false,
+        targets: {
+          esmodules: isESM ? true : undefined,
+        },
+      },
+    ],
+    '@babel/preset-typescript',
+  ]
+
+  return {
+    presets,
+  }
+}
diff --git a/package.json b/package.json
@@ -23,12 +23,14 @@
   "license": "MIT",
   "private": true,
   "devDependencies": {
-    "@swc/cli": "^0.1.26",
-    "@swc/core": "^1.2.28",
+    "@babel/cli": "^7.12.8",
+    "@babel/core": "^7.12.9",
+    "@babel/preset-env": "^7.12.7",
+    "@babel/preset-typescript": "^7.12.7",
     "@types/jest": "^26.0.14",
     "@types/recursive-readdir": "^2.2.0",
     "@typescript-eslint/eslint-plugin": "^2.34.0",
-    "@typescript-eslint/parser": "^2.34.0",
+    "@typescript-eslint/parser": "4.0.1",
     "@vue/eslint-config-typescript": "^5.1.0",
     "concurrently": "^5.3.0",
     "consola": "^2.15.0",
@@ -48,7 +50,7 @@
     "prettier": "^2.1.2",
     "recursive-readdir": "^2.2.2",
     "ts-node": "^9.0.0",
-    "typescript": "^4.0.3",
+    "typescript": "^4.1.2",
     "vite": "^1.0.0-rc.13",
     "vue": "^3",
     "vue-router": "4.0.0-beta.10"
@@ -58,6 +60,7 @@
     "@types/lodash.mergewith": "^4.6.6",
     "@types/tinycolor2": "^1.4.2",
     "change-case": "^4.1.1",
+    "css-get-unit": "^1.0.1",
     "csstype": "^3.0.5",
     "lodash.mergewith": "^4.6.2",
     "object-assign": "^4.1.1",
diff --git a/packages/c-accordion/package.json b/packages/c-accordion/package.json
@@ -14,8 +14,8 @@
   "license": "MIT",
   "scripts": {
     "build": "concurrently yarn:build:*",
-    "build:esm": "cross-env swc src --out-dir dist/esm/",
-    "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",
+    "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",
+    "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",
     "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"
   }
 }
diff --git a/packages/c-alert/package.json b/packages/c-alert/package.json
@@ -14,8 +14,8 @@
   "license": "MIT",
   "scripts": {
     "build": "concurrently yarn:build:*",
-    "build:esm": "cross-env swc src --out-dir dist/esm/",
-    "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",
+    "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",
+    "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",
     "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"
   },
   "dependencies": {
diff --git a/packages/c-box/package.json b/packages/c-box/package.json
@@ -14,8 +14,8 @@
   "license": "MIT",
   "scripts": {
     "build": "concurrently yarn:build:*",
-    "build:esm": "cross-env swc src --out-dir dist/esm/",
-    "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",
+    "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",
+    "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",
     "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"
   }
 }
diff --git a/packages/c-button/package.json b/packages/c-button/package.json
@@ -14,8 +14,8 @@
   "license": "MIT",
   "scripts": {
     "build": "concurrently yarn:build:*",
-    "build:esm": "cross-env swc src --out-dir dist/esm/",
-    "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",
+    "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",
+    "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",
     "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"
   }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -14,8 +14,8 @@
   "license": "MIT",
   "scripts": {
     "build": "concurrently yarn:build:*",
-    "build:esm": "cross-env swc src --out-dir dist/esm/",
-    "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",
+    "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",
+    "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",
     "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"
   }
 }
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
@@ -14,8 +14,8 @@
   "license": "MIT",
   "scripts": {
     "build": "concurrently yarn:build:*",
-    "build:esm": "cross-env swc src --out-dir dist/esm/",
-    "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",
+    "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",
+    "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",
     "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"
   }
 }
diff --git a/packages/styled-system/package.json b/packages/styled-system/package.json
@@ -12,7 +12,7 @@
   "scripts": {
     "build": "concurrently yarn:build:*",
     "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",
-    "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",
+    "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",
     "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"
   },
   "dependencies": {
diff --git a/packages/system/package.json b/packages/system/package.json
@@ -11,8 +11,8 @@
   "license": "MIT",
   "scripts": {
     "build": "concurrently yarn:build:*",
-    "build:esm": "cross-env swc src --out-dir dist/esm/",
-    "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",
+    "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",
+    "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",
     "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"
   },
   "dependencies": {
diff --git a/packages/theme-tools/package.json b/packages/theme-tools/package.json
@@ -14,8 +14,8 @@
   "license": "MIT",
   "scripts": {
     "build": "concurrently yarn:build:*",
-    "build:esm": "cross-env swc src --out-dir dist/esm/",
-    "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",
+    "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",
+    "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",
     "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"
   },
   "dependencies": {
diff --git a/packages/theme/package.json b/packages/theme/package.json
@@ -14,8 +14,8 @@
   "license": "MIT",
   "scripts": {
     "build": "concurrently yarn:build:*",
-    "build:esm": "cross-env swc src --out-dir dist/esm/",
-    "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",
+    "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",
+    "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",
     "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"
   },
   "dependencies": {
diff --git a/packages/utils/package-lock.json b/packages/utils/package-lock.json
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -11,8 +11,8 @@
   "license": "MIT",
   "scripts": {
     "build": "concurrently yarn:build:*",
-    "build:esm": "cross-env swc src --out-dir dist/esm/",
-    "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",
+    "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",
+    "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",
     "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"
   },
   "dependencies": {
diff --git a/packages/utils/src/object.ts b/packages/utils/src/object.ts
@@ -1,7 +1,9 @@
-import type { Dict, Omit } from "./types"
+import mergeWith from 'lodash.mergewith'
+import type { Dict, Omit } from './types'
 
-export { default as mergeWith } from "lodash.mergewith"
-export { default as objectAssign } from "object-assign"
+export { default as objectAssign } from 'object-assign'
+
+console.log(mergeWith)
 
 export function omit<T extends Dict, K extends keyof T>(object: T, keys: K[]) {
   const result: Dict = {}
@@ -52,9 +54,9 @@ export function get(
   obj: object,
   path: string | number,
   fallback?: any,
-  index?: number,
+  index?: number
 ) {
-  const key = typeof path === "string" ? path.split(".") : [path]
+  const key = typeof path === 'string' ? path.split('.') : [path]
 
   for (index = 0; index < key.length; index += 1) {
     if (!obj) {
@@ -71,7 +73,7 @@ type Handler = (
   obj: Readonly<object>,
   path: string | number,
   fallback?: any,
-  index?: number,
+  index?: number
 ) => any
 
 const memoize = (fn: Handler) => {
@@ -81,14 +83,14 @@ const memoize = (fn: Handler) => {
     obj: object,
     path: string | number,
     fallback?: any,
-    index?: number,
+    index?: number
   ) => {
     if (!cache.has(obj)) {
       cache.set(obj, new Map())
     }
 
     const map = cache.get(obj)
-    const key = typeof path === "string" ? path.split(".") : [path]
+    const key = typeof path === 'string' ? path.split('.') : [path]
 
     if (map.has(key)) {
       return map.get(key)
@@ -154,3 +156,5 @@ export const fromEntries = <T extends unknown>(entries: [string, any][]) =>
     carry[key] = value
     return carry
   }, {}) as T
+
+export { mergeWith }
diff --git a/scripts/parse-routes.ts b/scripts/parse-routes.ts
@@ -48,8 +48,8 @@ export interface Route {
 /** To import statement */
 const toImport = (component: string, importPath: string) =>
   // Note: for now dynamic imports dont work with vite. use static imports
-  `const ${component} = () => import('${importPath}')`
-// `import ${component} from '${importPath}'`
+  // `const ${component} = () => import('${importPath}')`
+  `import ${component} from '${importPath}'`
 
 interface Resolver {
   (resolver: Route): string
diff --git a/tsconfig.json b/tsconfig.json
@@ -6,9 +6,9 @@
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
     "target": "es5",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
-    "module": "esnext",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+    "module": "es2020",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
     "resolveJsonModule": true,
-    "lib": [ "esnext", "dom" ],
+    "lib": [ "es2020", "dom" ],
     "types": ["node", "jest"],
     "declaration": true,
     "sourceMap": true,
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ to: packages/<%=h.changeCase.paramCase(name)%>/package.json`
`18`	`18`	`"license": "MIT",`
`19`	`19`	`"scripts": {`
`20`	`20`	`"build": "concurrently yarn:build:*",`
`21`		`- "build:esm": "cross-env swc src --out-dir dist/esm/",`
`22`		`- "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",`
	`21`	`+ "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",`
	`22`	`+ "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",`
`23`	`23`	`"build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ to: packages/<%=h.changeCase.paramCase(name)%>/package.json`
`18`	`18`	`"license": "MIT",`
`19`	`19`	`"scripts": {`
`20`	`20`	`"build": "concurrently yarn:build:*",`
`21`		`- "build:esm": "cross-env swc src --out-dir dist/esm/",`
`22`		`- "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/"`
	`21`	`+ "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",`
	`22`	`+ "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps"`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`	`"license": "MIT",`
`15`	`15`	`"scripts": {`
`16`	`16`	`"build": "concurrently yarn:build:*",`
`17`		`- "build:esm": "cross-env swc src --out-dir dist/esm/",`
`18`		`- "build:cjs": "cross-env swc -C module.type=commonjs src --out-dir dist/cjs/",`
	`17`	`+ "build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts -d dist/esm --source-maps",`
	`18`	`+ "build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts -d dist/cjs --source-maps",`
`19`	`19`	`"build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist/types"`
`20`	`20`	`}`
`21`	`21`	`}`