Convert rocketchat-theme to main module structure (#12896)

RocketChat · Dec 12, 2018 · 4f429b5 · 4f429b5
1 parent cd7eb25
commit 4f429b5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/packages/rocketchat_theme/client/index.js b/packages/rocketchat_theme/client/index.js
@@ -0,0 +1 @@
+import './vendor/jscolor';
diff --git a/packages/rocketchat_theme/package.js b/packages/rocketchat_theme/package.js
@@ -5,22 +5,19 @@ Package.describe({
 	git: '',
 });
 Package.onUse(function(api) {
-	api.use('rocketchat:lib');
-	api.use('rocketchat:logger');
-	api.use('rocketchat:assets');
-	api.use('juliancwirko:postcss');
-	api.use('ecmascript');
-	api.use('less');
-	api.use('webapp');
-	api.use('webapp-hashing');
-	api.use('templating', 'client');
+	api.use([
+		'ecmascript',
+		'less',
+		'webapp',
+		'webapp-hashing',
+		'rocketchat:lib',
+		'rocketchat:logger',
+		'rocketchat:assets',
+		'templating',
+		'juliancwirko:postcss',
+	]);
 	// Compiled stylesheets
 	api.addFiles('client/main.css', 'client');
-	// Server side files
-	api.addFiles('server/server.js', 'server');
-	api.addFiles('server/variables.js', 'server');
-	// Colorpicker
-	api.addFiles('client/vendor/jscolor.js', 'client');
 	// Photoswipe
 	api.addFiles('client/vendor/photoswipe.css', 'client');
 	api.addAssets('client/imports/general/variables.css', 'server');
@@ -33,4 +30,6 @@ Package.onUse(function(api) {
 	api.addAssets('client/vendor/fontello/font/fontello.woff2', 'client');
 	// Run-time stylesheets
 	api.addAssets('server/colors.less', 'server');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat_theme/server/index.js b/packages/rocketchat_theme/server/index.js
@@ -0,0 +1,2 @@
+import './server';
+import './variables';
diff --git a/packages/rocketchat_theme/server/server.js b/packages/rocketchat_theme/server/server.js
@@ -1,7 +1,8 @@
-/* globals WebAppHashing */
-
 import { WebApp } from 'meteor/webapp';
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { Logger } from 'meteor/rocketchat:logger';
+import { WebAppHashing } from 'meteor/webapp-hashing';
 import _ from 'underscore';
 import less from 'less';
 import Autoprefixer from 'less-plugin-autoprefix';

diff --git a/packages/rocketchat_theme/server/variables.js b/packages/rocketchat_theme/server/variables.js
@@ -1,4 +1,4 @@
-
+import { RocketChat } from 'meteor/rocketchat:lib';
 // TODO: Define registers/getters/setters for packages to work with established
 // 			heirarchy of colors instead of making duplicate definitions
 // TODO: Settings pages to show simple separation of major/minor/addon colors