packaging: dropped bower, it's now replaced by npm and webcomponents from polymer.

.hgignore

@@ -24,7 +24,6 b' syntax: regexp'
 ^.dev
 ^._dev
 ^build/
-^bower_components/
 ^coverage\.xml$
 ^data$
 ^\.eggs/
@@ -43,9 +42,8 b' syntax: regexp'
 ^rhodecode/public/css/style.css$
 ^rhodecode/public/css/style-polymer.css$
 ^rhodecode/public/js/rhodecode-components.html$
+^rhodecode/public/js/rhodecode-components.js$
 ^rhodecode/public/js/scripts.js$
-^rhodecode/public/js/rhodecode-components.js$
-^rhodecode/public/js/app-bundle.js$
 ^rhodecode/public/js/src/components/root-styles.gen.html$
 ^rhodecode/public/js/vendors/webcomponentsjs/
 ^rhodecode\.db$

default.nix

@@ -54,7 +54,7 b' let'
     in
       !builtins.elem (basename path) [
         ".git" ".hg" "__pycache__" ".eggs" ".idea" ".dev"
-        "bower_components" "node_modules" "node_binaries"
+        "node_modules" "node_binaries"
         "build" "data" "result" "tmp"] &&
       !builtins.elem ext ["egg-info" "pyc"] &&
       # TODO: johbo: This check is wrong, since "path" contains an absolute path,
@@ -78,19 +78,12 b' let'
   version = builtins.readFile "${rhodecode-enterprise-ce-src}/rhodecode/VERSION";
   rhodecode-enterprise-ce-src = builtins.filterSource src-filter ./.;
 
-  buildBowerComponents = pkgs.buildBowerComponents;
   nodeEnv = import ./pkgs/node-default.nix {
     inherit
       pkgs;
   };
   nodeDependencies = nodeEnv.shell.nodeDependencies;
 
