From 77069d38c6bcafaf7d2f45ddb216f73385b404d9 Mon Sep 17 00:00:00 2001 From: benjaminkay93 Date: Fri, 10 May 2019 21:40:46 +0100 Subject: [PATCH 1/7] add windows to travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5bae751..44e8ea8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ os: - linux - osx + - windows language: node_js node_js: - 'lts/*' From 0dadb7ffaf001462e182dfe7281318737425614f Mon Sep 17 00:00:00 2001 From: benjaminkay93 Date: Fri, 10 May 2019 21:57:21 +0100 Subject: [PATCH 2/7] use escaped double quotes for running on windows --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 36518fb..b2b22ac 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,8 @@ "build:typedefs": "lerna run build:typedefs --stream", "test": "run-p test:tsc test:lint test:coverage", "test:lint": "run-p -c test:lint:*", - "test:lint:ts": "tslint 'packages/**/*.ts{,x}'", - "test:lint:css": "stylelint 'packages/**/*.ts{,x}'", + "test:lint:ts": "tslint \"packages/**/*.ts{,x}\"", + "test:lint:css": "stylelint \"packages/**/*.ts{,x}\"", "test:lint:md": "markdownlint ./docs/ ./packages/ ./testing/ ./*.md", "test:coverage": "jest --coverage", "test:tsc": "tsc", From b534802aaa6a1d5acbeae6617e576ebdb2707b1f Mon Sep 17 00:00:00 2001 From: benjaminkay93 Date: Fri, 10 May 2019 22:13:31 +0100 Subject: [PATCH 3/7] remove babel build environment --- babel.config.js | 5 +---- packages/core/core/package.json | 2 +- packages/core/logger/package.json | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/babel.config.js b/babel.config.js index 0743927..9c6735e 100644 --- a/babel.config.js +++ b/babel.config.js @@ -24,10 +24,7 @@ const presets = [ }, ], [ - '@babel/preset-react', - { - development: process.env.BABEL_ENV !== 'build', - }, + '@babel/preset-react' ], '@babel/preset-typescript', ] diff --git a/packages/core/core/package.json b/packages/core/core/package.json index e1c7d5c..e47b849 100644 --- a/packages/core/core/package.json +++ b/packages/core/core/package.json @@ -10,7 +10,7 @@ "@nastauk/graphics-logger": "*" }, "scripts": { - "build": "BABEL_ENV=build babel --root-mode upward src --out-dir dist --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments", + "build": "babel --root-mode upward src --out-dir dist --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments", "build:typedefs": "tsc --project ./tsconfig.build.json", "test": "echo \"No tests here.\"", "start": "node dist/" diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json index 7ce0674..a3cfd95 100644 --- a/packages/core/logger/package.json +++ b/packages/core/logger/package.json @@ -7,7 +7,7 @@ "author": "NaSTAuk ", "license": "MIT", "scripts": { - "build": "BABEL_ENV=build babel --root-mode upward src --out-dir dist --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments", + "build": "babel --root-mode upward src --out-dir dist --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments", "build:typedefs": "tsc --project ./tsconfig.build.json", "test": "echo \"No tests here.\" " } From 52a9bbe51d1e124e7c022073bd7e95756bcd67b2 Mon Sep 17 00:00:00 2001 From: benjaminkay93 Date: Fri, 10 May 2019 22:30:11 +0100 Subject: [PATCH 4/7] add --ignore-optional to yarn install commmand for travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 44e8ea8..2ebbe9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ language: node_js node_js: - 'lts/*' cache: yarn -install: yarn +install: yarn --ignore-optional script: - yarn test - yarn build From e2742a77984af7124bdc8f7755fca6911579112a Mon Sep 17 00:00:00 2001 From: benjaminkay93 Date: Fri, 10 May 2019 22:37:49 +0100 Subject: [PATCH 5/7] remove the ignore optional dependancies flag --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ebbe9b..44e8ea8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ language: node_js node_js: - 'lts/*' cache: yarn -install: yarn --ignore-optional +install: yarn script: - yarn test - yarn build From cb79435f9b8b55546bb5067e94f876d617cf5d7a Mon Sep 17 00:00:00 2001 From: benjaminkay93 Date: Fri, 10 May 2019 22:47:01 +0100 Subject: [PATCH 6/7] remove yarn cache --- .travis.yml | 1 - package.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 44e8ea8..445704b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ os: language: node_js node_js: - 'lts/*' -cache: yarn install: yarn script: - yarn test diff --git a/package.json b/package.json index b2b22ac..0ee50be 100644 --- a/package.json +++ b/package.json @@ -64,4 +64,4 @@ "clean": "git clean -xfd", "start": "yarn workspace @nastauk/graphics-core start" } -} \ No newline at end of file +} From f3e3d3f14b301e61f9993b98a242b87f1fc51fba Mon Sep 17 00:00:00 2001 From: benjaminkay93 Date: Fri, 10 May 2019 23:29:44 +0100 Subject: [PATCH 7/7] exit 0 on finished build in travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 445704b..85f721f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,3 +10,4 @@ script: - yarn test - yarn build - yarn coveralls + - exit 0 \ No newline at end of file