From dffb80b16a1526e88f8b9426075c9bc7ef4fda46 Mon Sep 17 00:00:00 2001 From: gliburch Date: Sun, 5 Jun 2016 16:05:04 +0900 Subject: [PATCH 1/4] Make seed project features as simple as possible --- .bowerrc | 2 +- .gitignore | 2 +- .jshintrc | 24 -- .travis.yml | 14 - README.md | 297 ------------------ app/app.js | 16 +- app/components/version/interpolate-filter.js | 9 - .../version/interpolate-filter_test.js | 15 - app/components/version/version-directive.js | 9 - .../version/version-directive_test.js | 17 - app/components/version/version.js | 8 - app/components/version/version_test.js | 11 - app/{ => components}/view1/view1.html | 0 app/components/view1/view1.js | 7 + app/components/view2/view2.html | 1 + app/components/view2/view2.js | 7 + app/index-async.html | 58 ---- app/index.html | 25 +- app/view1/view1.js | 14 - app/view1/view1_test.js | 16 - app/view2/view2.html | 5 - app/view2/view2.js | 14 - app/view2/view2_test.js | 16 - bower.json | 11 +- e2e-tests/protractor.conf.js | 22 -- e2e-tests/scenarios.js | 42 --- karma.conf.js | 34 -- package.json | 28 +- 28 files changed, 39 insertions(+), 685 deletions(-) delete mode 100644 .jshintrc delete mode 100644 .travis.yml delete mode 100644 README.md delete mode 100644 app/components/version/interpolate-filter.js delete mode 100644 app/components/version/interpolate-filter_test.js delete mode 100644 app/components/version/version-directive.js delete mode 100644 app/components/version/version-directive_test.js delete mode 100644 app/components/version/version.js delete mode 100644 app/components/version/version_test.js rename app/{ => components}/view1/view1.html (100%) create mode 100644 app/components/view1/view1.js create mode 100644 app/components/view2/view2.html create mode 100644 app/components/view2/view2.js delete mode 100644 app/index-async.html delete mode 100644 app/view1/view1.js delete mode 100644 app/view1/view1_test.js delete mode 100644 app/view2/view2.html delete mode 100644 app/view2/view2.js delete mode 100644 app/view2/view2_test.js delete mode 100644 e2e-tests/protractor.conf.js delete mode 100644 e2e-tests/scenarios.js delete mode 100644 karma.conf.js diff --git a/.bowerrc b/.bowerrc index 8c58c8efc9..e15bf53098 100644 --- a/.bowerrc +++ b/.bowerrc @@ -1,3 +1,3 @@ { - "directory": "app/bower_components" + "directory": "app/assets/lib" } \ No newline at end of file diff --git a/.gitignore b/.gitignore index b702acc68f..8c39eb299b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ logs/* !.gitkeep node_modules/ -bower_components/ +lib/ tmp .DS_Store .idea \ No newline at end of file diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index 60f49fd369..0000000000 --- a/.jshintrc +++ /dev/null @@ -1,24 +0,0 @@ -{ - "strict": "global", - "globals": { - // Angular - "angular": false, - - // Angular mocks - "module": false, - "inject": false, - - // Jasmine - "jasmine": false, - "describe": false, - "beforeEach": false, - "afterEach": false, - "it": false, - "expect": false, - - // Protractor - "browser": false, - "element": false, - "by": false - } -} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a549d113c0..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -language: node_js -node_js: - - '4.4' - -before_script: - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start - - npm start > /dev/null & - - npm run update-webdriver - - sleep 1 # give server time to start - -script: - - node_modules/.bin/karma start karma.conf.js --no-auto-watch --single-run --reporters=dots --browsers=Firefox - - node_modules/.bin/protractor e2e-tests/protractor.conf.js --browser=firefox diff --git a/README.md b/README.md deleted file mode 100644 index c0deb480c9..0000000000 --- a/README.md +++ /dev/null @@ -1,297 +0,0 @@ -# angular-seed — the seed for AngularJS apps - -This project is an application skeleton for a typical [AngularJS](http://angularjs.org/) web app. -You can use it to quickly bootstrap your angular webapp projects and dev environment for these -projects. - -The seed contains a sample AngularJS application and is preconfigured to install the Angular -framework and a bunch of development and testing tools for instant web development gratification. - -The seed app doesn't do much, just shows how to wire two controllers and views together. - - -## Getting Started - -To get you started you can simply clone the angular-seed repository and install the dependencies: - -### Prerequisites - -You need git to clone the angular-seed repository. You can get git from -[http://git-scm.com/](http://git-scm.com/). - -We also use a number of node.js tools to initialize and test angular-seed. You must have node.js and -its package manager (npm) installed. You can get them from [http://nodejs.org/](http://nodejs.org/). - -### Clone angular-seed - -Clone the angular-seed repository using [git][git]: - -``` -git clone https://github.com/angular/angular-seed.git -cd angular-seed -``` - -If you just want to start a new project without the angular-seed commit history then you can do: - -```bash -git clone --depth=1 https://github.com/angular/angular-seed.git -``` - -The `depth=1` tells git to only pull down one commit worth of historical data. - -### Install Dependencies - -We have two kinds of dependencies in this project: tools and angular framework code. The tools help -us manage and test the application. - -* We get the tools we depend upon via `npm`, the [node package manager][npm]. -* We get the angular code via `bower`, a [client-side code package manager][bower]. - -We have preconfigured `npm` to automatically run `bower` so we can simply do: - -``` -npm install -``` - -Behind the scenes this will also call `bower install`. You should find that you have two new -folders in your project. - -* `node_modules` - contains the npm packages for the tools we need -* `app/bower_components` - contains the angular framework files - -*Note that the `bower_components` folder would normally be installed in the root folder but -angular-seed changes this location through the `.bowerrc` file. Putting it in the app folder makes -it easier to serve the files by a webserver.* - -### Run the Application - -We have preconfigured the project with a simple development web server. The simplest way to start -this server is: - -``` -npm start -``` - -Now browse to the app at `http://localhost:8000/index.html`. - - - -## Directory Layout - -``` -app/ --> all of the source files for the application - app.css --> default stylesheet - components/ --> all app specific modules - version/ --> version related components - version.js --> version module declaration and basic "version" value service - version_test.js --> "version" value service tests - version-directive.js --> custom directive that returns the current app version - version-directive_test.js --> version directive tests - interpolate-filter.js --> custom interpolation filter - interpolate-filter_test.js --> interpolate filter tests - view1/ --> the view1 view template and logic - view1.html --> the partial template - view1.js --> the controller logic - view1_test.js --> tests of the controller - view2/ --> the view2 view template and logic - view2.html --> the partial template - view2.js --> the controller logic - view2_test.js --> tests of the controller - app.js --> main application module - index.html --> app layout file (the main html template file of the app) - index-async.html --> just like index.html, but loads js files asynchronously -karma.conf.js --> config file for running unit tests with Karma -e2e-tests/ --> end-to-end tests - protractor-conf.js --> Protractor config file - scenarios.js --> end-to-end scenarios to be run by Protractor -``` - -## Testing - -There are two kinds of tests in the angular-seed application: Unit tests and End to End tests. - -### Running Unit Tests - -The angular-seed app comes preconfigured with unit tests. These are written in -[Jasmine][jasmine], which we run with the [Karma Test Runner][karma]. We provide a Karma -configuration file to run them. - -* the configuration is found at `karma.conf.js` -* the unit tests are found next to the code they are testing and are named as `..._test.js`. - -The easiest way to run the unit tests is to use the supplied npm script: - -``` -npm test -``` - -This script will start the Karma test runner to execute the unit tests. Moreover, Karma will sit and -watch the source and test files for changes and then re-run the tests whenever any of them change. -This is the recommended strategy; if your unit tests are being run every time you save a file then -you receive instant feedback on any changes that break the expected code functionality. - -You can also ask Karma to do a single run of the tests and then exit. This is useful if you want to -check that a particular version of the code is operating as expected. The project contains a -predefined script to do this: - -``` -npm run test-single-run -``` - - -### End to end testing - -The angular-seed app comes with end-to-end tests, again written in [Jasmine][jasmine]. These tests -are run with the [Protractor][protractor] End-to-End test runner. It uses native events and has -special features for Angular applications. - -* the configuration is found at `e2e-tests/protractor-conf.js` -* the end-to-end tests are found in `e2e-tests/scenarios.js` - -Protractor simulates interaction with our web app and verifies that the application responds -correctly. Therefore, our web server needs to be serving up the application, so that Protractor -can interact with it. - -``` -npm start -``` - -In addition, since Protractor is built upon WebDriver we need to install this. The angular-seed -project comes with a predefined script to do this: - -``` -npm run update-webdriver -``` - -This will download and install the latest version of the stand-alone WebDriver tool. - -Once you have ensured that the development web server hosting our application is up and running -and WebDriver is updated, you can run the end-to-end tests using the supplied npm script: - -``` -npm run protractor -``` - -This script will execute the end-to-end tests against the application being hosted on the -development server. - - -## Updating Angular - -Previously we recommended that you merge in changes to angular-seed into your own fork of the project. -Now that the angular framework library code and tools are acquired through package managers (npm and -bower) you can use these tools instead to update the dependencies. - -You can update the tool dependencies by running: - -``` -npm update -``` - -This will find the latest versions that match the version ranges specified in the `package.json` file. - -You can update the Angular dependencies by running: - -``` -bower update -``` - -This will find the latest versions that match the version ranges specified in the `bower.json` file. - - -## Loading Angular Asynchronously - -The angular-seed project supports loading the framework and application scripts asynchronously. The -special `index-async.html` is designed to support this style of loading. For it to work you must -inject a piece of Angular JavaScript into the HTML page. The project has a predefined script to help -do this. - -``` -npm run update-index-async -``` - -This will copy the contents of the `angular-loader.js` library file into the `index-async.html` page. -You can run this every time you update the version of Angular that you are using. - - -## Serving the Application Files - -While angular is client-side-only technology and it's possible to create angular webapps that -don't require a backend server at all, we recommend serving the project files using a local -webserver during development to avoid issues with security restrictions (sandbox) in browsers. The -sandbox implementation varies between browsers, but quite often prevents things like cookies, xhr, -etc to function properly when an html page is opened via `file://` scheme instead of `http://`. - - -### Running the App during Development - -The angular-seed project comes preconfigured with a local development webserver. It is a node.js -tool called [http-server][http-server]. You can start this webserver with `npm start` but you may choose to -install the tool globally: - -``` -sudo npm install -g http-server -``` - -Then you can start your own development web server to serve static files from a folder by -running: - -``` -http-server -a localhost -p 8000 -``` - -Alternatively, you can choose to configure your own webserver, such as apache or nginx. Just -configure your server to serve the files under the `app/` directory. - - -### Running the App in Production - -This really depends on how complex your app is and the overall infrastructure of your system, but -the general rule is that all you need in production are all the files under the `app/` directory. -Everything else should be omitted. - -Angular apps are really just a bunch of static html, css and js files that just need to be hosted -somewhere they can be accessed by browsers. - -If your Angular app is talking to the backend server via xhr or other means, you need to figure -out what is the best way to host the static files to comply with the same origin policy if -applicable. Usually this is done by hosting the files by the backend server or through -reverse-proxying the backend server(s) and webserver(s). - - -## Continuous Integration - -### Travis CI - -[Travis CI][travis] is a continuous integration service, which can monitor GitHub for new commits -to your repository and execute scripts such as building the app or running tests. The angular-seed -project contains a Travis configuration file, `.travis.yml`, which will cause Travis to run your -tests when you push to GitHub. - -You will need to enable the integration between Travis and GitHub. See the Travis website for more -instruction on how to do this. - -### CloudBees - -CloudBees have provided a CI/deployment setup: - - - - -If you run this, you will get a cloned version of this repo to start working on in a private git repo, -along with a CI service (in Jenkins) hosted that will run unit and end to end tests in both Firefox and Chrome. - - -## Contact - -For more information on AngularJS please check out http://angularjs.org/ - -[git]: http://git-scm.com/ -[bower]: http://bower.io -[npm]: https://www.npmjs.org/ -[node]: http://nodejs.org -[protractor]: https://github.com/angular/protractor -[jasmine]: http://jasmine.github.io -[karma]: http://karma-runner.github.io -[travis]: https://travis-ci.org/ -[http-server]: https://github.com/nodeapps/http-server diff --git a/app/app.js b/app/app.js index 6ea2401bcd..747bcc42c9 100644 --- a/app/app.js +++ b/app/app.js @@ -4,11 +4,17 @@ angular.module('myApp', [ 'ngRoute', 'myApp.view1', - 'myApp.view2', - 'myApp.version' + 'myApp.view2' ]). -config(['$locationProvider', '$routeProvider', function($locationProvider, $routeProvider) { - $locationProvider.hashPrefix('!'); - +config(['$routeProvider', function($routeProvider) { + $routeProvider + .when('/view1', { + templateUrl: 'components/view1/view1.html', + controller: 'View1Ctrl' + }) + .when('/view2', { + templateUrl: 'components/view2/view2.html', + controller: 'View2Ctrl' + }); $routeProvider.otherwise({redirectTo: '/view1'}); }]); diff --git a/app/components/version/interpolate-filter.js b/app/components/version/interpolate-filter.js deleted file mode 100644 index 03bb1987df..0000000000 --- a/app/components/version/interpolate-filter.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -angular.module('myApp.version.interpolate-filter', []) - -.filter('interpolate', ['version', function(version) { - return function(text) { - return String(text).replace(/\%VERSION\%/mg, version); - }; -}]); diff --git a/app/components/version/interpolate-filter_test.js b/app/components/version/interpolate-filter_test.js deleted file mode 100644 index ff56c529eb..0000000000 --- a/app/components/version/interpolate-filter_test.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -describe('myApp.version module', function() { - beforeEach(module('myApp.version')); - - describe('interpolate filter', function() { - beforeEach(module(function($provide) { - $provide.value('version', 'TEST_VER'); - })); - - it('should replace VERSION', inject(function(interpolateFilter) { - expect(interpolateFilter('before %VERSION% after')).toEqual('before TEST_VER after'); - })); - }); -}); diff --git a/app/components/version/version-directive.js b/app/components/version/version-directive.js deleted file mode 100644 index 74088f8add..0000000000 --- a/app/components/version/version-directive.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -angular.module('myApp.version.version-directive', []) - -.directive('appVersion', ['version', function(version) { - return function(scope, elm, attrs) { - elm.text(version); - }; -}]); diff --git a/app/components/version/version-directive_test.js b/app/components/version/version-directive_test.js deleted file mode 100644 index 4a59e1193a..0000000000 --- a/app/components/version/version-directive_test.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict'; - -describe('myApp.version module', function() { - beforeEach(module('myApp.version')); - - describe('app-version directive', function() { - it('should print current version', function() { - module(function($provide) { - $provide.value('version', 'TEST_VER'); - }); - inject(function($compile, $rootScope) { - var element = $compile('')($rootScope); - expect(element.text()).toEqual('TEST_VER'); - }); - }); - }); -}); diff --git a/app/components/version/version.js b/app/components/version/version.js deleted file mode 100644 index cb7a10f9db..0000000000 --- a/app/components/version/version.js +++ /dev/null @@ -1,8 +0,0 @@ -'use strict'; - -angular.module('myApp.version', [ - 'myApp.version.interpolate-filter', - 'myApp.version.version-directive' -]) - -.value('version', '0.1'); diff --git a/app/components/version/version_test.js b/app/components/version/version_test.js deleted file mode 100644 index 4ca6880dab..0000000000 --- a/app/components/version/version_test.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -describe('myApp.version module', function() { - beforeEach(module('myApp.version')); - - describe('version service', function() { - it('should return current version', inject(function(version) { - expect(version).toEqual('0.1'); - })); - }); -}); diff --git a/app/view1/view1.html b/app/components/view1/view1.html similarity index 100% rename from app/view1/view1.html rename to app/components/view1/view1.html diff --git a/app/components/view1/view1.js b/app/components/view1/view1.js new file mode 100644 index 0000000000..fd9fc501fd --- /dev/null +++ b/app/components/view1/view1.js @@ -0,0 +1,7 @@ +'use strict'; + +angular.module('myApp.view1', ['ngRoute']) + +.controller('View1Ctrl', [function() { + +}]); \ No newline at end of file diff --git a/app/components/view2/view2.html b/app/components/view2/view2.html new file mode 100644 index 0000000000..9c523cdd88 --- /dev/null +++ b/app/components/view2/view2.html @@ -0,0 +1 @@ +

This is the partial for view 2.

\ No newline at end of file diff --git a/app/components/view2/view2.js b/app/components/view2/view2.js new file mode 100644 index 0000000000..10c56d35fa --- /dev/null +++ b/app/components/view2/view2.js @@ -0,0 +1,7 @@ +'use strict'; + +angular.module('myApp.view2', ['ngRoute']) + +.controller('View2Ctrl', [function() { + +}]); \ No newline at end of file diff --git a/app/index-async.html b/app/index-async.html deleted file mode 100644 index 39a592fb57..0000000000 --- a/app/index-async.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - My AngularJS App - - - - - -
- -
Angular seed app: v
- - - diff --git a/app/index.html b/app/index.html index ec9da03650..2a095c2fe4 100644 --- a/app/index.html +++ b/app/index.html @@ -8,16 +8,13 @@ My AngularJS App - - - + - - - + + - - - - - + + diff --git a/app/view1/view1.js b/app/view1/view1.js deleted file mode 100644 index 4ce0b4f118..0000000000 --- a/app/view1/view1.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -angular.module('myApp.view1', ['ngRoute']) - -.config(['$routeProvider', function($routeProvider) { - $routeProvider.when('/view1', { - templateUrl: 'view1/view1.html', - controller: 'View1Ctrl' - }); -}]) - -.controller('View1Ctrl', [function() { - -}]); \ No newline at end of file diff --git a/app/view1/view1_test.js b/app/view1/view1_test.js deleted file mode 100644 index 14ba79b48f..0000000000 --- a/app/view1/view1_test.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict'; - -describe('myApp.view1 module', function() { - - beforeEach(module('myApp.view1')); - - describe('view1 controller', function(){ - - it('should ....', inject(function($controller) { - //spec body - var view1Ctrl = $controller('View1Ctrl'); - expect(view1Ctrl).toBeDefined(); - })); - - }); -}); \ No newline at end of file diff --git a/app/view2/view2.html b/app/view2/view2.html deleted file mode 100644 index b6503ee11a..0000000000 --- a/app/view2/view2.html +++ /dev/null @@ -1,5 +0,0 @@ -

This is the partial for view 2.

-

- Showing of 'interpolate' filter: - {{ 'Current version is v%VERSION%.' | interpolate }} -

diff --git a/app/view2/view2.js b/app/view2/view2.js deleted file mode 100644 index a0ff97dbd7..0000000000 --- a/app/view2/view2.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -angular.module('myApp.view2', ['ngRoute']) - -.config(['$routeProvider', function($routeProvider) { - $routeProvider.when('/view2', { - templateUrl: 'view2/view2.html', - controller: 'View2Ctrl' - }); -}]) - -.controller('View2Ctrl', [function() { - -}]); \ No newline at end of file diff --git a/app/view2/view2_test.js b/app/view2/view2_test.js deleted file mode 100644 index 07b34d6bb3..0000000000 --- a/app/view2/view2_test.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict'; - -describe('myApp.view2 module', function() { - - beforeEach(module('myApp.view2')); - - describe('view2 controller', function(){ - - it('should ....', inject(function($controller) { - //spec body - var view2Ctrl = $controller('View2Ctrl'); - expect(view2Ctrl).toBeDefined(); - })); - - }); -}); \ No newline at end of file diff --git a/bower.json b/bower.json index 66d9d74ede..d8b3539b76 100644 --- a/bower.json +++ b/bower.json @@ -1,15 +1,8 @@ { - "name": "angular-seed", - "description": "A starter project for AngularJS", - "version": "0.0.0", - "homepage": "https://github.com/angular/angular-seed", - "license": "MIT", + "name": "angular-seed-micro", "private": true, "dependencies": { "angular": "~1.5.0", - "angular-route": "~1.5.0", - "angular-loader": "~1.5.0", - "angular-mocks": "~1.5.0", - "html5-boilerplate": "^5.3.0" + "angular-route": "~1.5.0" } } diff --git a/e2e-tests/protractor.conf.js b/e2e-tests/protractor.conf.js deleted file mode 100644 index 13c5cb6266..0000000000 --- a/e2e-tests/protractor.conf.js +++ /dev/null @@ -1,22 +0,0 @@ -//jshint strict: false -exports.config = { - - allScriptsTimeout: 11000, - - specs: [ - '*.js' - ], - - capabilities: { - 'browserName': 'chrome' - }, - - baseUrl: 'http://localhost:8000/', - - framework: 'jasmine', - - jasmineNodeOpts: { - defaultTimeoutInterval: 30000 - } - -}; diff --git a/e2e-tests/scenarios.js b/e2e-tests/scenarios.js deleted file mode 100644 index 240d5f61ac..0000000000 --- a/e2e-tests/scenarios.js +++ /dev/null @@ -1,42 +0,0 @@ -'use strict'; - -/* https://github.com/angular/protractor/blob/master/docs/toc.md */ - -describe('my app', function() { - - - it('should automatically redirect to /view1 when location hash/fragment is empty', function() { - browser.get('index.html'); - expect(browser.getLocationAbsUrl()).toMatch("/view1"); - }); - - - describe('view1', function() { - - beforeEach(function() { - browser.get('index.html#!/view1'); - }); - - - it('should render view1 when user navigates to /view1', function() { - expect(element.all(by.css('[ng-view] p')).first().getText()). - toMatch(/partial for view 1/); - }); - - }); - - - describe('view2', function() { - - beforeEach(function() { - browser.get('index.html#!/view2'); - }); - - - it('should render view2 when user navigates to /view2', function() { - expect(element.all(by.css('[ng-view] p')).first().getText()). - toMatch(/partial for view 2/); - }); - - }); -}); diff --git a/karma.conf.js b/karma.conf.js deleted file mode 100644 index 7271e9fef8..0000000000 --- a/karma.conf.js +++ /dev/null @@ -1,34 +0,0 @@ -//jshint strict: false -module.exports = function(config) { - config.set({ - - basePath: './app', - - files: [ - 'bower_components/angular/angular.js', - 'bower_components/angular-route/angular-route.js', - 'bower_components/angular-mocks/angular-mocks.js', - 'components/**/*.js', - 'view*/**/*.js' - ], - - autoWatch: true, - - frameworks: ['jasmine'], - - browsers: ['Chrome'], - - plugins: [ - 'karma-chrome-launcher', - 'karma-firefox-launcher', - 'karma-jasmine', - 'karma-junit-reporter' - ], - - junitReporter: { - outputFile: 'test_out/unit.xml', - suite: 'unit' - } - - }); -}; diff --git a/package.json b/package.json index 81b7aaf285..f0cae0ce4b 100644 --- a/package.json +++ b/package.json @@ -1,38 +1,14 @@ { - "name": "angular-seed", + "name": "angular-seed-micro", "private": true, - "version": "0.0.0", - "description": "A starter project for AngularJS", - "repository": "https://github.com/angular/angular-seed", - "license": "MIT", "devDependencies": { "bower": "^1.7.7", "http-server": "^0.9.0", - "jasmine-core": "^2.4.1", - "karma": "^0.13.22", - "karma-chrome-launcher": "^0.2.3", - "karma-firefox-launcher": "^0.1.7", - "karma-jasmine": "^0.3.8", - "karma-junit-reporter": "^0.4.1", - "protractor": "^3.2.2", "shelljs": "^0.6.0" }, "scripts": { "postinstall": "bower install", - "prestart": "npm install", - "start": "http-server -a localhost -p 8000 -c-1 ./app", - - "pretest": "npm install", - "test": "karma start karma.conf.js", - "test-single-run": "karma start karma.conf.js --single-run", - - "preupdate-webdriver": "npm install", - "update-webdriver": "webdriver-manager update", - - "preprotractor": "npm run update-webdriver", - "protractor": "protractor e2e-tests/protractor.conf.js", - - "update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + sed(/sourceMappingURL=angular-loader.min.js.map/,'sourceMappingURL=bower_components/angular-loader/angular-loader.min.js.map','app/bower_components/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'app/index-async.html');\"" + "start": "http-server -a 0.0.0.0 -p 8000 -c-1" } } From 67bac20aba208b39cf20b83614b91e9cee197daf Mon Sep 17 00:00:00 2001 From: gliburch Date: Sun, 5 Jun 2016 16:26:23 +0900 Subject: [PATCH 2/4] Dependencies follow master --- bower.json | 4 ++-- package.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bower.json b/bower.json index d8b3539b76..d9d0487f00 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "angular-seed-micro", "private": true, "dependencies": { - "angular": "~1.5.0", - "angular-route": "~1.5.0" + "angular": "master", + "angular-route": "master" } } diff --git a/package.json b/package.json index f0cae0ce4b..0647eccd78 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,9 @@ "name": "angular-seed-micro", "private": true, "devDependencies": { - "bower": "^1.7.7", - "http-server": "^0.9.0", - "shelljs": "^0.6.0" + "bower": "master", + "http-server": "master", + "shelljs": "master" }, "scripts": { "postinstall": "bower install", From 52316c9709c0063af58230a86ffaedcdf224757e Mon Sep 17 00:00:00 2001 From: gliburch Date: Sun, 5 Jun 2016 16:34:54 +0900 Subject: [PATCH 3/4] Oh sorry... :p --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 0647eccd78..7b3aa7ae0f 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,9 @@ "name": "angular-seed-micro", "private": true, "devDependencies": { - "bower": "master", - "http-server": "master", - "shelljs": "master" + "bower": "latest", + "http-server": "latest", + "shelljs": "latest" }, "scripts": { "postinstall": "bower install", From 86172a94272895b96b65399d0f8043dd5b0a3c95 Mon Sep 17 00:00:00 2001 From: gliburch Date: Mon, 29 Aug 2016 11:36:32 +0900 Subject: [PATCH 4/4] Sample url "#" to "#!" --- app/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/index.html b/app/index.html index 2a095c2fe4..7abdb860d9 100644 --- a/app/index.html +++ b/app/index.html @@ -13,8 +13,8 @@