move main to spm.main

popomore · Mar 27, 2014 · da4613f · da4613f
1 parent 9130174
commit da4613f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 9 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -5,6 +5,7 @@
 ## 0.4.0
 
 - add output as same as main
+- move main to spm.main
 
 ## 0.3.1
 

diff --git a/lib/spm-package.js b/lib/spm-package.js
@@ -33,7 +33,7 @@ function normalize(pkg) {
     name: pkg.name,
     version: pkg.version,
     dependencies: pkg.spm.dependencies || {},
-    main: pkg.main || 'index.js',
+    main: pkg.spm.main || 'index.js',
     dest: dest,
     output: pkg.spm.output || [],
     origin: pkg

diff --git a/test/fixtures/not-found/a.js → test/fixtures/not-found/index.js b/test/fixtures/not-found/a.js → test/fixtures/not-found/index.js
diff --git a/test/fixtures/not-found/package.json b/test/fixtures/not-found/package.json
@@ -1,8 +1,4 @@
 {
   "name": "a",
-  "version": "1.0.0",
-  "main": "a.js",
-  "spm": {
-    "dependencies": {}
-  }
+  "version": "1.0.0"
 }
diff --git a/test/fixtures/spm/package.json b/test/fixtures/spm/package.json
@@ -1,8 +1,8 @@
 {
   "name": "a",
   "version": "1.0.0",
-  "main": "a.js",
   "spm": {
+    "main": "a.js",
     "output": ["c.js"],
     "dependencies": {
       "b": "1.1.0",

diff --git a/test/fixtures/spm/sea-modules/b/1.1.0/package.json b/test/fixtures/spm/sea-modules/b/1.1.0/package.json
@@ -1,8 +1,8 @@
 {
   "name": "b",
   "version": "1.1.0",
-  "main": "src/b.js",
   "spm": {
+    "main": "src/b.js",
     "dependencies": {
       "d": "0.1.0",
       "c": "1.1.1"

diff --git a/test/fixtures/version-cache/package.json b/test/fixtures/version-cache/package.json
@@ -1,8 +1,8 @@
 {
   "name": "a",
   "version": "1.0.0",
-  "main": "a.js",
   "spm": {
+    "main": "a.js",
     "dependencies": {
       "b": "0.0.1"
     }