Skip to content

Commit

Permalink
Merge pull request #18936 from mshima/skip_ci-bash
Browse files Browse the repository at this point in the history
add .npmrc to force npm to use bash.
  • Loading branch information
DanielFran committed Jun 17, 2022
2 parents c7a090e + 8ffba79 commit ca1dd9e
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 0 deletions.
7 changes: 7 additions & 0 deletions generators/server/__snapshots__/generator.spec.mjs.snap
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,13 @@ Object {
],
},
],
"node": Array [
Object {
"templates": Array [
".npmrc",
],
},
],
"packageJson": Array [
Object {
"condition": [Function],
Expand Down
3 changes: 3 additions & 0 deletions generators/server/__snapshots__/needles.spec.mjs.snap
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down
5 changes: 5 additions & 0 deletions generators/server/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,11 @@ const baseServerFiles = {
templates: ['entrypoint.sh'],
},
],
node: [
{
templates: ['.npmrc'],
},
],
packageJson: [
{
condition: generator => generator.skipClient,
Expand Down
1 change: 1 addition & 0 deletions generators/server/templates/.npmrc.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
script-shell=bash
6 changes: 6 additions & 0 deletions test/__snapshots__/app-client-custom-path.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -1438,6 +1441,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down
39 changes: 39 additions & 0 deletions test/__snapshots__/app.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ Object {
".lintstagedrc.js": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -526,6 +529,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -1955,6 +1961,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -3361,6 +3370,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -4734,6 +4746,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -6122,6 +6137,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -7522,6 +7540,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -8913,6 +8934,9 @@ Object {
".lintstagedrc.js": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -10340,6 +10364,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -11341,6 +11368,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -12741,6 +12771,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -14108,6 +14141,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -15472,6 +15508,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down
9 changes: 9 additions & 0 deletions test/__snapshots__/server.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -613,6 +616,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -1194,6 +1200,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down
6 changes: 6 additions & 0 deletions test/blueprint/__snapshots__/app-blueprint.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -1441,6 +1444,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down
3 changes: 3 additions & 0 deletions test/blueprint/__snapshots__/scoped-blueprint.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ Object {
".mvn/wrapper/maven-wrapper.properties": Object {
"stateCleared": "modified",
},
".npmrc": Object {
"stateCleared": "modified",
},
".prettierignore": Object {
"stateCleared": "modified",
},
Expand Down

0 comments on commit ca1dd9e

Please sign in to comment.