From b08cb951cc812fbbedfdb01470b059e0ed5bca22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20H=C3=B8egh?= Date: Wed, 16 Feb 2022 15:37:22 +0100 Subject: [PATCH] Rename folder from release to postbuild --- .../dnb-design-system-portal/scripts/version.js | 2 +- packages/dnb-eufemia/jest.config.js | 2 +- packages/dnb-eufemia/package.json | 16 ++++++++-------- .../__tests__/__mocks__/version.mock | 0 .../__tests__/postbuild.test.js | 0 .../__tests__/prepareForRelease.test.js | 0 .../scripts/{release => postbuild}/babel-cjs.sh | 4 ++-- .../scripts/{release => postbuild}/babel-es.sh | 4 ++-- .../scripts/{release => postbuild}/babel-esm.sh | 4 ++-- .../scripts/{release => postbuild}/babel-umd.sh | 0 .../copy-build-artifacts.sh | 2 +- .../{release => postbuild}/copyFinaleBuild.js | 0 .../scripts/{release => postbuild}/copyStyles.js | 0 .../copyTypeScriptFiles.js | 0 .../getNextReleaseVersion.js | 4 ++-- .../scripts/{release => postbuild}/postbuild.sh | 2 +- .../{release => postbuild}/prepareForRelease.js | 0 .../{release => postbuild}/publish-prepare.sh | 4 ++-- .../{release => postbuild}/publish-release.sh | 0 .../tasks/__tests__/makeReleaseVersion.test.js | 6 +++--- .../scripts/prebuild/tasks/makeReleaseVersion.js | 2 +- 21 files changed, 26 insertions(+), 26 deletions(-) rename packages/dnb-eufemia/scripts/{release => postbuild}/__tests__/__mocks__/version.mock (100%) rename packages/dnb-eufemia/scripts/{release => postbuild}/__tests__/postbuild.test.js (100%) rename packages/dnb-eufemia/scripts/{release => postbuild}/__tests__/prepareForRelease.test.js (100%) rename packages/dnb-eufemia/scripts/{release => postbuild}/babel-cjs.sh (80%) rename packages/dnb-eufemia/scripts/{release => postbuild}/babel-es.sh (77%) rename packages/dnb-eufemia/scripts/{release => postbuild}/babel-esm.sh (77%) rename packages/dnb-eufemia/scripts/{release => postbuild}/babel-umd.sh (100%) rename packages/dnb-eufemia/scripts/{release => postbuild}/copy-build-artifacts.sh (84%) rename packages/dnb-eufemia/scripts/{release => postbuild}/copyFinaleBuild.js (100%) rename packages/dnb-eufemia/scripts/{release => postbuild}/copyStyles.js (100%) rename packages/dnb-eufemia/scripts/{release => postbuild}/copyTypeScriptFiles.js (100%) rename packages/dnb-eufemia/scripts/{release => postbuild}/getNextReleaseVersion.js (87%) rename packages/dnb-eufemia/scripts/{release => postbuild}/postbuild.sh (85%) rename packages/dnb-eufemia/scripts/{release => postbuild}/prepareForRelease.js (100%) rename packages/dnb-eufemia/scripts/{release => postbuild}/publish-prepare.sh (64%) rename packages/dnb-eufemia/scripts/{release => postbuild}/publish-release.sh (100%) diff --git a/packages/dnb-design-system-portal/scripts/version.js b/packages/dnb-design-system-portal/scripts/version.js index caa0ba62d96..e6fbf88784a 100644 --- a/packages/dnb-design-system-portal/scripts/version.js +++ b/packages/dnb-design-system-portal/scripts/version.js @@ -8,7 +8,7 @@ const path = require('path') const { isCI } = require('ci-info') const { getNextReleaseVersion, -} = require('@dnb/eufemia/scripts/release/getNextReleaseVersion') +} = require('@dnb/eufemia/scripts/postbuild/getNextReleaseVersion') const init = async () => { if (!isCI) { diff --git a/packages/dnb-eufemia/jest.config.js b/packages/dnb-eufemia/jest.config.js index d0378c18c7d..ffcc81c8537 100644 --- a/packages/dnb-eufemia/jest.config.js +++ b/packages/dnb-eufemia/jest.config.js @@ -4,7 +4,7 @@ const config = { testRegex: '(/__tests__/\\.js|(\\.|/)(test|spec))\\.(js|jsx|ts|tsx)?$', modulePathIgnorePatterns: [ 'not_in_use', - '/scripts/release/*', + '/scripts/postbuild/*', '/build/', '/assets/', '/stories/', diff --git a/packages/dnb-eufemia/package.json b/packages/dnb-eufemia/package.json index 5a0e03458d3..251aedc587e 100644 --- a/packages/dnb-eufemia/package.json +++ b/packages/dnb-eufemia/package.json @@ -22,12 +22,12 @@ "build": "./scripts/prebuild/local-prebuild.sh", "prebuild:ci": "yarn build:prebuild", "build:ci": "yarn prebuild:ci && yarn postbuild:ci && yarn publish:prepare", - "postbuild:ci": "./scripts/release/postbuild.sh", - "build:cjs": "./scripts/release/babel-cjs.sh", + "postbuild:ci": "./scripts/postbuild/postbuild.sh", + "build:cjs": "./scripts/postbuild/babel-cjs.sh", "build:clean": "rm -rf build/**", - "build:copy": "./scripts/release/copy-build-artifacts.sh", - "build:es": "./scripts/release/babel-es.sh", - "build:esm": "./scripts/release/babel-esm.sh", + "build:copy": "./scripts/postbuild/copy-build-artifacts.sh", + "build:es": "./scripts/postbuild/babel-es.sh", + "build:esm": "./scripts/postbuild/babel-esm.sh", "prebuild:figma:ci": "yarn figma", "postbuild:figma:ci": "yarn test:update && yarn test:screenshots:update && babel-node ./scripts/figma/tasks/commitChanges", "build:pack": "yarn build && yarn publish:prepare && cd ./build && yarn pack", @@ -37,7 +37,7 @@ "build:types:definitions": "yarn tsc --project tsconfig.definitions.json", "build:types:dev": "nodemon --exec 'babel-node ./scripts/prebuild/generateTypes.js' --ext js --watch './src/**/*' --watch './scripts/**/*'", "build:types:esm": "yarn tsc --project tsconfig.definitions.json --declarationDir ./build/esm --rootDir src", - "build:umd": "./scripts/release/babel-umd.sh", + "build:umd": "./scripts/postbuild/babel-umd.sh", "precommit": "yarn lint-staged", "dev:icons": "nodemon --exec 'babel-node ./scripts/tools/convertIcons' --ignore '/icons/**' --ignore '*.json'", "dev:resources": "nodemon --exec 'babel-node ./scripts/prebuild/resources/makeResourcesPackage.js' --ext js,html,json,css,scss --watch './build/style/**/*' --watch './scripts/**/*' --ignore '*.json'", @@ -59,9 +59,9 @@ "lint:styles": "stylelint './src/**/*.{js,scss}'", "lint:styles:staged": "stylelint './{src,scripts}/**/*.{js,scss}'", "make-properties": "babel-node ./scripts/prebuild/makeProperties", - "publish:ci": "yarn publish:prepare && ./scripts/release/publish-release.sh", + "publish:ci": "yarn publish:prepare && ./scripts/postbuild/publish-release.sh", "publish:dry": "dotenv semantic-release --no-ci --dry-run", - "publish:prepare": "./scripts/release/publish-prepare.sh", + "publish:prepare": "./scripts/postbuild/publish-prepare.sh", "reset": "rm -rf ./node_modules ./components ./elements ./es ./icons ./extensions ./shared ./style ./umd", "skeleton:font": "nodemon --exec 'babel-node ./scripts/tools/createSkeletonFont.js'", "start": "start-storybook -s / -p 8002 --ci --no-release-notes --no-version-updates", diff --git a/packages/dnb-eufemia/scripts/release/__tests__/__mocks__/version.mock b/packages/dnb-eufemia/scripts/postbuild/__tests__/__mocks__/version.mock similarity index 100% rename from packages/dnb-eufemia/scripts/release/__tests__/__mocks__/version.mock rename to packages/dnb-eufemia/scripts/postbuild/__tests__/__mocks__/version.mock diff --git a/packages/dnb-eufemia/scripts/release/__tests__/postbuild.test.js b/packages/dnb-eufemia/scripts/postbuild/__tests__/postbuild.test.js similarity index 100% rename from packages/dnb-eufemia/scripts/release/__tests__/postbuild.test.js rename to packages/dnb-eufemia/scripts/postbuild/__tests__/postbuild.test.js diff --git a/packages/dnb-eufemia/scripts/release/__tests__/prepareForRelease.test.js b/packages/dnb-eufemia/scripts/postbuild/__tests__/prepareForRelease.test.js similarity index 100% rename from packages/dnb-eufemia/scripts/release/__tests__/prepareForRelease.test.js rename to packages/dnb-eufemia/scripts/postbuild/__tests__/prepareForRelease.test.js diff --git a/packages/dnb-eufemia/scripts/release/babel-cjs.sh b/packages/dnb-eufemia/scripts/postbuild/babel-cjs.sh similarity index 80% rename from packages/dnb-eufemia/scripts/release/babel-cjs.sh rename to packages/dnb-eufemia/scripts/postbuild/babel-cjs.sh index 334f5ad19f9..6a42c9d9299 100755 --- a/packages/dnb-eufemia/scripts/release/babel-cjs.sh +++ b/packages/dnb-eufemia/scripts/postbuild/babel-cjs.sh @@ -19,8 +19,8 @@ echo 'Building cjs bundle done!' echo 'Copy additional files to cjs ...' -OUT_DIR=./build/cjs babel-node ./scripts/release/copyTypeScriptFiles.js -OUT_DIR=./build/cjs babel-node ./scripts/release/copyStyles.js +OUT_DIR=./build/cjs babel-node ./scripts/postbuild/copyTypeScriptFiles.js +OUT_DIR=./build/cjs babel-node ./scripts/postbuild/copyStyles.js echo 'Copy extra cjs package.json ...' diff --git a/packages/dnb-eufemia/scripts/release/babel-es.sh b/packages/dnb-eufemia/scripts/postbuild/babel-es.sh similarity index 77% rename from packages/dnb-eufemia/scripts/release/babel-es.sh rename to packages/dnb-eufemia/scripts/postbuild/babel-es.sh index 674e07d871b..a58c4db79d3 100755 --- a/packages/dnb-eufemia/scripts/release/babel-es.sh +++ b/packages/dnb-eufemia/scripts/postbuild/babel-es.sh @@ -19,5 +19,5 @@ echo 'Building es bundle done!' echo 'Copy additional files to es ...' -OUT_DIR=./build/es babel-node ./scripts/release/copyTypeScriptFiles.js -OUT_DIR=./build/es babel-node ./scripts/release/copyStyles.js +OUT_DIR=./build/es babel-node ./scripts/postbuild/copyTypeScriptFiles.js +OUT_DIR=./build/es babel-node ./scripts/postbuild/copyStyles.js diff --git a/packages/dnb-eufemia/scripts/release/babel-esm.sh b/packages/dnb-eufemia/scripts/postbuild/babel-esm.sh similarity index 77% rename from packages/dnb-eufemia/scripts/release/babel-esm.sh rename to packages/dnb-eufemia/scripts/postbuild/babel-esm.sh index ac4342e4091..153b9f37135 100755 --- a/packages/dnb-eufemia/scripts/release/babel-esm.sh +++ b/packages/dnb-eufemia/scripts/postbuild/babel-esm.sh @@ -19,5 +19,5 @@ echo 'Building esm bundle done!' echo 'Copy additional files to esm ...' -OUT_DIR=./build/esm babel-node ./scripts/release/copyTypeScriptFiles.js -OUT_DIR=./build/esm babel-node ./scripts/release/copyStyles.js +OUT_DIR=./build/esm babel-node ./scripts/postbuild/copyTypeScriptFiles.js +OUT_DIR=./build/esm babel-node ./scripts/postbuild/copyStyles.js diff --git a/packages/dnb-eufemia/scripts/release/babel-umd.sh b/packages/dnb-eufemia/scripts/postbuild/babel-umd.sh similarity index 100% rename from packages/dnb-eufemia/scripts/release/babel-umd.sh rename to packages/dnb-eufemia/scripts/postbuild/babel-umd.sh diff --git a/packages/dnb-eufemia/scripts/release/copy-build-artifacts.sh b/packages/dnb-eufemia/scripts/postbuild/copy-build-artifacts.sh similarity index 84% rename from packages/dnb-eufemia/scripts/release/copy-build-artifacts.sh rename to packages/dnb-eufemia/scripts/postbuild/copy-build-artifacts.sh index b64e2fdc1ff..ef6acbee601 100755 --- a/packages/dnb-eufemia/scripts/release/copy-build-artifacts.sh +++ b/packages/dnb-eufemia/scripts/postbuild/copy-build-artifacts.sh @@ -8,6 +8,6 @@ rm -rf build/**/{__tests__,cjs} cp -r ./assets/ ./build/assets cp .npmignore ./build/.npmignore cp README README.md LICENSE ./build -babel-node ./scripts/release/copyFinaleBuild.js +babel-node ./scripts/postbuild/copyFinaleBuild.js echo 'Copy build artifacts done!' \ No newline at end of file diff --git a/packages/dnb-eufemia/scripts/release/copyFinaleBuild.js b/packages/dnb-eufemia/scripts/postbuild/copyFinaleBuild.js similarity index 100% rename from packages/dnb-eufemia/scripts/release/copyFinaleBuild.js rename to packages/dnb-eufemia/scripts/postbuild/copyFinaleBuild.js diff --git a/packages/dnb-eufemia/scripts/release/copyStyles.js b/packages/dnb-eufemia/scripts/postbuild/copyStyles.js similarity index 100% rename from packages/dnb-eufemia/scripts/release/copyStyles.js rename to packages/dnb-eufemia/scripts/postbuild/copyStyles.js diff --git a/packages/dnb-eufemia/scripts/release/copyTypeScriptFiles.js b/packages/dnb-eufemia/scripts/postbuild/copyTypeScriptFiles.js similarity index 100% rename from packages/dnb-eufemia/scripts/release/copyTypeScriptFiles.js rename to packages/dnb-eufemia/scripts/postbuild/copyTypeScriptFiles.js diff --git a/packages/dnb-eufemia/scripts/release/getNextReleaseVersion.js b/packages/dnb-eufemia/scripts/postbuild/getNextReleaseVersion.js similarity index 87% rename from packages/dnb-eufemia/scripts/release/getNextReleaseVersion.js rename to packages/dnb-eufemia/scripts/postbuild/getNextReleaseVersion.js index f13d8eae3af..d5fe853e853 100644 --- a/packages/dnb-eufemia/scripts/release/getNextReleaseVersion.js +++ b/packages/dnb-eufemia/scripts/postbuild/getNextReleaseVersion.js @@ -4,8 +4,8 @@ */ // When on a "release" branch: -// run: yarn nodemon --exec 'babel-node ./scripts/release/getNextReleaseVersion.js' --ext js --watch './scripts/**/*' -// run (mjs): yarn nodemon --exec 'node --experimental-import-meta-resolve ./scripts/release/getNextReleaseVersion.mjs' --ext mjs --watch './scripts/**/*' +// run: yarn nodemon --exec 'babel-node ./scripts/postbuild/getNextReleaseVersion.js' --ext js --watch './scripts/**/*' +// run (mjs): yarn nodemon --exec 'node --experimental-import-meta-resolve ./scripts/postbuild/getNextReleaseVersion.mjs' --ext mjs --watch './scripts/**/*' const { exec } = require('child_process') const getBranchName = require('current-git-branch') diff --git a/packages/dnb-eufemia/scripts/release/postbuild.sh b/packages/dnb-eufemia/scripts/postbuild/postbuild.sh similarity index 85% rename from packages/dnb-eufemia/scripts/release/postbuild.sh rename to packages/dnb-eufemia/scripts/postbuild/postbuild.sh index 7fc70f20f5b..22a05ca97d7 100755 --- a/packages/dnb-eufemia/scripts/release/postbuild.sh +++ b/packages/dnb-eufemia/scripts/postbuild/postbuild.sh @@ -15,6 +15,6 @@ yarn prettier:other echo 'Testing the postbuild ...' -jest --ci --rootDir ./scripts/release ./postbuild.test.js +jest --ci --rootDir ./scripts/postbuild ./postbuild.test.js echo 'Postbuild done!' diff --git a/packages/dnb-eufemia/scripts/release/prepareForRelease.js b/packages/dnb-eufemia/scripts/postbuild/prepareForRelease.js similarity index 100% rename from packages/dnb-eufemia/scripts/release/prepareForRelease.js rename to packages/dnb-eufemia/scripts/postbuild/prepareForRelease.js diff --git a/packages/dnb-eufemia/scripts/release/publish-prepare.sh b/packages/dnb-eufemia/scripts/postbuild/publish-prepare.sh similarity index 64% rename from packages/dnb-eufemia/scripts/release/publish-prepare.sh rename to packages/dnb-eufemia/scripts/postbuild/publish-prepare.sh index 70ea41fb985..160904921b8 100755 --- a/packages/dnb-eufemia/scripts/release/publish-prepare.sh +++ b/packages/dnb-eufemia/scripts/postbuild/publish-prepare.sh @@ -4,10 +4,10 @@ set -e # Exit immediately if a command exits with a non-zero status. echo 'Prepare before publish has started ...' -babel-node ./scripts/release/prepareForRelease.js +babel-node ./scripts/postbuild/prepareForRelease.js echo 'Testing the postbuild before publish ...' -jest --ci --rootDir ./scripts/release ./prepareForRelease.test.js +jest --ci --rootDir ./scripts/postbuild ./prepareForRelease.test.js echo 'Prepare before publish is done!' diff --git a/packages/dnb-eufemia/scripts/release/publish-release.sh b/packages/dnb-eufemia/scripts/postbuild/publish-release.sh similarity index 100% rename from packages/dnb-eufemia/scripts/release/publish-release.sh rename to packages/dnb-eufemia/scripts/postbuild/publish-release.sh diff --git a/packages/dnb-eufemia/scripts/prebuild/tasks/__tests__/makeReleaseVersion.test.js b/packages/dnb-eufemia/scripts/prebuild/tasks/__tests__/makeReleaseVersion.test.js index 71ee95555ea..93adff2c0c4 100644 --- a/packages/dnb-eufemia/scripts/prebuild/tasks/__tests__/makeReleaseVersion.test.js +++ b/packages/dnb-eufemia/scripts/prebuild/tasks/__tests__/makeReleaseVersion.test.js @@ -6,11 +6,11 @@ import fs from 'fs-extra' import { makeReleaseVersion } from '../makeReleaseVersion' import * as getBranchName from 'current-git-branch' -import * as getNextReleaseVersion from '../../../release/getNextReleaseVersion' +import * as getNextReleaseVersion from '../../../postbuild/getNextReleaseVersion' -jest.mock('../../../release/getNextReleaseVersion', () => { +jest.mock('../../../postbuild/getNextReleaseVersion', () => { return { - ...jest.requireActual('../../../release/getNextReleaseVersion'), + ...jest.requireActual('../../../postbuild/getNextReleaseVersion'), getNextReleaseVersion: jest.fn().mockResolvedValue(), } }) diff --git a/packages/dnb-eufemia/scripts/prebuild/tasks/makeReleaseVersion.js b/packages/dnb-eufemia/scripts/prebuild/tasks/makeReleaseVersion.js index ca25297c476..e8ada506925 100644 --- a/packages/dnb-eufemia/scripts/prebuild/tasks/makeReleaseVersion.js +++ b/packages/dnb-eufemia/scripts/prebuild/tasks/makeReleaseVersion.js @@ -9,7 +9,7 @@ import getBranchName from 'current-git-branch' import { getNextReleaseVersion, releaseBranches, -} from '../../release/getNextReleaseVersion' +} from '../../postbuild/getNextReleaseVersion' export async function makeReleaseVersion() { const branchName = getBranchName()