Skip to content

Commit

Permalink
Fix package name references
Browse files Browse the repository at this point in the history
  • Loading branch information
Philip Plagge committed Aug 14, 2019
1 parent 7f3aafd commit 4d1276d
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ aliases:
- .

- &save_js_packages
key: js-packages-v1-{{ .Branch }}-{{ checksum "/root/project/app/package-lock.json" }}-{{ checksum "/root/project/app/packages/t3n-components/package-lock.json" }}-{{ checksum "/root/project/app/packages/t3n-storybook/package-lock.json" }}-{{ checksum "/root/project/app/packages/t3n-theme/package-lock.json" }}
key: js-packages-v1-{{ .Branch }}-{{ checksum "/root/project/app/package-lock.json" }}-{{ checksum "/root/project/app/packages/configs/package-lock.json" }}-{{ checksum "/root/project/app/packages/components/package-lock.json" }}-{{ checksum "/root/project/app/packages/storybook/package-lock.json" }}-{{ checksum "/root/project/app/packages/theme/package-lock.json" }}
paths:
- /root/.npm

- &restore_js_packages
keys:
- js-packages-v1-{{ .Branch }}-{{ checksum "/root/project/app/package-lock.json" }}-{{ checksum "/root/project/app/packages/t3n-components/package-lock.json" }}-{{ checksum "/root/project/app/packages/t3n-storybook/package-lock.json" }}-{{ checksum "/root/project/app/packages/t3n-theme/package-lock.json" }}
- js-packages-v1-{{ .Branch }}-{{ checksum "/root/project/app/package-lock.json" }}-{{ checksum "/root/project/app/packages/configs/package-lock.json" }}-{{ checksum "/root/project/app/packages/components/package-lock.json" }}-{{ checksum "/root/project/app/packages/storybook/package-lock.json" }}-{{ checksum "/root/project/app/packages/theme/package-lock.json" }}
- js-packages-v1-{{ .Branch }}-
- js-packages-v1-

Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build:
<<: *sharedBeforeScript
script:
- npm install --unsafe-perm
- ls -lha packages/t3n-storybook/
- ls -lha packages/storybook/
- docker build --pull -t $CONTAINER_RELEASE_IMAGE .

layers:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ The monorepo is structured into 3 packages:

First, install all dependencies by running `npm install`.

Before starting development the first time, you need to run `npm run build` from the main package. This will run the build script of each package in the correct order, as **t3n-storybook** depends on **t3n-components**, which itself depends on **t3n-theme**.
Before starting development the first time, you need to run `npm run build` from the main package. This will run the build script of each package in the correct order, as **@t3n/storybook** depends on **@t3n/components**, which itself depends on **@t3n/theme**.

After, you can run `npm run start` to start storybook and watch file changes in all packages.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,26 @@
"start:components": "lerna run start --scope @t3n/components --stream",
"build:components": "lerna run build --scope @t3n/components --stream",
"test:components": "lerna run test --scope @t3n/components --stream",
"lint:components": "eslint './packages/t3n-components/src/**'",
"lint:components": "eslint './packages/components/src/**'",
"start:theme": "lerna run start --scope @t3n/theme --stream",
"build:theme": "lerna run build --scope @t3n/theme --stream",
"test:theme": "lerna run test --scope @t3n/theme --stream",
"lint:theme": "eslint './packages/t3n-theme/src/**'",
"lint:theme": "eslint './packages/theme/src/**'",
"start:storybook": "lerna run start --scope @t3n/storybook --stream",
"build:storybook": "lerna run build --scope @t3n/storybook --stream",
"serve:storybook": "lerna run serve --scope @t3n/storybook --stream",
"test:storybook": "lerna run test --scope @t3n/storybook --stream",
"lint:storybook": "eslint './packages/t3n-storybook/src/**'",
"lint:storybook": "eslint './packages/storybook/src/**'",
"prettier:format": "prettier --write 'packages/**/*.{ts,tsx,js,jsx}'",
"prettier:check": "prettier --check 'packages/**/*.{ts,tsx,js,jsx}'",
"upgrade-interactive": "npm-check --update && npm-check --update packages/t3n-components && npm-check --update packages/t3n-theme && npm-check --update packages/t3n-storybook && npm-check --update packages/t3n-configs",
"upgrade-interactive": "npm-check --update && npm-check --update packages/components && npm-check --update packages/theme && npm-check --update packages/storybook && npm-check --update packages/configs",
"codegen:watch": "npx apollo client:codegen --target=typescript --watch",
"codegen:build": "npx apollo client:codegen --target=typescript"
},
"jest": {
"projects": [
"<rootDir>/packages/t3n-theme/package.json",
"<rootDir>/packages/t3n-components/package.json"
"<rootDir>/packages/theme/package.json",
"<rootDir>/packages/components/package.json"
]
},
"dependencies": {}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const configure = require('@t3n/configs/webpack');

module.exports = {
...configure({ title: 't3n-components', dirname: __dirname }),
...configure({ title: '@t3n/components', dirname: __dirname }),
externals: {
react: {
root: 'React',
Expand Down
2 changes: 1 addition & 1 deletion packages/configs/webpack/storybook.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = ({ config }) => {
};

config.resolve.extensions.push('.ts', '.tsx');
config.plugins.push(new WebpackNotifierPlugin({ title: 't3n-storybook' }));
config.plugins.push(new WebpackNotifierPlugin({ title: '@t3n/storybook' }));

return config;
};
2 changes: 1 addition & 1 deletion packages/theme/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const configure = require('@t3n/configs/webpack');

module.exports = {
...configure({ title: 't3n-theme', dirname: __dirname }),
...configure({ title: '@t3n/theme', dirname: __dirname }),
externals: {
react: {
root: 'React',
Expand Down

0 comments on commit 4d1276d

Please sign in to comment.