feat(adder,builder): *.cjs.js -> *.cjs

deot · Aug 24, 2023 · e524118 · e524118
1 parent 1eaf618
commit e524118
Show file tree

Hide file tree

Showing 14 changed files with 104 additions and 28 deletions.
diff --git a/packages/adder/package.json b/packages/adder/package.json
@@ -1,10 +1,16 @@
 {
   "name": "@deot/dev-adder",
   "version": "2.3.2",
+  "type": "module",
   "main": "dist/index.es.js",
-  "module": "dist/index.es.js",
   "types": "dist/index.d.ts",
-  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
     "dist"
   ],
@@ -19,4 +25,4 @@
     "ora": "^7.0.1",
     "@deot/dev-shared": "^2.3.0"
   }
-}
+}
diff --git a/packages/adder/src/index.ts b/packages/adder/src/index.ts
@@ -44,7 +44,7 @@ export const run = (options: Options) => Utils.autoCatch(async () => {
 			exports: {
 				".": {
 					import: "./dist/index.es.js",
-					require: "./dist/index.cjs.js",
+					require: "./dist/index.cjs",
 					types: "./dist/index.d.ts"
 				}
 			},

diff --git a/packages/builder/__tests__/index.spec.ts b/packages/builder/__tests__/index.spec.ts
@@ -24,7 +24,7 @@ describe('index', () => {
 	}, 120000);
 
 	it('singlerepo', async () => {
-		expect.assertions(5);
+		expect.assertions(7);
 		const response = await Shell.spawn(`npm`, ['run', 'build'], {
 			cwd: path.resolve('./packages/_/singlerepo'),
 			stdio: 'pipe'
@@ -35,6 +35,12 @@ describe('index', () => {
 		// 因为js引用了css，vite会将其打包出，命名为style.css
 		expect(fs.existsSync(path.resolve('./packages/_/singlerepo/dist/style.css'))).toBe(true);
 
+		// es
+		expect(fs.existsSync(path.resolve('./packages/_/singlerepo/dist/index.es.js'))).toBe(true);
+
+		// cjs
+		expect(fs.existsSync(path.resolve('./packages/_/singlerepo/dist/index.cjs'))).toBe(true);
+
 		// iife
 		expect(fs.existsSync(path.resolve('./packages/_/singlerepo/dist/index.iife.js'))).toBe(true);
 

diff --git a/packages/builder/package.json b/packages/builder/package.json
@@ -1,10 +1,16 @@
 {
   "name": "@deot/dev-builder",
   "version": "2.3.3",
+  "type": "module",
   "main": "dist/index.es.js",
-  "module": "dist/index.es.js",
   "types": "dist/index.d.ts",
-  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
     "dist",
     "api-extractor.shared.json",

diff --git a/packages/builder/src/script.ts b/packages/builder/src/script.ts
@@ -78,7 +78,7 @@ export const run = async (options: Build) => {
 
 								// ChunkOutput // js
 								if (j.type === 'chunk') { 
-									fs.outputFileSync(`${outDir}/${j.name}.${format}.js`, j.code);
+									fs.outputFileSync(`${outDir}/${j.name}.${format}${format === 'cjs' ? '' : '.js'}`, j.code);
 									return;
 								}
 							});
@@ -91,13 +91,14 @@ export const run = async (options: Build) => {
 
 	let outputs = fs
 		.readdirSync(outDir)
-		.filter((i: string) => /^index(.*)(?!=\.d)\.js$/.test(i));
+		.filter((i: string) => /^index(.*)(?!=\.d)\.c?js$/.test(i));
 
 	outputs.forEach((file: string) => {
 		let stat = fs.statSync(path.resolve(outDir, file));
+
 		stats.push({
-			file: file.replace(/^(.*)(\..*\.js)/, '$1.ts'),
-			format: file.replace(/.*\.(.*)\.js/, '$1'),
+			file: file.replace(/^(.*)((\..*\.js)|\.cjs)/, '$1.ts'),
+			format: file.replace(/(.*\.(.*)\.js|.*\.(cjs))/, '$2$3'),
 			size: stat.size
 		});
 	});

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,10 +1,16 @@
 {
   "name": "@deot/dev-cli",
   "version": "2.3.4",
+  "type": "module",
   "main": "dist/index.es.js",
-  "module": "dist/index.es.js",
   "types": "dist/index.d.ts",
-  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
     "dist",
     "config"
@@ -30,4 +36,4 @@
   "bin": {
     "ddc": "bin/cli.js"
   }
-}
+}
diff --git a/packages/dever/package.json b/packages/dever/package.json
@@ -1,10 +1,16 @@
 {
   "name": "@deot/dev-dever",
   "version": "2.3.2",
+  "type": "module",
   "main": "dist/index.es.js",
-  "module": "dist/index.es.js",
   "types": "dist/index.d.ts",
-  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
     "dist",
     "index.ejs",

diff --git a/packages/index/package.json b/packages/index/package.json
@@ -1,9 +1,16 @@
 {
   "name": "@deot/dev",
   "version": "2.3.4",
+  "type": "module",
   "main": "dist/index.es.js",
   "types": "dist/index.d.ts",
-  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
     "dist",
     "commitlint.js",
@@ -28,4 +35,4 @@
     "@deot/dev-releaser": "^2.3.1",
     "@deot/dev-updater": "^2.3.1"
   }
-}
+}
diff --git a/packages/linker/package.json b/packages/linker/package.json
@@ -1,10 +1,16 @@
 {
   "name": "@deot/dev-linker",
   "version": "2.3.1",
+  "type": "module",
   "main": "dist/index.es.js",
-  "module": "dist/index.es.js",
   "types": "dist/index.d.ts",
-  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
     "dist"
   ],

diff --git a/packages/releaser/package.json b/packages/releaser/package.json
@@ -1,10 +1,16 @@
 {
   "name": "@deot/dev-releaser",
   "version": "2.3.1",
+  "type": "module",
   "main": "dist/index.es.js",
-  "module": "dist/index.es.js",
   "types": "dist/index.d.ts",
-  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
     "dist"
   ],

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,9 +1,16 @@
 {
   "name": "@deot/dev-shared",
   "version": "2.3.0",
+  "type": "module",
   "main": "dist/index.es.js",
   "types": "dist/index.d.ts",
-  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
     "dist"
   ],

diff --git a/packages/test/package.json b/packages/test/package.json
@@ -1,9 +1,16 @@
 {
   "name": "@deot/dev-test",
   "version": "2.3.2",
+  "type": "module",
   "main": "dist/index.es.js",
   "types": "dist/index.d.ts",
-  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
     "dist"
   ],

diff --git a/packages/tester/package.json b/packages/tester/package.json
@@ -1,10 +1,16 @@
 {
   "name": "@deot/dev-tester",
   "version": "2.3.1",
+  "type": "module",
   "main": "dist/index.es.js",
-  "module": "dist/index.es.js",
   "types": "dist/index.d.ts",
-  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
     "dist",
     "shared.config.ts"

diff --git a/packages/updater/package.json b/packages/updater/package.json
@@ -1,10 +1,16 @@
 {
   "name": "@deot/dev-updater",
   "version": "2.3.1",
+  "type": "module",
   "main": "dist/index.es.js",
-  "module": "dist/index.es.js",
   "types": "dist/index.d.ts",
-  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
     "dist"
   ],