diff --git a/.gitignore b/.gitignore index c69e46b27..48ce38c16 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ dist npm-debug.log .vscode yarn.lock +*.log diff --git a/package-lock.json b/package-lock.json index d5432cb88..1f8469a42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -542,6 +542,12 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "dev": true }, + "cat": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/cat/-/cat-0.2.0.tgz", + "integrity": "sha1-/YUM2n1BYuaQTzO3/PdDsSQ/1DQ=", + "dev": true + }, "chai": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz", @@ -735,6 +741,16 @@ "require-from-string": "2.0.2" } }, + "cross-env": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.1.4.tgz", + "integrity": "sha512-Mx8mw6JWhfpYoEk7PGvHxJMLQwQHORAs8+2bX+C1lGQ4h3GkDb1zbzC2Nw85YH9ZQMlO0BHZxMacgrfPmMFxbg==", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "is-windows": "1.0.2" + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -3245,6 +3261,12 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "ncp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", + "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=", + "dev": true + }, "node-gyp": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", diff --git a/package.json b/package.json index e39cc10b3..9bb59e617 100644 --- a/package.json +++ b/package.json @@ -10,12 +10,12 @@ "format:fix": "npm run format:base -- --write", "lint": "tslint -c tslint.json \"src/**/*.ts\" \"test/**/*.ts\"", "lint:fix": "npm run lint -- --fix", - "release": "npm run build && rimraf dist && tsc -p tsconfig-release.json && npm run copy:common && npm run prepare:package && BUILD_TYPE=prod npm run set:vars", + "release": "npm run build && rimraf dist && tsc -p tsconfig-release.json && npm run copy:common && npm run prepare:package && cross-env BUILD_TYPE=prod npm run set:vars", "build": "rimraf dist && tsc && npm run format:check && npm run lint && npm t", - "copy:common": "cp README.md dist", + "copy:common": "ncp README.md dist/README.md", "prepare:package": "cat package.json | ts-node build/package.ts > dist/package.json", - "test": "rimraf dist && tsc && cp -r test/fixtures dist/test && mocha dist/test --recursive", - "test:watch": "rimraf dist && tsc && cp -r test/fixtures dist/test && BUILD_TYPE=dev npm run set:vars && mocha dist/test --watch --recursive", + "test": "rimraf dist && tsc && ncp test/fixtures dist/test/fixtures && mocha dist/test --recursive", + "test:watch": "rimraf dist && tsc && ncp test/fixtures dist/test/fixtures && cross-env BUILD_TYPE=dev npm run set:vars && mocha dist/test --watch --recursive", "set:vars": "ts-node build/vars.ts --src ./dist", "tscv": "tsc --version", "tsc": "tsc", @@ -68,14 +68,17 @@ "@types/node": "^6.0.103", "@types/node-sass": "^3.10.31", "@types/sprintf-js": "0.0.27", + "cat": "^0.2.0", "chai": "^3.5.0", "chai-spies": "^0.7.1", + "cross-env": "^5.1.4", "husky": "^0.14.3", "js-yaml": "^3.11.0", "json-stringify-pretty-compact": "^1.1.0", "lint-staged": "^7.0.4", "minimalist": "1.0.0", "mocha": "3.0.2", + "ncp": "^2.0.0", "node-sass": "^4.8.3", "prettier": "1.12.1", "rimraf": "^2.6.2", diff --git a/yarn.lock b/yarn.lock index 43223f5a5..e267cec00 100644 --- a/yarn.lock +++ b/yarn.lock @@ -384,6 +384,10 @@ caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" +cat@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/cat/-/cat-0.2.0.tgz#fd850cda7d4162e6904f33b7fcf743b1243fd434" + chai-spies@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/chai-spies/-/chai-spies-0.7.1.tgz#343d99f51244212e8b17e64b93996ff7b2c2a9b1" @@ -532,6 +536,13 @@ cosmiconfig@^4.0.0: parse-json "^4.0.0" require-from-string "^2.0.1" +cross-env@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.4.tgz#f61c14291f7cc653bb86457002ea80a04699d022" + dependencies: + cross-spawn "^5.1.0" + is-windows "^1.0.0" + cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" @@ -539,7 +550,7 @@ cross-spawn@^3.0.0: lru-cache "^4.0.1" which "^1.2.9" -cross-spawn@^5.0.1: +cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" dependencies: @@ -1494,7 +1505,7 @@ is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" -is-windows@^1.0.2: +is-windows@^1.0.0, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -2149,6 +2160,10 @@ natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" +ncp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" + node-gyp@^3.3.1: version "3.4.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.4.0.tgz#dda558393b3ecbbe24c9e6b8703c71194c63fa36"