From 4496cd9f2c6ea3e210cd8c96127e2003109b7297 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Mon, 13 Jul 2020 15:49:07 -0700 Subject: [PATCH] chore: cleanup --- package.json | 2 +- packages/webpack/CODE_OF_CONDUCT.md | 83 ------------------- packages/webpack/PULL_REQUEST_TESTS.md | 11 --- packages/webpack/package.json | 3 +- .../notes/CONTRIBUTING-webpack.md | 0 workspace.json | 29 ++++++- 6 files changed, 28 insertions(+), 100 deletions(-) delete mode 100644 packages/webpack/CODE_OF_CONDUCT.md delete mode 100644 packages/webpack/PULL_REQUEST_TESTS.md rename packages/webpack/CONTRIBUTING.md => tools/notes/CONTRIBUTING-webpack.md (100%) diff --git a/package.json b/package.json index e10fea490..105f4b327 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "workspace-schematic": "nx workspace-schematic", "dep-graph": "nx dep-graph", "help": "nx help", - "setup": "npx rimraf -- hooks node_modules package-lock.json && npm i && nx run core:setup" + "setup": "npm i -g @nrwl/cli && npx rimraf -- hooks node_modules package-lock.json && npm i && nx run core:setup" }, "private": true, "dependencies": { diff --git a/packages/webpack/CODE_OF_CONDUCT.md b/packages/webpack/CODE_OF_CONDUCT.md deleted file mode 100644 index 1c845d0b1..000000000 --- a/packages/webpack/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,83 +0,0 @@ -# NativeScript Community Code of Conduct - -Our community members come from all walks of life and are all at different stages of their personal and professional journeys. To support everyone, we've prepared a short code of conduct. Our mission is best served in an environment that is friendly, safe, and accepting; free from intimidation or harassment. - -Towards this end, certain behaviors and practices will not be tolerated. - -## tl;dr - -- Be respectful. -- We're here to help. -- Abusive behavior is never tolerated. -- Violations of this code may result in swift and permanent expulsion from the NativeScript community channels. - -## Administrators - -- Dan Wilson (@DanWilson on Slack) -- Jen Looper (@jen.looper on Slack) -- TJ VanToll (@tjvantoll on Slack) - -## Scope - -We expect all members of the NativeScript community, including administrators, users, facilitators, and vendors to abide by this Code of Conduct at all times in our community venues, online and in person, and in one-on-one communications pertaining to NativeScript affairs. - -This policy covers the usage of the NativeScript Slack community, as well as the NativeScript support forums, NativeScript GitHub repositories, the NativeScript website, and any NativeScript-related events. This Code of Conduct is in addition to, and does not in any way nullify or invalidate, any other terms or conditions related to use of NativeScript. - -The definitions of various subjective terms such as "discriminatory", "hateful", or "confusing" will be decided at the sole discretion of the NativeScript administrators. - -## Friendly, Harassment-Free Space - -We are committed to providing a friendly, safe, and welcoming environment for all, regardless of gender identity, sexual orientation, disability, ethnicity, religion, age, physical appearance, body size, race, or similar personal characteristics. - -We ask that you please respect that people have differences of opinion regarding technical choices, and acknowledge that every design or implementation choice carries a trade-off and numerous costs. There is seldom a single right answer. A difference of technology preferences is never a license to be rude. - -Any spamming, trolling, flaming, baiting, or other attention-stealing behaviour is not welcome, and will not be tolerated. - -Harassing other users of NativeScript is never tolerated, whether via public or private media. - -Avoid using offensive or harassing package names, nicknames, or other identifiers that might detract from a friendly, safe, and welcoming environment for all. - -Harassment includes, but is not limited to: harmful or prejudicial verbal or written comments related to gender identity, sexual orientation, disability, ethnicity, religion, age, physical appearance, body size, race, or similar personal characteristics; inappropriate use of nudity, sexual images, and/or sexually explicit language in public spaces; threats of physical or non-physical harm; deliberate intimidation, stalking or following; harassing photography or recording; sustained disruption of talks or other events; inappropriate physical contact; and unwelcome sexual attention. - -## Acceptable Content - -The NativeScript administrators reserve the right to make judgement calls about what is and isn't appropriate in published content. These are guidelines to help you be successful in our community. - -Content must contain something applicable to the previously stated goals of the NativeScript community. "Spamming", that is, publishing any form of content that is not applicable, is not allowed. - -Content must not contain illegal or infringing content. You should only publish content to NativeScript properties if you have the right to do so. This includes complying with all software license agreements or other intellectual property restrictions. For example, redistributing an MIT-licensed module with the copyright notice removed, would not be allowed. You will be responsible for any violation of laws or others’ intellectual property rights. - -Content must not be malware. For example, content (code, video, pictures, words, etc.) which is designed to maliciously exploit or damage computer systems, is not allowed. - -Content name, description, and other visible metadata must not include abusive, inappropriate, or harassing content. - -## Reporting Violations of this Code of Conduct - -If you believe someone is harassing you or has otherwise violated this Code of Conduct, please contact the administrators and send us an abuse report. If this is the initial report of a problem, please include as much detail as possible. It is easiest for us to address issues when we have more context. - -## Consequences - -All content published to the NativeScript community channels is hosted at the sole discretion of the NativeScript administrators. - -Unacceptable behavior from any community member, including sponsors, employees, customers, or others with decision-making authority, will not be tolerated. - -Anyone asked to stop unacceptable behavior is expected to comply immediately. - -If a community member engages in unacceptable behavior, the NativeScript administrators may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event or service). - -## Addressing Grievances - -If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify the administrators. We will do our best to ensure that your grievance is handled appropriately. - -In general, we will choose the course of action that we judge as being most in the interest of fostering a safe and friendly community. - -## Contact Info -Please contact Dan Wilson @DanWilson if you need to report a problem or address a grievance related to an abuse report. - -You are also encouraged to contact us if you are curious about something that might be "on the line" between appropriate and inappropriate content. We are happy to provide guidance to help you be a successful part of our community. - -## Credit and License - -This Code of Conduct borrows heavily from the WADE Code of Conduct, which is derived from the NodeBots Code of Conduct, which in turn borrows from the npm Code of Conduct, which was derived from the Stumptown Syndicate Citizen's Code of Conduct, and the Rust Project Code of Conduct. - -This document may be reused under a Creative Commons Attribution-ShareAlike License. \ No newline at end of file diff --git a/packages/webpack/PULL_REQUEST_TESTS.md b/packages/webpack/PULL_REQUEST_TESTS.md deleted file mode 100644 index 395e4fc45..000000000 --- a/packages/webpack/PULL_REQUEST_TESTS.md +++ /dev/null @@ -1,11 +0,0 @@ -This document describes comment messages available to execute tests on pull request. - -|Comment |Commit Status Context|Description| -|:----------------------:|:-------------------:|:---------:| -|`run ci` | |Run all below.| -|`js`|ci/jenkins/webpack-js|Pack the *@nativescript/webpack* plugin and bundle the [template-hello-world](https://github.com/NativeScript/template-hello-world) template app. | -|`ts`|ci/jenkins/webpack-ts|Pack the *@nativescript/webpack* plugin and bundle the [template-hello-world-ts](https://github.com/NativeScript/template-hello-world-ts) template app.| -|`ng`|ci/jenkins/webpack-ng|Pack the *@nativescript/webpack* plugin and bundle the [template-hello-world-ng](https://github.com/NativeScript/template-hello-world-ng) template app.| -|`groceries`|ci/jenkins/webpack-groceries|Pack the *@nativescript/webpack* plugin and bundle the [Groceries](https://github.com/NativeScript/sample-Groceries) app. | -|`sdk`|ci/jenkins/webpack-sdk|Pack the *@nativescript/webpack* plugin and bundle the [SDK](https://github.com/NativeScript/nativescript-sdk-examples-ng) app. | -|`testsappng`|ci/jenkins/webpack-testsappng|Pack the *@nativescript/webpack* plugin and bundle the [tests-app-ng](https://github.com/NativeScript/tests-app-ng) app. | diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 50992b775..2dee7b7dd 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -29,11 +29,12 @@ "url": "https://github.com/NativeScript/nativescript-dev-webpack.git" }, "scripts": { + "clean": "npx rimraf -- node_modules package-lock.json && npm i", "tsc": "tsc", "postinstall": "node postinstall.js", "preuninstall": "node preuninstall.js", "postpack": "rm -rf node_modules", - "setup": "npm i && npm run build", + "setup": "npm run clean && npm run build", "build": "npm run tsc && npm run jasmine", "test": "npm run build", "jasmine": "jasmine --config=jasmine-config/jasmine.json", diff --git a/packages/webpack/CONTRIBUTING.md b/tools/notes/CONTRIBUTING-webpack.md similarity index 100% rename from packages/webpack/CONTRIBUTING.md rename to tools/notes/CONTRIBUTING-webpack.md diff --git a/workspace.json b/workspace.json index 1a640b782..ab2be4483 100644 --- a/workspace.json +++ b/workspace.json @@ -36,7 +36,13 @@ "options": { "commands": [ { - "command": "npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js && npm i && npx rimraf -- package-lock.json" + "command": "npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js" + }, + { + "command": "npm i" + }, + { + "command": "npx rimraf -- package-lock.json" } ], "cwd": "packages/core/__tests__/e2e/automated", @@ -80,7 +86,13 @@ "options": { "commands": [ { - "command": "npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js && npm i && npx rimraf -- package-lock.json" + "command": "npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js" + }, + { + "command": "npm i" + }, + { + "command": "npx rimraf -- package-lock.json" } ], "cwd": "packages/core/__tests__/e2e/playground", @@ -124,7 +136,13 @@ "options": { "commands": [ { - "command": "npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js && npm i && npx rimraf -- package-lock.json" + "command": "npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js" + }, + { + "command": "npm i" + }, + { + "command": "npx rimraf -- package-lock.json" } ], "cwd": "packages/core/__tests__/e2e/ui", @@ -364,7 +382,10 @@ "options": { "commands": [ { - "command": "npm run setup && mv \"$(npm pack | tail -n 1)\" nativescript-webpack.tgz" + "command": "npm run setup" + }, + { + "command": "mv \"$(npm pack | tail -n 1)\" nativescript-webpack.tgz" } ], "cwd": "packages/webpack",