From 77f1e6217b154e81536377d9f136fa8e13d810c9 Mon Sep 17 00:00:00 2001 From: FrankQiu Date: Fri, 30 Oct 2020 13:45:26 +0800 Subject: [PATCH 1/9] fix: updated snapshot and added shein logo and website --- docs/00.md | 4 ++++ test/build/package-bootstrap/__snapshots__ | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/00.md b/docs/00.md index 8f2b22a1b5..2c18b541a6 100644 --- a/docs/00.md +++ b/docs/00.md @@ -68,4 +68,8 @@ usersList: name: TRPG Engine img: https://trpgdoc.moonrailgun.com/img/trpg_logo.png url: https://trpgdoc.moonrailgun.com/ + - shein: + name: SHEIN + img: https://sheinsz.ltwebstatic.com/she_dist/images/touch-icon-ipad-144-47ceee2d97.png + url: https://www.shein.com/ --- diff --git a/test/build/package-bootstrap/__snapshots__ b/test/build/package-bootstrap/__snapshots__ index 7dfa73a455..a5649ac9a1 100644 --- a/test/build/package-bootstrap/__snapshots__ +++ b/test/build/package-bootstrap/__snapshots__ @@ -4,7 +4,6 @@ exports[`snowpack build package-bootstrap: allFiles 1`] = ` Array [ "__snowpack__/env.js", "_dist_/index.js", - "_dist_/style.css", "web_modules/bootstrap/dist/css/bootstrap.min.css", "web_modules/bootstrap/dist/css/bootstrap.min.css.proxy.js", "web_modules/import-map.json", @@ -18,8 +17,6 @@ exports[`snowpack build package-bootstrap: build/_dist_/index.js 1`] = ` console.log('CSS added to page!');" `; -exports[`snowpack build package-bootstrap: build/_dist_/style.css 1`] = `"@import \\"../web_modules/bootstrap/dist/css/bootstrap.min.css\\";"`; - exports[`snowpack build package-bootstrap: build/web_modules/bootstrap/dist/css/bootstrap.min.css 1`] = ` "/*! * Bootstrap v4.5.2 (https://getbootstrap.com/) From 2495d1230a88fe7d3225fba9d69488bd63351316 Mon Sep 17 00:00:00 2001 From: FrankQiu Date: Sun, 1 Nov 2020 23:19:17 +0800 Subject: [PATCH 2/9] chore: deleted alias in installOptions --- snowpack/src/config.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/snowpack/src/config.ts b/snowpack/src/config.ts index 9bc2f37f86..aca92dd208 100644 --- a/snowpack/src/config.ts +++ b/snowpack/src/config.ts @@ -134,10 +134,10 @@ const configSchema = { installTypes: {type: 'boolean'}, polyfillNode: {type: 'boolean'}, sourceMap: {oneOf: [{type: 'boolean'}, {type: 'string'}]}, - alias: { - type: 'object', - additionalProperties: {type: 'string'}, - }, + // alias: { + // type: 'object', + // additionalProperties: {type: 'string'}, + // }, env: { type: 'object', additionalProperties: { From f911c203134aed93790337aa25fc974f7bbdd640 Mon Sep 17 00:00:00 2001 From: FrankQiu Date: Mon, 2 Nov 2020 00:19:03 +0800 Subject: [PATCH 3/9] chore: deleted alias in installOptions --- snowpack/src/config.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/snowpack/src/config.ts b/snowpack/src/config.ts index aca92dd208..3f8f5f407f 100644 --- a/snowpack/src/config.ts +++ b/snowpack/src/config.ts @@ -134,10 +134,6 @@ const configSchema = { installTypes: {type: 'boolean'}, polyfillNode: {type: 'boolean'}, sourceMap: {oneOf: [{type: 'boolean'}, {type: 'string'}]}, - // alias: { - // type: 'object', - // additionalProperties: {type: 'string'}, - // }, env: { type: 'object', additionalProperties: { From cf89b88f339cab386ba5bde2b1368fa9a6869a66 Mon Sep 17 00:00:00 2001 From: FrankQiu Date: Mon, 2 Nov 2020 23:49:18 +0800 Subject: [PATCH 4/9] chore: drop the alias in installOptions in SnowpackConfig interface --- snowpack/src/types/snowpack.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snowpack/src/types/snowpack.ts b/snowpack/src/types/snowpack.ts index 4b7053c58e..89ba7e19eb 100644 --- a/snowpack/src/types/snowpack.ts +++ b/snowpack/src/types/snowpack.ts @@ -203,7 +203,7 @@ export interface SnowpackConfig { hmrPort: number | undefined; hmrErrorOverlay: boolean; }; - installOptions: InstallOptions; + installOptions: Omit; buildOptions: { out: string; baseUrl: string; From ca6b4d7d8e4dfd505dec746da2ddb0d85f4d2ff8 Mon Sep 17 00:00:00 2001 From: FrankQiu Date: Thu, 5 Nov 2020 14:14:51 +0800 Subject: [PATCH 5/9] docs: added a Pull Request Guidelines --- CONTRIBUTING.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6b1feec8ce..eca22e5f01 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -109,6 +109,25 @@ Note the path must start with must start with a `.` to be considered local The `--verbose` flag enables additional logs which will help to identify the source of a problem. The `--reload` will clear the local cache which might have been created by a different `snowpack` version. Learn more about [Snowpack's CLI flags](https://www.snowpack.dev/#cli-flags). + +## Pull Request Guidelines + +- Checkout a topic branch from a base branch, e.g. `master`, and merge back against that branch. + +- If adding a new feature: + + - Provide a convincing reason to add this feature. + - Add accompanying tests if applicable. + +- If fixing bug: + + - If you are resolving a special issue, add `(fix #xxxx)` (#xxxx is the issue id) in your PR title for a better release. + - Provide a detailed description of the bug in the PR. Live demo preferred. + - Add appropriate tests if applicable. + +- Ensure all tests have been passed. + + ## Discussion [Join the Pika Discord](https://discord.gg/rS8SnRk) From 6fbcb6822760449e6d1c55c80b1851183596bee0 Mon Sep 17 00:00:00 2001 From: iam-frankqiu Date: Thu, 5 Nov 2020 06:21:25 +0000 Subject: [PATCH 6/9] [ci] yarn format --- CONTRIBUTING.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eca22e5f01..f427ac5845 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -109,7 +109,6 @@ Note the path must start with must start with a `.` to be considered local The `--verbose` flag enables additional logs which will help to identify the source of a problem. The `--reload` will clear the local cache which might have been created by a different `snowpack` version. Learn more about [Snowpack's CLI flags](https://www.snowpack.dev/#cli-flags). - ## Pull Request Guidelines - Checkout a topic branch from a base branch, e.g. `master`, and merge back against that branch. @@ -127,7 +126,6 @@ The `--verbose` flag enables additional logs which will help to identify the sou - Ensure all tests have been passed. - ## Discussion [Join the Pika Discord](https://discord.gg/rS8SnRk) From d389453df2814cad85ef7ee4e5cd9503b9e817af Mon Sep 17 00:00:00 2001 From: FrankQiu Date: Fri, 6 Nov 2020 10:59:04 +0800 Subject: [PATCH 7/9] docs: submitted a revised pull request guidelines. --- CONTRIBUTING.md | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f427ac5845..af171d8f7d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -111,20 +111,17 @@ The `--verbose` flag enables additional logs which will help to identify the sou ## Pull Request Guidelines -- Checkout a topic branch from a base branch, e.g. `master`, and merge back against that branch. +Checkout a topic branch from a base branch, e.g. `master`, and merge back against that branch. -- If adding a new feature: +If adding a feature, it probably should have been brought up in a [discussion](https://github.com/snowpackjs/snowpack/discussions) instead before the PR was created. - - Provide a convincing reason to add this feature. - - Add accompanying tests if applicable. - -- If fixing bug: +Some tips for creating your first pull request: - - If you are resolving a special issue, add `(fix #xxxx)` (#xxxx is the issue id) in your PR title for a better release. - - Provide a detailed description of the bug in the PR. Live demo preferred. - - Add appropriate tests if applicable. + - Provide background for why a PR was created. + - Link to any relevant issues, discussions, or past PRs. + - Add accompanying tests if applicable. -- Ensure all tests have been passed. +Ensure all tests have been passed. ## Discussion From 3ad97f4569639fbd33859ac0314924a0bf5bd08c Mon Sep 17 00:00:00 2001 From: iam-frankqiu Date: Fri, 6 Nov 2020 03:02:04 +0000 Subject: [PATCH 8/9] [ci] yarn format --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index af171d8f7d..eafb49c104 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -117,9 +117,9 @@ If adding a feature, it probably should have been brought up in a [discussion](h Some tips for creating your first pull request: - - Provide background for why a PR was created. - - Link to any relevant issues, discussions, or past PRs. - - Add accompanying tests if applicable. +- Provide background for why a PR was created. +- Link to any relevant issues, discussions, or past PRs. +- Add accompanying tests if applicable. Ensure all tests have been passed. From 4471367e9b8bc9247887df229890d80a1363acca Mon Sep 17 00:00:00 2001 From: "Fred K. Schott" Date: Thu, 5 Nov 2020 19:59:35 -0800 Subject: [PATCH 9/9] Update CONTRIBUTING.md --- CONTRIBUTING.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eafb49c104..356d0c1e18 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -120,8 +120,7 @@ Some tips for creating your first pull request: - Provide background for why a PR was created. - Link to any relevant issues, discussions, or past PRs. - Add accompanying tests if applicable. - -Ensure all tests have been passed. +- Ensure all tests have been passed. ## Discussion