Skip to content

Commit

Permalink
fix: build adapter before bundling
Browse files Browse the repository at this point in the history
amcgee committed Aug 27, 2019

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
1 parent b4f37ad commit 861844f
Showing 5 changed files with 2,112 additions and 116 deletions.
94 changes: 48 additions & 46 deletions cli/package.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,50 @@
{
"name": "@dhis2/cli-app-scripts",
"version": "1.1.2",
"main": "src/index.js",
"repository": "https://github.com/amcgee/dhis2-app-platform",
"author": "Austin McGee <austin@dhis2.org>",
"license": "BSD-3-Clause",
"publishConfig": {
"access": "public"
},
"files": [
"assets",
"bin",
"config",
"src"
],
"dependencies": {
"@babel/core": "^7.3.3",
"@babel/plugin-proposal-class-properties": "^7.4.4",
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
"@babel/preset-env": "^7.3.1",
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.3.3",
"@dhis2/cli-helpers-engine": "^1.4.0",
"chalk": "^2.4.2",
"fs-extra": "^8.1.0",
"gaze": "^1.1.3",
"handlebars": "^4.1.2",
"i18next-conv": "^9",
"i18next-scanner": "^2.9.1",
"lodash": "^4.17.11",
"react": "*",
"rollup": "^1.20.2",
"rollup-plugin-babel": "^4.3.2",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^5.0.1",
"styled-jsx": "^3.2.1"
},
"bin": {
"d2-app-scripts": "./bin/d2-app-scripts"
},
"scripts": {
"copy:shell": "mkdir -p assets && rm -rf assets/shell && cp -rf ../shell assets/shell && rm -rf assets/shell/node_modules",
"build": "yarn copy:shell",
"prepublishOnly": "yarn build"
}
"name": "@dhis2/cli-app-scripts",
"version": "1.1.2",
"main": "src/index.js",
"repository": "https://github.com/amcgee/dhis2-app-platform",
"author": "Austin McGee <austin@dhis2.org>",
"license": "BSD-3-Clause",
"publishConfig": {
"access": "public"
},
"files": [
"assets",
"bin",
"config",
"src"
],
"dependencies": {
"@babel/core": "^7.3.3",
"@babel/plugin-proposal-class-properties": "^7.4.4",
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
"@babel/preset-env": "^7.3.1",
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.3.3",
"@dhis2/cli-helpers-engine": "^1.4.0",
"chalk": "^2.4.2",
"fs-extra": "^8.1.0",
"gaze": "^1.1.3",
"handlebars": "^4.1.2",
"i18next-conv": "^9",
"i18next-scanner": "^2.9.1",
"lodash": "^4.17.11",
"react": "*",
"rollup": "^1.20.2",
"rollup-plugin-babel": "^4.3.2",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^5.0.1",
"styled-jsx": "^3.2.1"
},
"bin": {
"d2-app-scripts": "./bin/d2-app-scripts"
},
"scripts": {
"assets:prep": "rm -rf assets && mkdir -p assets",
"assets:copy": "cp -rf ../shell assets/shell",
"assets:clean": "cd assets/shell && rm -rf node_modules .pnp.js .pnp adapter/node_modules adapter/.pnp.js adapter/.pnp",
"build": "yarn assets:prep && yarn assets:copy && yarn assets:clean",
"prepublishOnly": "yarn build"
}
}
2 changes: 1 addition & 1 deletion examples/simple-app/yarn.lock
Original file line number Diff line number Diff line change
@@ -727,7 +727,7 @@
to-fast-properties "^2.0.0"

"@dhis2/cli-app-scripts@file:../../cli":
version "0.9.1"
version "1.1.2"
dependencies:
"@babel/core" "^7.3.3"
"@babel/plugin-proposal-class-properties" "^7.4.4"
45 changes: 23 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{
"name": "root",
"private": true,
"workspaces": [
"cli"
],
"devDependencies": {
"@dhis2/cli-style": "^4.1.1",
"babel-eslint": "^10.0.3",
"concurrently": "^4.1.2"
},
"scripts": {
"format": "d2-style js apply --all --no-stage",
"install:example": "cd examples/simple-app && yarn install --force --check-files",
"build:cli": "cd cli && yarn build",
"build:docs": "cp -f CHANGELOG.md docs/",
"build:example": "cd examples/simple-app && yarn build --force",
"build": "yarn build:cli && yarn install:example",
"start:example": "cd examples/simple-app && yarn start --force",
"start": "yarn build && yarn start:example",
"docs": "yarn build:docs && npx serve -s docs"
},
"version": "1.1.2"
"name": "root",
"private": true,
"workspaces": [
"cli"
],
"devDependencies": {
"@dhis2/cli-style": "^4.1.1",
"babel-eslint": "^10.0.3",
"concurrently": "^4.1.2"
},
"scripts": {
"format": "d2-style js apply --all --no-stage",
"install:example": "cd examples/simple-app && yarn install --force --check-files",
"build:adapter": "cd shell/adapter && yarn --force --check-files && yarn build",
"build:cli": "cd cli && yarn build",
"build:docs": "cp -f CHANGELOG.md docs/",
"build:example": "cd examples/simple-app && yarn build --force",
"build": "yarn build:adapter && yarn build:cli && yarn install:example",
"start:example": "cd examples/simple-app && yarn start --force",
"start": "yarn build && yarn start:example",
"docs": "yarn build:docs && npx serve -s docs"
},
"version": "1.1.2"
}
54 changes: 30 additions & 24 deletions shell/adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
{
"name": "@dhis2/app-adapter",
"version": "1.0.0",
"private": true,
"main": "build/cjs/lib.js",
"module": "build/es/lib.js",
"dependencies": {
"@dhis2/ui-core": "3.9.0",
"@dhis2/ui-widgets": "^1.0.4",
"moment": "^2.24.0"
},
"devDependencies": {
"@dhis2/cli-app": "1.0.0"
},
"scripts": {
"build": "d2-app build"
},
"peerDependencies": {
"@dhis2/app-runtime": "^1.5.1",
"@dhis2/d2-i18n": "*",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"styled-jsx": "*"
}
"name": "@dhis2/app-adapter",
"version": "1.0.0",
"private": true,
"main": "build/cjs/lib.js",
"module": "build/es/lib.js",
"files": [
"build"
],
"dependencies": {
"@dhis2/ui-core": "3.9.0",
"@dhis2/ui-widgets": "^1.0.4",
"moment": "^2.24.0"
},
"devDependencies": {
"@dhis2/cli-app-scripts": "file:../../cli"
},
"scripts": {
"build": "d2-app-scripts build"
},
"peerDependencies": {
"@dhis2/app-runtime": "^1.5.1",
"@dhis2/d2-i18n": "*",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"styled-jsx": "*"
},
"installConfig": {
"pnp": true
}
}
2,033 changes: 2,010 additions & 23 deletions shell/adapter/yarn.lock

Large diffs are not rendered by default.

0 comments on commit 861844f

Please sign in to comment.