Merge branch 'remove-bower' into better-permissions

techfromsage · Jun 13, 2019 · f094704 · f094704
2 parents fc769af + 345964e
commit f094704
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 41 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,22 +1,21 @@
 module.exports = function(grunt) {
-
   // Project configuration.
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
     distdir: './dist',
     copy: {
-      bower: {
+      dependencies: {
         files: [
           {
             expand: true,
-            cwd: './',
+            cwd: './node_modules',
             src: [
-              'bower_components/bootstrap/dist/js/bootstrap.min.js',
-              'bower_components/bootstrap/dist/css/bootstrap.min.css',
-              'bower_components/jquery/dist/jquery.min.js'
+              'bootstrap/dist/js/bootstrap.min.js',
+              'bootstrap/dist/css/bootstrap.min.css',
+              'jquery/dist/jquery.min.js'
             ],
-            dest: 'dist'
-          }
+            dest: 'dist/dependencies'
+          },
         ]
       },
       common: {
@@ -50,6 +49,9 @@ module.exports = function(grunt) {
     manifest.version = grunt.config('pkg.version');
     if (grunt.option('identifier')) {
       manifest.applications = { 'gecko': { 'id': grunt.option('identifier') } };
+      delete manifest.options_page;
+      delete manifest.options_ui.chrome_style;
+      manifest.options_ui.browser_style = true;
     }
     if (dist === 'manifold') {
       // manifoldjs requires a completely different icons schema for packaging edge extensions
@@ -70,12 +72,12 @@ module.exports = function(grunt) {
   grunt.registerTask(
     'dist-common',
     'Create distribution for Web Extension browsers',
-    ['create-dist-dir', 'write-manifest:common', 'copy:bower', 'copy:common']
+    ['create-dist-dir', 'write-manifest:common', 'copy:dependencies', 'copy:common']
   );
   grunt.registerTask(
     'dist-manifold',
     'Create distribution for Web Extension browsers',
-    ['create-dist-dir', 'write-manifest:manifold', 'copy:bower', 'copy:common']
+    ['create-dist-dir', 'write-manifest:manifold', 'copy:dependencies', 'copy:common']
   );
   grunt.registerTask('default', ['dist-common']);
 };
diff --git a/bower.json b/bower.json
diff --git a/options.html b/options.html
@@ -3,10 +3,10 @@
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title data-message="optionsTitle">Talis Aspire Reading Lists Bookmarking Options</title>
-    <script src="/bower_components/jquery/dist/jquery.min.js"></script>
-    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css" />
+    <script src="/dependencies/jquery/dist/jquery.min.js"></script>
+    <link rel="stylesheet" href="/dependencies/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="css/options.css" />
-    <script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+    <script src="/dependencies/bootstrap/dist/js/bootstrap.min.js"></script>
     <script src="js/allTenants.js"></script>
     <script src="js/tenants.js"></script>
     <script src="js/options.js"></script>
@@ -35,8 +35,8 @@
             <div class="col-xs-8">
                 <input type="text" id="tenantCode" />
             </div>
-        </div>        
-  
+        </div>
+
     </div>
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -7,7 +7,8 @@
     "grunt": "^1.0.1",
     "grunt-contrib-copy": "^1.0.0"
   },
-  "scripts": {
-    "postinstall": "./node_modules/.bin/bower install"
+  "dependencies": {
+    "bootstrap": "^3.3.6",
+    "jquery": "^3.3.1"
   }
 }