Merge pull request #9434 from le717/themes-main-js

ingorichter · ingorichter · commit d48ab743a20d · 2014-10-09T16:03:40.000-07:00
Remove main.js requirement for themes
diff --git a/src/extensibility/node/package-validator.js b/src/extensibility/node/package-validator.js
@@ -287,8 +287,11 @@ function extractAndValidateFiles(zipPath, extractDir, options, callback) {
                     callback(err, null);
                     return;
                 }
-                var mainJS = path.join(extractDir, commonPrefix, "main.js");
-                if (!fs.existsSync(mainJS)) {
+                var mainJS  = path.join(extractDir, commonPrefix, "main.js"),
+                    isTheme = metadata && metadata.theme;
+                
+                // Throw missing main.js file only for non-theme extensions
+                if (!isTheme && !fs.existsSync(mainJS)) {
                     errors.push([Errors.MISSING_MAIN, zipPath, mainJS]);
                 }
                 callback(null, {
diff --git a/src/extensibility/node/package.json b/src/extensibility/node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "brackets-extensibility",
   "description": "Used in the management of Brackets extensions",
-  "version": "0.32.0",
+  "version": "0.45.0",
   "dependencies": {
     "decompress-zip": "0.0.2",
     "semver": "2.x",
diff --git a/src/extensibility/node/spec/Installation.spec.js b/src/extensibility/node/spec/Installation.spec.js
@@ -56,7 +56,7 @@ var basicValidExtension       = path.join(testFilesDirectory, "basic-valid-exten
     missingPackageJSON        = path.join(testFilesDirectory, "missing-package-json.zip"),
     missingPackageJSONUpdate  = path.join(testFilesDirectory, "missing-package-json-update.zip"),
     missingPackageJSONRenamed = path.join(testFilesDirectory, "added-package-json-test", "missing-package-json.zip"),
-    withSymlink            = path.join(testFilesDirectory, "with-symlink.zip");
+    withSymlink               = path.join(testFilesDirectory, "with-symlink.zip");
 
 
 describe("Package Installation", function () {
diff --git a/src/extensibility/node/spec/Validation.spec.js b/src/extensibility/node/spec/Validation.spec.js
@@ -44,6 +44,7 @@ var testFilesDirectory = path.join(path.dirname(module.filename),
 
 var basicValidExtension    = path.join(testFilesDirectory, "basic-valid-extension.zip"),
     basicValidExtension2   = path.join(testFilesDirectory, "basic-valid-extension-2.0.zip"),
+    basicValidTheme        = path.join(testFilesDirectory, "basic-valid-theme-1.0.zip"),
     missingPackageJSON     = path.join(testFilesDirectory, "missing-package-json.zip"),
     invalidJSON            = path.join(testFilesDirectory, "invalid-json.zip"),
     invalidZip             = path.join(testFilesDirectory, "invalid-zip-file.zip"),
@@ -167,6 +168,15 @@ describe("Package Validation", function () {
         });
     });
     
+    it("should NOT require a main.js in the zip file for a theme", function (done) {
+        packageValidator.validate(basicValidTheme, {}, function (err, result) {
+            expect(err).toBeNull();
+            expect(result.errors.length).toEqual(0);
+            expect(result.metadata.theme).toBeDefined();
+            done();
+        });
+    });
+    
     it("should determine the common prefix if there is one", function (done) {
         packageValidator.validate(oneLevelDown, {}, function (err, result) {
             expect(err).toBeNull();
diff --git a/test/spec/extension-test-files/basic-valid-theme-1.0.zip b/test/spec/extension-test-files/basic-valid-theme-1.0.zip
diff --git a/test/spec/extension-test-files/basic-valid-theme-1.0/package.json b/test/spec/extension-test-files/basic-valid-theme-1.0/package.json
@@ -0,0 +1,19 @@
+{
+    "name": "basic-valid-theme",
+    "title": "Basic Valid Theme",
+    "version": "1.0.0",
+    "author": "Alfred Einstein <alfred_not_albert@thoseeinsteins.org> (https://thoseeinsteins.org/alfred)",
+    "contributors": [
+        "Johan Einstein",
+        {
+            "name": "Albert Einstein Jr.",
+            "email": "not_that_albert@thoseeinsteins.org"
+        },
+        "Jens Einstein <jens@thoseeinsteins.org>"
+    ],
+    "theme": {
+        "file": "theme.less",
+        "dark": false
+    },
+    "keywords": ["theme"]
+}
diff --git a/test/spec/extension-test-files/basic-valid-theme-1.0/theme.less b/test/spec/extension-test-files/basic-valid-theme-1.0/theme.less

Original file line number	Diff line number	Diff line change
`@@ -287,8 +287,11 @@ function extractAndValidateFiles(zipPath, extractDir, options, callback) {`
`287`	`287`	`callback(err, null);`
`288`	`288`	`return;`
`289`	`289`	`}`
`290`		`- var mainJS = path.join(extractDir, commonPrefix, "main.js");`
`291`		`- if (!fs.existsSync(mainJS)) {`
	`290`	`+ var mainJS = path.join(extractDir, commonPrefix, "main.js"),`
	`291`	`+ isTheme = metadata && metadata.theme;`
	`292`	`+`
	`293`	`+ // Throw missing main.js file only for non-theme extensions`
	`294`	`+ if (!isTheme && !fs.existsSync(mainJS)) {`
`292`	`295`	`errors.push([Errors.MISSING_MAIN, zipPath, mainJS]);`
`293`	`296`	`}`
`294`	`297`	`callback(null, {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "brackets-extensibility",`
`3`	`3`	`"description": "Used in the management of Brackets extensions",`
`4`		`- "version": "0.32.0",`
	`4`	`+ "version": "0.45.0",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"decompress-zip": "0.0.2",`
`7`	`7`	`"semver": "2.x",`