diff --git a/README.MD b/README.MD index 791b841..4054e76 100644 --- a/README.MD +++ b/README.MD @@ -8,16 +8,22 @@ It includes: * Dummy API to start with * Karma and Jasmine for testing purposes +## Prerequisite + +Please, make sure you are using **npm 5.7.0 or higher**. If no, you need to change *npm ci* command to *npm install* + ## Install ```cmd git clone https://github.com/Drag13/typescript-browserify-template -npm i -npm install:all +npm ci +npm run install:all ``` ## Start ```cmd npm start -``` \ No newline at end of file +``` + +That's it! Your client and server is running now. Give it a try! \ No newline at end of file diff --git a/package.json b/package.json index 397f500..d65fb35 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "client": "cd client && npm start", "server": "cd server && npm start", - "install:all": "cd server && npm install && cd ../client && npm install", + "install:all": "cd server && npm ci && cd ../client && npm ci", "test": "cd server && npm test && cd ../client && npm test", "start": "npm-run-all --parallel client server" }, diff --git a/server/package-lock.json b/server/package-lock.json index 160a5ce..9ab9d37 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1332,23 +1332,6 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, - "coffee-script": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz", - "integrity": "sha1-YplqhheAx15tUGnROCJyO3NAS/w=", - "dev": true, - "requires": { - "mkdirp": "~0.3.5" - }, - "dependencies": { - "mkdirp": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", - "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=", - "dev": true - } - } - }, "collection-map": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz", @@ -1518,7 +1501,8 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "dev": true, + "optional": true }, "constantinople": { "version": "3.1.2", @@ -2995,18 +2979,6 @@ "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", "dev": true }, - "growl": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.0.tgz", - "integrity": "sha512-ElsQbgadAZdhC8L+hx4RJu6fDe5uPCaRjdw8CvD39VYemGQT9CSiLdRAEYFWVIlCbPNlw+G4AbqBhQJF2qyHdg==", - "dev": true - }, - "grunt-exec": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-0.4.7.tgz", - "integrity": "sha1-QAUf+k6wyWV+BTuV6I1ENSocLCU=", - "dev": true - }, "gulp": { "version": "3.9.1", "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz", @@ -3885,76 +3857,21 @@ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true }, - "jasmine-growl-reporter": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/jasmine-growl-reporter/-/jasmine-growl-reporter-1.0.3.tgz", - "integrity": "sha512-WediiANO4FybZwfvK6a3uzm8O5iOanOcpJfFN4PnOFpf3Lolg0qgGwpwqqwFv2aGVaTWoBYKzSXzXDHYH6Badg==", + "jasmine": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.3.1.tgz", + "integrity": "sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==", "dev": true, "requires": { - "growl": "1.10.0" - } - }, - "jasmine-node": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/jasmine-node/-/jasmine-node-2.0.1.tgz", - "integrity": "sha512-1S5Z4Mof5yxwqLIApzyo2pV5WN2kRpTSgICvEo3+rJmKve9P94kolzC9eS0u5cyiT+gxBY2mwOQdxLbkhwKzoA==", - "dev": true, - "requires": { - "coffee-script": "~1.7.1", - "gaze": "~1.1.2", - "grunt-exec": "~0.4.5", - "jasmine-growl-reporter": "~1.0.1", - "jasmine-reporters": "git://github.com/larrymyers/jasmine-reporters.git#2c7242dc11c15c2f156169bc704798568b8cb50d", - "minimist": "~0.0.8", - "mkdirp": "~0.3.5", - "underscore": "~1.6.0", - "walkdir": "~0.0.7", - "xml2js": "~0.4.1" - }, - "dependencies": { - "gaze": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", - "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", - "dev": true, - "requires": { - "globule": "^1.0.0" - } - }, - "globule": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", - "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", - "dev": true, - "requires": { - "glob": "~7.1.1", - "lodash": "~4.17.10", - "minimatch": "~3.0.2" - } - }, - "mkdirp": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", - "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=", - "dev": true - } + "glob": "^7.0.6", + "jasmine-core": "~3.3.0" } }, - "jasmine-reporters": { - "version": "git://github.com/larrymyers/jasmine-reporters.git#2c7242dc11c15c2f156169bc704798568b8cb50d", - "from": "git://github.com/larrymyers/jasmine-reporters.git#2c7242dc11c15c2f156169bc704798568b8cb50d", - "dev": true, - "requires": { - "mkdirp": "~0.3.5" - }, - "dependencies": { - "mkdirp": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", - "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=", - "dev": true - } - } + "jasmine-core": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.3.0.tgz", + "integrity": "sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==", + "dev": true }, "js-stringify": { "version": "1.0.2", @@ -6040,7 +5957,8 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true + "dev": true, + "optional": true }, "semver": { "version": "5.6.0", @@ -6977,12 +6895,6 @@ } } }, - "underscore": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", - "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", - "dev": true - }, "undertaker": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.0.tgz", @@ -7394,12 +7306,6 @@ "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=" }, - "walkdir": { - "version": "0.0.12", - "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.12.tgz", - "integrity": "sha512-HFhaD4mMWPzFSqhpyDG48KDdrjfn409YQuVW7ckZYhW4sE87mYtWifdB/+73RA7+p4s4K18n5Jfx1kHthE1gBw==", - "dev": true - }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", @@ -7528,22 +7434,6 @@ "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=", "dev": true }, - "xml2js": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", - "dev": true, - "requires": { - "sax": ">=0.6.0", - "xmlbuilder": "~9.0.1" - } - }, - "xmlbuilder": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", - "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", - "dev": true - }, "xmlhttprequest-ssl": { "version": "1.5.5", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", diff --git a/server/package.json b/server/package.json index 032e960..ffa2e2d 100644 --- a/server/package.json +++ b/server/package.json @@ -4,11 +4,11 @@ "description": "", "scripts": { "start": "npm-run-all build run", - "build": "./node_modules/.bin/gulp buildAll", - "run": "./node_modules/.bin/gulp run", - "test:run":"./node_modules/.bin/jasmine-node tests", - "test:build" :"./node_modules/.bin/tsc -p ./tests", - "test": "npm-run-all test:build test:run" + "build": "gulp buildAll", + "run": "gulp run", + "test:run": "jasmine tests/*", + "test:build": "./node_modules/.bin/tsc -p ./tests", + "test": "npm-run-all test:run" }, "author": "drag13", "license": "MIT", @@ -36,7 +36,7 @@ "gulp": "3.9.1", "gulp-nodemon": "2.4.2", "gulp-tsb": "2.0.5", - "jasmine-node": "^2.0.1", + "jasmine": "3.3.1", "marked": "0.6.0", "nodemon": "1.18.9", "typescript": "3.2.4", diff --git a/server/tests/testSpec.js b/server/tests/testSpec.js deleted file mode 100644 index 42181bc..0000000 --- a/server/tests/testSpec.js +++ /dev/null @@ -1,6 +0,0 @@ -"use strict"; -describe('basic server test', function () { - it('1 === 1 to be true', function () { - expect(1).toBe(1); - }); -});