From b8625a60d21550c8d91059e514a8cc8d49461535 Mon Sep 17 00:00:00 2001 From: Garrett Serack Date: Fri, 22 Sep 2017 16:18:21 -0700 Subject: [PATCH] Yarn round 2 (#16) * switched to yarn for publishing * WIP * cleaned up --- .gitignore | 8 +++++++- .gulp/publishing.iced | 9 +++++---- .npmignore | 16 +++++++++++++++- package.json | 4 ++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index e7aecfa..ad4ca6c 100644 --- a/.gitignore +++ b/.gitignore @@ -289,4 +289,10 @@ __pycache__/ package-lock.json *.tgz -yarn.lock \ No newline at end of file +yarn.lock + +package/ +*.tar +*.tgz +src/obj/ +*.log \ No newline at end of file diff --git a/.gulp/publishing.iced b/.gulp/publishing.iced index 73d46dc..14f5997 100644 --- a/.gulp/publishing.iced +++ b/.gulp/publishing.iced @@ -1,8 +1,9 @@ -task 'publish-preview', '', ['version-number'] , (done) -> +task 'publish-preview', '', ['version-number','build'] , (done) -> package_json = require "#{basefolder}/package.json" - # Note : this will call the npm prepare task, which will call + # move .gitignore out of the way - yarn bug + rm "-f", "#{basefolder}/.gitignore" execute "#{basefolder}/node_modules/.bin/yarn publish --tag preview --new-version #{version} --access public ",{cwd:basefolder, silent:false }, (c,o,e) -> echo "\n\nPublished: #{package_json.name}@#{info version} (tagged as @preview)\n\n" - done() - \ No newline at end of file + # bring back .gitignore! + execute "git checkout #{basefolder}/.gitignore",{cwd:basefolder, silent:true }, done diff --git a/.npmignore b/.npmignore index f8a119c..7266145 100644 --- a/.npmignore +++ b/.npmignore @@ -1,7 +1,21 @@ .gulp/ .vscode/ +src/JsonConverters/ +src/Model/ +src/Properties/ test/ + +package/ +*.tar +*.tgz + gulpfile.js *.sln +*.cs +*.resx +src/obj/ +yarn.lock -src/obj/ \ No newline at end of file +*.log +*.csproj +src/Model/License.cs diff --git a/package.json b/package.json index 8f8a989..44aaa0b 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ "run-sequence": "*", "shx": "^0.2.2", "through2-parallel": "^0.1.3", - "yarn": "^1.0.2", - "yargs": "^8.0.2" + "yargs": "^8.0.2", + "yarn": "^1.0.2" }, "dependencies": { "dotnet-2.0.0": "^1.1.0"