Skip to content
This repository was archived by the owner on Jul 19, 2021. It is now read-only.

Fix fake SSL certificate path in slate-tools start command #458

Merged
t-kelly merged 3 commits into from
Mar 27, 2018
Merged

Fix fake SSL certificate path in slate-tools start command #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f45997
Fix fake SSL certificate path in slate-tools start command
Mar 27, 2018
460ae4f
v1.0.0-alpha.26
Mar 27, 2018
e4e6f10
Merge branch '1.x' into fix-ssl-cert-path
t-kelly Mar 27, 2018
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
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Change Log

## v1.0.0-alpha.26 (2018-03-27)

#### :bug: Bug Fix

* `slate-tools`
* [#458](https://github.com/Shopify/slate/pull/448) Fix fake SSL certificate path in slate-tools start command. ([@t-kelly](https://github.com/t-kelly))

#### Committers: 3

* Thomas Kelly ([t-kelly](https://github.com/t-kelly))

## v1.0.0-alpha.25 (2018-03-23)

#### :rocket: Enhancement
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "2.0.0",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"npmClient": "yarn",
"useWorkspaces": true,
"changelog": {
Expand Down
6 changes: 3 additions & 3 deletions packages/create-slate-theme/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-slate-theme",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "Create a new slate project from an existing slate theme repo",
"main": "index.js",
"author": "Shopify Inc.",
Expand All @@ -15,8 +15,8 @@
"create-slate-theme": "./index.js"
},
"dependencies": {
"@shopify/slate-analytics": "^1.0.0-alpha.25",
"@shopify/slate-env": "^1.0.0-alpha.25",
"@shopify/slate-analytics": "^1.0.0-alpha.26",
"@shopify/slate-env": "^1.0.0-alpha.26",
"chalk": "^2.3.0",
"commander": "^2.12.2",
"execa": "^0.9.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/html-webpack-liquid-asset-tags-plugin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/html-webpack-liquid-asset-tags-plugin",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "Finds static asset references and turns them into liquid tags with the 'asset_url' filter",
"main": "index.js",
"author": "Shopify Inc.",
Expand Down
6 changes: 3 additions & 3 deletions packages/slate-analytics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/slate-analytics",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "Slate's analytics controller and event emitter",
"main": "index.js",
"scripts": {
Expand All @@ -17,8 +17,8 @@
},
"homepage": "https://github.com/shopify/slate#readme",
"dependencies": {
"@shopify/slate-error": "^1.0.0-alpha.25",
"@shopify/slate-rc": "^1.0.0-alpha.25",
"@shopify/slate-error": "^1.0.0-alpha.26",
"@shopify/slate-rc": "^1.0.0-alpha.26",
"axios": "^0.18.0",
"chalk": "^2.3.0",
"inquirer": "^5.0.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/slate-babel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/slate-babel",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "Slate's webpack babel loader configurable via slate.config.js",
"main": "index.js",
"repository": "https://github.com/Shopify/slate/tree/1.x/packages/slate-babel",
Expand All @@ -11,7 +11,7 @@
},
"homepage": "https://github.com/shopify/slate#readme",
"dependencies": {
"@shopify/slate-common-excludes": "^1.0.0-alpha.25",
"@shopify/slate-config": "^1.0.0-alpha.25"
"@shopify/slate-common-excludes": "^1.0.0-alpha.26",
"@shopify/slate-config": "^1.0.0-alpha.26"
}
}
4 changes: 2 additions & 2 deletions packages/slate-common-excludes/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/slate-common-excludes",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "Common file exclusions used accross the Webpack build config.",
"main": "index.js",
"repository": "https://github.com/Shopify/slate/tree/1.x/packages/slate-common-excludes",
Expand All @@ -11,6 +11,6 @@
},
"homepage": "https://github.com/shopify/slate#readme",
"dependencies": {
"@shopify/slate-config": "^1.0.0-alpha.25"
"@shopify/slate-config": "^1.0.0-alpha.26"
}
}
2 changes: 1 addition & 1 deletion packages/slate-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/slate-config",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "Generate configurations for Slate packages by applying values from slate.config.js to override default values",
"main": "index.js",
"repository": "https://github.com/Shopify/slate/tree/1.x/packages/slate-config",
Expand Down
4 changes: 2 additions & 2 deletions packages/slate-cssvar-loader/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/slate-cssvar-loader",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "Finds CSS custom properties (variables) in your stylesheets and replaces them with their corresponding liquid variable",
"main": "index.js",
"repository": "https://github.com/Shopify/slate/tree/1.x/packages/slate-cssvar-loader",
Expand All @@ -11,7 +11,7 @@
},
"homepage": "https://github.com/Shopify/slate#readme",
"dependencies": {
"@shopify/slate-config": "^1.0.0-alpha.25",
"@shopify/slate-config": "^1.0.0-alpha.26",
"loader-utils": "^1.1.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/slate-env/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/slate-env",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "Manages the environment variables which are needed by Slate to interact with Shopify servers.",
"main": "index.js",
"repository": "https://github.com/Shopify/slate/tree/1.x/packages/slate-env",
Expand All @@ -11,7 +11,7 @@
},
"homepage": "https://github.com/shopify/slate#readme",
"dependencies": {
"@shopify/slate-config": "^1.0.0-alpha.25",
"@shopify/slate-config": "^1.0.0-alpha.26",
"dotenv": "^4.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-error/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/slate-error",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "Slate's global error class",
"main": "index.js",
"repository": "https://github.com/Shopify/slate/tree/1.x/packages/slate-error",
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-liquid-asset-loader/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/slate-liquid-asset-loader",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "Parses liquid files, searching for assets that are piped to `asset_url` and transforming them into `require()` call so that images are run through the correct loader and their name are fingerprinted.",
"main": "index.js",
"repository": "https://github.com/Shopify/slate/tree/1.x/packages/slate-liquid-asset-loader",
Expand Down
6 changes: 3 additions & 3 deletions packages/slate-rc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/slate-rc",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "Slate's global configuration manager. Generates, reads, and applies values to a global .slaterc file",
"main": "index.js",
"repository": "https://github.com/Shopify/slate/tree/1.x/packages/slate-rc",
Expand All @@ -11,8 +11,8 @@
},
"homepage": "https://github.com/shopify/slate",
"dependencies": {
"@shopify/slate-config": "^1.0.0-alpha.25",
"@shopify/slate-error": "^1.0.0-alpha.25",
"@shopify/slate-config": "^1.0.0-alpha.26",
"@shopify/slate-error": "^1.0.0-alpha.26",
"fs-extra": "^5.0.0",
"mock-fs": "^4.4.2",
"semver": "^5.5.0",
Expand Down
9 changes: 5 additions & 4 deletions packages/slate-sync/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/slate-sync",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "Slate's Shopify API client which handles all theme development requests",
"repository": "https://github.com/Shopify/slate/tree/1.x/packages/slate-sync",
"license": "MIT",
Expand All @@ -11,10 +11,11 @@
},
"engine": ">=8.9.4",
"dependencies": {
"@shopify/slate-analytics": "^1.0.0-alpha.25",
"@shopify/slate-config": "^1.0.0-alpha.25",
"@shopify/slate-env": "^1.0.0-alpha.25",
"@shopify/slate-analytics": "^1.0.0-alpha.26",
"@shopify/slate-config": "^1.0.0-alpha.26",
"@shopify/slate-env": "^1.0.0-alpha.26",
"@shopify/themekit": "0.6.12",
"array-flatten": "^2.1.1",
"chalk": "2.3.2",
"figures": "^2.0.0",
"inquirer": "^5.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-tag-webpack-plugin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/slate-tag-webpack-plugin",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "A webpack plugin that tags a Slate theme settings_schema.json so it's easy to identify on Shopify servers",
"main": "index.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions packages/slate-tools/cli/commands/start.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ let spinner = ora(chalk.magenta(' Compiling...')).start();

const sslCert = fs.existsSync(config.paths.ssl.cert)
? fs.readFileSync(config.paths.ssl.cert)
: fs.readFileSync(path.join(__dirname, '../ssl/server.pem'));
: fs.readFileSync(path.join(__dirname, '../../ssl/server.pem'));

const sslKey = fs.existsSync(config.paths.ssl.key)
? fs.readFileSync(config.paths.ssl.key)
: fs.readFileSync(path.join(__dirname, '../ssl/server.pem'));
: fs.readFileSync(path.join(__dirname, '../../ssl/server.pem'));

const sslOptions = {
key: sslKey,
Expand Down
22 changes: 11 additions & 11 deletions packages/slate-tools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/slate-tools",
"version": "1.0.0-alpha.25",
"version": "1.0.0-alpha.26",
"description": "A modern development toolkit for Shopify themes",
"repository":
"https://github.com/Shopify/slate/tree/1.x/packages/slate-tools",
Expand All @@ -14,16 +14,16 @@
},
"engine": ">=8.9.4",
"dependencies": {
"@shopify/html-webpack-liquid-asset-tags-plugin": "^1.0.0-alpha.25",
"@shopify/slate-analytics": "^1.0.0-alpha.25",
"@shopify/slate-babel": "^1.0.0-alpha.25",
"@shopify/slate-common-excludes": "^1.0.0-alpha.25",
"@shopify/slate-config": "^1.0.0-alpha.25",
"@shopify/slate-cssvar-loader": "^1.0.0-alpha.25",
"@shopify/slate-env": "^1.0.0-alpha.25",
"@shopify/slate-liquid-asset-loader": "^1.0.0-alpha.25",
"@shopify/slate-sync": "^1.0.0-alpha.25",
"@shopify/slate-tag-webpack-plugin": "^1.0.0-alpha.25",
"@shopify/html-webpack-liquid-asset-tags-plugin": "^1.0.0-alpha.26",
"@shopify/slate-analytics": "^1.0.0-alpha.26",
"@shopify/slate-babel": "^1.0.0-alpha.26",
"@shopify/slate-common-excludes": "^1.0.0-alpha.26",
"@shopify/slate-config": "^1.0.0-alpha.26",
"@shopify/slate-cssvar-loader": "^1.0.0-alpha.26",
"@shopify/slate-env": "^1.0.0-alpha.26",
"@shopify/slate-liquid-asset-loader": "^1.0.0-alpha.26",
"@shopify/slate-sync": "^1.0.0-alpha.26",
"@shopify/slate-tag-webpack-plugin": "^1.0.0-alpha.26",
"@shopify/theme-lint": "^2.0.0",
"@shopify/themekit": "0.6.12",
"archiver": "^2.1.0",
Expand Down