-  bowerComponents = buildBowerComponents {
-    name = "enterprise-ce-${version}";
-    generated = ./pkgs/bower-packages.nix;
-    src = rhodecode-enterprise-ce-src;
-  };
-
   rhodecode-testdata-src = sources.rhodecode-testdata or (
     pkgs.fetchhg {
       url = "https://code.rhodecode.com/upstream/rc_testdata";
@@ -108,7 +101,7 b' let'
   pythonLocalOverrides = self: super: {
     rhodecode-enterprise-ce =
       let
-        linkNodeAndBowerPackages = ''
+        linkNodePackages = ''
           export RHODECODE_CE_PATH=${rhodecode-enterprise-ce-src}
 
           echo "[BEGIN]: Link node packages and binaries"
@@ -124,12 +117,6 b' let'
           mkdir node_binaries
           ln -s ${nodeDependencies}/bin/* node_binaries/
           echo "[DONE ]: Link node packages and binaries"
-
-          echo "[BEGIN]: Link bower packages"
-          rm -fr bower_components
-          mkdir bower_components
-          ln -s ${bowerComponents}/bower_components/* bower_components/
-          echo "[DONE ]: Link bower packages"
         '';
 
         releaseName = "RhodeCodeEnterpriseCE-${version}";
@@ -147,8 +134,7 b' let'
       passthru = {
         inherit
           rhodecode-testdata
-          bowerComponents
-          linkNodeAndBowerPackages
+          linkNodePackages
           myPythonPackagesUnfix
           pythonLocalOverrides
           pythonCommunityOverrides;
@@ -192,7 +178,7 b' let'
 
       preBuild = ''
         echo "[BEGIN]: Building frontend assets"
-        ${linkNodeAndBowerPackages}
+        ${linkNodePackages}
         make web-build
         rm -fr node_modules
         rm -fr node_binaries

docs/contributing/dependencies.rst

@@ -13,48 +13,4 b' dependencies for Python and JavaScript w'
 this section to generate the needed Nix derivations.
 
 
-Python dependencies
-===================
-
-We use the tool `pip2nix` to generate the Nix derivations for our Python
-dependencies.
-
-Generating the dependencies should be done with the following command:
-
-.. code:: shell
-
-   pip2nix generate --license
-
-
-.. note::
-
-   License extraction support is still experimental, use the version from the
-   following pull request: https://github.com/ktosiek/pip2nix/pull/30
-
-
-
-Node dependencies
-=================
-
-After adding new dependencies via ``npm install --save``, use `node2nix` to
-update the corresponding Nix derivations:
-
-.. code:: shell
-
-   cd pkgs
-   node2nix --input ../package.json \
-            -o node-packages.nix \
-            -e node-env.nix \
-            -c node-default.nix \
-            -d --flatten
-
-
-Bower dependencies
-==================
-
-Frontend dependencies are managed based on `bower`, with `bower2nix` a tool
-exists which can generate the needed Nix derivations:
-
-.. code:: shell
-
-   bower2nix bower.json pkgs/bower-packages.nix
+Please check pkgs/README.rst file for mor information on how to build the packages.

grunt_config.json

@@ -8,14 +8,13 b''
       "src": "rhodecode/public/js/src",
       "src_rc": "rhodecode/public/js/rhodecode",
       "dest": "rhodecode/public/js",
-      "bower": "bower_components",
       "node_modules": "node_modules"
     }
   },
   "copy": {
     "main": {
       "expand": true,
-      "cwd": "bower_components",
+      "cwd": "node_modules/@webcomponents",
       "src": "webcomponentsjs/*.*",
       "dest": "<%= dirs.js.dest %>/vendors"
     }

package.json

@@ -10,7 +10,6 b''
   },
   "devDependencies": {
     "appenlight-client": "git+https://[e-mail]/AppEnlight/appenlight-client-js.git#0.5.1",
-    "bower": "^1.8.4",
     "clipboard": "^2.0.1",
     "exports-loader": "^0.6.4",
     "favico.js": "^0.3.10",

pkgs/README.rst

@@ -44,14 +44,6 b' The sed at the end fixes a bug with http'
    sed -i -e 's/http:\/\//https:\/\//g' pkgs/node-packages.nix
 
 
-Bower dependencies
-==================
-
-.. code:: shell
-
-   nix-shell pkgs/shell-generate.nix --command "bower2nix bower.json pkgs/bower-packages.nix"
-
-
 Generate license data
 =====================
 

pkgs/node-packages.nix

@@ -1490,15 +1490,6 b' let'
         sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
       };
     };
-    "bower-1.8.4" = {
-      name = "bower";
-      packageName = "bower";
-      version = "1.8.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
-        sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a";
-      };
-    };
     "brace-expansion-1.1.11" = {
       name = "brace-expansion";
       packageName = "brace-expansion";
@@ -7940,7 +7931,6 b' let'
       sources."bn.js-4.11.8"
       sources."boolbase-1.0.0"
       sources."boom-2.10.1"
-      sources."bower-1.8.4"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
         dependencies = [

pkgs/shell-generate.nix

@@ -23,9 +23,6 b' pkgs.stdenv.mkDerivation {'
     pip2nix.pip2nix
     pythonPackages.pip-tools
 
-    # Allows to generate bower dependencies
-    pkgs.nodePackages.bower2nix
-
     # Allows to generate node dependencies
     pkgs.nodePackages.node2nix
 

rhodecode/config/licenses.json

@@ -1896,17 +1896,6 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "node-bower-1.8.4"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
         "name": "python2.7-rhodecode-testdata-0.10.0"
     }
 ]

rhodecode/templates/base/root.mako

@@ -29,7 +29,7 b" c.template_context['default_user'] = {"
     <head>
 
         <script src="${h.asset('js/vendors/webcomponentsjs/custom-elements-es5-adapter.js', ver=c.rhodecode_version_hash)}"></script>
-        <script src="${h.asset('js/vendors/webcomponentsjs/webcomponents-lite.js', ver=c.rhodecode_version_hash)}"></script>
+        <script src="${h.asset('js/vendors/webcomponentsjs/webcomponents-bundle.js', ver=c.rhodecode_version_hash)}"></script>
         <title>${self.title()}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 

shell.nix

@@ -94,7 +94,7 b' in enterprise-ce.override (attrs: {'
     export PS1="\n\[\033[1;32m\][CE-shell:\w]$\[\033[0m\] "
 
     echo "Building frontend assets"
-    ${enterprise-ce.linkNodeAndBowerPackages}
+    ${enterprise-ce.linkNodePackages}
 
     # Setup a temporary directory.
     tmp_path=$(mktemp -d)

webpack.config.js

@@ -33,12 +33,9 b' module.exports = {'
     },
     // Tell Webpack which directories to look in to resolve import statements.
     // Normally Webpack will look in node_modules by default but since we’re overriding
-    // the property we’ll need to tell it to look there in addition to the
-    // bower_components folder.
     resolve: {
         modules: [
             path.resolve(__dirname, 'node_modules'),
-            path.resolve(__dirname, 'bower_components')
         ]
     },
     // These rules tell Webpack how to process different module types.