Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes to build scripts for Windows. #2051

Merged
merged 7 commits into from
Nov 6, 2017
+38 −10
Merged

Fixes to build scripts for Windows. #2051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d03cda
Build scripts working on Windows.
AaronFriel Oct 14, 2017
5715039
Run bootstrap script with node.
AaronFriel Oct 24, 2017
ccd20f1
Add cross-env as root devdep, remove unnecessary script.
AaronFriel Nov 6, 2017
db5288c
Run test script with node.
AaronFriel Nov 6, 2017
c952617
Merge branch 'master' into winqol
AaronFriel Nov 6, 2017
b893e3b
Fix package.json in app/vue
AaronFriel Nov 6, 2017
c9f5988
Update yarn.lock.
AaronFriel Nov 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/comments/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"prepare": "node ../../scripts/prepare.js",
"publish-storybook": "bash .scripts/publish_storybook.sh",
"storybook": "start-storybook -p 3006",
"storybook-local": "STORYBOOK_CLOUD_SERVER='http://localhost:3003/graphql' start-storybook -p 9010",
"storybook-local": "cross-env STORYBOOK_CLOUD_SERVER='http://localhost:3003/graphql' start-storybook -p 9010",
"storybook-remote": "start-storybook -p 3006"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion app/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"url": "https://github.com/storybooks/storybook.git"
},
"scripts": {
"dev": "DEV_BUILD=1 nodemon --watch ./src --exec 'yarn prepare'",
"dev": "cross-env DEV_BUILD=1 nodemon --watch ./src --exec \"yarn prepare\"",
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion app/vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"url": "https://github.com/storybooks/storybook.git"
},
"scripts": {
"dev": "DEV_BUILD=1 nodemon --watch ./src --exec 'yarn prepare'",
"dev": "cross-env DEV_BUILD=1 nodemon --watch ./src --exec \"yarn prepare\"",
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/vue-kitchen-sink/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"babel-loader": "^7.1.2",
"babel-preset-env": "^1.6.0",
"babel-preset-vue": "^1.2.1",
"cross-env": "^3.0.0",
"cross-env": "^5.1.1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it still needed here, given that we have it in root now?

Copy link
Contributor Author

@AaronFriel AaronFriel Nov 6, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't sure. The kitchen sink is something people should be able to play with in isolation, right?

I assumed that because babel-core and babel-preset-env were also duplicated, that the package vue-kitchen-sink should be self-contained.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The kitchen sink is something people should be able to play with in isolation, right?

Not really. In our case, it‘s mainly used to test the changes made to other packages

"css-loader": "^0.28.7",
"file-loader": "^1.1.5",
"vue-hot-reload-api": "^2.2.0",
Expand Down
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"examples/vue-kitchen-sink"
],
"scripts": {
"bootstrap": "./scripts/bootstrap.js",
"bootstrap": "node ./scripts/bootstrap.js",
"bootstrap:docs": "yarn install --cwd docs",
"bootstrap:react-native-vanilla": "npm --prefix examples/react-native-vanilla install",
"bootstrap:crna-kitchen-sink": "npm --prefix examples/crna-kitchen-sink install",
Expand All @@ -34,7 +34,7 @@
"lint:js": "eslint --cache --cache-location=.cache/eslint --ext .js,.jsx,.json",
"lint:md": "remark",
"publish": "lerna publish",
"test": "./scripts/test.js",
"test": "node ./scripts/test.js",
"repo-dirty-check": "node ./scripts/repo-dirty-check"
},
"devDependencies": {
Expand All @@ -50,6 +50,7 @@
"chalk": "^2.3.0",
"codecov": "^3.0.0",
"commander": "^2.11.0",
"cross-env": "^5.1.1",
"danger": "^2.0.0",
"enzyme": "^3.1.1",
"enzyme-adapter-react-16": "^1.0.4",
Expand Down
35 changes: 31 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3096,9 +3096,9 @@ create-react-class@^15.5.2:
loose-envify "^1.3.1"
object-assign "^4.1.1"

cross-env@^3.0.0:
version "3.2.4"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-3.2.4.tgz#9e0585f277864ed421ce756f81a980ff0d698aba"
cross-env@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.1.tgz#b6d8ab97f304c0f71dae7277b75fe424c08dfa74"
dependencies:
cross-spawn "^5.1.0"
is-windows "^1.0.0"
Expand Down Expand Up @@ -12052,7 +12052,7 @@ webpack-sources@^1.0.1:
source-list-map "^2.0.0"
source-map "~0.5.3"

webpack@3.8.1, webpack@^3.6.0, webpack@^3.8.1:
webpack@3.8.1, webpack@^3.8.1:
version "3.8.1"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.8.1.tgz#b16968a81100abe61608b0153c9159ef8bb2bd83"
dependencies:
Expand All @@ -12079,6 +12079,33 @@ webpack@3.8.1, webpack@^3.6.0, webpack@^3.8.1:
webpack-sources "^1.0.1"
yargs "^8.0.2"

webpack@^3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.6.0.tgz#a89a929fbee205d35a4fa2cc487be9cbec8898bc"
dependencies:
acorn "^5.0.0"
acorn-dynamic-import "^2.0.0"
ajv "^5.1.5"
ajv-keywords "^2.0.0"
async "^2.1.2"
enhanced-resolve "^3.4.0"
escope "^3.6.0"
interpret "^1.0.0"
json-loader "^0.5.4"
json5 "^0.5.1"
loader-runner "^2.3.0"
loader-utils "^1.1.0"
memory-fs "~0.4.1"
mkdirp "~0.5.0"
node-libs-browser "^2.0.0"
source-map "^0.5.3"
supports-color "^4.2.1"
tapable "^0.2.7"
uglifyjs-webpack-plugin "^0.4.6"
watchpack "^1.4.0"
webpack-sources "^1.0.1"
yargs "^8.0.2"

websocket-driver@>=0.5.1:
version "0.7.0"
resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
Expand Down