Skip to content

Commit

Permalink
Updates references to app/bower_components
Browse files Browse the repository at this point in the history
  • Loading branch information
willroberts committed Sep 12, 2022
1 parent 444213c commit 2720d04
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 29 deletions.
3 changes: 0 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
.git
.vagrant
.bowerrc
.gitignore
bower.json
circle.yml
Procfile
README.md
rules.json
Vagrantfile
desktop
app/audio
app/bower_components
app/replay
app/resources
app/original_resources
Expand Down
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ test/unit/sdk/cards/
gulp/rsx.js

# Third-party code
app/bower_components
app/vendor
node_modules
packages
Expand Down
14 changes: 7 additions & 7 deletions gulp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -263,13 +263,13 @@ data: {
The vendor task concats our external javascript files (outside the main bundle) into a single vendor.js file which is included prior to the main bundle. This includes `cocos` and other external dependencies which are not Browserified. Note that ordering matters and they are concatenated in order specified.
```
const vendorFiles = [
'./app/bower_components/jquery/jquery.js',
'./app/bower_components/velocity/velocity.js',
'./app/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js',
'./app/bower_components/underscore/underscore.js',
'./app/bower_components/backbone/backbone.js',
'./app/bower_components/backfire/dist/backfire.js',
'./app/bower_components/backbone.marionette/lib/backbone.marionette.js',
'./node_modules/@bower_components/jquery/jquery.js',
'./node_modules/@bower_components/velocity/velocity.js',
'./node_modules/@bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js',
'./node_modules/@bower_components/underscore/underscore.js',
'./node_modules/@bower_components/backbone/backbone.js',
'./node_modules/@bower_components/backfire/dist/backfire.js',
'./node_modules/@bower_components/backbone.marionette/lib/backbone.marionette.js',
'./app/vendor/jquery_ui/jquery-ui.min.js',
'./app/vendor/ccConfig.js',
'./app/vendor/cocos2d-html5/lib/cocos2d-js-v3.3-beta0.js',
Expand Down
2 changes: 1 addition & 1 deletion gulp/css.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const sass = gsass(Sass);
export default function css() {
return gulp.src('./app/ui/styles/application.scss')
.pipe(sass({
includePaths: ['./app/vendor', './app/bower_components'],
includePaths: ['./app/vendor', './node_modules/@bower_components'],
}))
.pipe(autoprefixer('last 1 version', '> 1%', 'ie 8', 'ie 7'))
.pipe(rename((p) => {
Expand Down
14 changes: 7 additions & 7 deletions gulp/vendor.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import { opts } from './shared';
const minify = composer(uglify, console);

const vendorFiles = [
'./app/bower_components/jquery/jquery.js',
'./app/bower_components/velocity/velocity.js',
'./app/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js',
'./app/bower_components/underscore/underscore.js',
'./app/bower_components/backbone/backbone.js',
'./app/bower_components/backfire/dist/backfire.js',
'./app/bower_components/backbone.marionette/lib/backbone.marionette.js',
'./node_modules/@bower_components/jquery/jquery.js',
'./node_modules/@bower_components/velocity/velocity.js',
'./node_modules/@bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js',
'./node_modules/@bower_components/underscore/underscore.js',
'./node_modules/@bower_components/backbone/backbone.js',
'./node_modules/@bower_components/backfire/dist/backfire.js',
'./node_modules/@bower_components/backbone.marionette/lib/backbone.marionette.js',
'./app/vendor/jquery_ui/jquery-ui.min.js',
'./app/vendor/ccConfig.js',
'./app/vendor/cocos2d-html5/lib/cocos2d-js-v3.3-beta0.js',
Expand Down
14 changes: 7 additions & 7 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,13 @@ const watchPaths = {
html: './app/index.hbs',
css: './app/ui/**/*.scss',
vendor: [
'./app/bower_components/jquery/jquery.js',
'./app/bower_components/velocity/velocity.js',
'./app/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js',
'./app/bower_components/underscore/underscore.js',
'./app/bower_components/backbone/backbone.js',
'./app/bower_components/backfire/dist/backfire.js',
'./app/bower_components/backbone.marionette/lib/backbone.marionette.js',
'./node_modules/@bower_components/jquery/jquery.js',
'./node_modules/@bower_components/velocity/velocity.js',
'./node_modules/@bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js',
'./node_modules/@bower_components/underscore/underscore.js',
'./node_modules/@bower_components/backbone/backbone.js',
'./node_modules/@bower_components/backfire/dist/backfire.js',
'./node_modules/@bower_components/backbone.marionette/lib/backbone.marionette.js',
'./app/vendor/jquery_ui/jquery-ui.min.js',
'./app/vendor/ccConfig.js',
'./app/vendor/cocos2d-html5/lib/cocos2d-js-v3.3-beta0.js',
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,7 @@
"test": "mocha -t 1000 --recursive test",
"tsc": "tsc",
"tsc:chroma-js": "tsc -p ./packages/chroma-js/tsconfig.json",
"watch": "node --max_old_space_size=2048 --stack-size=100000 node_modules/gulp/bin/gulp.js build",
"postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'app/bower_components', 'junction') } catch (e) { }\""
"watch": "node --max_old_space_size=2048 --stack-size=100000 node_modules/gulp/bin/gulp.js build"
},
"engines": {
"yarn": ">= 1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion scripts/provision_vm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ echo 'Redis install completed."'
echo "Install npm packages (global depends)"
sudo npm install -g coffee-script
sudo npm install -g grunt-cli
sudo npm install -g bower
sudo npm install -g yarn
sudo npm install -g forever
sudo npm install -g browserify

Expand Down

0 comments on commit 2720d04

Please sign in to comment.