Skip to content

Commit

Permalink
remove bower dependecies
Browse files Browse the repository at this point in the history
  • Loading branch information
westlywright committed May 9, 2018
1 parent 791635b commit f4d2e21
Show file tree
Hide file tree
Showing 13 changed files with 392 additions and 6,422 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM node:7
RUN mkdir /source
WORKDIR /source
COPY package.json bower.json ./
COPY package.json ./
COPY scripts ./scripts
RUN yarn install && yarn global add bower phantomjs-prebuilt && bower --allow-root install && yarn cache clean && bower --allow-root cache clean
RUN yarn install && yarn global add phantomjs-prebuilt && yarn cache clean
COPY . /source
EXPOSE 8000
CMD ["yarn","start","--","--ssl=false"]
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@ Perhaps you like managing Cattle.
## Usage

Prerequisites:
* [Bower](from http://bower.io/)
* [Git](http://git-scm.com/)
* [Node.js](http://nodejs.org/) 0.12.x (with NPM)
* [Yarn](https://yarnpkg.com/en/docs/install) (Note Path Setup)

If you're on a Mac and use Homebrew, you can follow these steps:
```bash
brew install node watchman yarn
yarn global add bower
```

Setup:
Expand Down
19 changes: 0 additions & 19 deletions bower.json

This file was deleted.

37 changes: 18 additions & 19 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,34 +80,33 @@ module.exports = function(defaults) {
// modules that you would like to import into your application
// please specify an object with the list of modules as keys
// along with the exports of each module as its value.
app.import('bower_components/jgrowl/jquery.jgrowl.js');
app.import('bower_components/jgrowl/jquery.jgrowl.css');
app.import('bower_components/d3/d3.js');
app.import('bower_components/prism/prism.js');
app.import('bower_components/prism/components/prism-yaml.js');
app.import('bower_components/prism/components/prism-bash.js');
app.import('bower_components/async/dist/async.js');
app.import('bower_components/jszip/dist/jszip.js')
app.import('bower_components/position-calculator/dist/position-calculator.js');
app.import('bower_components/identicon.js/pnglib.js');
app.import('bower_components/identicon.js/identicon.js');
app.import('bower_components/momentjs/moment.js');
app.import('bower_components/ember-shortcuts/ember-shortcuts.js');
app.import('bower_components/jsondiffpatch/public/build/jsondiffpatch.js');
app.import('bower_components/jsondiffpatch/public/build/jsondiffpatch-formatters.js');
app.import('node_modules/async/dist/async.js');
app.import('node_modules/d3/d3.js');
app.import('node_modules/identicon.js/identicon.js');
app.import('node_modules/identicon.js/pnglib.js');
app.import('node_modules/jgrowl/jquery.jgrowl.css');
app.import('node_modules/jgrowl/jquery.jgrowl.js');
app.import('node_modules/jsondiffpatch/public/build/jsondiffpatch-formatters.js');
app.import('node_modules/jsondiffpatch/public/build/jsondiffpatch.js');
app.import('node_modules/jszip/dist/jszip.js')
app.import('node_modules/moment/moment.js');
app.import('node_modules/prismjs/prism.js');
app.import('node_modules/prismjs/components/prism-bash.js');
app.import('node_modules/prismjs/components/prism-yaml.js');

app.import('vendor/icons/style.css');
app.import('vendor/aws-sdk-ec2.js');
app.import('vendor/ember-shortcuts.js');
app.import('vendor/file-saver/fileSaver.mini.js');
app.import('vendor/icons/fonts/rancher-icons.svg', { destDir: 'assets/fonts/'});
app.import('vendor/icons/fonts/rancher-icons.ttf', { destDir: 'assets/fonts/'});
app.import('vendor/icons/fonts/rancher-icons.woff', { destDir: 'assets/fonts/'});
app.import('vendor/icons/style.css');
app.import('vendor/json-sanitizer/json-sanitizer.js');
app.import('vendor/prompt/prompt-v1-latin-300.woff', { destDir: 'assets/fonts/'});
app.import('vendor/prompt/prompt-v1-latin-300.woff2',{ destDir: 'assets/fonts/'});
app.import('vendor/prompt/prompt-v1-latin-600.woff', { destDir: 'assets/fonts/'});
app.import('vendor/prompt/prompt-v1-latin-600.woff2',{ destDir: 'assets/fonts/'});
app.import('vendor/aws-sdk-ec2.js');
app.import('vendor/aliyun-sdk.js');
app.import('vendor/file-saver/fileSaver.mini.js');
app.import('vendor/json-sanitizer/json-sanitizer.js');

return app.toTree();
};
13 changes: 0 additions & 13 deletions lib/global-admin/bower.js

This file was deleted.

8 changes: 7 additions & 1 deletion lib/global-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,20 @@
"ember-engine"
],
"dependencies": {
"async": "*",
"jgrowl": "*",
"momentjs": "*",
"card": "*",
"d3": "*",
"ember-basic-dropdown": "*",
"ember-math-helpers": "*",
"ember-truth-helpers": "*",
"ember-cli-htmlbars": "*",
"ember-cli-babel": "*",
"ember-cli-clipboard": "*",
"ember-href-to": "*",
"ember-concurrency": "*"
"ember-concurrency": "*",
"marked": "*"
},
"ember-addon": {
"paths": [
Expand Down
9 changes: 9 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
"license": "Apache-2.0",
"devDependencies": {
"ansi_up": "^2.0.2",
"async": "2.1.2",
"broccoli-asset-rev": "^2.6.0",
"card": "2.4.0",
"d3": "3.5.17",
"dotenv": "^4.0.0",
"ember-api-store": "^2.6.6",
"ember-basic-dropdown": "^1.0.0",
Expand Down Expand Up @@ -67,9 +70,15 @@
"forever-agent": "^0.6.1",
"glob": "^7.1.2",
"http-proxy": "^1.16.2",
"identicon.js": "^2.3.2",
"jgrowl": "~1.4.2",
"jsondiffpatch": "^0.2.4",
"jszip": "^3.1.5",
"liquid-fire": "^0.29.2",
"loader.js": "^4.7.0",
"marked": "^0.3.15",
"moment": "~2.22.1",
"prismjs": "^1.14.0",
"semver": "^5.4.1",
"shell-quote": "^1.6.1",
"url-regex": "^4.1.1",
Expand Down
2 changes: 0 additions & 2 deletions scripts/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@ apt-get install -y --force-yes --no-install-recommends hicolor-icon-theme
apt-get install -y nodejs phantomjs yarn g++ ca-certificates google-chrome-stable --no-install-recommends
update-alternatives --install /usr/bin/node node /usr/bin/nodejs 10
yarn config set cache-folder /var/cache/npm
yarn global add bower

yarn --pure-lockfile install
bower --allow-root install
git submodule init
git submodule update
git status
2 changes: 1 addition & 1 deletion scripts/ci
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [[ "${UPLOAD_LATEST}" == "true" ]]; then
docker pull google/cloud-sdk
fi

rm -rf node_modules bower_components build dist tmp
rm -rf node_modules build dist tmp

./scripts/bootstrap

Expand Down
2 changes: 0 additions & 2 deletions scripts/update-dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,4 @@ echo -n "Installing Yarn packages..."
yarn install
echo "Done"

echo -n "Installing Bower packages..."
bower install
echo "Done"
Loading

0 comments on commit f4d2e21

Please sign in to comment.